From 086ca235076d7450d3e46e8f80f483b895856777 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Thu, 4 May 2023 07:45:58 -0600 Subject: [PATCH] Trivial cleanups Signed-off-by: Felipe Contreras --- git-remote-hg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-remote-hg b/git-remote-hg index 797ebbc..59d1db7 100755 --- a/git-remote-hg +++ b/git-remote-hg @@ -470,7 +470,7 @@ def export_ref(repo, name, kind, head): if marks.is_marked(c.hex()): continue - (manifest, user, (time, tz), files, desc, extra) = repo.changelog.read(node) + manifest, user, (time, tz), files, desc, extra = repo.changelog.read(node) rev_branch = extra[b'branch'].decode() user = user.decode() @@ -486,7 +486,7 @@ def export_ref(repo, name, kind, head): else: committer = author - parents = [repo[p] for p in repo.changelog.parentrevs(rev) if p >= 0] + parents = [p for p in c.parents() if p.rev() != -1] modified, removed = get_filechanges(repo, c, parents, files) @@ -519,11 +519,11 @@ def export_ref(repo, name, kind, head): if extra_msg: desc += b'\n--HG--\n' + extra_msg.encode() + modified_final = [export_file(c, fname) for fname in modified] + if len(parents) == 0 and rev: print('reset %s/%s' % (prefix, ename)) - modified_final = [export_file(c, fname) for fname in modified] - print("commit %s/%s" % (prefix, ename)) print("mark :%d" % (marks.get_mark(c.hex()))) print("author %s" % (author))