##// END OF EJS Templates
histedit: renaming parts to which _histedit was split...
Kostia Balytskyi -
r28154:47f56b6b default
parent child Browse files
Show More
@@ -1054,22 +1054,22 b' def _histedit(ui, repo, state, *freeargs'
1054 state.read()
1054 state.read()
1055 state = bootstrapcontinue(ui, state, opts)
1055 state = bootstrapcontinue(ui, state, opts)
1056 elif goal == goaleditplan:
1056 elif goal == goaleditplan:
1057 _editplanaction(ui, repo, state, rules)
1057 _edithisteditplan(ui, repo, state, rules)
1058 return
1058 return
1059 elif goal == goalabort:
1059 elif goal == goalabort:
1060 _abortaction(ui, repo, state)
1060 _aborthistedit(ui, repo, state)
1061 return
1061 return
1062 else:
1062 else:
1063 # goal == goalnew
1063 # goal == goalnew
1064 _newaction(ui, repo, state, revs, freeargs, opts)
1064 _newhistedit(ui, repo, state, revs, freeargs, opts)
1065
1065
1066 _continueaction(ui, repo, state)
1066 _continuehistedit(ui, repo, state)
1067 _finishaction(ui, repo, state)
1067 _finishhistedit(ui, repo, state)
1068
1068
1069 def _continueaction(ui, repo, state):
1069 def _continuehistedit(ui, repo, state):
1070 """This action runs after either:
1070 """This function runs after either:
1071 - bootstrapcontinue (if the goal is 'continue')
1071 - bootstrapcontinue (if the goal is 'continue')
1072 - _newaction (if the goal is 'new')
1072 - _newhistedit (if the goal is 'new')
1073 """
1073 """
1074 # preprocess rules so that we can hide inner folds from the user
1074 # preprocess rules so that we can hide inner folds from the user
1075 # and only show one editor
1075 # and only show one editor
@@ -1095,7 +1095,7 b' def _continueaction(ui, repo, state):'
1095 state.write()
1095 state.write()
1096 ui.progress(_("editing"), None)
1096 ui.progress(_("editing"), None)
1097
1097
1098 def _finishaction(ui, repo, state):
1098 def _finishhistedit(ui, repo, state):
1099 """This action runs when histedit is finishing its session"""
1099 """This action runs when histedit is finishing its session"""
1100 repo.ui.pushbuffer()
1100 repo.ui.pushbuffer()
1101 hg.update(repo, state.parentctxnode, quietempty=True)
1101 hg.update(repo, state.parentctxnode, quietempty=True)
@@ -1144,7 +1144,7 b' def _finishaction(ui, repo, state):'
1144 if repo.vfs.exists('histedit-last-edit.txt'):
1144 if repo.vfs.exists('histedit-last-edit.txt'):
1145 repo.vfs.unlink('histedit-last-edit.txt')
1145 repo.vfs.unlink('histedit-last-edit.txt')
1146
1146
1147 def _abortaction(ui, repo, state):
1147 def _aborthistedit(ui, repo, state):
1148 try:
1148 try:
1149 state.read()
1149 state.read()
1150 tmpnodes, leafs = newnodestoabort(state)
1150 tmpnodes, leafs = newnodestoabort(state)
@@ -1181,7 +1181,7 b' def _abortaction(ui, repo, state):'
1181 finally:
1181 finally:
1182 state.clear()
1182 state.clear()
1183
1183
1184 def _editplanaction(ui, repo, state, rules):
1184 def _edithisteditplan(ui, repo, state, rules):
1185 state.read()
1185 state.read()
1186 if not rules:
1186 if not rules:
1187 comment = geteditcomment(node.short(state.parentctxnode),
1187 comment = geteditcomment(node.short(state.parentctxnode),
@@ -1201,7 +1201,7 b' def _editplanaction(ui, repo, state, rul'
1201 state.actions = actions
1201 state.actions = actions
1202 state.write()
1202 state.write()
1203
1203
1204 def _newaction(ui, repo, state, revs, freeargs, opts):
1204 def _newhistedit(ui, repo, state, revs, freeargs, opts):
1205 outg = opts.get('outgoing')
1205 outg = opts.get('outgoing')
1206 rules = opts.get('commands', '')
1206 rules = opts.get('commands', '')
1207 force = opts.get('force')
1207 force = opts.get('force')
General Comments 0
You need to be logged in to leave comments. Login now