[PATCH 07 of 23 v2] rebase: move repo and ui to the class and make opts an optional parameter

Kostia Balytskyi ikostia at fb.com
Tue May 31 19:23:27 EDT 2016


# HG changeset patch
# User Kostia Balytskyi <ikostia at fb.com>
# Date 1464602803 -3600
#      Mon May 30 11:06:43 2016 +0100
# Node ID 02f4b29d482f66d1eee5dc6593f9f2ba594d1ac1
# Parent  a2452f690466392d1a90dd8ba56fa710fd99e5df
rebase: move repo and ui to the class and make opts an optional parameter

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -121,7 +121,12 @@
 
 class RebaseRuntimeState(object):
     """This class is a container for rebase runtime state"""
-    def __init__(self, opts):
+    def __init__(self, repo, ui, opts=None):
+        self.repo = repo
+        self.ui = ui
+        opts = opts or {}
+        self.opts = opts
+
         self.originalwd = None
         self.external = nullrev
         # Mapping between the old revision id and either what is the new rebased
@@ -255,7 +260,7 @@
     unresolved conflicts.
 
     """
-    rtstate = RebaseRuntimeState(opts)
+    rtstate = RebaseRuntimeState(repo, ui, opts)
 
     lock = wlock = None
     try:


More information about the Mercurial-devel mailing list