Revert of 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>.canonical-url.
+    """Return the configured base URL from branch.<branchname>.baseurl.
 
     Returns None if it is not set.
     """
-    branch = self.GetBranch()
-    url = RunGit(['config', 'branch.%s.canonical-url' % branch],
-                 error_ok=True).strip()
-    if not url:
-      url = RunGit(['config', 'branch.%s.base-url' % branch],
-                   error_ok=True).strip()
-    return url
+    return RunGit(['config', 'branch.%s.base-url' % self.GetBranch()],
+                  error_ok=True).strip()
 
   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 1513 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:]))