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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Martin Geisler - - Load All Authors

File last commit:

r16932:7985a9e2 default


                r24995:0579b0c2

default

Download file

             test-mactext.t
        
                    38 lines
            
             | 1019 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mactext.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ cat > unix2mac.py <<EOF

        > import sys

        > 

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

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

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

        >     file(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

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ echo hello > f

        $ hg add f

        $ hg ci -m 1

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ python unix2mac.py f

        $ hg ci -m 2

        Martin Geisler
    
win32text: lowercase warning message

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

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        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

Matt Mackall tests: unify test-mactext	r12458
		$ cat > unix2mac.py <<EOF
		> import sys
		>
		> for path in sys.argv[1:]:
		> data = file(path, 'rb').read()
		> data = data.replace('\n', '\r')
		> file(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
Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Matt Mackall tests: unify test-mactext	r12458	$ echo hello > f
		$ hg add f
		$ hg ci -m 1
Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Matt Mackall tests: unify test-mactext	r12458	$ python unix2mac.py f
		$ hg ci -m 2
Martin Geisler win32text: lowercase warning message	r16932	attempt to commit or push text file(s) using CR line endings
Matt Mackall tests: unify test-mactext	r12458	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>