##// END OF EJS Templates
histedit: fix --continue when rules are finished...
Durham Goode -
r24959:3c762cce stable
parent child Browse files
Show More
@@ -893,21 +893,22 b' def _histedit(ui, repo, state, *freeargs'
893
893
894 def bootstrapcontinue(ui, state, opts):
894 def bootstrapcontinue(ui, state, opts):
895 repo = state.repo
895 repo = state.repo
896 action, currentnode = state.rules.pop(0)
896 if state.rules:
897
897 action, currentnode = state.rules.pop(0)
898 actobj = actiontable[action].fromrule(state, currentnode)
899
898
900 s = repo.status()
899 actobj = actiontable[action].fromrule(state, currentnode)
901 if s.modified or s.added or s.removed or s.deleted:
900
902 actobj.continuedirty()
903 s = repo.status()
901 s = repo.status()
904 if s.modified or s.added or s.removed or s.deleted:
902 if s.modified or s.added or s.removed or s.deleted:
905 raise util.Abort(_("working copy still dirty"))
903 actobj.continuedirty()
904 s = repo.status()
905 if s.modified or s.added or s.removed or s.deleted:
906 raise util.Abort(_("working copy still dirty"))
906
907
907 parentctx, replacements = actobj.continueclean()
908 parentctx, replacements = actobj.continueclean()
908
909
909 state.parentctxnode = parentctx.node()
910 state.parentctxnode = parentctx.node()
910 state.replacements.extend(replacements)
911 state.replacements.extend(replacements)
911
912
912 return state
913 return state
913
914
General Comments 0
You need to be logged in to leave comments. Login now