[PATCH 5 of 7 v6] rebase: move revset-defining local variables to the RR class
Kostia Balytskyi
ikostia at fb.com
Mon Jun 13 18:03:50 EDT 2016
# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1465854200 -3600
# Mon Jun 13 22:43:20 2016 +0100
# Node ID ad8e1710d3337924368905bdb1601c0bbc150e15
# Parent 5403815281a1e78e26992bf3180c527727c9463c
rebase: move revset-defining local variables to the RR class
This commit moves:
-destf
-srcf
-basef
-revf
to be fields of the previously introduced rebaseruntime class.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -121,7 +121,7 @@ def _revsetdestrebase(repo, subset, x):
class rebaseruntime(object):
"""This class is a container for rebase runtime state"""
- def __init__(self):
+ def __init__(self, opts):
self.originalwd = None
self.external = nullrev
# Mapping between the old revision id and either what is the new rebased
@@ -133,6 +133,12 @@ class rebaseruntime(object):
self.skipped = set()
self.targetancestors = set()
+ # Validate input and define rebasing points
+ self.destf = opts.get('dest', None)
+ self.srcf = opts.get('source', None)
+ self.basef = opts.get('base', None)
+ self.revf = opts.get('rev', [])
+
@command('rebase',
[('s', 'source', '',
_('rebase the specified changeset and descendants'), _('REV')),
@@ -243,18 +249,13 @@ def rebase(ui, repo, **opts):
unresolved conflicts.
"""
- rbsrt = rebaseruntime()
+ rbsrt = rebaseruntime(opts)
lock = wlock = None
try:
wlock = repo.wlock()
lock = repo.lock()
- # Validate input and define rebasing points
- destf = opts.get('dest', None)
- srcf = opts.get('source', None)
- basef = opts.get('base', None)
- revf = opts.get('rev', [])
# search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214.
destspace = opts.get('_destspace')
@@ -294,7 +295,7 @@ def rebase(ui, repo, **opts):
if collapsef:
raise error.Abort(
_('cannot use collapse with continue or abort'))
- if srcf or basef or destf:
+ if rbsrt.srcf or rbsrt.basef or rbsrt.destf:
raise error.Abort(
_('abort and continue do not allow specifying revisions'))
if abortf and opts.get('tool', False):
@@ -333,7 +334,8 @@ def rebase(ui, repo, **opts):
_checkobsrebase(repo, ui, rebaseobsrevs, rebasesetrevs,
rebaseobsskipped)
else:
- dest, rebaseset = _definesets(ui, repo, destf, srcf, basef, revf,
+ dest, rebaseset = _definesets(ui, repo, rbsrt.destf, rbsrt.srcf,
+ rbsrt.basef, rbsrt.revf,
destspace=destspace)
if dest is None:
return _nothingtorebase()
More information about the Mercurial-devel
mailing list