gitcmds: rename default_remote() to upstream_remote()

Make the function more general and rename it to better reflect its
purpose.

Signed-off-by: David Aguilar <davvid@gmail.com>

Author: davvid

cola/gitcmds.py

@@ -32,16 +32,24 @@ def add(items, u=False):
         items, lambda paths: add('--', force=True, verbose=True, u=u, *paths))
 
 
+def get_branch(branch):
+    if branch is None:
+        branch = current_branch()
+    return branch
+
+
 def get_config(config):
     if config is None:
         config = gitcfg.current()
     return config
 
 
-def default_remote(config=None):
-    """Return the remote tracked by the current branch."""
+
+def upstream_remote(branch=None, config=None):
+    """Return the remote associated with the specified branch"""
     config = get_config(config)
-    return config.get('branch.%s.remote' % current_branch())
+    branch = get_branch(branch)
+    return config.get('branch.%s.remote' % branch)
 
 
 def remote_url(remote, push=False, config=None):

cola/widgets/remote.py

@@ -262,7 +262,7 @@ def __init__(self, model, action, title, parent=None, icon=None):
             self.top_layout, self.options_layout)
         self.setLayout(self.main_layout)
 
-        default_remote = gitcmds.default_remote() or 'origin'
+        default_remote = gitcmds.upstream_remote() or 'origin'
 
         remotes = self.model.remotes
         if default_remote in remotes:

test/gitcmds_test.py

@@ -32,12 +32,12 @@ def test_branch_list_remote(self):
         self.git('remote', 'rm', 'origin')
         self.assertEqual(gitcmds.branch_list(remote=True), [])
 
-    def test_default_remote(self):
-        """Test default_remote()."""
-        self.assertEqual(gitcmds.default_remote(config=self.config), None)
+    def test_upstream_remote(self):
+        """Test getting the configured upstream remote"""
+        self.assertEqual(gitcmds.upstream_remote(config=self.config), None)
         self.git('config', 'branch.master.remote', 'test')
         self.config.reset()
-        self.assertEqual(gitcmds.default_remote(config=self.config), 'test')
+        self.assertEqual(gitcmds.upstream_remote(config=self.config), 'test')
 
     def test_tracked_branch(self):
         """Test tracked_branch()."""