1548 if f not in ctx1 and f not in ctx1.dirs(): |
1548 if f not in ctx1 and f not in ctx1.dirs(): |
1549 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
1549 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
1550 match.bad = bad |
1550 match.bad = bad |
1551 |
1551 |
1552 r = [[], [], [], [], [], [], []] |
1552 r = [[], [], [], [], [], [], []] |
1553 if working: # we need to scan the working dir |
1553 r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) |
1554 r = ctx2._dirstatestatus(match=match, ignored=listignored, |
|
1555 clean=listclean, unknown=listunknown) |
|
1556 |
1554 |
1557 if not parentworking: |
1555 if not parentworking: |
1558 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, |
1556 r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, |
1559 listunknown) |
1557 listunknown) |
1560 |
1558 |