Mercurial > hg > hg-git
changeset 932:f33faedc1add
push: use unfiltered repo for looking previously mapped nodes
It looks like this is the only place where this could happen via this
map_hg_get function.
author | Sean Farley <sean@farley.io> |
---|---|
date | Mon, 27 Apr 2015 16:51:27 -0700 |
parents | a12e11d9fb11 |
children | 07f03124e1b9 |
files | hggit/git_handler.py |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -1038,6 +1038,8 @@ bookmarks.setcurrent(self.repo, 'master') new_refs['refs/heads/master'] = self.map_git_get(tip) + # mapped nodes might be hidden + unfiltered = self.repo.unfiltered() for rev, rev_refs in exportable.iteritems(): ctx = self.repo[rev] if not rev_refs: @@ -1071,7 +1073,7 @@ if ref not in refs: new_refs[ref] = self.map_git_get(ctx.hex()) elif new_refs[ref] in self._map_git: - rctx = self.repo[self.map_hg_get(new_refs[ref])] + rctx = unfiltered[self.map_hg_get(new_refs[ref])] if rctx.ancestor(ctx) == rctx or force: new_refs[ref] = self.map_git_get(ctx.hex()) else: