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..daa64f8448a6bd457201eeedc4b140e1d913556e 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -318,8 +318,14 @@ 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'):
+    # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
+    # This allows devs to use experimental repos which have a different url
+    # but whose branch(s) are the same as official repos.
+    if (current_url != url and
+        url != 'git://foo' and
+        subprocess2.capture(
+            ['git', 'config', 'remote.origin.gclient-auto-fix-url'],
+            cwd=self.checkout_path).strip() != 'False'):
       print('_____ switching %s to a new upstream' % self.relpath)
       # Make sure it's clean
       self._CheckClean(rev_str)
@@ -859,7 +865,7 @@ class GitWrapper(SCMWrapper):
   def _Capture(self, args):
     return subprocess2.check_output(
         ['git'] + args,
-        stderr=subprocess2.PIPE,
+        stderr=subprocess2.VOID,

[Dirk Pranke, 2013/05/22 00:05:15]

why change this from PIPE to VOID ?

[Isaac (away), 2013/05/22 00:12:25]

This is an unrelated minor bug I spotted.
subprocess2.check_call_out returns (stdout, stderr)
subprocess2.check_output returns check_call_out[0]

So it is discarding stderr.

         nag_timer=self.nag_timer,
         nag_max=self.nag_max,
         cwd=self.checkout_path).strip()