equal
deleted
inserted
replaced
946 |
946 |
947 if not parentworking: |
947 if not parentworking: |
948 def bad(f, msg): |
948 def bad(f, msg): |
949 if f not in ctx1: |
949 if f not in ctx1: |
950 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
950 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
951 return False |
|
952 match.bad = bad |
951 match.bad = bad |
953 |
952 |
954 if working: # we need to scan the working dir |
953 if working: # we need to scan the working dir |
955 s = self.dirstate.status(match, listignored, listclean, listunknown) |
954 s = self.dirstate.status(match, listignored, listclean, listunknown) |
956 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
955 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |