nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 977384 - mach mercurial-setup: Remaining cleanup; r=gps

Browse source
This commit is contained in:
Ed Morley 2014-02-27 10:10:22 +00:00
parent 947aafcf25
commit 1386611e1d
2 changed files with 9 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
tools/mercurial/hgsetup/config.py
View file

@ -133,7 +133,6 @@ class MercurialConfig(object):
except KeyError: except KeyError:
pass pass
def have_qnew_currentuser_default(self): def have_qnew_currentuser_default(self):
if 'defaults' not in self._c: if 'defaults' not in self._c:
return False return False
@ -154,8 +153,6 @@ class MercurialConfig(object):
d = self._c['defaults'] d = self._c['defaults']
if 'qnew' not in d: if 'qnew' not in d:
d['qnew'] = '-U' d['qnew'] = '-U'
else: else:
d['qnew'] = '-U ' + d['qnew'] d['qnew'] = '-U ' + d['qnew']

16
tools/mercurial/hgsetup/wizard.py
View file

@ -156,19 +156,17 @@ class MercurialSetupWizard(object):
self.prompt_external_extension(c, 'bzexport', BZEXPORT_INFO) self.prompt_external_extension(c, 'bzexport', BZEXPORT_INFO)
active = c.extensions if 'mq' in c.extensions:
if 'mq' in active:
self.prompt_external_extension(c, 'mqext', MQEXT_INFO, self.prompt_external_extension(c, 'mqext', MQEXT_INFO,
os.path.join(self.ext_dir, 'mqext')) os.path.join(self.ext_dir, 'mqext'))
if 'mqext' in c.extensions: if 'mqext' in c.extensions:
self.update_mercurial_repo( self.update_mercurial_repo(
hg, hg,
'https://bitbucket.org/sfink/mqext', 'https://bitbucket.org/sfink/mqext',
os.path.join(self.ext_dir, 'mqext'), os.path.join(self.ext_dir, 'mqext'),
'default', 'default',
'Ensuring mqext extension is up to date...') 'Ensuring mqext extension is up to date...')
if self._prompt_yn('Would you like to configure mqext to ' if self._prompt_yn('Would you like to configure mqext to '
'automatically commit changes as you modify patches'): 'automatically commit changes as you modify patches'):
c.autocommit_mq(True) c.autocommit_mq(True)
@ -305,4 +303,4 @@ class MercurialSetupWizard(object):
if choice in ('n', 'no'): if choice in ('n', 'no'):
return False return False
print('Must reply with one of {yes, no, y, no}.') print('Must reply with one of {yes, no, y, n}.')