Fix gclient sync 'dontswitchurl' url stickiness

gclient_scm.py

 # Copyright (c) 2012 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 300 matching lines @@
                                 '\tTo resolve:\n'
                                 '\t\trm -rf %s\n'
                                 '\tAnd run gclient sync again\n'
                                 % (self.relpath, rev_str, self.relpath))
 
     # See if the url has changed (the unittests use git://foo for the url, let
     # that through).
     current_url = self._Capture(['config', 'remote.origin.url'])
     # TODO(maruel): Delete url != 'git://foo' since it's just to make the
     # unit test pass. (and update the comment above)
-    if (current_url != url and url != 'git://foo' and
-        self._Capture(['config', 'remote.origin.gclient']) != 'getoffmylawn'):
+    if (current_url != url and url != 'git://foo' and subprocess2.capture(

[M-A Ruel, 2013/05/20 20:37:43]

one condition per line, so that the line ends with and
(as per style guide)

+            ['git', 'config', 'remote.origin.gclient'],
+            cwd=self.checkout_path).strip() != 'dontswitchurl'):

[Dirk Pranke, 2013/05/20 17:55:19]

I would prefer that we have a comment here about what we're doing and what
'dontswitchurl' is for.

       print('_____ switching %s to a new upstream' % self.relpath)
       # Make sure it's clean
       self._CheckClean(rev_str)
       # Switch over to the new upstream
       self._Run(['remote', 'set-url', 'origin', url], options)
       quiet = []
       if not options.verbose:
         quiet = ['--quiet']
       self._UpdateBranchHeads(options, fetch=False)
       self._Run(['fetch', 'origin', '--prune'] + quiet, options)
@@ skipping 519 matching lines @@
   def _GetCurrentBranch(self):
     # Returns name of current branch or None for detached HEAD
     branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
     if branch == 'HEAD':
       return None
     return branch
 
   def _Capture(self, args):
     return subprocess2.check_output(
         ['git'] + args,
-        stderr=subprocess2.PIPE,
+        stderr=subprocess2.VOID,
         nag_timer=self.nag_timer,
         nag_max=self.nag_max,
         cwd=self.checkout_path).strip()
 
   def _UpdateBranchHeads(self, options, fetch=False):
     """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
     if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
       backoff_time = 5
       for _ in range(3):
         try:
@@ skipping 403 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command