Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 11228:5cdac5c35e68
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 28 May 2010 16:01:57 -0500 |
| parents | e43c23d189a5 054549ccb680 |
| children | 5116a077c3da |
comparison
equal
deleted
inserted
replaced
| 11226:b9e89fc5c7f1 | 11228:5cdac5c35e68 |
|---|---|
| 1039 if f not in ctx1: | 1039 if f not in ctx1: |
| 1040 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) | 1040 self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
| 1041 match.bad = bad | 1041 match.bad = bad |
| 1042 | 1042 |
| 1043 if working: # we need to scan the working dir | 1043 if working: # we need to scan the working dir |
| 1044 subrepos = ctx1.substate.keys() | 1044 subrepos = [] |
| 1045 if '.hgsub' in self.dirstate: | |
| 1046 subrepos = ctx1.substate.keys() | |
| 1045 s = self.dirstate.status(match, subrepos, listignored, | 1047 s = self.dirstate.status(match, subrepos, listignored, |
| 1046 listclean, listunknown) | 1048 listclean, listunknown) |
| 1047 cmp, modified, added, removed, deleted, unknown, ignored, clean = s | 1049 cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
| 1048 | 1050 |
| 1049 # check for any possibly clean files | 1051 # check for any possibly clean files |