Mercurial > hg
comparison mercurial/localrepo.py @ 7067:40d105a12cac
status: don't warn about missing files present in base revision (issue1323)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 08 Oct 2008 16:22:10 -0500 |
| parents | 582dac23ebac |
| children | 4e0d54fbd34f |
comparison
equal
deleted
inserted
replaced
| 7066:865c5be0f8df | 7067:40d105a12cac |
|---|---|
| 956 ctx2 = self[node2] | 956 ctx2 = self[node2] |
| 957 working = ctx2 == self[None] | 957 working = ctx2 == self[None] |
| 958 parentworking = working and ctx1 == self['.'] | 958 parentworking = working and ctx1 == self['.'] |
| 959 match = match or match_.always(self.root, self.getcwd()) | 959 match = match or match_.always(self.root, self.getcwd()) |
| 960 listignored, listclean, listunknown = ignored, clean, unknown | 960 listignored, listclean, listunknown = ignored, clean, unknown |
| 961 | |
| 962 if not parentworking: | |
| 963 def bad(f, msg): | |
| 964 if f not in ctx1: | |
| 965 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | |
| 966 return False | |
| 967 match.bad = bad | |
| 961 | 968 |
| 962 if working: # we need to scan the working dir | 969 if working: # we need to scan the working dir |
| 963 s = self.dirstate.status(match, listignored, listclean, listunknown) | 970 s = self.dirstate.status(match, listignored, listclean, listunknown) |
| 964 cmp, modified, added, removed, deleted, unknown, ignored, clean = s | 971 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
| 965 | 972 |