This is an archive of the discontinued Mercurial Phabricator instance.

rebase: disable `inmemory` if the rebaseset contains the working copy

Authored by phillco on Dec 8 2017, 2:25 AM.



As described in the comment, rebasing the working copy parent with in-memory
merge, and then updating to the new commit, isn't much faster because of the
extra overhead of uppdating. Best to leave it off in that case.

This commit makes deploying in-memory merge via an extension easier, because
you can just set inmemory=True based on some config or probability, and this
will turn off the cases where it's not desired.

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Dec 8 2017, 2:25 AM
phillco edited the summary of this revision. (Show Details)Dec 8 2017, 2:28 AM
dlax requested changes to this revision.Dec 8 2017, 4:44 AM
This revision now requires changes to proceed.Dec 8 2017, 4:44 AM
durin42 added a subscriber: durin42.Dec 8 2017, 1:45 PM

@dlax I see a request changes here, but I don't see any commentary as to why?

dlax added a comment.Dec 8 2017, 2:33 PM

@dlax I see a request changes here, but I don't see any commentary as to why?

I meant to comment that the first hunks (i.e. those above the big comment block) seem unrelated and to ask for clarification.
No idea where my comment went, sorry...

@dlax you mean the parts where we pass opts instead of inmemory? This is necessary for the function to mutate opts['inmemory'].

phillco updated this revision to Diff 4276.Dec 8 2017, 6:32 PM
This revision was automatically updated to reflect the committed changes.