equal
deleted
inserted
replaced
1276 for f in removed: |
1276 for f in removed: |
1277 if f in mf: |
1277 if f in mf: |
1278 del mf[f] |
1278 del mf[f] |
1279 return mf |
1279 return mf |
1280 |
1280 |
|
1281 def _prestatus(self, other, s, match, listignored, listclean, listunknown): |
|
1282 """override the parent hook with a dirstate query |
|
1283 |
|
1284 We use this prestatus hook to populate the status with information from |
|
1285 the dirstate. |
|
1286 """ |
|
1287 return self._dirstatestatus(match, listignored, listclean, listunknown) |
|
1288 |
1281 def _dirstatestatus(self, match=None, ignored=False, clean=False, |
1289 def _dirstatestatus(self, match=None, ignored=False, clean=False, |
1282 unknown=False): |
1290 unknown=False): |
1283 '''Gets the status from the dirstate -- internal use only.''' |
1291 '''Gets the status from the dirstate -- internal use only.''' |
1284 listignored, listclean, listunknown = ignored, clean, unknown |
1292 listignored, listclean, listunknown = ignored, clean, unknown |
1285 match = match or matchmod.always(self._repo.root, self._repo.getcwd()) |
1293 match = match or matchmod.always(self._repo.root, self._repo.getcwd()) |