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

transplant: use peer of source repository as "remote" for "repo.pull()"...

transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.

Martin Geisler - - Load All Authors

File last commit:

r13519:43b3b761 default


                r20020:6fb59247

default

Download file

             test-eol-update.t
        
                    152 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test EOL update

        $ cat >> $HGRCPATH <<EOF

        > [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

        > 

        >     cat > .hgeol <<EOF

        > [patterns]

        > **.txt = LF

        > EOF

        > 

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

        >     hg commit --addremove -m 'LF commit'

        > 

        >     cat > .hgeol <<EOF

        > [patterns]

        > **.txt = CRLF

        > EOF

        > 

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

        >     hg commit -m 'CRLF commit'

        > 

        >     cd ..

        > }

        $ dotest () {

        >     seteol $1

        > 

        >     echo

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

        >     hg clone --noupdate repo repo-$1

        >     cd repo-$1

        > 

        >     cat > .hg/hgrc <<EOF

        > [extensions]

        > eol =

        > EOF

        > 

        >     hg update

        > 

        >     echo '% a.txt (before)'

        >     cat a.txt

        > 

        >     printf "first${EOL}third${EOL}" > a.txt

        > 

        >     echo '% a.txt (after)'

        >     cat a.txt

        >     echo '% hg diff'

        >     hg diff

        > 

        >     echo '% hg update 0'

        >     hg update 0

        > 

        >     echo '% a.txt'

        >     cat a.txt

        >     echo '% hg diff'

        >     hg diff

        > 

        > 

        >     cd ..

        >     rm -r repo-$1

        > }

        $ makerepo

        # ==== setup repository ====

        % hg init

        adding .hgeol

        adding a.txt

        $ dotest LF

        % hg clone repo repo-LF

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

        % a.txt (before)

        first\r (esc)

        second\r (esc)

        third\r (esc)

        % a.txt (after)

        first

        third

        % hg diff

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

        --- a/a.txt

        +++ b/a.txt

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

         first\r (esc)

        -second\r (esc)

         third\r (esc)

        % hg update 0

        merging a.txt

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

        % a.txt

        first

        third

        % hg diff

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

        --- a/a.txt

        +++ b/a.txt

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

         first

        -second

         third

        $ dotest CRLF

        % hg clone repo repo-CRLF

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

        % a.txt (before)

        first\r (esc)

        second\r (esc)

        third\r (esc)

        % a.txt (after)

        first\r (esc)

        third\r (esc)

        % hg diff

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

        --- a/a.txt

        +++ b/a.txt

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

         first\r (esc)

        -second\r (esc)

         third\r (esc)

        % hg update 0

        merging a.txt

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

        % a.txt

        first

        third

        % hg diff

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

        --- a/a.txt

        +++ b/a.txt

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

         first

        -second

         third

        $ 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

				Test EOL update

				$ cat >> $HGRCPATH <<EOF
				> [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
				>
				> cat > .hgeol <<EOF
				> [patterns]
				> **.txt = LF
				> EOF
				>
				> printf "first\nsecond\nthird\n" > a.txt
				> hg commit --addremove -m 'LF commit'
				>
				> cat > .hgeol <<EOF
				> [patterns]
				> **.txt = CRLF
				> EOF
				>
				> printf "first\r\nsecond\r\nthird\r\n" > a.txt
				> hg commit -m 'CRLF commit'
				>
				> cd ..
				> }

				$ dotest () {
				> seteol $1
				>
				> echo
				> echo "% hg clone repo repo-$1"
				> hg clone --noupdate repo repo-$1
				> cd repo-$1
				>
				> cat > .hg/hgrc <<EOF
				> [extensions]
				> eol =
				> EOF
				>
				> hg update
				>
				> echo '% a.txt (before)'
				> cat a.txt
				>
				> printf "first${EOL}third${EOL}" > a.txt
				>
				> echo '% a.txt (after)'
				> cat a.txt
				> echo '% hg diff'
				> hg diff
				>
				> echo '% hg update 0'
				> hg update 0
				>
				> echo '% a.txt'
				> cat a.txt
				> echo '% hg diff'
				> hg diff
				>
				>
				> cd ..
				> rm -r repo-$1
				> }

				$ makerepo

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

				% hg clone repo repo-LF
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				% a.txt (before)
				first\r (esc)
				second\r (esc)
				third\r (esc)
				% a.txt (after)
				first
				third
				% hg diff
				diff --git a/a.txt b/a.txt
				--- a/a.txt
				+++ b/a.txt
				@@ -1,3 +1,2 @@
				first\r (esc)
				-second\r (esc)
				third\r (esc)
				% hg update 0
				merging a.txt
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				% a.txt
				first
				third
				% hg diff
				diff --git a/a.txt b/a.txt
				--- a/a.txt
				+++ b/a.txt
				@@ -1,3 +1,2 @@
				first
				-second
				third
				$ dotest CRLF

				% hg clone repo repo-CRLF
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				% a.txt (before)
				first\r (esc)
				second\r (esc)
				third\r (esc)
				% a.txt (after)
				first\r (esc)
				third\r (esc)
				% hg diff
				diff --git a/a.txt b/a.txt
				--- a/a.txt
				+++ b/a.txt
				@@ -1,3 +1,2 @@
				first\r (esc)
				-second\r (esc)
				third\r (esc)
				% hg update 0
				merging a.txt
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				% a.txt
				first
				third
				% hg diff
				diff --git a/a.txt b/a.txt
				--- a/a.txt
				+++ b/a.txt
				@@ -1,3 +1,2 @@
				first
				-second
				third
				$ rm -r repo