upstream/mercurial-mirror Files · tests/test-commit-unresolved.t

hghave: allow adding customized features at runtime...

hghave: allow adding customized features at runtime Before this patch, there is no way to add customized features to `hghave` without changing `hghave` and `hghave.py` themselves. This decreases reusability of `run-tests.py` framework for third party tools, because they may want to examine custom features at runtime (e.g. existence of some external tools). To allow adding customized features at runtime, this patch makes `hghave` import `hghaveaddon` module, only when `hghaveaddon.py` file can be found in directories below: - `TESTDIR` for invocation via `run-tests.py` - `.` for invocation via command line The path to the directory where `hghaveaddon.py` should be placed is added to `sys.path` only while importing `hghaveaddon`, because: - `.` may not be added to `PYTHONPATH` - adding additional path to `sys.path` may change behavior of subsequent `import` for other features `hghave` is terminated with exit code '2' at failure of `import hghaveaddon`, because exit code '2' terminates `run-tests.py` immediately. This is a one of preparations for issue4677.

Wagner Bruna - - Load All Authors

File last commit:

r23917:3cbb5bf4 default


                r25732:b94df10c

default

Download file

             test-commit-unresolved.t
        
                    47 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-commit-unresolved.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ addcommit () {

        >     echo $1 > $1

        >     hg add $1

        >     hg commit -d "${2} 0" -m $1

        > }

        $ commit () {

        >     hg commit -d "${2} 0" -m $1

        > }

        $ hg init a

        $ cd a

        $ addcommit "A" 0

        $ addcommit "B" 1

        $ echo "C" >> A

        $ commit "C" 2

        $ hg update -C 0

        1 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo "D" >> A

        $ commit "D" 3

        created new head

      Merging a conflict araises

        $ hg merge

        merging A

        warning: conflicts during merge.

        merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

        1 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

      Correct the conflict without marking the file as resolved

        $ echo "ABCD" > A

        $ hg commit -m "Merged"

        abort: unresolved merge conflicts (see "hg help resolve")

        [255]

      Mark the conflict as resolved and commit

        $ hg resolve -m A

        (no more unresolved files)

        $ hg commit -m "Merged"

        $ 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

				$ addcommit () {
				> echo $1 > $1
				> hg add $1
				> hg commit -d "${2} 0" -m $1
				> }

				$ commit () {
				> hg commit -d "${2} 0" -m $1
				> }

				$ hg init a
				$ cd a
				$ addcommit "A" 0
				$ addcommit "B" 1
				$ echo "C" >> A
				$ commit "C" 2

				$ hg update -C 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo "D" >> A
				$ commit "D" 3
				created new head

				Merging a conflict araises

				$ hg merge
				merging A
				warning: conflicts during merge.
				merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				Correct the conflict without marking the file as resolved

				$ echo "ABCD" > A
				$ hg commit -m "Merged"
				abort: unresolved merge conflicts (see "hg help resolve")
				[255]

				Mark the conflict as resolved and commit

				$ hg resolve -m A
				(no more unresolved files)
				$ hg commit -m "Merged"

				$ cd ..