upstream/mercurial-mirror Files · tests/test-rebase-issue-noparam-single-rev.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:

r12640:6cc4b14f default


                r15077:02734d2b

stable

Download file

             test-rebase-issue-noparam-single-rev.t
        
                    123 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-issue-noparam-single-rev.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ echo r2 > r2

        $ hg ci -Am r2

        adding r2

        $ hg tglog

        @  4: 'r2'

        |

        o  3: 'r1'

        |

        | o  2: 'l1'

        |/

        o  1: 'c2'

        |

        o  0: 'c1'

      Rebase with no arguments - single revision in source branch:

        $ hg up -q -C 2

        $ hg rebase

        saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  4: 'l1'

        |

        o  3: 'r2'

        |

        o  2: 'r1'

        |

        o  1: 'c2'

        |

        o  0: 'c1'

        $ cd ..

        $ hg init b

        $ cd b

        $ echo c1 > c1

        $ hg ci -Am c1

        adding c1

        $ echo c2 > c2

        $ hg ci -Am c2

        adding c2

        $ echo l1 > l1

        $ hg ci -Am l1

        adding l1

        $ echo l2 > l2

        $ hg ci -Am l2

        adding l2

        $ hg up -q -C 1

        $ echo r1 > r1

        $ hg ci -Am r1

        adding r1

        created new head

        $ hg tglog

        @  4: 'r1'

        |

        | o  3: 'l2'

        | |

        | o  2: 'l1'

        |/

        o  1: 'c2'

        |

        o  0: 'c1'

      Rebase with no arguments - single revision in target branch:

        $ hg up -q -C 3

        $ hg rebase

        saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  4: 'l2'

        |

        o  3: 'l1'

        |

        o  2: 'r1'

        |

        o  1: 'c2'

        |

        o  0: 'c1'

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo c1 > c1
				$ hg ci -Am c1
				adding c1

				$ echo c2 > c2
				$ hg ci -Am c2
				adding c2

				$ echo l1 > l1
				$ hg ci -Am l1
				adding l1

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

				$ echo r2 > r2
				$ hg ci -Am r2
				adding r2

				$ hg tglog
				@ 4: 'r2'
				\|
				o 3: 'r1'
				\|
				\| o 2: 'l1'
				\|/
				o 1: 'c2'
				\|
				o 0: 'c1'

				Rebase with no arguments - single revision in source branch:

				$ hg up -q -C 2

				$ hg rebase
				saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 4: 'l1'
				\|
				o 3: 'r2'
				\|
				o 2: 'r1'
				\|
				o 1: 'c2'
				\|
				o 0: 'c1'

				$ cd ..


				$ hg init b
				$ cd b

				$ echo c1 > c1
				$ hg ci -Am c1
				adding c1

				$ echo c2 > c2
				$ hg ci -Am c2
				adding c2

				$ echo l1 > l1
				$ hg ci -Am l1
				adding l1

				$ echo l2 > l2
				$ hg ci -Am l2
				adding l2

				$ hg up -q -C 1

				$ echo r1 > r1
				$ hg ci -Am r1
				adding r1
				created new head

				$ hg tglog
				@ 4: 'r1'
				\|
				\| o 3: 'l2'
				\| \|
				\| o 2: 'l1'
				\|/
				o 1: 'c2'
				\|
				o 0: 'c1'

				Rebase with no arguments - single revision in target branch:

				$ hg up -q -C 3

				$ hg rebase
				saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 4: 'l2'
				\|
				o 3: 'l1'
				\|
				o 2: 'r1'
				\|
				o 1: 'c2'
				\|
				o 0: 'c1'