Mercurial > hg
changeset 29401:87acd047711e
rebase: move local variables 'date' and 'extrafns' to the RR class
This commit moves the following variables, local to the rebase function to be
fields of the rebaseruntime:
-date
-extrafns
| author | Kostia Balytskyi <ikostia@fb.com> |
|---|---|
| date | Tue, 21 Jun 2016 06:29:23 -0700 |
| parents | c79da70a4659 |
| children | 7481ffb7ff83 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Tue Jun 21 06:29:23 2016 -0700 +++ b/hgext/rebase.py Tue Jun 21 06:29:23 2016 -0700 @@ -141,6 +141,12 @@ self.collapsef = opts.get('collapse', False) self.collapsemsg = cmdutil.logmessage(ui, opts) + self.date = opts.get('date', None) + + e = opts.get('extrafn') # internal, used by e.g. hgsubversion + self.extrafns = [_savegraft] + if e: + self.extrafns = [e] @command('rebase', [('s', 'source', '', @@ -269,11 +275,6 @@ destspace = opts.get('_destspace') contf = opts.get('continue') abortf = opts.get('abort') - date = opts.get('date', None) - e = opts.get('extrafn') # internal, used by e.g. hgsubversion - extrafns = [_savegraft] - if e: - extrafns = [e] keepf = opts.get('keep', False) keepbranchesf = opts.get('keepbranches', False) # keepopen is not meant for use on the command line, but by @@ -395,7 +396,7 @@ # insert _savebranch at the start of extrafns so if # there's a user-provided extrafn it can clobber branch if # desired - extrafns.insert(0, _savebranch) + rbsrt.extrafns.insert(0, _savebranch) if rbsrt.collapsef: branches = set() for rev in rbsrt.state: @@ -415,7 +416,7 @@ if rbsrt.activebookmark: bookmarks.deactivate(repo) - extrafn = _makeextrafn(extrafns) + extrafn = _makeextrafn(rbsrt.extrafns) sortedstate = sorted(rbsrt.state) total = len(sortedstate) @@ -462,7 +463,7 @@ newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn, editor=editor, keepbranches=keepbranchesf, - date=date) + date=rbsrt.date) else: # Skip commit if we are collapsing repo.dirstate.beginparentchange() @@ -521,7 +522,7 @@ commitmsg=commitmsg, extrafn=extrafn, editor=editor, keepbranches=keepbranchesf, - date=date) + date=rbsrt.date) if newnode is None: newrev = rbsrt.target else: