upstream/mercurial-mirror Files · tests/test-check-code-hg.t

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r22180:17011b36

stable

Download file

             test-check-code-hg.t
        
                    17 lines
            
             | 664 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-code-hg.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #if test-repo

        $ check_code="$TESTDIR"/../contrib/check-code.py

        $ cd "$TESTDIR"/..

      New errors are not allowed. Warnings are strongly discouraged.

      (The writing "no-che?k-code" is for not skipping this file when checking.)

        $ hg locate | sed 's-\\-/-g' |

        >   xargs "$check_code" --warnings --per-file=0 || false

        Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)

        Skipping i18n/polib.py it has no-che?k-code (glob)

        Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)

        Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)

        Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)

      #endif

	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

				#if test-repo

				$ check_code="$TESTDIR"/../contrib/check-code.py
				$ cd "$TESTDIR"/..

				New errors are not allowed. Warnings are strongly discouraged.
				(The writing "no-che?k-code" is for not skipping this file when checking.)

				$ hg locate \| sed 's-\\-/-g' \|
				> xargs "$check_code" --warnings --per-file=0 \|\| false
				Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)
				Skipping i18n/polib.py it has no-che?k-code (glob)
				Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
				Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
				Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)

				#endif