##// END OF EJS Templates
rebase: delete obsolete internal "keepopen" option...
Martin von Zweigbergk -
r36789:f7e3fe95 default
parent child Browse files
Show More
@@ -174,9 +174,6 b' class rebaseruntime(object):'
174
174
175 self.keepf = opts.get('keep', False)
175 self.keepf = opts.get('keep', False)
176 self.keepbranchesf = opts.get('keepbranches', False)
176 self.keepbranchesf = opts.get('keepbranches', False)
177 # keepopen is not meant for use on the command line, but by
178 # other extensions
179 self.keepopen = opts.get('keepopen', False)
180 self.obsoletenotrebased = {}
177 self.obsoletenotrebased = {}
181 self.obsoletewithoutsuccessorindestination = set()
178 self.obsoletewithoutsuccessorindestination = set()
182 self.inmemory = inmemory
179 self.inmemory = inmemory
@@ -551,7 +548,7 b' class rebaseruntime(object):'
551 repo, ui, opts = self.repo, self.ui, self.opts
548 repo, ui, opts = self.repo, self.ui, self.opts
552 fm = ui.formatter('rebase', opts)
549 fm = ui.formatter('rebase', opts)
553 fm.startitem()
550 fm.startitem()
554 if self.collapsef and not self.keepopen:
551 if self.collapsef:
555 p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
552 p1, p2, _base = defineparents(repo, min(self.state), self.destmap,
556 self.state, self.skipped,
553 self.state, self.skipped,
557 self.obsoletenotrebased)
554 self.obsoletenotrebased)
General Comments 0
You need to be logged in to leave comments. Login now