summaryrefslogtreecommitdiffstats
path: root/git_config.py
diff options
context:
space:
mode:
Diffstat (limited to 'git_config.py')
-rw-r--r--git_config.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/git_config.py b/git_config.py
index 0379181a..e2236785 100644
--- a/git_config.py
+++ b/git_config.py
@@ -464,9 +464,13 @@ def _open_ssh(host, port=None):
464 % (host,port, str(e)), file=sys.stderr) 464 % (host,port, str(e)), file=sys.stderr)
465 return False 465 return False
466 466
467 time.sleep(1)
468 ssh_died = (p.poll() is not None)
469 if ssh_died:
470 return False
471
467 _master_processes.append(p) 472 _master_processes.append(p)
468 _master_keys.add(key) 473 _master_keys.add(key)
469 time.sleep(1)
470 return True 474 return True
471 finally: 475 finally:
472 _master_keys_lock.release() 476 _master_keys_lock.release()
@@ -568,6 +572,7 @@ class Remote(object):
568 self._config = config 572 self._config = config
569 self.name = name 573 self.name = name
570 self.url = self._Get('url') 574 self.url = self._Get('url')
575 self.pushUrl = self._Get('pushurl')
571 self.review = self._Get('review') 576 self.review = self._Get('review')
572 self.projectname = self._Get('projectname') 577 self.projectname = self._Get('projectname')
573 self.fetch = list(map(RefSpec.FromString, 578 self.fetch = list(map(RefSpec.FromString,
@@ -694,6 +699,10 @@ class Remote(object):
694 """Save this remote to the configuration. 699 """Save this remote to the configuration.
695 """ 700 """
696 self._Set('url', self.url) 701 self._Set('url', self.url)
702 if self.pushUrl is not None:
703 self._Set('pushurl', self.pushUrl + '/' + self.projectname)
704 else:
705 self._Set('pushurl', self.pushUrl)
697 self._Set('review', self.review) 706 self._Set('review', self.review)
698 self._Set('projectname', self.projectname) 707 self._Set('projectname', self.projectname)
699 self._Set('fetch', list(map(str, self.fetch))) 708 self._Set('fetch', list(map(str, self.fetch)))