first import

sites/all/modules/drush/commands/pm/version_control/backup.inc

@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file Drush pm directory copy backup extension
+ */
+
+class drush_pm_version_control_backup implements drush_pm_version_control {
+
+  /**
+   * Implementation of pre_update().
+   */
+  public function pre_update(&$project, $items_to_test = array()) {
+    if (drush_get_option('no-backup', FALSE)) {
+      return TRUE;
+    }
+    if ($backup_target = $this->prepare_backup_dir()) {
+      if ($project['project_type'] != 'core') {
+        $backup_target .= '/' . $project['project_type'] . 's';
+        drush_mkdir($backup_target);
+      }
+      $backup_target .= '/'. $project['name'];
+      // Save for rollback or notifications.
+      $project['backup_target'] = $backup_target;
+
+      // Move or copy to backup target based in package-handler.
+      if (drush_get_option('package-handler', 'wget') == 'wget') {
+        if (drush_move_dir($project['full_project_path'], $backup_target)) {
+          return TRUE;
+        }
+      }
+      // cvs or git.
+      elseif (drush_copy_dir($project['full_project_path'], $backup_target)) {
+        return TRUE;
+      }
+      return drush_set_error('DRUSH_PM_BACKUP_FAILED', dt('Failed to backup project directory !project to !backup_target', array('!project' => $project['full_project_path'], '!backup_target' => $backup_target)));
+    }
+  }
+
+  /**
+   * Implementation of rollback().
+   */
+  public function rollback($project) {
+    if (drush_get_option('no-backup', FALSE)) {
+      return;
+    }
+    if (drush_move_dir($project['backup_target'], $project['full_project_path'], TRUE)) {
+      return drush_log(dt("Backups were restored successfully."), 'ok');
+    }
+    return drush_set_error('DRUSH_PM_BACKUP_ROLLBACK_FAILED', dt('Could not restore backup and rollback from failed upgrade. You will need to resolve manually.'));
+  }
+
+  /**
+   * Implementation of post_update().
+   */
+  public function post_update($project) {
+    if (drush_get_option('no-backup', FALSE)) {
+      return;
+    }
+    if ($project['backup_target']) {
+      drush_log(dt("Backups were saved into the directory !backup_target.", array('!backup_target' => $project['backup_target'])), 'ok');
+    }
+  }
+
+  /**
+   * Implementation of post_download().
+   */
+  public function post_download($project) {
+   // NOOP
+  }
+
+  // Helper for pre_update.
+  public function prepare_backup_dir($subdir = NULL) {
+    return drush_prepare_backup_dir($subdir);
+  }
+
+  public static function reserved_files() {
+    return array();
+  }
+}

sites/all/modules/drush/commands/pm/version_control/bzr.inc

