equal
deleted
inserted
replaced
1562 |
1562 |
1563 @eh.wrapcommand(b'rollback') |
1563 @eh.wrapcommand(b'rollback') |
1564 def overriderollback(orig, ui, repo, **opts): |
1564 def overriderollback(orig, ui, repo, **opts): |
1565 with repo.wlock(): |
1565 with repo.wlock(): |
1566 before = repo.dirstate.parents() |
1566 before = repo.dirstate.parents() |
1567 orphans = set( |
1567 orphans = { |
1568 f |
1568 f |
1569 for f in repo.dirstate |
1569 for f in repo.dirstate |
1570 if lfutil.isstandin(f) and repo.dirstate[f] != b'r' |
1570 if lfutil.isstandin(f) and repo.dirstate[f] != b'r' |
1571 ) |
1571 } |
1572 result = orig(ui, repo, **opts) |
1572 result = orig(ui, repo, **opts) |
1573 after = repo.dirstate.parents() |
1573 after = repo.dirstate.parents() |
1574 if before == after: |
1574 if before == after: |
1575 return result # no need to restore standins |
1575 return result # no need to restore standins |
1576 |
1576 |