Mercurial > hg-git
changeset 1079:fda826275060
git_handler: add config knob for marking git branches public
author | Sean Farley <sean@farley.io> |
---|---|
date | Thu, 24 Dec 2015 15:51:17 -0600 |
parents | a70c1f6caead |
children | d96f998a718f |
files | hggit/git_handler.py |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py Fri May 15 15:02:24 2015 -0700 +++ b/hggit/git_handler.py Thu Dec 24 15:51:17 2015 -0600 @@ -318,17 +318,23 @@ self.save_map(self.map_file) + # also mark public any branches the user specified + blist = [self.repo[branch].node() for branch in + self.ui.configlist('git', 'public')] if rnode and self.ui.configbool('hggit', 'usephases'): + blist.append(rnode) + + if blist: lock = self.repo.lock() try: tr = self.repo.transaction("phase") try: phases.advanceboundary(self.repo, tr, phases.public, - [rnode]) + blist) except TypeError: # hg < 3.2 phases.advanceboundary(self.repo, phases.public, - [rnode]) + blist) tr.close() finally: if tr is not None: