Show More
@@ -524,6 +524,12 b' def collapse(repo, first, last, commitop' | |||||
524 | def _isdirtywc(repo): |
|
524 | def _isdirtywc(repo): | |
525 | return repo[None].dirty(missing=True) |
|
525 | return repo[None].dirty(missing=True) | |
526 |
|
526 | |||
|
527 | def abortdirty(): | |||
|
528 | raise error.Abort(_('working copy has pending changes'), | |||
|
529 | hint=_('amend, commit, or revert them and run histedit ' | |||
|
530 | '--continue, or abort with histedit --abort')) | |||
|
531 | ||||
|
532 | ||||
527 | class pick(histeditaction): |
|
533 | class pick(histeditaction): | |
528 | def run(self): |
|
534 | def run(self): | |
529 | rulectx = self.repo[self.node] |
|
535 | rulectx = self.repo[self.node] | |
@@ -996,7 +1002,7 b' def bootstrapcontinue(ui, state, opts):' | |||||
996 | if _isdirtywc(repo): |
|
1002 | if _isdirtywc(repo): | |
997 | actobj.continuedirty() |
|
1003 | actobj.continuedirty() | |
998 | if _isdirtywc(repo): |
|
1004 | if _isdirtywc(repo): | |
999 | raise error.Abort(_("working copy still dirty")) |
|
1005 | abortdirty() | |
1000 |
|
1006 | |||
1001 | parentctx, replacements = actobj.continueclean() |
|
1007 | parentctx, replacements = actobj.continueclean() | |
1002 |
|
1008 |
General Comments 0
You need to be logged in to leave comments.
Login now