use canonical base URL for projects

git_cl.py

 #!/usr/bin/env python
 # 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import datetime
@@ skipping 617 matching lines @@
           'ERROR: Your diff contains %d commits already in %s.\n'
           'Run "git log --oneline %s..HEAD" to get a list of commits in '
           'the diff.  If you are using a custom git flow, you can override'
           ' the reference used for this check with "git config '
           'gitcl.remotebranch <git-ref>".' % (
               len(common_commits), remote_branch, upstream_git_obj))
       return False
     return True
 
   def GetGitBaseUrlFromConfig(self):
-    """Return the configured base URL from branch.<branchname>.baseurl.
+    """Return the configured base URL from branch.<branchname>.canonical-url.
 
     Returns None if it is not set.
     """
-    return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
+    return RunGit(['config', 'branch.%s.canonical-url' % self.GetBranch()],
                   error_ok=True).strip()

[Sergey Berezin, 2014/05/13 18:55:22]

Let's continue checking .base-url if .canonical-url is not present. This allows
us to be backwards compatible with existing repo checkouts, and with repos that
have not transitioned yet to the canonical base URL.

We should phase .base-url config slowly over time once all the projects are
transitioned to the new scheme and have been using it for a while.

[sheyang, 2014/05/13 22:01:36]

Done.

 
   def GetRemoteUrl(self):
     """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
 
     Returns None if there is no remote.
     """
     remote, _ = self.GetRemoteBranch()
     return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
   def GetIssue(self):
@@ skipping 413 matching lines @@
   if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
 
+  if 'CANONICAL_URL' in keyvals:
+    branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
+    branch = ShortBranchName(branchref)
+    RunGit(['config', 'branch.%s.canonical-url' % branch,
+            keyvals['CANONICAL_URL']],
+          error_ok=False)
+
 
 def urlretrieve(source, destination):
   """urllib is broken for SSL connections via a proxy therefore we
   can't use urllib.urlretrieve()."""
   with open(destination, 'w') as f:
     f.write(urllib2.urlopen(source).read())
 
 
 def hasSheBang(fname):
   """Checks fname is a #! script."""
@@ skipping 59 matching lines @@
 
   url = args[0]
   if not url.endswith('codereview.settings'):
     url = os.path.join(url, 'codereview.settings')
 
   # Load code review settings and download hooks (if available).
   LoadCodereviewSettingsFromFile(urllib2.urlopen(url))
   DownloadHooks(True)
   return 0
 
-
-def CMDbaseurl(parser, args):
-  """Gets or sets base-url for this branch."""
-  branchref = RunGit(['symbolic-ref', 'HEAD']).strip()
-  branch = ShortBranchName(branchref)
-  _, args = parser.parse_args(args)
-  if not args:
-    print("Current base-url:")
-    return RunGit(['config', 'branch.%s.base-url' % branch],
-                  error_ok=False).strip()
-  else:
-    print("Setting base-url to %s" % args[0])
-    return RunGit(['config', 'branch.%s.base-url' % branch, args[0]],
-                  error_ok=False).strip()

[Sergey Berezin, 2014/05/13 18:55:22]

Since you are modifying only chromium at the moment, I'd keep this command
intact. It allows developers to set custom base URL in case they need to fix it
in their checkout.

In fact, for the transition, I'd keep both .base-url and .canonical-url, with
the latter overriding the former.

[sheyang, 2014/05/13 22:01:36]

Done.

-
-
 def CMDstatus(parser, args):
   """Show status of changelists.
 
   Colors are used to tell the state of the CL unless --fast is used:
     - Red      not sent for review or broken
     - Blue     waiting for review
     - Yellow   waiting for you to reply to review
     - Green    LGTM'ed
     - Magenta  in the commit queue
     - Cyan     was committed, branch can be deleted
@@ skipping 1418 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))