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

Matt Mackall - - Load All Authors

File last commit:

r25472:4d2b9b30 default


                r38817:bb54db4a

@96 default

Download file

             test-hgwebdirsym.t
        
                    80 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgwebdirsym.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve symlink

      Tests whether or not hgwebdir properly handles various symlink topologies.

      hide outer repo

        $ hg init

        $ hg init a

        $ echo a > a/a

        $ hg --cwd a ci -Ama -d'1 0'

        adding a

        $ mkdir webdir

        $ cd webdir

        $ hg init b

        $ echo b > b/b

        $ hg --cwd b ci -Amb -d'2 0'

        adding b

        $ hg init c

        $ echo c > c/c

        $ hg --cwd c ci -Amc -d'3 0'

        adding c

        $ ln -s ../a al

        $ ln -s ../webdir circle

        $ root=`pwd`

        $ cd ..

        $ cat > collections.conf <<EOF

        > [collections]

        > $root=$root

        > EOF

        $ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \

        >     -A access-collections.log -E error-collections.log

        $ cat hg.pid >> $DAEMON_PIDS

      should succeed

        $ get-with-headers.py localhost:$HGPORT '?style=raw'

        200 Script output follows

        /al/

        /b/

        /c/

        $ get-with-headers.py localhost:$HGPORT 'al/file/tip/a?style=raw'

        200 Script output follows

        a

        $ get-with-headers.py localhost:$HGPORT 'b/file/tip/b?style=raw'

        200 Script output follows

        b

        $ get-with-headers.py localhost:$HGPORT 'c/file/tip/c?style=raw'

        200 Script output follows

        c

      should fail

        $ get-with-headers.py localhost:$HGPORT 'circle/al/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/al/file/tip/a not found

        [1]

        $ get-with-headers.py localhost:$HGPORT 'circle/b/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/b/file/tip/a not found

        [1]

        $ get-with-headers.py localhost:$HGPORT 'circle/c/file/tip/a?style=raw'

        404 Not Found

        error: repository circle/c/file/tip/a not found

        [1]

      collections errors

        $ cat error-collections.log

	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 symlink

				Tests whether or not hgwebdir properly handles various symlink topologies.

				hide outer repo
				$ hg init

				$ hg init a
				$ echo a > a/a
				$ hg --cwd a ci -Ama -d'1 0'
				adding a
				$ mkdir webdir
				$ cd webdir
				$ hg init b
				$ echo b > b/b
				$ hg --cwd b ci -Amb -d'2 0'
				adding b
				$ hg init c
				$ echo c > c/c
				$ hg --cwd c ci -Amc -d'3 0'
				adding c
				$ ln -s ../a al
				$ ln -s ../webdir circle
				$ root=`pwd`
				$ cd ..
				$ cat > collections.conf <<EOF
				> [collections]
				> $root=$root
				> EOF
				$ hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \
				> -A access-collections.log -E error-collections.log
				$ cat hg.pid >> $DAEMON_PIDS

				should succeed

				$ get-with-headers.py localhost:$HGPORT '?style=raw'
				200 Script output follows


				/al/
				/b/
				/c/

				$ get-with-headers.py localhost:$HGPORT 'al/file/tip/a?style=raw'
				200 Script output follows

				a
				$ get-with-headers.py localhost:$HGPORT 'b/file/tip/b?style=raw'
				200 Script output follows

				b
				$ get-with-headers.py localhost:$HGPORT 'c/file/tip/c?style=raw'
				200 Script output follows

				c

				should fail

				$ get-with-headers.py localhost:$HGPORT 'circle/al/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/al/file/tip/a not found
				[1]
				$ get-with-headers.py localhost:$HGPORT 'circle/b/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/b/file/tip/a not found
				[1]
				$ get-with-headers.py localhost:$HGPORT 'circle/c/file/tip/a?style=raw'
				404 Not Found


				error: repository circle/c/file/tip/a not found
				[1]

				collections errors

				$ cat error-collections.log