Consolidate use of clone_repository()

galaxyproject · Jun 5, 2018 · a777c39 · a777c39
1 parent 17d7c0f
commit a777c39
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/lib/galaxy/webapps/tool_shed/controllers/upload.py b/lib/galaxy/webapps/tool_shed/controllers/upload.py
@@ -5,7 +5,6 @@
 import tempfile
 
 import requests
-from mercurial import commands
 
 from galaxy import (
     util,
@@ -65,11 +64,9 @@ def upload(self, trans, **kwd):
                 # Use mercurial clone to fetch repository, contents will then be copied over.
                 uploaded_directory = tempfile.mkdtemp()
                 repo_url = 'http%s' % url[len('hg'):]
-                repo_url = repo_url.encode('ascii', 'replace')
-                try:
-                    commands.clone(hg_util.get_configured_ui(), repo_url, uploaded_directory)
-                except Exception as e:
-                    message = 'Error uploading via mercurial clone: %s' % basic_util.to_html_string(str(e))
+                cloned_ok, error_message = hg_util.clone_repository(repo_url, uploaded_directory)
+                if not cloned_ok:
+                    message = 'Error uploading via mercurial clone: %s' % error_message
                     status = 'error'
                     basic_util.remove_dir(uploaded_directory)
                     uploaded_directory = None

diff --git a/lib/tool_shed/util/hg_util.py b/lib/tool_shed/util/hg_util.py
@@ -5,7 +5,12 @@
 from datetime import datetime
 from time import gmtime
 
-from mercurial import cmdutil, commands, hg, ui
+from mercurial import (
+    cmdutil,
+    commands,
+    hg,
+    ui
+)
 
 from tool_shed.util import basic_util
 
@@ -31,13 +36,17 @@ def archive_repository_revision(app, repository, archive_dir, changeset_revision
         raise Exception(error_message)
 
 
-def clone_repository(repository_clone_url, repository_file_dir, ctx_rev):
+def clone_repository(repository_clone_url, repository_file_dir, ctx_rev=None):
     """
     Clone the repository up to the specified changeset_revision.  No subsequent revisions will be
     present in the cloned repository.
     """
+    cmd = ['hg', 'clone']
+    if ctx_rev:
+        cmd.extend(['-r', ctx_rev])
+    cmd.extend([repository_clone_url, repository_file_dir])
     try:
-        subprocess.check_output(['hg', 'clone', '-r', ctx_rev, repository_clone_url, repository_file_dir], stderr=subprocess.STDOUT)
+        subprocess.check_output(cmd, stderr=subprocess.STDOUT)
         return True, None
     except Exception as e:
         error_message = 'Error cloning repository: %s' % e