Mercurial > public > mercurial-scm > hg-stable
diff mercurial/scmutil.py @ 43106:d783f945a701
py3: finish porting iteritems() to pycompat and remove source transformer
This commit finishes porting .iteritems() to pycompat.iteritems()
for the mercurial package.
The translation of .iteritems() to .items() was the last conversion
performed by the source transformer. With the porting to pycompat
complete, we no longer have a need for the source transformer. So
the source transformer has been removed. Good riddance! The code
base is now compatible with Python 2 and Python 3.
For the record, as the person who introduced the source transformer,
it brings me joy to delete it. It accomplished its goal to facilitate
a port to Python 3 without overly burdening people on some painful
low-level differences between Python 2 and 3. It is unfortunate we
still have to wallpaper over many differences with the pycompat
shim. But it is what it is.
Differential Revision: https://phab.mercurial-scm.org/D7015
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 07 Oct 2019 00:04:04 -0400 |
| parents | c59eb1560c44 |
| children | 54e943b28101 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/scmutil.py Mon Oct 07 00:04:04 2019 -0400 @@ -135,7 +135,7 @@ del subpaths[subpath] missing.add(subpath) - for subpath, ctx in sorted(subpaths.iteritems()): + for subpath, ctx in sorted(pycompat.iteritems(subpaths)): yield subpath, ctx.sub(subpath) # Yield an empty subrepo based on ctx1 for anything only in ctx2. That way, @@ -1298,7 +1298,7 @@ ignored=False, full=False, ) - for abs, st in walkresults.iteritems(): + for abs, st in pycompat.iteritems(walkresults): dstate = dirstate[abs] if dstate == b'?' and audit_path.check(abs): unknown.append(abs) @@ -1345,7 +1345,7 @@ with repo.wlock(): wctx.forget(deleted) wctx.add(unknown) - for new, old in renames.iteritems(): + for new, old in pycompat.iteritems(renames): wctx.copy(old, new) @@ -1481,10 +1481,11 @@ oldcopies = copiesmod.pathcopies(newctx, oldctx, match) oldcopies.update(copies) copies = dict( - (dst, oldcopies.get(src, src)) for dst, src in oldcopies.iteritems() + (dst, oldcopies.get(src, src)) + for dst, src in pycompat.iteritems(oldcopies) ) # Adjust the dirstate copies - for dst, src in copies.iteritems(): + for dst, src in pycompat.iteritems(copies): if src not in newctx or dst in newctx or ds[dst] != b'a': src = None ds.copy(src, dst) @@ -2070,7 +2071,7 @@ return published = [ rev - for rev, (old, new) in phasetracking.iteritems() + for rev, (old, new) in pycompat.iteritems(phasetracking) if new == phases.public and rev < origrepolen ] if not published: