Merged from master, resolved conflicts.

2 files changed, 27 insertions, 3 deletions

diff --git a/INSTALL b/INSTALL
index 0cbee72..879c94b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,7 +40,7 @@ Dependencies
 
  * apache2
  * build-essential
- * git-core
+ * git
  * mercurial (v2.4.1, not in Ubuntu repositories, need to install via pip)
  * pgadmin3
  * postgresql-9.1
@@ -55,6 +55,7 @@ Dependencies
  * python-dev
  * python-docutils
  * python-formencode
+ * python-ldap
  * python-mailer
  * python-markdown
  * python-nose
@@ -362,3 +363,26 @@ If set up as root, use:
 
     python scripts/update-repos --repos-dir /opt/rhodecode/git_repos \
     --user rhodecode
+
+Upgrading the Rhodecode instance
+================================
+
+The rhodecode-setup script also supports update of the Rhodecode to the
+specific tag or branch, while doing the reinstallation of the Rhodecode
+automatically. Downgrade of the database is not supported by the Rhodecode
+tools, so bare this in mind when updating to an older version/tag/branch.
+
+To update the system to a specific tag/branch run the following command
+from the rhodecode-config base directory:
+
+    python scripts/rhodecode-setup --rhodecode-config config/production.ini \
+    --rhodecode-usr $USR --rhodecode-branch $TAG \
+    --rhodecode-checkout-dir $CO_DIR --dbname $DB_NAME \
+    --assume-yes --update
+
+   Explaining variables:
+   * $USR: Rhodecode system user (defaults is: rhodecode)
+   * $TAG: Tag or branch in the Rhodecode cloned repository to which
+     the code base will be updated.
+   * $CO_DIR: path to the directory where Rhodecode was previously cloned.
+   * $DB_NAME: Database name for Rhodecode (default is: rhodecode)
diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index a2065b1..8cd7cd7 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -16,7 +16,7 @@ REQUIRED_PACKAGES = ["python-pip", "python-webob", "python-bcrypt",
                      "python-formencode", "python-pylons", "python-dev",
                      "python-pastescript", "python-psycopg2", "python-nose",
                      "build-essential", "python-amqplib", "python-anyjson",
-                     "python-mailer", "apache2", "git"]
+                     "python-mailer", "apache2", "git", "python-ldap"]
 # Packages required for celery integration.
 CELERY_REQUIRED_PACKAGES = ["rabbitmq-server"]
 
@@ -512,7 +512,7 @@ def update_rhodecode(tag, work_dir):
     :param source_co: The destination directory where the code is cloned.
     :type str
     """
-    cmd_args = ["git", "pull"]
+    cmd_args = ["git", "pull", "origin", tag]
     execute_command(cmd_args, work_dir=work_dir)
     cmd_args = ["git", "checkout", tag]
     execute_command(cmd_args, work_dir=work_dir, with_sudo=True)