Show More
@@ -121,7 +121,13 b' def _revsetdestrebase(repo, subset, x):' | |||||
121 |
|
121 | |||
122 | class rebaseruntime(object): |
|
122 | class rebaseruntime(object): | |
123 | """This class is a container for rebase runtime state""" |
|
123 | """This class is a container for rebase runtime state""" | |
124 | def __init__(self): |
|
124 | def __init__(self, repo, ui, opts=None): | |
|
125 | if opts is None: | |||
|
126 | opts = {} | |||
|
127 | ||||
|
128 | self.repo = repo | |||
|
129 | self.ui = ui | |||
|
130 | self.opts = opts | |||
125 | self.originalwd = None |
|
131 | self.originalwd = None | |
126 | self.external = nullrev |
|
132 | self.external = nullrev | |
127 | # Mapping between the old revision id and either what is the new rebased |
|
133 | # Mapping between the old revision id and either what is the new rebased | |
@@ -243,7 +249,7 b' def rebase(ui, repo, **opts):' | |||||
243 | unresolved conflicts. |
|
249 | unresolved conflicts. | |
244 |
|
250 | |||
245 | """ |
|
251 | """ | |
246 | rbsrt = rebaseruntime() |
|
252 | rbsrt = rebaseruntime(repo, ui, opts) | |
247 |
|
253 | |||
248 | lock = wlock = None |
|
254 | lock = wlock = None | |
249 | try: |
|
255 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now