Bug 1178955 - Don't pass config paths to updater; r=smacleod
authorGregory Szorc <gps@mozilla.com>
Fri, 17 Jul 2015 10:28:12 -0700
changeset 253477 a0fe4554cf59a20cf26715b7a0d11e8619c05b51
parent 253476 609f510f8c5873bf1e43b442d9481d79c2f04f21
child 253478 58c918dfc1d4f3c1abca25cd6d69420f94c28b60
push id29066
push userkwierso@gmail.com
push dateSat, 18 Jul 2015 00:55:13 +0000
treeherdermozilla-central@5db9b72d15c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmacleod
bugs1178955
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1178955 - Don't pass config paths to updater; r=smacleod They aren't needed.
tools/mercurial/hgsetup/update.py
tools/mercurial/mach_commands.py
--- a/tools/mercurial/hgsetup/update.py
+++ b/tools/mercurial/hgsetup/update.py
@@ -21,17 +21,17 @@ Your Mercurial recommended extensions ar
 
 class MercurialUpdater(object):
 
     def __init__(self, state_dir):
         self.state_dir = os.path.normpath(state_dir)
         self.ext_dir = os.path.join(self.state_dir, 'mercurial', 'extensions')
         self.vcs_tools_dir = os.path.join(self.state_dir, 'version-control-tools')
 
-    def update_all(self, config_paths):
+    def update_all(self):
         try:
             os.makedirs(self.ext_dir)
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
 
         try:
             hg = which.which('hg')
--- a/tools/mercurial/mach_commands.py
+++ b/tools/mercurial/mach_commands.py
@@ -56,15 +56,15 @@ class VersionControlCommands(object):
         state_path = os.path.join(state_dir, 'setup.lastcheck')
 
         with open(state_path, 'a'):
             os.utime(state_path, None)
 
         if update_only:
             from hgsetup.update import MercurialUpdater
             updater = MercurialUpdater(self._context.state_dir)
-            result = updater.update_all(map(os.path.expanduser, config_paths))
+            result = updater.update_all()
         else:
             from hgsetup.wizard import MercurialSetupWizard
             wizard = MercurialSetupWizard(self._context.state_dir)
             result = wizard.run(map(os.path.expanduser, config_paths))
 
         return result