khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This patch fix the issue5864 (or maybe issue5865 too) which occurs during split (or I should say at the time of filtering the hunks in interactive mode) where user hits a not ending loop of "no changes to record". And it's not only the case for split it will happen in every interactive case for e.g. `hg commit -i` or `hg uncommit -i` After looking into code I found that when filtering we have some notation called "special" for the file headers which doesn't contain any hunk and just contain the header (for e.g. newly added empty file or deleted file) where the user cannot change the content of operation. And I think we can put this "flag-only" file change in that same bucket of "special". But I doubt a bit about the case when a file have flag change and atleast one hunk then user won't be able to separate the flag change from hunks. Changed test file reflect the fixed behaviour. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6058 AFFECTED FILES mercurial/patch.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 @@ -727,27 +727,57 @@ o 0:51f273a58d82 initial - $ printf 'y\ny\ny\n' | hg split - diff --git a/foo b/foo - old mode 100644 - new mode 100755 - examine changes to 'foo'? [Ynesfdaq?] y - - no changes to record + $ cat > $TESTTMP/messages <<EOF + > split 1 + > EOF + +#if obsstore-on + $ printf 'y\n' | hg split diff --git a/foo b/foo old mode 100644 new mode 100755 examine changes to 'foo'? [Ynesfdaq?] y - no changes to record + EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset. + EDITOR: make executable + EDITOR: + EDITOR: + EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. + EDITOR: HG: Leave message empty to abort commit. + EDITOR: HG: -- + EDITOR: HG: user: test + EDITOR: HG: branch 'default' + EDITOR: HG: changed foo + created new head + + $ hg glog + @ 2:b154670c87da split 1 + | + o 0:51f273a58d82 initial + +#else + $ printf 'y\n' | hg split diff --git a/foo b/foo old mode 100644 new mode 100755 examine changes to 'foo'? [Ynesfdaq?] y - no changes to record - diff --git a/foo b/foo - old mode 100644 - new mode 100755 - examine changes to 'foo'? [Ynesfdaq?] abort: response expected - [255] + EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset. + EDITOR: make executable + EDITOR: + EDITOR: + EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. + EDITOR: HG: Leave message empty to abort commit. + EDITOR: HG: -- + EDITOR: HG: user: test + EDITOR: HG: branch 'default' + EDITOR: HG: changed foo + created new head + saved backup bundle to $TESTTMP/issue5864/.hg/strip-backup/3a2125f0f4cb-629e4432-split.hg + + $ hg glog + @ 1:b154670c87da split 1 + | + o 0:51f273a58d82 initial + +#endif diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -863,7 +863,7 @@ diff_re = re.compile('diff -r .* (.*)$') allhunks_re = re.compile('(?:index|deleted file) ') pretty_re = re.compile('(?:new file|deleted file) ') - special_re = re.compile('(?:index|deleted|copy|rename) ') + special_re = re.compile('(?:index|deleted|copy|rename|new mode) ') newfile_re = re.compile('(?:new file)') def __init__(self, header): To: khanchi97, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
