Mercurial > hg
comparison hgext/mq.py @ 13036:77aa74fe0e0b
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 22 Nov 2010 13:11:46 -0600 |
| parents | 026053f691a4 f08df4d38442 |
| children | d73c3034deee |
comparison
equal
deleted
inserted
replaced
| 13034:8cb33163b391 | 13036:77aa74fe0e0b |
|---|---|
| 1308 # we might end up with files that were added between | 1308 # we might end up with files that were added between |
| 1309 # qtip and the dirstate parent, but then changed in the | 1309 # qtip and the dirstate parent, but then changed in the |
| 1310 # local dirstate. in this case, we want them to only | 1310 # local dirstate. in this case, we want them to only |
| 1311 # show up in the added section | 1311 # show up in the added section |
| 1312 for x in m: | 1312 for x in m: |
| 1313 if x == '.hgsub' or x == '.hgsubstate': | |
| 1314 self.ui.warn(_('warning: not refreshing %s\n') % x) | |
| 1315 continue | |
| 1313 if x not in aa: | 1316 if x not in aa: |
| 1314 mm.add(x) | 1317 mm.add(x) |
| 1315 # we might end up with files added by the local dirstate that | 1318 # we might end up with files added by the local dirstate that |
| 1316 # were deleted by the patch. In this case, they should only | 1319 # were deleted by the patch. In this case, they should only |
| 1317 # show up in the changed section. | 1320 # show up in the changed section. |
| 1318 for x in a: | 1321 for x in a: |
| 1322 if x == '.hgsub' or x == '.hgsubstate': | |
| 1323 self.ui.warn(_('warning: not adding %s\n') % x) | |
| 1324 continue | |
| 1319 if x in dd: | 1325 if x in dd: |
| 1320 dd.remove(x) | 1326 dd.remove(x) |
| 1321 mm.add(x) | 1327 mm.add(x) |
| 1322 else: | 1328 else: |
| 1323 aa.add(x) | 1329 aa.add(x) |
| 1324 # make sure any files deleted in the local dirstate | 1330 # make sure any files deleted in the local dirstate |
| 1325 # are not in the add or change column of the patch | 1331 # are not in the add or change column of the patch |
| 1326 forget = [] | 1332 forget = [] |
| 1327 for x in d + r: | 1333 for x in d + r: |
| 1334 if x == '.hgsub' or x == '.hgsubstate': | |
| 1335 self.ui.warn(_('warning: not removing %s\n') % x) | |
| 1336 continue | |
| 1328 if x in aa: | 1337 if x in aa: |
| 1329 aa.remove(x) | 1338 aa.remove(x) |
| 1330 forget.append(x) | 1339 forget.append(x) |
| 1331 continue | 1340 continue |
| 1332 else: | 1341 else: |