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

r36040:adec6374 default


                r38817:bb54db4a

@96 default

Download file

             test-mactext.t
        
                    38 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mactext.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > unix2mac.py <<EOF

        > import sys

        > 

        > for path in sys.argv[1:]:

        >     data = open(path, 'rb').read()

        >     data = data.replace(b'\n', b'\r')

        >     open(path, 'wb').write(data)

        > EOF

        $ cat > print.py <<EOF

        > import sys

        > print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))

        > EOF

        $ hg init

        $ echo '[hooks]' >> .hg/hgrc

        $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc

        $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc

        $ cat .hg/hgrc

        [hooks]

        pretxncommit.cr = python:hgext.win32text.forbidcr

        pretxnchangegroup.cr = python:hgext.win32text.forbidcr

        $ echo hello > f

        $ hg add f

        $ hg ci -m 1

        $ $PYTHON unix2mac.py f

        $ hg ci -m 2

        attempt to commit or push text file(s) using CR line endings

        in dea860dc51ec: f

        transaction abort!

        rollback completed

        abort: pretxncommit.cr hook failed

        [255]

        $ hg cat f | $PYTHON print.py

        hello<LF>

        $ cat f | $PYTHON print.py

        hello<CR>

	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


				$ cat > unix2mac.py <<EOF
				> import sys
				>
				> for path in sys.argv[1:]:
				> data = open(path, 'rb').read()
				> data = data.replace(b'\n', b'\r')
				> open(path, 'wb').write(data)
				> EOF
				$ cat > print.py <<EOF
				> import sys
				> print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
				> EOF
				$ hg init
				$ echo '[hooks]' >> .hg/hgrc
				$ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
				$ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
				$ cat .hg/hgrc
				[hooks]
				pretxncommit.cr = python:hgext.win32text.forbidcr
				pretxnchangegroup.cr = python:hgext.win32text.forbidcr

				$ echo hello > f
				$ hg add f
				$ hg ci -m 1

				$ $PYTHON unix2mac.py f
				$ hg ci -m 2
				attempt to commit or push text file(s) using CR line endings
				in dea860dc51ec: f
				transaction abort!
				rollback completed
				abort: pretxncommit.cr hook failed
				[255]
				$ hg cat f \| $PYTHON print.py
				hello<LF>
				$ cat f \| $PYTHON print.py
				hello<CR>