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

Augie Fackler - - Load All Authors

File last commit:

r33956:b9765319 default


                r38817:bb54db4a

@96 default

Download file

             test-dirstate.t
        
                    93 lines
            
             | 1.9 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

        moving a/b/c/d/y to z/b/c/d/y

        moving a/b/c/d/z to z/b/c/d/z

      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 __future__ import absolute_import

        > from mercurial import (

        >   error,

        >   extensions,

        >   merge,

        > )

        > 

        > 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
				moving a/b/c/d/y to z/b/c/d/y
				moving a/b/c/d/z to z/b/c/d/z

				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 __future__ import absolute_import
				> from mercurial import (
				> error,
				> extensions,
				> merge,
				> )
				>
				> 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