equal
deleted
inserted
replaced
1008 if f not in ctx1: |
1008 if f not in ctx1: |
1009 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
1009 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
1010 match.bad = bad |
1010 match.bad = bad |
1011 |
1011 |
1012 if working: # we need to scan the working dir |
1012 if working: # we need to scan the working dir |
1013 subrepos = ctx1.substate.keys() |
1013 subrepos = [] |
|
1014 if '.hgsub' in self.dirstate: |
|
1015 subrepos = ctx1.substate.keys() |
1014 s = self.dirstate.status(match, subrepos, listignored, |
1016 s = self.dirstate.status(match, subrepos, listignored, |
1015 listclean, listunknown) |
1017 listclean, listunknown) |
1016 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
1018 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
1017 |
1019 |
1018 # check for any possibly clean files |
1020 # check for any possibly clean files |