diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:29:53 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:05 -0700 |
| commit | 611024e606c8019d348ab1821a1fbb1898384a25 (patch) | |
| tree | e7841785bfce8fc7632756ed36e509272a505ff9 /contrib | |
| parent | remote-hg: check diverged bookmarks (diff) | |
| download | tgif-611024e606c8019d348ab1821a1fbb1898384a25.tar.xz | |
remote-hg: simplify branch_tip()
It simply picks the last head that is not closed, but we have a stored
list of open heads.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index e8ebc17e75..8df72d90c8 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -560,12 +560,8 @@ def do_capabilities(parser): print -def branch_tip(repo, branch): - # older versions of mercurial don't have this - if hasattr(repo, 'branchtip'): - return repo.branchtip(branch) - else: - return repo.branchtags()[branch] +def branch_tip(branch): + return branches[branch][-1] def get_branch_tip(repo, branch): global branches @@ -577,7 +573,7 @@ def get_branch_tip(repo, branch): # verify there's only one head if (len(heads) > 1): warn("Branch '%s' has more than one head, consider merging" % branch) - return branch_tip(repo, hgref(branch)) + return branch_tip(hgref(branch)) return heads[0] @@ -828,7 +824,7 @@ def parse_tag(parser): def write_tag(repo, tag, node, msg, author): branch = repo[node].branch() - tip = branch_tip(repo, branch) + tip = branch_tip(branch) tip = repo[tip] def getfilectx(repo, memctx, f): |