D3986: split: abort if there's an unfinished operation
This revision now requires changes to proceed. baymax added a comment. baymax requested changes to this revision. 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: REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D3986/new/ REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers, baymax Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3986: split: abort if there's an unfinished operation
quark added a comment. I think a most flexible solution is to not do the check if there is nothing to rebase. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3986: split: abort if there's an unfinished operation
martinvonz added a comment. 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3986: split: abort if there's an unfinished operation
martinvonz added a comment. In https://phab.mercurial-scm.org/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? 2. 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3986: split: abort if there's an unfinished operation
quark added a comment. FB has users reporting they need to split commits in the middle of a histedit. So this might be too restrictive. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3986 To: martinvonz, #hg-reviewers Cc: quark, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3986: split: abort if there's an unfinished operation
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3986
AFFECTED FILES
hgext/split.py
tests/test-split.t
CHANGE DETAILS
diff --git a/tests/test-split.t b/tests/test-split.t
--- a/tests/test-split.t
+++ b/tests/test-split.t
@@ -91,6 +91,15 @@
$ hg forget 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
$ cp -R . ../clean
diff --git a/hgext/split.py b/hgext/split.py
--- a/hgext/split.py
+++ b/hgext/split.py
@@ -108,6 +108,7 @@
if len(ctx.parents()) > 1:
raise error.Abort(_('cannot split a merge changeset'))
+cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
# Deactivate bookmark temporarily so it won't get moved unintentionally
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
