upstream/mercurial-mirror Files · tests/test-dirstate.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Pierre-Yves David - - Load All Authors

File last commit:

r26587:56b2bcea default


                r32255:7e35d31b

default

Download file

             test-dirstate.t
        
                    88 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dirstate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ------ Test dirstate._dirs refcounting

        $ hg init t

        $ cd t

        $ mkdir -p a/b/c/d

        $ touch a/b/c/d/x

        $ touch a/b/c/d/y

        $ touch a/b/c/d/z

        $ hg ci -Am m

        adding a/b/c/d/x

        adding a/b/c/d/y

        adding a/b/c/d/z

        $ hg mv a z

        moving a/b/c/d/x to z/b/c/d/x (glob)

        moving a/b/c/d/y to z/b/c/d/y (glob)

        moving a/b/c/d/z to z/b/c/d/z (glob)

      Test name collisions

        $ rm z/b/c/d/x

        $ mkdir z/b/c/d/x

        $ touch z/b/c/d/x/y

        $ hg add z/b/c/d/x/y

        abort: file 'z/b/c/d/x' in dirstate clashes with 'z/b/c/d/x/y'

        [255]

        $ rm -rf z/b/c/d

        $ touch z/b/c/d

        $ hg add z/b/c/d

        abort: directory 'z/b/c/d' already in dirstate

        [255]

        $ cd ..

      Issue1790: dirstate entry locked into unset if file mtime is set into

      the future

      Prepare test repo:

        $ hg init u

        $ cd u

        $ echo a > a

        $ hg add

        adding a

        $ hg ci -m1

      Set mtime of a into the future:

        $ touch -t 202101011200 a

      Status must not set a's entry to unset (issue1790):

        $ hg status

        $ hg debugstate

        n 644          2 2021-01-01 12:00:00 a

      Test modulo storage/comparison of absurd dates:

      #if no-aix

        $ touch -t 195001011200 a

        $ hg st

        $ hg debugstate

        n 644          2 2018-01-19 15:14:08 a

      #endif

      Verify that exceptions during a dirstate change leave the dirstate

      coherent (issue4353)

        $ cat > ../dirstateexception.py <<EOF

        > from mercurial import merge, extensions, error

        > 

        > def wraprecordupdates(orig, repo, actions, branchmerge):

        >     raise error.Abort("simulated error while recording dirstateupdates")

        > 

        > def reposetup(ui, repo):

        >     extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates)

        > EOF

        $ hg rm a

        $ hg commit -m 'rm a'

        $ echo "[extensions]" >> .hg/hgrc

        $ echo "dirstateex=../dirstateexception.py" >> .hg/hgrc

        $ hg up 0

        abort: simulated error while recording dirstateupdates

        [255]

        $ hg log -r . -T '{rev}\n'

        1

        $ hg status

        ? a

	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

				------ Test dirstate._dirs refcounting

				$ hg init t
				$ cd t
				$ mkdir -p a/b/c/d
				$ touch a/b/c/d/x
				$ touch a/b/c/d/y
				$ touch a/b/c/d/z
				$ hg ci -Am m
				adding a/b/c/d/x
				adding a/b/c/d/y
				adding a/b/c/d/z
				$ hg mv a z
				moving a/b/c/d/x to z/b/c/d/x (glob)
				moving a/b/c/d/y to z/b/c/d/y (glob)
				moving a/b/c/d/z to z/b/c/d/z (glob)

				Test name collisions

				$ rm z/b/c/d/x
				$ mkdir z/b/c/d/x
				$ touch z/b/c/d/x/y
				$ hg add z/b/c/d/x/y
				abort: file 'z/b/c/d/x' in dirstate clashes with 'z/b/c/d/x/y'
				[255]
				$ rm -rf z/b/c/d
				$ touch z/b/c/d
				$ hg add z/b/c/d
				abort: directory 'z/b/c/d' already in dirstate
				[255]

				$ cd ..

				Issue1790: dirstate entry locked into unset if file mtime is set into
				the future

				Prepare test repo:

				$ hg init u
				$ cd u
				$ echo a > a
				$ hg add
				adding a
				$ hg ci -m1

				Set mtime of a into the future:

				$ touch -t 202101011200 a

				Status must not set a's entry to unset (issue1790):

				$ hg status
				$ hg debugstate
				n 644 2 2021-01-01 12:00:00 a

				Test modulo storage/comparison of absurd dates:

				#if no-aix
				$ touch -t 195001011200 a
				$ hg st
				$ hg debugstate
				n 644 2 2018-01-19 15:14:08 a
				#endif

				Verify that exceptions during a dirstate change leave the dirstate
				coherent (issue4353)

				$ cat > ../dirstateexception.py <<EOF
				> from mercurial import merge, extensions, error
				>
				> def wraprecordupdates(orig, repo, actions, branchmerge):
				> raise error.Abort("simulated error while recording dirstateupdates")
				>
				> def reposetup(ui, repo):
				> extensions.wrapfunction(merge, 'recordupdates', wraprecordupdates)
				> EOF

				$ hg rm a
				$ hg commit -m 'rm a'
				$ echo "[extensions]" >> .hg/hgrc
				$ echo "dirstateex=../dirstateexception.py" >> .hg/hgrc
				$ hg up 0
				abort: simulated error while recording dirstateupdates
				[255]
				$ hg log -r . -T '{rev}\n'
				1
				$ hg status
				? a