Show More
@@ -502,6 +502,9 b' def collapse(repo, first, last, commitop' | |||||
502 | editor=editor) |
|
502 | editor=editor) | |
503 | return repo.commitctx(new) |
|
503 | return repo.commitctx(new) | |
504 |
|
504 | |||
|
505 | def _isdirtywc(repo): | |||
|
506 | return repo[None].dirty(missing=True) | |||
|
507 | ||||
505 | class pick(histeditaction): |
|
508 | class pick(histeditaction): | |
506 | def run(self): |
|
509 | def run(self): | |
507 | rulectx = self.repo[self.node] |
|
510 | rulectx = self.repo[self.node] | |
@@ -971,11 +974,9 b' def bootstrapcontinue(ui, state, opts):' | |||||
971 |
|
974 | |||
972 | actobj = actiontable[action].fromrule(state, currentnode) |
|
975 | actobj = actiontable[action].fromrule(state, currentnode) | |
973 |
|
976 | |||
974 | s = repo.status() |
|
977 | if _isdirtywc(repo): | |
975 | if s.modified or s.added or s.removed or s.deleted: |
|
|||
976 | actobj.continuedirty() |
|
978 | actobj.continuedirty() | |
977 | s = repo.status() |
|
979 | if _isdirtywc(repo): | |
978 | if s.modified or s.added or s.removed or s.deleted: |
|
|||
979 | raise error.Abort(_("working copy still dirty")) |
|
980 | raise error.Abort(_("working copy still dirty")) | |
980 |
|
981 | |||
981 | parentctx, replacements = actobj.continueclean() |
|
982 | parentctx, replacements = actobj.continueclean() |
General Comments 0
You need to be logged in to leave comments.
Login now