D6390: commit: move sorting of added and removed files list to lower level
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon May 20 11:49:09 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6310180662f5: commit: move sorting of added and removed files list to lower level (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6390?vs=15150&id=15199
REVISION DETAIL
https://phab.mercurial-scm.org/D6390
AFFECTED FILES
mercurial/localrepo.py
mercurial/manifest.py
CHANGE DETAILS
diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -1486,8 +1486,8 @@
_checkforbidden(added)
# combine the changed lists into one sorted iterator
- work = heapq.merge([(x, False) for x in added],
- [(x, True) for x in removed])
+ work = heapq.merge([(x, False) for x in sorted(added)],
+ [(x, True) for x in sorted(removed)])
arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
cachedelta = self._revlog.rev(p1), deltatext
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2641,8 +2641,8 @@
raise
# update manifest
- removed = [f for f in sorted(removed) if f in m1 or f in m2]
- drop = [f for f in removed if f in m]
+ removed = [f for f in removed if f in m1 or f in m2]
+ drop = sorted([f for f in removed if f in m])
for f in drop:
del m[f]
files = changed + removed
To: martinvonz, #hg-reviewers
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list