- User Since
- Jan 29 2018, 11:31 AM (50 w, 4 d)
Wed, Jan 9
Tue, Dec 25
Ready for review.
Sun, Dec 23
Oh, yes. It is extension specific configuration.
Abandoning this one.
@av6 Thanks for the review. I will update it.
Sat, Dec 22
Please take a look at tests changes, as I accepted these changes using --interactive flag thinking it as a expected change.
I think I can't add tests which will reflect the expected bahivour for this issue here in mercurial, so I will send a test patch in evolve.
Oct 21 2018
Sep 3 2018
Ready to review.
Aug 30 2018
Made changes. Ready to review.
Aug 27 2018
Aug 26 2018
Aug 16 2018
Aug 15 2018
Aug 14 2018
Aug 10 2018
Aug 7 2018
@yuja Is there any command left which we can consider to add
'history-editing-backup' config option?
Aug 6 2018
Aug 5 2018
Aug 4 2018
Aug 3 2018
Aug 2 2018
Aug 1 2018
Jul 31 2018
Jul 27 2018
Jul 24 2018
@pulkit I will send a follow up which will take care of bookmarks movement. Thanks for review!
Jul 22 2018
Jul 21 2018
right, will change it.
+ # either mark obsolete or keep rebased revisions
+ repo, ui, opts = self.repo, self.ui, self.opts
+ fm = ui.formatter('rebase', opts)
+ clearrebased(ui, repo, self.destmap, self.state, self.skipped,
+ collapsedas=None, keepf=self.keepf, fm=fm)
+ return 0
I doubt if this would work with --collapse. Can you try writing some tests?
What is the expected behaviour in case of --collapse? Should it collapse only those revisions which are rebased, then we may have to ask user to change commit message accordingly.
I'm not pretty sure, but it might be possible to utilize _finishrebase()
to implement --stop, roughly by:
- restore status
- drop revisions that aren't rebased yet
- finish it
yeah, trying to do it in _finishrebase()
+ elif stop:
+ #todo: raise error for conflicting options