equal
deleted
inserted
replaced
1193 match.bad = bad |
1193 match.bad = bad |
1194 |
1194 |
1195 if working: # we need to scan the working dir |
1195 if working: # we need to scan the working dir |
1196 subrepos = [] |
1196 subrepos = [] |
1197 if '.hgsub' in self.dirstate: |
1197 if '.hgsub' in self.dirstate: |
1198 subrepos = ctx1.substate.keys() |
1198 subrepos = ctx2.substate.keys() |
1199 s = self.dirstate.status(match, subrepos, listignored, |
1199 s = self.dirstate.status(match, subrepos, listignored, |
1200 listclean, listunknown) |
1200 listclean, listunknown) |
1201 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
1201 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
1202 |
1202 |
1203 # check for any possibly clean files |
1203 # check for any possibly clean files |