Patchwork [5,of,7,v4] rebase: move revset-defining local variables to the RRS class

login
register
mail settings
Submitter Kostia Balytskyi
Date June 5, 2016, 5:46 p.m.
Message ID <d55ee8750f35e50a4005.1465148779@ikostia-mbp>
Download mbox | patch
Permalink /patch/15415/
State Superseded
Headers show

Comments

Kostia Balytskyi - June 5, 2016, 5:46 p.m.
# HG changeset patch
# User Kostia Balytskyi <ikostia@fb.com>
# Date 1465135652 -3600
#      Sun Jun 05 15:07:32 2016 +0100
# Node ID d55ee8750f35e50a4005cf2cc160a22035217d2a
# Parent  f77b84882afcf7e12afc520db6e758ca302a97b2
rebase: move revset-defining local variables to the RRS class

This commit moves:
 -destf
 -srcf
 -basef
 -revf
to be fields of the previously introduced RebaseRuntimeState class.
Yuya Nishihara - June 13, 2016, 1:39 p.m.
On Sun, 5 Jun 2016 18:46:19 +0100, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia@fb.com>
> # Date 1465135652 -3600
> #      Sun Jun 05 15:07:32 2016 +0100
> # Node ID d55ee8750f35e50a4005cf2cc160a22035217d2a
> # Parent  f77b84882afcf7e12afc520db6e758ca302a97b2
> rebase: move revset-defining local variables to the RRS class
> 
> This commit moves:
>  -destf
>  -srcf
>  -basef
>  -revf
> to be fields of the previously introduced RebaseRuntimeState 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 RebaseRuntimeState(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 RebaseRuntimeState(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', [])

Are we going to move everything under the RRS class?

I think it will be nice if we can separate the command processing from the
rebase logic. I have no idea how difficult it will be, though.

Patch

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 RebaseRuntimeState(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 RebaseRuntimeState(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.
 
     """
-    rtstate = RebaseRuntimeState()
+    rtstate = RebaseRuntimeState(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 rtstate.srcf or rtstate.basef or rtstate.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, rtstate.destf, rtstate.srcf,
+                                          rtstate.basef, rtstate.revf,
                                           destspace=destspace)
             if dest is None:
                 return _nothingtorebase()