@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * @file Drush pm Bazaar extension
+ */
+
+class drush_pm_version_control_bzr implements drush_pm_version_control {
+
+  /**
+   * Implementation of pre_update().
+   *
+   * Check that the project or drupal core directory looks clean
+   */
+  public function pre_update(&$project, $items_to_test = array()) {
+    // Bazaar needs a list of items to test within the given project.
+    // If $items_to_test is empty we need to force it to test the project
+    // directory itself --once we've cd'ed to it.
+    if (empty($items_to_test)) {
+      $items_to_test = array('.' => '.');
+    }
+    $args = array_keys($items_to_test);
+    array_unshift($args, 'bzr status --short' . str_repeat(' %s', count($args)));
+    array_unshift($args, $project['full_project_path']);
+    if (call_user_func_array('drush_shell_cd_and_exec', $args)) {
+      $output = preg_grep('/^[\sRCP][\sNDKM][\s\*]/', drush_shell_exec_output());
+      if (!empty($output)) {
+        return drush_set_error('DRUSH_PM_BZR_LOCAL_CHANGES', dt("The Bazaar working copy at !path appears to have uncommitted changes (see below). Please commit or revert these changes before continuing:\n!output", array('!path' => $project['full_project_path'], '!output' => implode("\n", $output))));
+      }
+    }
+    else {
+      return drush_set_error('DRUSH_PM_BZR_NOT_FOUND', dt("Drush was unable to get the bzr status on !path. Check that you have Bazaar \ninstalled and that this directory is a Bazaar working copy.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+    }
+    return TRUE;
+  }
+
+  /**
+   * Implementation of rollback().
+   */
+  public function rollback($project) {
+    if (drush_shell_exec('bzr revert %s', $project['full_project_path'])) {
+      $output = drush_shell_exec_output();
+      if (!empty($output)) {
+        return drush_set_error('DRUSH_PM_BZR_LOCAL_CHANGES', dt("The Bazaar working copy at !path appears to have uncommitted changes (see below). Please commit or revert these changes before continuing:\n!output", array('!path' => $project['full_project_path'], '!output' => implode("\n", $output))));
+      }
+    }
+    else {
+      return drush_set_error('DRUSH_PM_BZR_NOT_FOUND', dt("Drush was unable to get the Bazaar status on !path. Check that you have Bazaar \ninstalled and that this directory is a Bazaar working copy.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+    }
+  }
+
+  /**
+   * Implementation of post_update().
+   */
+  public function post_update($project) {
+    if ($this->sync($project)) {
+      // Only attempt commit on a sucessful sync
+      $this->commit($project);
+    }
+  }
+
+  /**
+   * Implementation of post_download().
+   */
+  public function post_download($project) {
+    if ($this->sync($project)) {
+      // Only attempt commit on a sucessful sync
+      $this->commit($project);
+    }
+  }
+
+  /**
+   * Automatically add any unversioned files to Bazaar and remove any files
+   * that have been deleted on the file system
+   */
+  private function sync($project) {
+    if (drush_get_option('bzrsync')) {
+      $errors = '';
+      $root = array();
+      if (drush_shell_exec('bzr status --short %s', $project['full_project_path'])) {
+        $output = drush_shell_exec_output();
+        // All paths returned by bzr status are relative to the repository root.
+        if (drush_shell_exec('bzr root %s', $project['full_project_path'])) {
+          $root = drush_shell_exec_output();
+        }
+        foreach ($output as $line) {
+          if (preg_match('/^\?\s+(.*)/', $line, $matches)) {
+            $path = $root[0] .'/'. $matches[1];
+            if (!drush_shell_exec('bzr add --no-recurse %s', $path)) {
+              $errors .= implode("\n", drush_shell_exec_output());
+            }
+          }
+          else if (preg_match('/^\s+D\s+(.*)/', $line, $matches)) {
+            $path = $root[0] .'/'. $matches[1];
+            if (!drush_shell_exec('bzr remove %s', $path)) {
+              $errors .= implode("\n", drush_shell_exec_output());
+            }
+          }
+        }
+        if (!empty($errors)) {
+          return drush_set_error('DRUSH_PM_BZR_SYNC_PROBLEMS', dt("Problems were encountered adding or removing files to/from Bazaar.\nThe specific errors are below:\n!errors", array('!errors' => $errors)));
+        }
+      }
+      else {
+        return drush_set_error('DRUSH_PM_BZR_NOT_FOUND', dt("Drush was unable to get the bzr status. Check that you have Bazaar \ninstalled and that the site is a Bazaar working copy.\nThe specific errors are below:\n!errors", array('!errors' => implode("\n", drush_shell_exec_output()))));
+      }
+      return TRUE;
+    }
+  }
+
+  /**
+   * Automatically commit changes to the repository
+   */
+  private function commit($project) {
+    if (drush_get_option('bzrcommit')) {
+      $message = drush_get_option('bzrmessage');
+      if (empty($message)) {
+        $message = dt("Drush automatic commit.\nProject: @name @type\nCommand: @arguments", array('@name' => $project['name'], '@type' => $project['project_type'], '@arguments' => implode(' ', $_SERVER['argv'])));
+      }
+      if (drush_shell_exec('bzr commit --message=%s %s', $message, $project['full_project_path'])) {
+        drush_log(dt('Project committed to Bazaar successfully'), 'ok');
+      }
+      else {
+        drush_set_error('DRUSH_PM_BZR_COMMIT_PROBLEMS', dt("Problems were encountered committing your changes to Bazaar.\nThe specific errors are below:\n!errors", array('!errors' => implode("\n", drush_shell_exec_output()))));
+      }
+    }
+    else {
+      drush_print(dt("You should consider committing the new code to your Bazaar repository.\nIf this version becomes undesireable, use Bazaar to roll back."));
+    }
+  }
+
+  public static function reserved_files() {
+    return array('.bzr', '.bzrignore', '.bzrtags');
+  }
+}

sites/all/modules/drush/commands/pm/version_control/svn.inc

@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * @file Drush pm SVN extension
+ */
+
+class drush_pm_version_control_svn implements drush_pm_version_control {
+
+  /**
+   * Implementation of pre_update().
+   */
+  public function pre_update(&$project, $items_to_test = array()) {
+    // If items to test is empty, test everything; otherwise, pass just
+    // the list of files to test to svn status.
+    $args = array_keys($items_to_test);
+    array_unshift($args, 'svn status '. drush_get_option('svnstatusparams') . str_repeat('%s ', count($args)));
+    array_unshift($args, $project['full_project_path']);
+    if (call_user_func_array('drush_shell_cd_and_exec', $args)) {
+      $output = preg_grep('/^[ ACDMRX?!~][ CM][ L][ +][ SX][ K]/', drush_shell_exec_output());
+      if (!empty($output)) {
+        return drush_set_error('DRUSH_PM_SVN_LOCAL_CHANGES', dt("The SVN working copy at !path appears to have uncommitted changes (see below). Please commit or revert these changes before continuing:\n!output", array('!path' => $project['full_project_path'], '!output' => implode("\n", $output))));
+      }
+    }
+    else {
+      return drush_set_error('DRUSH_PM_SVN_NOT_FOUND', dt("Drush was unable to get the svn status on !path.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+    }
+
+    // Check for incoming updates
+    $args = array_keys($items_to_test);
+    array_unshift($args, 'svn status -u '. drush_get_option('svnstatusparams') . str_repeat('%s ', count($args)));
+    array_unshift($args, $project['full_project_path']);
+    if (call_user_func_array('drush_shell_cd_and_exec', $args)) {
+      $output = preg_grep('/\*/', drush_shell_exec_output());
+      if (!empty($output)) {
+        return drush_set_error('DRUSH_PM_SVN_REMOTE_CHANGES', dt("The SVN working copy at !path appears to be out of date with the repository (see below). Please run 'svn update' to pull down changes before continuing:\n!output", array('!path' => $project['full_project_path'], '!output' => implode("\n", $output))));
+      }
+    }
+    else {
+      return drush_set_error('DRUSH_PM_SVN_NOT_FOUND', dt("Drush was unable to get the svn remote status on !path. Check that you have connectivity to the repository.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+    }
+    return TRUE;
+  }
+
+  /**
+   * Implementation of rollback().
+   */
+  public function rollback($project) {
+    if (drush_shell_exec('svn revert '. drush_get_option('svnrevertparams') .' '. $project['full_project_path'])) {
+      $output = drush_shell_exec_output();
+      if (!empty($output)) {
+        return drush_set_error('DRUSH_PM_SVN_LOCAL_CHANGES', dt("The SVN working copy at !path appears to have uncommitted changes (see below). Please commit or revert these changes before continuing:\n!output", array('!path' => $project['full_project_path'], '!output' => implode("\n", $output))));
+      }
+    }
+    else {
+      return drush_set_error('DRUSH_PM_SVN_NOT_FOUND', dt("Drush was unable to get the svn status on !path. Check that you have Subversion \ninstalled and that this directory is a subversion working copy.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+    }
+  }
+
+  /**
+   * Implementation of post_update().
+   */
+  public function post_update($project) {
+    if ($this->sync($project)) {
+      // Only attempt commit on a sucessful sync
+      $this->commit($project);
+    }
+  }
+
+  /**
+   * Implementation of post_download().
+   */
+  public function post_download($project) {
+    if ($this->sync($project)) {
+      // Only attempt commit on a sucessful sync
+      $this->commit($project);
+    }
+  }
+
+  /**
+   * Automatically add any unversioned files to Subversion and remove any files
+   * that have been deleted on the file system
+   */
+  private function sync($project) {
+    if (drush_get_option('svnsync')) {
+      $errors = '';
+      if (drush_shell_exec('svn status '. drush_get_option('svnstatusparams') .' '. $project['full_project_path'])) {
+        $output = drush_shell_exec_output();
+        foreach ($output as $line) {
+          if (preg_match('/^\? *(.*)/', $line, $matches)) {
+            if (!drush_shell_exec('svn add '. drush_get_option('svnaddparams') .' '. $matches[1])) {
+              $errors .= implode("\n", drush_shell_exec_output());
+            }
+          }
+          if (preg_match('/^\! *(.*)/', $line, $matches)) {
+            if (!drush_shell_exec('svn remove '. drush_get_option('svnremoveparams') .' '. $matches[1])) {
+              $errors .= implode("\n", drush_shell_exec_output());
+            }
+          }
+        }
+        if (!empty($errors)) {
+          return drush_set_error('DRUSH_PM_SVN_SYNC_PROBLEMS', dt("Problems were encountered adding or removing files to/from this SVN working copy.\nThe specific errors are below:\n!errors", array('!errors' => $errors)));
+        }
+      }
+      else {
+        return drush_set_error('DRUSH_PM_SVN_NOT_FOUND', dt("Drush was unable to get the svn status on !path. Check that you have Subversion \ninstalled and that this directory is a subversion working copy.\nThe specific errors are below:\n!errors", array('!path' => $project['full_project_path'], '!errors' => implode("\n", drush_shell_exec_output()))));
+      }
+      return TRUE;
+    }
+  }
+
+  /**
+   * Automatically commit changes to the repository
+   */
+  private function commit($project) {
+    if (drush_get_option('svncommit')) {
+      $message = drush_get_option('svnmessage');
+      if (empty($message)) {
+        $message = dt("Drush automatic commit: \n") . implode(' ', $_SERVER['argv']);
+      }
+      if (drush_shell_exec('svn commit '. drush_get_option('svncommitparams') .' -m "'. $message .'" '. $project['full_project_path'])) {
+        drush_log(dt('Project committed to Subversion successfully'), 'ok');
+      }
+      else {
+        drush_set_error('DRUSH_PM_SVN_COMMIT_PROBLEMS', dt("Problems were encountered committing your changes to Subversion.\nThe specific errors are below:\n!errors", array('!errors' => implode("\n", drush_shell_exec_output()))));
+      }
+    }
+    else {
+      drush_print(dt("You should consider committing the new code to your Subversion repository.\nIf this version becomes undesireable, use Subversion to roll back."));
+    }
+  }
+
+  public static function reserved_files() {
+    return array('.svn');
+  }
+}