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

Matt Mackall - - Load All Authors

File last commit:

r14903:a934b924 stable


                r25732:b94df10c

default

Download file

             test-confused-revert.t
        
                    82 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-confused-revert.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo foo > a

        $ hg add a

        $ hg commit -m "1"

        $ echo bar > b

        $ hg add b

        $ hg remove a

      Should show a removed and b added:

        $ hg status

        A b

        R a

        $ hg revert --all

        undeleting a

        forgetting b

      Should show b unknown and a back to normal:

        $ hg status

        ? b

        $ rm b

        $ hg co -C 0

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

        $ echo foo-a > a

        $ hg commit -m "2a"

        $ hg co -C 0

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

        $ echo foo-b > a

        $ hg commit -m "2b"

        created new head

        $ HGMERGE=true hg merge 1

        merging a

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

        (branch merge, don't forget to commit)

      Should show foo-b:

        $ cat a

        foo-b

        $ echo bar > b

        $ hg add b

        $ rm a

        $ hg remove a

      Should show a removed and b added:

        $ hg status

        A b

        R a

      Revert should fail:

        $ hg revert

        abort: uncommitted merge with no revision specified

        (use "hg update" or see "hg help revert")

        [255]

      Revert should be ok now:

        $ hg revert -r2 --all

        undeleting a

        forgetting b

      Should show b unknown and a marked modified (merged):

        $ hg status

        M a

        ? b

      Should show foo-b:

        $ cat a

        foo-b

	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

				$ hg init
				$ echo foo > a
				$ hg add a
				$ hg commit -m "1"

				$ echo bar > b
				$ hg add b
				$ hg remove a

				Should show a removed and b added:

				$ hg status
				A b
				R a

				$ hg revert --all
				undeleting a
				forgetting b

				Should show b unknown and a back to normal:

				$ hg status
				? b

				$ rm b

				$ hg co -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo-a > a
				$ hg commit -m "2a"

				$ hg co -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo-b > a
				$ hg commit -m "2b"
				created new head

				$ HGMERGE=true hg merge 1
				merging a
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Should show foo-b:

				$ cat a
				foo-b

				$ echo bar > b
				$ hg add b
				$ rm a
				$ hg remove a

				Should show a removed and b added:

				$ hg status
				A b
				R a

				Revert should fail:

				$ hg revert
				abort: uncommitted merge with no revision specified
				(use "hg update" or see "hg help revert")
				[255]

				Revert should be ok now:

				$ hg revert -r2 --all
				undeleting a
				forgetting b

				Should show b unknown and a marked modified (merged):

				$ hg status
				M a
				? b

				Should show foo-b:

				$ cat a
				foo-b