Mercurial > hg
view tests/test-editor-filename.t @ 45382:0652a533fe3c
mergestate: use _stateextras instead of merge records for commit related info
There is a set of information related to a merge which is needed on commit. We
want to store such information in the mergestate so that we can read it while
committing.
For this purpose, we are using merge records and introduced a merge
entry state for that. However this won't scale and is not clean way to implement
this.
This patch reworks the existing logic related to this to use _stateextras and
read from it.
Right now the information stored is not very descriptive but it will be in next
patch.
Using _stateextras also makes MERGE_RECORD_MERGED_OTHER useless and only to be
kept for BC.
Differential Revision: https://phab.mercurial-scm.org/D8920
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 10 Aug 2020 15:29:02 +0530 |
parents | f802a75da585 |
children | ac362d5a7893 |
line wrap: on
line source
Test temp file used with an editor has the expected suffix. $ hg init Create an editor that writes its arguments to stdout and set it to $HGEDITOR. $ cat > editor.sh << EOF > echo "\$@" > exit 1 > EOF $ hg add editor.sh $ HGEDITOR="sh $TESTTMP/editor.sh" $ export HGEDITOR Verify that the path for a commit editor has the expected suffix. $ hg commit *.commit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that the path for a histedit editor has the expected suffix. $ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > histedit= > EOF $ hg commit --message 'At least one commit for histedit.' $ hg histedit *.histedit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that when performing an action that has the side-effect of creating an editor for a diff, the file ends in .diff. $ echo 1 > one $ echo 2 > two $ hg add adding one adding two $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF > y > e > q > EOF diff --git a/one b/one new file mode 100644 examine changes to 'one'? (enter ? for help) [Ynesfdaq?] y @@ -0,0 +1,1 @@ +1 record change 1/2 to 'one'? (enter ? for help) [Ynesfdaq?] e *.diff (glob) editor exited with exit code 1 record change 1/2 to 'one'? (enter ? for help) [Ynesfdaq?] q abort: user quit [255]