Choosing a default remote for determining base_url.

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 logging
@@ skipping 30 matching lines @@
 import presubmit_support
 import rietveld
 import scm
 import subprocess2
 import watchlists
 
 
 DEFAULT_SERVER = 'https://codereview.appspot.com'
 POSTUPSTREAM_HOOK_PATTERN = '.git/hooks/post-cl-%s'
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
+GIT_INSTRUCTIONS_URL = 'http://code.google.com/p/chromium/wiki/UsingNewGit'
 
 
 # Initialized in main()
 settings = None
 
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
 
@@ skipping 240 matching lines @@
     self.upstream_branch = None
     self.has_issue = False
     self.issue = None
     self.has_description = False
     self.description = None
     self.has_patchset = False
     self.patchset = None
     self._rpc_server = None
     self.cc = None
     self.watchers = ()
+    self._remote = None
 
   def GetCCList(self):
     """Return the users cc'd on this CL.
 
     Return is a string suitable for passing to gcl with the --cc flag.
     """
     if self.cc is None:
       base_cc = settings  .GetDefaultCCList()
       more_cc = ','.join(self.watchers)
       self.cc = ','.join(filter(None, (base_cc, more_cc))) or ''
@@ skipping 58 matching lines @@
     return remote, upstream_branch
 
   def GetUpstreamBranch(self):
     if self.upstream_branch is None:
       remote, upstream_branch = self.FetchUpstreamTuple()
       if remote is not '.':
         upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
       self.upstream_branch = upstream_branch
     return self.upstream_branch
 
+  def GetRemote(self):
+    if not self._remote:
+      self._remote = self.FetchUpstreamTuple()[0]
+      if self._remote == '.':
+        def warn_default():
+          logging.warning('Could not determine which remote this change is '
+                         'associated with, so defaulting to "%s".  This may '
+                         'not be what you want.  You may prevent this message '
+                         'by running "git svn info" as documented here:  %s',
+                          self._remote,
+                          GIT_INSTRUCTIONS_URL)
+
+        remotes = RunGit(['remote'], error_ok=True).split()
+        if len(remotes) == 1:
+          self._remote, = remotes
+          warn_default()

[M-A Ruel, 2012/03/22 19:39:00]

Actually, I'd prefer to not warn here. It's fine actually. The user pulled from
a remote, pipelined CLs and is uploading that. The remote _is_ known and not
ambiguous.

[jmbaker1, 2012/03/22 19:56:58]

Done.

+        elif 'origin' in remotes:
+          self._remote = 'origin'
+          warn_default()
+        else:
+          logging.warn('Could not determine which remote this change is '
+                       'associated with.  You may prevent this message by '
+                       'running "git svn info" as documented here:  %s',
+                       GIT_INSTRUCTIONS_URL)
+    return self._remote
+
+
   def GetRemoteUrl(self):
     """Return the configured remote URL, e.g. 'git://example.org/foo.git/'.
 
     Returns None if there is no remote.
     """
-    remote = self.FetchUpstreamTuple()[0]
-    if remote == '.':
-      return None
+    remote = self.GetRemote()
     return RunGit(['config', 'remote.%s.url' % remote], error_ok=True).strip()
 
   def GetIssue(self):
     if not self.has_issue:
       issue = RunGit(['config', self._IssueSetting()], error_ok=True).strip()
       if issue:
         self.issue = issue
       else:
         self.issue = None
       self.has_issue = True
@@ skipping 1088 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))