This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3161

convert: look up branch only among branches
ClosedPublic

Authored by martinvonz on Apr 6 2018, 1:46 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG810413b745ff: convert: look up branch only among branches
Summary

repo[<branch name>] can find something that's not a branch, which is
not good.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 6 2018, 1:46 PM
indygreg accepted this revision.Apr 6 2018, 2:49 PM
This revision is now accepted and ready to land.Apr 6 2018, 2:49 PM
Closed by commit rHG810413b745ff: convert: look up branch only among branches (authored by martinvonz). · Explain WhyApr 6 2018, 2:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/hg.py (6 lines)

Diff 7797

hgext/convert/hg.py

closed = 'close' in commit.extra closed = 'close' in commit.extra
if not closed and not man.cmp(m1node, man.revision(mnode)): if not closed and not man.cmp(m1node, man.revision(mnode)):
self.ui.status(_("filtering out empty revision\n")) self.ui.status(_("filtering out empty revision\n"))
self.repo.rollback(force=True) self.repo.rollback(force=True)
return parent return parent
return p2 return p2
def puttags(self, tags): def puttags(self, tags):
try: tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
tagparent = self.repo[self.tagsbranch].node() tagparent = tagparent or nodemod.nullid
except error.RepoError:
tagparent = nodemod.nullid
oldlines = set() oldlines = set()
for branch, heads in self.repo.branchmap().iteritems(): for branch, heads in self.repo.branchmap().iteritems():
for h in heads: for h in heads:
if '.hgtags' in self.repo[h]: if '.hgtags' in self.repo[h]:
oldlines.update( oldlines.update(
set(self.repo[h]['.hgtags'].data().splitlines(True))) set(self.repo[h]['.hgtags'].data().splitlines(True)))
oldlines = sorted(list(oldlines)) oldlines = sorted(list(oldlines))