Show More
@@ -1541,21 +1541,9 b' class localrepository(object):' | |||||
1541 | match.bad = bad |
|
1541 | match.bad = bad | |
1542 |
|
1542 | |||
1543 | if working: # we need to scan the working dir |
|
1543 | if working: # we need to scan the working dir | |
1544 | subrepos = [] |
|
1544 | r = ctx2._dirstatestatus(match=match, ignored=listignored, | |
1545 | if '.hgsub' in self.dirstate: |
|
1545 | clean=listclean, unknown=listunknown) | |
1546 | subrepos = sorted(ctx2.substate) |
|
1546 | modified, added, removed, deleted, unknown, ignored, clean = r | |
1547 | s = self.dirstate.status(match, subrepos, listignored, |
|
|||
1548 | listclean, listunknown) |
|
|||
1549 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
|||
1550 |
|
||||
1551 | # check for any possibly clean files |
|
|||
1552 | if parentworking and cmp: |
|
|||
1553 | modified2, fixup = ctx2._checklookup(cmp) |
|
|||
1554 | modified += modified2 |
|
|||
1555 |
|
||||
1556 | # update dirstate for files that are actually clean |
|
|||
1557 | if fixup and listclean: |
|
|||
1558 | clean += fixup |
|
|||
1559 |
|
1547 | |||
1560 | if not parentworking: |
|
1548 | if not parentworking: | |
1561 | mf1 = mfmatches(ctx1) |
|
1549 | mf1 = mfmatches(ctx1) | |
@@ -1563,7 +1551,7 b' class localrepository(object):' | |||||
1563 | # we are comparing working dir against non-parent |
|
1551 | # we are comparing working dir against non-parent | |
1564 | # generate a pseudo-manifest for the working dir |
|
1552 | # generate a pseudo-manifest for the working dir | |
1565 | mf2 = mfmatches(self['.']) |
|
1553 | mf2 = mfmatches(self['.']) | |
1566 |
for f in |
|
1554 | for f in modified + added: | |
1567 | mf2[f] = None |
|
1555 | mf2[f] = None | |
1568 | mf2.set(f, ctx2.flags(f)) |
|
1556 | mf2.set(f, ctx2.flags(f)) | |
1569 | for f in removed: |
|
1557 | for f in removed: |
General Comments 0
You need to be logged in to leave comments.
Login now