equal
deleted
inserted
replaced
280 if repo.ui.configbool('mq', 'secret', False): |
280 if repo.ui.configbool('mq', 'secret', False): |
281 phase = phases.secret |
281 phase = phases.secret |
282 if phase is not None: |
282 if phase is not None: |
283 backup = repo.ui.backupconfig('phases', 'new-commit') |
283 backup = repo.ui.backupconfig('phases', 'new-commit') |
284 # Marking the repository as committing an mq patch can be used |
284 # Marking the repository as committing an mq patch can be used |
285 # to optimize operations like _branchtags(). |
285 # to optimize operations like branchtags(). |
286 repo._committingpatch = True |
286 repo._committingpatch = True |
287 try: |
287 try: |
288 if phase is not None: |
288 if phase is not None: |
289 repo.ui.setconfig('phases', 'new-commit', phase) |
289 repo.ui.setconfig('phases', 'new-commit', phase) |
290 return repo.commit(*args, **kwargs) |
290 return repo.commit(*args, **kwargs) |
1569 |
1569 |
1570 m = list(mm) |
1570 m = list(mm) |
1571 r = list(dd) |
1571 r = list(dd) |
1572 a = list(aa) |
1572 a = list(aa) |
1573 |
1573 |
1574 # create 'match' that includes the files to be recommited. |
1574 # create 'match' that includes the files to be recommitted. |
1575 # apply matchfn via repo.status to ensure correct case handling. |
1575 # apply matchfn via repo.status to ensure correct case handling. |
1576 cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4] |
1576 cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4] |
1577 allmatches = set(cm + ca + cr + cd) |
1577 allmatches = set(cm + ca + cr + cd) |
1578 refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] |
1578 refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)] |
1579 |
1579 |