upstream/mercurial-mirror Files · tests/test-editor-filename.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Yuya Nishihara - - Load All Authors

File last commit:

r34060:4bf18894 default


                r38817:bb54db4a

@96 default

Download file

             test-editor-filename.t
        
                    61 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-editor-filename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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'? [Ynesfdaq?] y

        @@ -0,0 +1,1 @@

        +1

        record change 1/2 to 'one'? [Ynesfdaq?] e

        *.diff (glob)

        editor exited with exit code 1

        record change 1/2 to 'one'? [Ynesfdaq?] q

        abort: user quit

        [255]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				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'? [Ynesfdaq?] y

				@@ -0,0 +1,1 @@
				+1
				record change 1/2 to 'one'? [Ynesfdaq?] e

				*.diff (glob)
				editor exited with exit code 1
				record change 1/2 to 'one'? [Ynesfdaq?] q

				abort: user quit
				[255]