upstream/mercurial-mirror Files · tests/test-log-exthook.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:

r35906:c8e2d6ed default


                r38817:bb54db4a

@96 default

Download file

             test-log-exthook.t
        
                    60 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-log-exthook.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test hg log changeset printer external hook

      -------------------------------------------

        $ cat > $TESTTMP/logexthook.py <<EOF

        > from __future__ import absolute_import

        > from mercurial import (

        >   commands,

        >   logcmdutil,

        >   repair,

        > )

        > def rot13description(self, ctx):

        >     summary = "summary".encode('rot13')

        >     description = ctx.description().strip().splitlines()[0].encode('rot13')

        >     self.ui.write("%s:     %s\n" % (summary, description))

        > def reposetup(ui, repo):

        >     logcmdutil.changesetprinter._exthook = rot13description

        > EOF

      Prepare the repository

        $ hg init empty

        $ cd empty

        $ touch ROOT

        $ hg commit -A -m "Root" ROOT

        $ touch a b c

        $ hg commit -A -m "Add A, B, C" a b c

      Check the log

        $ hg log --config extensions.t=$TESTTMP/logexthook.py

        changeset:   1:70fc82b23320

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        fhzznel:     Nqq N, O, P

        summary:     Add A, B, C

        changeset:   0:b00443a54871

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        fhzznel:     Ebbg

        summary:     Root

      Check that exthook is working with graph log too

        $ hg log -G --config extensions.t=$TESTTMP/logexthook.py

        @  changeset:   1:70fc82b23320

        |  tag:         tip

        |  user:        test

        |  date:        Thu Jan 01 00:00:00 1970 +0000

        |  fhzznel:     Nqq N, O, P

        |  summary:     Add A, B, C

        |

        o  changeset:   0:b00443a54871

           user:        test

           date:        Thu Jan 01 00:00:00 1970 +0000

           fhzznel:     Ebbg

           summary:     Root

	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 hg log changeset printer external hook
				-------------------------------------------

				$ cat > $TESTTMP/logexthook.py <<EOF
				> from __future__ import absolute_import
				> from mercurial import (
				> commands,
				> logcmdutil,
				> repair,
				> )
				> def rot13description(self, ctx):
				> summary = "summary".encode('rot13')
				> description = ctx.description().strip().splitlines()[0].encode('rot13')
				> self.ui.write("%s: %s\n" % (summary, description))
				> def reposetup(ui, repo):
				> logcmdutil.changesetprinter._exthook = rot13description
				> EOF

				Prepare the repository

				$ hg init empty
				$ cd empty
				$ touch ROOT
				$ hg commit -A -m "Root" ROOT

				$ touch a b c
				$ hg commit -A -m "Add A, B, C" a b c

				Check the log

				$ hg log --config extensions.t=$TESTTMP/logexthook.py
				changeset: 1:70fc82b23320
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				fhzznel: Nqq N, O, P
				summary: Add A, B, C

				changeset: 0:b00443a54871
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				fhzznel: Ebbg
				summary: Root

				Check that exthook is working with graph log too

				$ hg log -G --config extensions.t=$TESTTMP/logexthook.py
				@ changeset: 1:70fc82b23320
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| fhzznel: Nqq N, O, P
				\| summary: Add A, B, C
				\|
				o changeset: 0:b00443a54871
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				fhzznel: Ebbg
				summary: Root