Remove all references to GIT_MODE from depot_tools

recipe_modules/gclient/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from recipe_engine import recipe_api
 
 
 class RevisionResolver(object):
   """Resolves the revision based on build properties."""
 
@@ skipping 133 matching lines @@
           revisions.extend(['--revision', '%s@%s' % (s.name, fixed_revision)])
 
     for name, revision in sorted(cfg.revisions.items()):
       fixed_revision = self.resolve_revision(revision)
       if fixed_revision:
         revisions.extend(['--revision', '%s@%s' % (name, fixed_revision)])
 
     test_data_paths = set(cfg.got_revision_mapping.keys() +
                           [s.name for s in cfg.solutions])
     step_test_data = lambda: (
-      self.test_api.output_json(test_data_paths, cfg.GIT_MODE))
+      self.test_api.output_json(test_data_paths))
     try:
-      if not cfg.GIT_MODE:  # pragma: no cover
-        args = ['sync', '--nohooks', '--force', '--verbose']
-        if cfg.delete_unversioned_trees:
-          args.append('--delete_unversioned_trees')
-        if with_branch_heads:
-          args.append('--with_branch_heads')
-        self('sync', args + revisions + ['--output-json', self.m.json.output()],
-                   step_test_data=step_test_data,
-                   **kwargs)
-      else:
-        # clean() isn't used because the gclient sync flags passed in checkout()
-        # do much the same thing, and they're more correct than doing a separate
-        # 'gclient revert' because it makes sure the other args are correct when
-        # a repo was deleted and needs to be re-cloned (notably
-        # --with_branch_heads), whereas 'revert' uses default args for clone
-        # operations.
-        #
-        # TODO(mmoss): To be like current official builders, this step could
-        # just delete the whole <slave_name>/build/ directory and start each
-        # build from scratch. That might be the least bad solution, at least
-        # until we have a reliable gclient method to produce a pristine working
-        # dir for git-based builds (e.g. maybe some combination of 'git
-        # reset/clean -fx' and removing the 'out' directory).
-        j = '-j2' if self.m.platform.is_win else '-j8'
-        args = ['sync', '--verbose', '--with_branch_heads', '--nohooks', j,
-                '--reset', '--force', '--upstream', '--no-nag-max']
-        if cfg.delete_unversioned_trees:
-          args.append('--delete_unversioned_trees')
-        self('sync', args + revisions +
-                   ['--output-json', self.m.json.output()],
-                   step_test_data=step_test_data,
-                   **kwargs)
+      # clean() isn't used because the gclient sync flags passed in checkout()
+      # do much the same thing, and they're more correct than doing a separate
+      # 'gclient revert' because it makes sure the other args are correct when
+      # a repo was deleted and needs to be re-cloned (notably
+      # --with_branch_heads), whereas 'revert' uses default args for clone
+      # operations.
+      #
+      # TODO(mmoss): To be like current official builders, this step could
+      # just delete the whole <slave_name>/build/ directory and start each
+      # build from scratch. That might be the least bad solution, at least
+      # until we have a reliable gclient method to produce a pristine working
+      # dir for git-based builds (e.g. maybe some combination of 'git
+      # reset/clean -fx' and removing the 'out' directory).
+      j = '-j2' if self.m.platform.is_win else '-j8'
+      args = ['sync', '--verbose', '--with_branch_heads', '--nohooks', j,
+              '--reset', '--force', '--upstream', '--no-nag-max']
+      if cfg.delete_unversioned_trees:
+        args.append('--delete_unversioned_trees')
+      self('sync', args + revisions +
+                 ['--output-json', self.m.json.output()],
+                 step_test_data=step_test_data,
+                 **kwargs)
     finally:
       result = self.m.step.active_result
       data = result.json.output
       for path, info in data['solutions'].iteritems():
         # gclient json paths always end with a slash
         path = path.rstrip('/')
         if path in cfg.got_revision_mapping:
           propname = cfg.got_revision_mapping[path]
           result.presentation.properties[propname] = info['revision']
 
@@ skipping 34 matching lines @@
     if revert is self.RevertOnTryserver:
       revert = self.m.tryserver.is_tryserver
 
     if inject_parent_got_revision:
       self.inject_parent_got_revision(cfg, override=True)
 
     self('setup', ['config', '--spec', self.config_to_pythonish(cfg)], **kwargs)
 
     sync_step = None
     try:
-      if not cfg.GIT_MODE:  # pragma: no cover
-        try:
-          if revert:
-            self.revert(**kwargs)
-        finally:
-          sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
-                                **kwargs)
-      else:
-        sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
-                              **kwargs)
+      sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
+                            **kwargs)
 
-        cfg_cmds = [
-          ('user.name', 'local_bot'),
-          ('user.email', 'local_bot@example.com'),
-        ]
-        for var, val in cfg_cmds:
-          name = 'recurse (git config %s)' % var
-          self(name, ['recurse', 'git', 'config', var, val], **kwargs)
-
+      cfg_cmds = [
+        ('user.name', 'local_bot'),
+        ('user.email', 'local_bot@example.com'),
+      ]
+      for var, val in cfg_cmds:
+        name = 'recurse (git config %s)' % var
+        self(name, ['recurse', 'git', 'config', var, val], **kwargs)
     finally:
       cwd = kwargs.get('cwd', self.m.path['slave_build'])
       if 'checkout' not in self.m.path:
         self.m.path['checkout'] = cwd.join(
           *cfg.solutions[0].name.split(self.m.path.sep))
 
     return sync_step
 
   def revert(self, **kwargs):  # pragma: no cover
     """Return a gclient_safe_revert step."""
@@ skipping 82 matching lines @@
     """Updates config revision corresponding to patch_project.
 
     Useful for bot_update only, as this is the only consumer of gclient's config
     revision map. This doesn't overwrite the revision if it was already set.
     """
     assert patch_project is None or isinstance(patch_project, basestring)
     cfg = gclient_config or self.c
     path, revision = cfg.patch_projects.get(patch_project, (None, None))
     if path and revision and path not in cfg.revisions:
       cfg.revisions[path] = revision