Fix gclient sync 'dontswitchurl' url stickiness

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 18bc0e389653cfab2ec2fc1443a963c1887c5cb0..d78adfabcc2ed50e5442cdaff97246268f29aa51 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -318,8 +318,9 @@ class GitWrapper(SCMWrapper):
     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)
@@ -859,7 +860,7 @@ class GitWrapper(SCMWrapper):
   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()