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

Pulkit Goyal - - Load All Authors

File last commit:

r38382:a6426dd3 default


                r38817:bb54db4a

@96 default

Download file

             test-revlog-v2.t
        
                    64 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-v2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require reporevlogstore

      A repo with unknown revlogv2 requirement string cannot be opened

        $ hg init invalidreq

        $ cd invalidreq

        $ echo exp-revlogv2.unknown >> .hg/requires

        $ hg log

        abort: repository requires features unknown to this Mercurial: exp-revlogv2.unknown!

        (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

        [255]

        $ cd ..

      Can create and open repo with revlog v2 requirement

        $ cat >> $HGRCPATH << EOF

        > [experimental]

        > revlogv2 = enable-unstable-format-and-corrupt-my-data

        > EOF

        $ hg init empty-repo

        $ cd empty-repo

        $ cat .hg/requires

        dotencode

        exp-revlogv2.0

        fncache

        store

        $ hg log

      Unknown flags to revlog are rejected

        >>> with open('.hg/store/00changelog.i', 'wb') as fh:

        ...     fh.write(b'\x00\x04\xde\xad') and None

        $ hg log

        abort: unknown flags (0x04) in version 57005 revlog 00changelog.i!

        [255]

        $ cd ..

      Writing a simple revlog v2 works

        $ hg init simple

        $ cd simple

        $ touch foo

        $ hg -q commit -A -m initial

        $ hg log

        changeset:   0:96ee1d7354c4

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     initial

      Header written as expected (changelog always disables generaldelta)

        $ f --hexdump --bytes 4 .hg/store/00changelog.i

        .hg/store/00changelog.i:

        0000: 00 01 de ad                                     |....|

        $ f --hexdump --bytes 4 .hg/store/data/foo.i

        .hg/store/data/foo.i:

        0000: 00 03 de ad                                     |....|

	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

				#require reporevlogstore

				A repo with unknown revlogv2 requirement string cannot be opened

				$ hg init invalidreq
				$ cd invalidreq
				$ echo exp-revlogv2.unknown >> .hg/requires
				$ hg log
				abort: repository requires features unknown to this Mercurial: exp-revlogv2.unknown!
				(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
				[255]
				$ cd ..

				Can create and open repo with revlog v2 requirement

				$ cat >> $HGRCPATH << EOF
				> [experimental]
				> revlogv2 = enable-unstable-format-and-corrupt-my-data
				> EOF

				$ hg init empty-repo
				$ cd empty-repo
				$ cat .hg/requires
				dotencode
				exp-revlogv2.0
				fncache
				store

				$ hg log

				Unknown flags to revlog are rejected

				>>> with open('.hg/store/00changelog.i', 'wb') as fh:
				... fh.write(b'\x00\x04\xde\xad') and None

				$ hg log
				abort: unknown flags (0x04) in version 57005 revlog 00changelog.i!
				[255]

				$ cd ..

				Writing a simple revlog v2 works

				$ hg init simple
				$ cd simple
				$ touch foo
				$ hg -q commit -A -m initial

				$ hg log
				changeset: 0:96ee1d7354c4
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: initial

				Header written as expected (changelog always disables generaldelta)

				$ f --hexdump --bytes 4 .hg/store/00changelog.i
				.hg/store/00changelog.i:
				0000: 00 01 de ad \|....\|

				$ f --hexdump --bytes 4 .hg/store/data/foo.i
				.hg/store/data/foo.i:
				0000: 00 03 de ad \|....\|