Show More
@@ -148,7 +148,6 b' class rebaseruntime(object):' | |||||
148 | self.activebookmark = None |
|
148 | self.activebookmark = None | |
149 | self.dest = None |
|
149 | self.dest = None | |
150 | self.skipped = set() |
|
150 | self.skipped = set() | |
151 | self.destancestors = set() |
|
|||
152 |
|
151 | |||
153 | self.collapsef = opts.get('collapse', False) |
|
152 | self.collapsef = opts.get('collapse', False) | |
154 | self.collapsemsg = cmdutil.logmessage(ui, opts) |
|
153 | self.collapsemsg = cmdutil.logmessage(ui, opts) | |
@@ -336,11 +335,9 b' class rebaseruntime(object):' | |||||
336 |
|
335 | |||
337 | (self.originalwd, self.dest, self.state) = result |
|
336 | (self.originalwd, self.dest, self.state) = result | |
338 | if self.collapsef: |
|
337 | if self.collapsef: | |
339 |
|
|
338 | destancestors = self.repo.changelog.ancestors([self.dest], | |
340 |
|
|
339 | inclusive=True) | |
341 | inclusive=True) |
|
340 | self.external = externalparent(self.repo, self.state, destancestors) | |
342 | self.external = externalparent(self.repo, self.state, |
|
|||
343 | self.destancestors) |
|
|||
344 |
|
341 | |||
345 | if dest.closesbranch() and not self.keepbranchesf: |
|
342 | if dest.closesbranch() and not self.keepbranchesf: | |
346 | self.ui.status(_('reopening closed branch head %s\n') % dest) |
|
343 | self.ui.status(_('reopening closed branch head %s\n') % dest) | |
@@ -360,11 +357,6 b' class rebaseruntime(object):' | |||||
360 | raise error.Abort(_('cannot collapse multiple named ' |
|
357 | raise error.Abort(_('cannot collapse multiple named ' | |
361 | 'branches')) |
|
358 | 'branches')) | |
362 |
|
359 | |||
363 | # Rebase |
|
|||
364 | if not self.destancestors: |
|
|||
365 | self.destancestors = repo.changelog.ancestors([self.dest], |
|
|||
366 | inclusive=True) |
|
|||
367 |
|
||||
368 | # Keep track of the active bookmarks in order to reset them later |
|
360 | # Keep track of the active bookmarks in order to reset them later | |
369 | self.activebookmark = self.activebookmark or repo._activebookmark |
|
361 | self.activebookmark = self.activebookmark or repo._activebookmark | |
370 | if self.activebookmark: |
|
362 | if self.activebookmark: |
General Comments 0
You need to be logged in to leave comments.
Login now