comparison mercurial/localrepo.py @ 14870:f73c7b70df68 stable

subrepo: use working copy of .hgsub to filter status (issue2901)
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Jul 2011 17:41:49 -0500
parents de9eb6b1da4f
children 96a72cbc6c29
comparison
equal deleted inserted replaced
14865:eb914541a950 14870:f73c7b70df68
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