mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
merge: backout manifest sorting and workarounds for cost of it
Backout f6ac62c2cfa7 and 14f4258e3526 which no longer are needed.
This commit is contained in:
parent
ee476759ff
commit
c2bd1c416f
@ -228,10 +228,7 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
|
|||||||
|
|
||||||
prompts = []
|
prompts = []
|
||||||
# Compare manifests
|
# Compare manifests
|
||||||
visit = m1.iteritems()
|
for f, n in m1.iteritems():
|
||||||
if repo.ui.debugflag:
|
|
||||||
visit = sorted(visit)
|
|
||||||
for f, n in visit:
|
|
||||||
if partial and not partial(f):
|
if partial and not partial(f):
|
||||||
continue
|
continue
|
||||||
if f in m2:
|
if f in m2:
|
||||||
@ -271,10 +268,7 @@ def manifestmerge(repo, p1, p2, pa, overwrite, partial):
|
|||||||
else:
|
else:
|
||||||
act("other deleted", "r", f)
|
act("other deleted", "r", f)
|
||||||
|
|
||||||
visit = m2.iteritems()
|
for f, n in m2.iteritems():
|
||||||
if repo.ui.debugflag:
|
|
||||||
visit = sorted(visit)
|
|
||||||
for f, n in visit:
|
|
||||||
if partial and not partial(f):
|
if partial and not partial(f):
|
||||||
continue
|
continue
|
||||||
if f in m1 or f in copied: # files already visited
|
if f in m1 or f in copied: # files already visited
|
||||||
|
Loading…
Reference in New Issue
Block a user