upstream/mercurial-mirror Files · tests/test-eol-add.t

narrow: fix flaky behavior described in issue6150...

narrow: fix flaky behavior described in issue6150 This has been plaguing the CI for a good while, and it doesn't appear to have an easy fix proposed yet. The solution in this change is to always do an unambiguous (but expensive) lookup in case of comparison. This should always be correct, albeit suboptimal. Differential Revision: https://phab.mercurial-scm.org/D10034

Martin Geisler - - Load All Authors

File last commit:

r13519:43b3b761 default


                r47280:b994db7c

stable

Download file

             test-eol-add.t
        
                    125 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-add.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-eol-add

              r12421
            
      Test adding .hgeol

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

              r13519
            
        $ cat >> $HGRCPATH <<EOF

        Matt Mackall
    
tests: unify test-eol-add

              r12421
            
        > [diff]

        > git = 1

        > EOF

        $ seteol () {

        >     if [ $1 = "LF" ]; then

        >         EOL='\n'

        >     else

        >         EOL='\r\n'

        >     fi

        > }

        $ makerepo () {

        >     echo

        >     echo "# ==== setup repository ===="

        >     echo '% hg init'

        >     hg init repo

        >     cd repo

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

        >     hg commit -d '100 0' --addremove -m 'LF commit'

        >     cd ..

        > }

        $ dotest () {

        >     seteol $1

        >     echo

        >     echo "% hg clone repo repo-$1"

        >     hg clone repo repo-$1

        >     cd repo-$1

        >     cat > .hg/hgrc <<EOF

        > [extensions]

        > eol =

        > [eol]

        > native = LF

        > EOF

        >     cat > .hgeol <<EOF

        > [patterns]

        > **.txt = native

        > [repository]

        > native = $1

        > EOF

        >     echo '% hg add .hgeol'

        >     hg add .hgeol

        >     echo '% hg status'

        >     hg status

        >     echo '% hg commit'

        >     hg commit -d '200 0' -m 'Added .hgeol file'

        >     echo '% hg status'

        >     hg status

        >     echo '% hg tip -p'

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

              r12943
            
        >     hg tip -p

        Matt Mackall
    
tests: unify test-eol-add

              r12421
            
        >     cd ..

        >     rm -r repo-$1

        > }

        $ makerepo

        # ==== setup repository ====

        % hg init

        adding a.txt

        $ dotest LF

        % hg clone repo repo-LF

        updating to branch default

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

        % hg add .hgeol

        % hg status

        A .hgeol

        % hg commit

        % hg status

        % hg tip -p

        changeset:   1:33503edb53b0

        tag:         tip

        user:        test

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

        summary:     Added .hgeol file

        diff --git a/.hgeol b/.hgeol

        new file mode 100644

        --- /dev/null

        +++ b/.hgeol

        @@ -0,0 +1,4 @@

        +[patterns]

        +**.txt = native

        +[repository]

        +native = LF

        $ dotest CRLF

        % hg clone repo repo-CRLF

        updating to branch default

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

        % hg add .hgeol

        % hg status

        M a.txt

        A .hgeol

        % hg commit

        % hg status

        % hg tip -p

        changeset:   1:6e64eaa9eb23

        tag:         tip

        user:        test

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

        summary:     Added .hgeol file

        diff --git a/.hgeol b/.hgeol

        new file mode 100644

        --- /dev/null

        +++ b/.hgeol

        @@ -0,0 +1,4 @@

        +[patterns]

        +**.txt = native

        +[repository]

        +native = CRLF

        diff --git a/a.txt b/a.txt

        --- a/a.txt

        +++ b/a.txt

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

        -first

        -second

        -third

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

              r12943
            
        +first\r (esc)

        +second\r (esc)

        +third\r (esc)

        Matt Mackall
    
tests: unify test-eol-add

              r12421
            
        $ rm -r repo

	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-add	r12421	Test adding .hgeol

Martin Geisler tests: don't overwrite HGRCPATH...	r13519	$ cat >> $HGRCPATH <<EOF
Matt Mackall tests: unify test-eol-add	r12421	> [diff]
		> git = 1
		> EOF
		$ seteol () {
		> if [ $1 = "LF" ]; then
		> EOL='\n'
		> else
		> EOL='\r\n'
		> fi
		> }
		$ makerepo () {
		> echo
		> echo "# ==== setup repository ===="
		> echo '% hg init'
		> hg init repo
		> cd repo
		> printf "first\nsecond\nthird\n" > a.txt
		> hg commit -d '100 0' --addremove -m 'LF commit'
		> cd ..
		> }
		$ dotest () {
		> seteol $1
		> echo
		> echo "% hg clone repo repo-$1"
		> hg clone repo repo-$1
		> cd repo-$1
		> cat > .hg/hgrc <<EOF
		> [extensions]
		> eol =
		> [eol]
		> native = LF
		> EOF
		> cat > .hgeol <<EOF
		> [patterns]
		> **.txt = native
		> [repository]
		> native = $1
		> EOF
		> echo '% hg add .hgeol'
		> hg add .hgeol
		> echo '% hg status'
		> hg status
		> echo '% hg commit'
		> hg commit -d '200 0' -m 'Added .hgeol file'
		> echo '% hg status'
		> hg status
		> echo '% hg tip -p'
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	> hg tip -p
Matt Mackall tests: unify test-eol-add	r12421	> cd ..
		> rm -r repo-$1
		> }
		$ makerepo

		# ==== setup repository ====
		% hg init
		adding a.txt
		$ dotest LF

		% hg clone repo repo-LF
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% hg add .hgeol
		% hg status
		A .hgeol
		% hg commit
		% hg status
		% hg tip -p
		changeset: 1:33503edb53b0
		tag: tip
		user: test
		date: Thu Jan 01 00:03:20 1970 +0000
		summary: Added .hgeol file

		diff --git a/.hgeol b/.hgeol
		new file mode 100644
		--- /dev/null
		+++ b/.hgeol
		@@ -0,0 +1,4 @@
		+[patterns]
		+**.txt = native
		+[repository]
		+native = LF

		$ dotest CRLF

		% hg clone repo repo-CRLF
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		% hg add .hgeol
		% hg status
		M a.txt
		A .hgeol
		% hg commit
		% hg status
		% hg tip -p
		changeset: 1:6e64eaa9eb23
		tag: tip
		user: test
		date: Thu Jan 01 00:03:20 1970 +0000
		summary: Added .hgeol file

		diff --git a/.hgeol b/.hgeol
		new file mode 100644
		--- /dev/null
		+++ b/.hgeol
		@@ -0,0 +1,4 @@
		+[patterns]
		+**.txt = native
		+[repository]
		+native = CRLF
		diff --git a/a.txt b/a.txt
		--- a/a.txt
		+++ b/a.txt
		@@ -1,3 +1,3 @@
		-first
		-second
		-third
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	+first\r (esc)
		+second\r (esc)
		+third\r (esc)
Matt Mackall tests: unify test-eol-add	r12421
		$ rm -r repo