Skip to content

revert the last commit from wp-admin #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abiam-Dronca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

revert the last commit from wp-admin #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gitium/inc/class-git-wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,11 @@ function rm_cached( $path ) {
return ( $return == 0 );
}

function revert_commit( $commit_hash ) {
list( $return, ) = $this->_call( 'revert', '--no-edit', $commit_hash );
return ( $return === 0 );
}

function remove_wp_content_from_version_control() {
$process = proc_open(
'rm -rf ' . ABSPATH . '/wp-content/.git',
Expand Down
40 changes: 40 additions & 0 deletions gitium/inc/class-gitium-submenu-commits.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,33 @@ class Gitium_Submenu_Commits extends Gitium_Menu {
public function __construct() {
parent::__construct( $this->gitium_menu_slug, $this->commits_menu_slug );
add_action( GITIUM_ADMIN_MENU_ACTION, array( $this, 'admin_menu' ) );
if ( current_user_can( GITIUM_MANAGE_OPTIONS_CAPABILITY ) ) {
add_action( 'admin_init', array( $this, 'revert_last_commit' ) );
}
}

public function revert_last_commit() {
if ( ! filter_input( INPUT_POST, 'GitiumSubmitRevertLastCommit', FILTER_SANITIZE_FULL_SPECIAL_CHARS ) ) {
return;
}
check_admin_referer( 'gitium-admin' );

$commits = $this->git->get_last_commits( 1 );
if ( empty( $commits ) ) {
$this->redirect( 'No commits to revert.', false, $this->commits_menu_slug );
}

$commit_hash = key( $commits );

if ( ! $this->git->revert_commit( $commit_hash ) ) {
$this->redirect( 'Could not revert commit: ' . $this->git->get_last_error(), false, $this->commits_menu_slug );
}

if ( ! $this->git->push() ) {
$this->redirect( 'Revert commit created locally but push failed: ' . $this->git->get_last_error(), false, $this->commits_menu_slug );
}

$this->success_redirect( 'Commit `' . $commit_hash . '` reverted and pushed successfully.', $this->commits_menu_slug );
}

public function admin_menu() {
Expand Down Expand Up @@ -69,6 +96,7 @@ public function page() {
<?php $this->table_head(); ?>
<tbody>
<?php
$first = true;
foreach ( $this->git->get_last_commits( GITIUM_LAST_COMMITS ) as $commit_id => $data ) {
unset( $committer_name );
extract( $data );
Expand Down Expand Up @@ -114,9 +142,21 @@ public function page() {
</td>
<td>
<p style="padding-top:8px;"><?php echo esc_html( $commit_id ); ?></p>
<?php if ( $first ) : ?>
<form method="POST" style="display:inline;">
<?php wp_nonce_field( 'gitium-admin' ); ?>
<input type="submit"
name="GitiumSubmitRevertLastCommit"
class="button button-secondary"
value="Revert"
onclick="return confirm('Revert commit <?php echo esc_js( $commit_id ); ?>?');"
/>
</form>
<?php endif; ?>
</td>
<?php
$this->table_end_row();
$first = false;
}
?>
</tbody>
Expand Down