opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 00:44:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_18.01' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2018-04-16 17:40:27 +01:00
parent a1d76681f6 3e56c24d0a
commit 2bb388db20
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/util/hg_util.py
+12 -4
View File
@@ -54,14 +54,13 @@ def clone_repository(repository_clone_url, repository_file_dir, ctx_rev):
Clone the repository up to the specified changeset_revision. No subsequent revisions will be
present in the cloned repository.
"""
stdouterr = None
try:
stdouterr = subprocess.check_output(['hg', 'clone', '-r', ctx_rev, repository_clone_url, repository_file_dir], stderr=subprocess.STDOUT)
subprocess.check_output(['hg', 'clone', '-r', ctx_rev, repository_clone_url, repository_file_dir], stderr=subprocess.STDOUT)
return True, None
except Exception as e:
error_message = 'Error cloning repository: %s' % e
if isinstance(e, subprocess.CalledProcessError):
error_message += "\nOutput was:\n%s" % stdouterr
error_message += "\nOutput was:\n%s" % e.output
log.error(error_message)
return False, error_message
@@ -457,4 +456,13 @@ def update_repository(repo, ctx_rev=None):
# I = ignored
# It would be nice if we could use mercurial's purge extension to remove untracked files. The problem is that
# purging is not supported by the mercurial API.
commands.update(get_configured_ui(), repo, rev=ctx_rev)
cmd = ['hg', 'update']
if ctx_rev:
cmd.extend(['-r', ctx_rev])
try:
subprocess.check_output(cmd, stderr=subprocess.STDOUT, cwd=repo.root)
except Exception as e:
error_message = 'Error updating repository: %s' % e
if isinstance(e, subprocess.CalledProcessError):
error_message += "\nOutput was:\n%s" % e.output
raise Exception(error_message)