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

url: Remove the proxy env variables only when needed (issue2451)...

url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.

Mads Kiilerich - - Load All Authors

File last commit:

r12942:05fffd66 stable


                r15077:02734d2b

stable

Download file

             test-diff-newlines.t
        
                    18 lines
            
             | 397 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

        $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a

        $ 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
    
tests: use (esc) for all non-ASCII test output

              r12942
            
         embedded\rnewline (esc)

        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

		$ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
		$ 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 tests: use (esc) for all non-ASCII test output	r12942	embedded\rnewline (esc)
Adrian Buehlmann tests: unify test-diff-newlines	r12143	+clean diff