[PATCH v4 10/13] remote-hg: fake bookmark when there's none
STALE3763d
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:55:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v4 of 2 in this series.
Revisions (2)
- v4 current
- v5 [diff vs current]
Or at least no current bookmark. Signed-off-by: Felipe Contreras <redacted> --- contrib/remote-hg/git-remote-hg | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 3bb3192..e8e3791 100755
--- a/contrib/remote-hg/git-remote-hg
+++ b/contrib/remote-hg/git-remote-hg@@ -419,12 +419,20 @@ def list_branch_head(repo, cur): g_head = (head, 'branches', repo[tip]) def list_bookmark_head(repo, cur): - global g_head + global g_head, bmarks head = bookmarks.readcurrent(repo) - if not head: - return - node = repo[head] + if head: + node = repo[head] + else: + # fake bookmark from current branch + head = cur + tip = get_branch_tip(repo, head) + if not tip: + return + node = repo[tip] + bmarks[head] = node + print "@refs/heads/%s HEAD" % head g_head = (head, 'bookmarks', node)
--
1.8.0