indygreg created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12319 AFFECTED FILES hgext/convert/cvs.py hgext/convert/hg.py CHANGE DETAILS diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -39,7 +39,6 @@ merge as mergemod, mergestate, phases, - pycompat, util, ) from mercurial.utils import dateutil @@ -423,7 +422,7 @@ tagparent = tagparent or self.repo.nullid oldlines = set() - for branch, heads in pycompat.iteritems(self.repo.branchmap()): + for branch, heads in self.repo.branchmap().items(): for h in heads: if b'.hgtags' in self.repo[h]: oldlines.update( diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -18,7 +18,6 @@ from mercurial import ( encoding, error, - pycompat, util, ) from mercurial.utils import ( @@ -316,7 +315,7 @@ if full: raise error.Abort(_(b"convert from cvs does not support --full")) self._parse() - return sorted(pycompat.iteritems(self.files[rev])), {}, set() + return sorted(self.files[rev].items()), {}, set() def getcommit(self, rev): self._parse() To: indygreg, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
