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

Jason R. Coombs - - Load All Authors

File last commit:

r27982:bf1d5c22 default


                r38817:bb54db4a

@96 default

Download file

             test-schemes.t
        
                    74 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-schemes.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > schemes=

        > 

        > [schemes]

        > l = http://localhost:$HGPORT/

        > parts = http://{1}:$HGPORT/

        > z = file:\$PWD/

        > EOF

        $ hg init test

        $ cd test

        $ echo a > a

        $ hg ci -Am initial

        adding a

      invalid scheme

        $ hg log -R z:z

        abort: no '://' in scheme url 'z:z'

        [255]

      http scheme

        $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

        $ cat hg.pid >> $DAEMON_PIDS

        $ hg incoming l://

        comparing with l://

        searching for changes

        no changes found

        [1]

      check that {1} syntax works

        $ hg incoming --debug parts://localhost

        using http://localhost:$HGPORT/

        sending capabilities command

        comparing with parts://localhost/

        query 1; heads

        sending batch command

        searching for changes

        all remote heads known locally

        no changes found

        [1]

      check that paths are expanded

        $ PWD=`pwd` hg incoming z://

        comparing with z://

        searching for changes

        no changes found

        [1]

      check that debugexpandscheme outputs the canonical form

        $ hg debugexpandscheme bb://user/repo

        https://bitbucket.org/user/repo

      expanding an unknown scheme emits the input

        $ hg debugexpandscheme foobar://this/that

        foobar://this/that

      expanding a canonical URL emits the input

        $ hg debugexpandscheme https://bitbucket.org/user/repo

        https://bitbucket.org/user/repo

      errors

        $ cat errors.log

        $ cd ..

	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 serve

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> schemes=
				>
				> [schemes]
				> l = http://localhost:$HGPORT/
				> parts = http://{1}:$HGPORT/
				> z = file:\$PWD/
				> EOF
				$ hg init test
				$ cd test
				$ echo a > a
				$ hg ci -Am initial
				adding a

				invalid scheme

				$ hg log -R z:z
				abort: no '://' in scheme url 'z:z'
				[255]

				http scheme

				$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
				$ cat hg.pid >> $DAEMON_PIDS
				$ hg incoming l://
				comparing with l://
				searching for changes
				no changes found
				[1]

				check that {1} syntax works

				$ hg incoming --debug parts://localhost
				using http://localhost:$HGPORT/
				sending capabilities command
				comparing with parts://localhost/
				query 1; heads
				sending batch command
				searching for changes
				all remote heads known locally
				no changes found
				[1]

				check that paths are expanded

				$ PWD=`pwd` hg incoming z://
				comparing with z://
				searching for changes
				no changes found
				[1]

				check that debugexpandscheme outputs the canonical form

				$ hg debugexpandscheme bb://user/repo
				https://bitbucket.org/user/repo

				expanding an unknown scheme emits the input

				$ hg debugexpandscheme foobar://this/that
				foobar://this/that

				expanding a canonical URL emits the input

				$ hg debugexpandscheme https://bitbucket.org/user/repo
				https://bitbucket.org/user/repo

				errors

				$ cat errors.log

				$ cd ..