Mercurial > hg-git
diff hggit/git_handler.py @ 640:cacd98c7382e
git_handler: move gparents initialization up to start of import_git_commit
gparents will be used to compute .hgsubstate in an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 14 Feb 2014 13:15:45 -0800 |
parents | 42ca3ace9a0f |
children | 5a17de2247bf |
line wrap: on
line diff
--- a/hggit/git_handler.py Fri Feb 14 11:31:54 2014 -0800 +++ b/hggit/git_handler.py Fri Feb 14 13:15:45 2014 -0800 @@ -675,6 +675,8 @@ (strip_message, hg_renames, hg_branch, extra) = self.extract_hg_metadata(commit.message) + gparents = map(self.map_hg_get, commit.parents) + # get a list of the changed, added, removed files and gitlinks files, gitlinks = self.get_files_changed(commit) @@ -786,7 +788,6 @@ return context.memfilectx(f, data, 'l' in e, 'x' in e, copied_path) - gparents = map(self.map_hg_get, commit.parents) p1, p2 = (nullid, nullid) octopus = False