This is an archive of the discontinued Mercurial Phabricator instance.

rebase: move bookmarks with --keep (issue5682)
AbandonedPublic

Authored by martinvonz on Sep 20 2017, 12:55 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Summary

This is my version of Jun's D727. Not meant to be accepted, but
instead possibly incorporated into Jun's patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Sep 20 2017, 12:55 PM
martinvonz updated this revision to Diff 1940.Sep 20 2017, 1:04 PM
martinvonz updated this revision to Diff 1987.Sep 21 2017, 6:14 PM
quark accepted this revision.Sep 21 2017, 7:01 PM
quark added a subscriber: quark.
quark added inline comments.
hgext/rebase.py
1380

In the future we might want to get the 'rebase' name from current transaction (and enforce an active transaction in cleanupnodes). In that case the name parameter becomes less necessary and moves could be the 3rd argument.

I'll update the code if I'm expected to do that.

martinvonz added inline comments.Sep 21 2017, 7:07 PM
hgext/rebase.py
1380

I'll update the code if I'm expected to do that.

Yes, I was planning to let you take the contents of this patch and put it in yours.

mercurial/scmutil.py
585–586

As I said on IRC, please also update this to be more accurate, because it 'moves' it not only about overrides, it can also have items that are not in 'replacements'

592–593

I'd just drop this actually. Nothing expensive happens if they're both empty anyway

martinvonz updated this revision to Diff 2198.Sep 30 2017, 10:16 AM
martinvonz abandoned this revision.Sep 30 2017, 10:49 AM

Dropping this as planned. Contents of it went in as D727 (because it was Jun who wrote it).