Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 00:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1389417 - Disable problematic extensions when running hg update; r=ted

Browse Source 
We correctly worked around problems for `hg pull` but not for
`hg update`. Make the workaround consistent.

MozReview-Commit-ID: 7A4dgANO0ip

--HG--
extra : rebase_source : fd4b90200ab3ce07a3921a02ae28f5a7a0c3d83c
This commit is contained in:
Gregory Szorc 2017-08-11 09:18:04 -07:00
parent 93e68c316b
commit 075f82ba4d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
python/mozboot/mozboot/bootstrap.py
View File

@ -353,8 +353,6 @@ def configure_mercurial(hg, root_state_dir):
def update_mercurial_repo(hg, url, dest, revision):
"""Perform a clone/pull + update of a Mercurial repository."""
args = [hg]
# Disable common extensions whose older versions may cause `hg`
# invocations to abort.
disable_exts = [
@ -368,22 +366,31 @@ def update_mercurial_repo(hg, url, dest, revision):
'push-to-try',
'reviewboard',
]
for ext in disable_exts:
args.extend(['--config', 'extensions.%s=!' % ext])
def disable_extensions(args):
for ext in disable_exts:
args.extend(['--config', 'extensions.%s=!' % ext])
pull_args = [hg]
disable_extensions(pull_args)
if os.path.exists(dest):
args.extend(['pull', url])
pull_args.extend(['pull', url])
cwd = dest
else:
args.extend(['clone', '--noupdate', url, dest])
pull_args.extend(['clone', '--noupdate', url, dest])
cwd = '/'
update_args = [hg]
disable_extensions(update_args)
update_args.extend(['update', '-r', revision])
print('=' * 80)
print('Ensuring %s is up to date at %s' % (url, dest))
try:
subprocess.check_call(args, cwd=cwd)
subprocess.check_call([hg, 'update', '-r', revision], cwd=dest)
subprocess.check_call(pull_args, cwd=cwd)
subprocess.check_call(update_args, cwd=dest)
finally:
print('=' * 80)