mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: write tags in the appropriate branch

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2013-04-22 16:55:16 -05:00
committed by Junio C Hamano
parent 68d4f4f3e9
commit e1760f8c2c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/remote-helpers/git-remote-hg
View File

@ -725,7 +725,9 @@ def parse_tag(parser):
parsed_tags[name] = (tagger, data) parsed_tags[name] = (tagger, data)
def write_tag(repo, tag, node, msg, author): def write_tag(repo, tag, node, msg, author):
tip = repo['tip'] branch = repo[node].branch()
tip = branch_tip(repo, branch)
tip = repo[tip]
def getfilectx(repo, memctx, f): def getfilectx(repo, memctx, f):
try: try:
@ -744,7 +746,7 @@ def write_tag(repo, tag, node, msg, author):
ctx = context.memctx(repo, (p1, p2), msg, ctx = context.memctx(repo, (p1, p2), msg,
['.hgtags'], getfilectx, ['.hgtags'], getfilectx,
user, (date, tz), {}) user, (date, tz), {'branch' : branch})
tmp = encoding.encoding tmp = encoding.encoding
encoding.encoding = 'utf-8' encoding.encoding = 'utf-8'