upstream/mercurial-mirror Files · tests/test-diff-newlines.t

mq: use dirstateguard instead of dirstate.invalidate (qpush)...

mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default


                r24996:58308dde

default

Download file

             test-diff-newlines.t
        
                    19 lines
            
             | 425 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-newlines.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg init

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        $ hg ci -Ama -d '1 0'

        adding a

        $ echo clean diff >> a

        $ hg ci -mb -d '2 0'

        $ hg diff -r0 -r1

        diff -r 107ba6f817b5 -r 310ce7989cdc a

        --- a/a	Thu Jan 01 00:00:01 1970 +0000

        +++ b/a	Thu Jan 01 00:00:02 1970 +0000

        @@ -1,2 +1,3 @@

         confuse str.splitlines

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
         embedded\r (no-eol) (esc)

        newline

        Adrian Buehlmann
    
tests: unify test-diff-newlines

              r12143
            
        +clean diff

	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

Adrian Buehlmann tests: unify test-diff-newlines	r12143	$ hg init

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
Adrian Buehlmann tests: unify test-diff-newlines	r12143	$ hg ci -Ama -d '1 0'
		adding a

		$ echo clean diff >> a
		$ hg ci -mb -d '2 0'

		$ hg diff -r0 -r1
		diff -r 107ba6f817b5 -r 310ce7989cdc a
		--- a/a Thu Jan 01 00:00:01 1970 +0000
		+++ b/a Thu Jan 01 00:00:02 1970 +0000
		@@ -1,2 +1,3 @@
		confuse str.splitlines
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	embedded\r (no-eol) (esc)
		newline
Adrian Buehlmann tests: unify test-diff-newlines	r12143	+clean diff