facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

histedit: renaming parts to which _histedit was split

Browse Source 
I recently broke _histedit into multiple functions, each of which
had 'action' in its name. This is a little bit confusing since 'action'
is the word for an individual histedit plan item (such as edit or pick).
To avoid this confusion, these functions are now renamed to contain
'histedit' as part of their names.
This commit is contained in:
Kostia Balytskyi 2016-02-15 14:57:06 +00:00
parent 6f752dbaad
commit f0666adeb0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hgext/histedit.py
View File

@ -1054,22 +1054,22 @@ def _histedit(ui, repo, state, *freeargs, **opts):
state.read()
state = bootstrapcontinue(ui, state, opts)
elif goal == goaleditplan:
_editplanaction(ui, repo, state, rules)
_edithisteditplan(ui, repo, state, rules)
return
elif goal == goalabort:
_abortaction(ui, repo, state)
_aborthistedit(ui, repo, state)
return
else:
# goal == goalnew
_newaction(ui, repo, state, revs, freeargs, opts)
_newhistedit(ui, repo, state, revs, freeargs, opts)
_continueaction(ui, repo, state)
_finishaction(ui, repo, state)
_continuehistedit(ui, repo, state)
_finishhistedit(ui, repo, state)
def _continueaction(ui, repo, state):
"""This action runs after either:
def _continuehistedit(ui, repo, state):
"""This function runs after either:
- bootstrapcontinue (if the goal is 'continue')
- _newaction (if the goal is 'new')
- _newhistedit (if the goal is 'new')
"""
# preprocess rules so that we can hide inner folds from the user
# and only show one editor
@ -1095,7 +1095,7 @@ def _continueaction(ui, repo, state):
state.write()
ui.progress(_("editing"), None)
def _finishaction(ui, repo, state):
def _finishhistedit(ui, repo, state):
"""This action runs when histedit is finishing its session"""
repo.ui.pushbuffer()
hg.update(repo, state.parentctxnode, quietempty=True)
@ -1144,7 +1144,7 @@ def _finishaction(ui, repo, state):
if repo.vfs.exists('histedit-last-edit.txt'):
repo.vfs.unlink('histedit-last-edit.txt')
def _abortaction(ui, repo, state):
def _aborthistedit(ui, repo, state):
try:
state.read()
tmpnodes, leafs = newnodestoabort(state)
@ -1181,7 +1181,7 @@ def _abortaction(ui, repo, state):
finally:
state.clear()
def _editplanaction(ui, repo, state, rules):
def _edithisteditplan(ui, repo, state, rules):
state.read()
if not rules:
comment = geteditcomment(node.short(state.parentctxnode),
@ -1201,7 +1201,7 @@ def _editplanaction(ui, repo, state, rules):
state.actions = actions
state.write()
def _newaction(ui, repo, state, revs, freeargs, opts):
def _newhistedit(ui, repo, state, revs, freeargs, opts):
outg = opts.get('outgoing')
rules = opts.get('commands', '')
force = opts.get('force')