upstream/mercurial-mirror Files · tests/test-check-help.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

Pulkit Goyal - - Load All Authors

File last commit:

r35967:80e5210d default


                r38817:bb54db4a

@96 default

Download file

             test-check-help.t
        
                    29 lines
            
             | 868 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-help.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

        $ . "$TESTDIR/helpers-testrepo.sh"

        $ cat <<'EOF' > scanhelptopics.py

        > from __future__ import absolute_import, print_function

        > import re

        > import sys

        > if sys.platform == "win32":

        >     import os, msvcrt

        >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

        > topics = set()

        > topicre = re.compile(br':hg:`help ([a-z0-9\-.]+)`')

        > for fname in sys.argv:

        >     with open(fname, 'rb') as f:

        >         topics.update(m.group(1) for m in topicre.finditer(f.read()))

        > for s in sorted(topics):

        >     print(s)

        > EOF

        $ cd "$TESTDIR"/..

      Check if ":hg:`help TOPIC`" is valid:

      (use "xargs -n1 -t" to see which help commands are executed)

        $ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' \

        > | sed 's|\\|/|g' \

        > | xargs $PYTHON "$TESTTMP/scanhelptopics.py" \

        > | xargs -n1 hg help > /dev/null

	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

				#require test-repo

				$ . "$TESTDIR/helpers-testrepo.sh"

				$ cat <<'EOF' > scanhelptopics.py
				> from __future__ import absolute_import, print_function
				> import re
				> import sys
				> if sys.platform == "win32":
				> import os, msvcrt
				> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				> topics = set()
				> topicre = re.compile(br':hg:`help ([a-z0-9\-.]+)`')
				> for fname in sys.argv:
				> with open(fname, 'rb') as f:
				> topics.update(m.group(1) for m in topicre.finditer(f.read()))
				> for s in sorted(topics):
				> print(s)
				> EOF

				$ cd "$TESTDIR"/..

				Check if ":hg:`help TOPIC`" is valid:
				(use "xargs -n1 -t" to see which help commands are executed)

				$ testrepohg files 'glob:{hgdemandimport,hgext,mercurial}/*/.py' \
				> \| sed 's\|\\\|/\|g' \
				> \| xargs $PYTHON "$TESTTMP/scanhelptopics.py" \
				> \| xargs -n1 hg help > /dev/null