This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3986

split: abort if there's an unfinished operation
Needs RevisionPublic

Authored by martinvonz on Jul 30 2018, 5:45 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jul 30 2018, 5:45 PM
quark added a subscriber: quark.Jul 31 2018, 1:16 AM

FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.

martinvonz added a comment.Jul 31 2018, 1:20 AM
In D3986#61989, @quark wrote:

FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive.

Two thoughts:

  1. We had talked at Google about having the "edit" action create split markers if the user created multiple commits. Do you think that would address the FB users' use case?
  1. It seems very dangerous to not have this check at least when not using obsmarkers and there are descendants of the current commit (split then rebases the descendants), so I'd like to keep the check in at least that case.
martinvonz added a comment.Jul 31 2018, 2:36 AM

Oh, I should have said that I agree with not queuing this patch now. We can discuss what we want to do and do it on the default branch later.

quark added a comment.Aug 1 2018, 11:35 AM

I think a most flexible solution is to not do the check if there is nothing to rebase.

baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (1 line)
Mtests/test-split.t (9 lines)

Diff 9671

hgext/split.py

if not alloworphaned and descendants: if not alloworphaned and descendants:
raise error.Abort( raise error.Abort(
_('cannot split changeset with children without rebase')) _('cannot split changeset with children without rebase'))
torebase = () torebase = ()
if len(ctx.parents()) > 1: if len(ctx.parents()) > 1:
raise error.Abort(_('cannot split a merge changeset')) raise error.Abort(_('cannot split a merge changeset'))
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
# Deactivate bookmark temporarily so it won't get moved unintentionally # Deactivate bookmark temporarily so it won't get moved unintentionally
bname = repo._activebookmark bname = repo._activebookmark
if bname and repo._bookmarks[bname] != ctx.node(): if bname and repo._bookmarks[bname] != ctx.node():
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
wnode = repo['.'].node() wnode = repo['.'].node()

tests/test-split.t

$ touch dirty $ touch dirty
$ hg add dirty $ hg add dirty
$ hg split . $ hg split .
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg forget dirty $ hg forget dirty
$ rm dirty $ rm dirty
Cannot split while there's an unfinished operation
$ touch .hg/graftstate
$ hg split .
abort: graft in progress
(use 'hg graft --continue' or 'hg graft --stop' to stop)
[255]
$ rm .hg/graftstate
Make a clean directory for future tests to build off of Make a clean directory for future tests to build off of
$ cp -R . ../clean $ cp -R . ../clean
Split a head Split a head
$ hg bookmark r3 $ hg bookmark r3