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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24996:58308dde

default

Download file

             test-eol-clone.t
        
                    76 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-clone.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-eol-clone

              r12422
            
      Testing cloning with the EOL extension

        Martin Geisler
    
tests: don't overwrite HGRCPATH...

              r13519
            
        $ cat >> $HGRCPATH <<EOF

        Matt Mackall
    
tests: unify test-eol-clone

              r12422
            
        > [extensions]

        > eol =

        > 

        > [eol]

        > native = CRLF

        > EOF

      setup repository

        $ hg init repo

        $ cd repo

        $ cat > .hgeol <<EOF

        > [patterns]

        > **.txt = native

        > EOF

        $ printf "first\r\nsecond\r\nthird\r\n" > a.txt

        $ hg commit --addremove -m 'checkin'

        adding .hgeol

        adding a.txt

      Clone

        $ cd ..

        $ hg clone repo repo-2

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd repo-2

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        $ hg cat a.txt

        Matt Mackall
    
tests: unify test-eol-clone

              r12422
            
        first

        second

        third

        $ hg remove .hgeol

        $ hg commit -m 'remove eol'

        $ hg push --quiet

        $ cd ..

      Test clone of repo with .hgeol in working dir, but no .hgeol in tip

        $ hg clone repo repo-3

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd repo-3

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a.txt

        Matt Mackall
    
tests: unify test-eol-clone

              r12422
            
        first

        second

        third

      Test clone of revision with .hgeol

        $ cd ..

        $ hg clone -r 0 repo repo-4

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 2 changes to 2 files

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd repo-4

        $ cat .hgeol

        [patterns]

        **.txt = native

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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-eol-clone	r12422	Testing cloning with the EOL extension

Martin Geisler tests: don't overwrite HGRCPATH...	r13519	$ cat >> $HGRCPATH <<EOF
Matt Mackall tests: unify test-eol-clone	r12422	> [extensions]
		> eol =
		>
		> [eol]
		> native = CRLF
		> EOF

		setup repository

		$ hg init repo
		$ cd repo
		$ cat > .hgeol <<EOF
		> [patterns]
		> **.txt = native
		> EOF
		$ printf "first\r\nsecond\r\nthird\r\n" > a.txt
		$ hg commit --addremove -m 'checkin'
		adding .hgeol
		adding a.txt

		Clone

		$ cd ..
		$ hg clone repo repo-2
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd repo-2
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a.txt
		first\r (esc)
		second\r (esc)
		third\r (esc)
		$ hg cat a.txt
Matt Mackall tests: unify test-eol-clone	r12422	first
		second
		third
		$ hg remove .hgeol
		$ hg commit -m 'remove eol'
		$ hg push --quiet
		$ cd ..

		Test clone of repo with .hgeol in working dir, but no .hgeol in tip

		$ hg clone repo repo-3
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd repo-3

Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a.txt
Matt Mackall tests: unify test-eol-clone	r12422	first
		second
		third

		Test clone of revision with .hgeol

		$ cd ..
		$ hg clone -r 0 repo repo-4
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 2 changes to 2 files
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd repo-4
		$ cat .hgeol
		[patterns]
		**.txt = native

Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a.txt
		first\r (esc)
		second\r (esc)
		third\r (esc)
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..