##// END OF EJS Templates
commit: move sorting of added and removed files list to lower level...
Martin von Zweigbergk -
r42534:63101806 default
parent child Browse files
Show More
@@ -2641,8 +2641,8 b' class localrepository(object):'
2641 2641 raise
2642 2642
2643 2643 # update manifest
2644 removed = [f for f in sorted(removed) if f in m1 or f in m2]
2645 drop = [f for f in removed if f in m]
2644 removed = [f for f in removed if f in m1 or f in m2]
2645 drop = sorted([f for f in removed if f in m])
2646 2646 for f in drop:
2647 2647 del m[f]
2648 2648 files = changed + removed
@@ -1486,8 +1486,8 b' class manifestrevlog(object):'
1486 1486
1487 1487 _checkforbidden(added)
1488 1488 # combine the changed lists into one sorted iterator
1489 work = heapq.merge([(x, False) for x in added],
1490 [(x, True) for x in removed])
1489 work = heapq.merge([(x, False) for x in sorted(added)],
1490 [(x, True) for x in sorted(removed)])
1491 1491
1492 1492 arraytext, deltatext = m.fastdelta(self.fulltextcache[p1], work)
1493 1493 cachedelta = self._revlog.rev(p1), deltatext
General Comments 0
You need to be logged in to leave comments. Login now