upstream/mercurial-mirror Files · tests/test-rebase-named-branches.t

httprepo: long arguments support (issue2126)...

httprepo: long arguments support (issue2126) Send the command arguments in the HTTP headers. The command is still part of the URL. If the server does not have the 'httpheader' capability, the client will send the command arguments in the URL as it did previously. Web servers typically allow more data to be placed within the headers than in the URL, so this approach will: - Avoid HTTP errors due to using a URL that is too large. - Allow Mercurial to implement a more efficient wire protocol. An alternate approach is to send the arguments as part of the request body. This approach has been rejected because it requires the use of POST requests, so it would break any existing configuration that relies on the request type for authentication or caching. Extensibility: - The header size is provided by the server, which makes it possible to introduce an hgrc setting for it. - The client ignores the capability value after the first comma, which allows more information to be included in the future.

Stefano Tortarolo - - Load All Authors

File last commit:

r13733:4e2690a7 default


                r14093:ce99d887

default

Download file

             test-rebase-named-branches.t
        
                    171 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-named-branches.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 A > A

        $ hg ci -Am A

        adding A

        $ echo B > B

        $ hg ci -Am B

        adding B

        $ hg up -q -C 0

        $ echo C > C

        $ hg ci -Am C

        adding C

        created new head

        $ hg up -q -C 0

        $ echo D > D

        $ hg ci -Am D

        adding D

        created new head

        $ hg merge -r 2

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

        (branch merge, don't forget to commit)

        $ hg ci -m E

        $ hg up -q -C 3

        $ echo F > F

        $ hg ci -Am F

        adding F

        created new head

        $ cd ..

      Rebasing descendant onto ancestor across different named branches

        $ hg clone -q -u . a a1

        $ cd a1

        $ hg branch dev

        marked working directory as branch dev

        $ echo x > x

        $ hg add x

        $ hg ci -m 'extra named branch'

        $ hg tglog

        @  6: 'extra named branch' dev

        |

        o  5: 'F'

        |

        | o  4: 'E'

        |/|

        o |  3: 'D'

        | |

        | o  2: 'C'

        |/

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 6 -d 5

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

        $ hg tglog

        @  6: 'extra named branch'

        |

        o  5: 'F'

        |

        | o  4: 'E'

        |/|

        o |  3: 'D'

        | |

        | o  2: 'C'

        |/

        | o  1: 'B'

        |/

        o  0: 'A'

        $ cd ..

      Rebasing descendant onto ancestor across the same named branches

        $ hg clone -q -u . a a2

        $ cd a2

        $ echo x > x

        $ hg add x

        $ hg ci -m 'G'

        $ hg tglog

        @  6: 'G'

        |

        o  5: 'F'

        |

        | o  4: 'E'

        |/|

        o |  3: 'D'

        | |

        | o  2: 'C'

        |/

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 6 -d 5

        abort: source is descendant of destination

        [255]

        $ cd ..

      Rebasing ancestor onto descendant across different named branches

        $ hg clone -q -u . a a3

        $ cd a3

        $ hg branch dev

        marked working directory as branch dev

        $ echo x > x

        $ hg add x

        $ hg ci -m 'extra named branch'

        $ hg tglog

        @  6: 'extra named branch' dev

        |

        o  5: 'F'

        |

        | o  4: 'E'

        |/|

        o |  3: 'D'

        | |

        | o  2: 'C'

        |/

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 5 -d 6

        abort: source is ancestor of destination

        [255]

        $ 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

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


				$ hg init a
				$ cd a

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

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

				$ hg up -q -C 0

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

				$ hg up -q -C 0

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

				$ hg merge -r 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg ci -m E

				$ hg up -q -C 3

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

				$ cd ..


				Rebasing descendant onto ancestor across different named branches

				$ hg clone -q -u . a a1

				$ cd a1

				$ hg branch dev
				marked working directory as branch dev

				$ echo x > x

				$ hg add x

				$ hg ci -m 'extra named branch'

				$ hg tglog
				@ 6: 'extra named branch' dev
				\|
				o 5: 'F'
				\|
				\| o 4: 'E'
				\|/\|
				o \| 3: 'D'
				\| \|
				\| o 2: 'C'
				\|/
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 6 -d 5
				saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 6: 'extra named branch'
				\|
				o 5: 'F'
				\|
				\| o 4: 'E'
				\|/\|
				o \| 3: 'D'
				\| \|
				\| o 2: 'C'
				\|/
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ cd ..

				Rebasing descendant onto ancestor across the same named branches

				$ hg clone -q -u . a a2

				$ cd a2

				$ echo x > x

				$ hg add x

				$ hg ci -m 'G'

				$ hg tglog
				@ 6: 'G'
				\|
				o 5: 'F'
				\|
				\| o 4: 'E'
				\|/\|
				o \| 3: 'D'
				\| \|
				\| o 2: 'C'
				\|/
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 6 -d 5
				abort: source is descendant of destination
				[255]

				$ cd ..

				Rebasing ancestor onto descendant across different named branches

				$ hg clone -q -u . a a3

				$ cd a3

				$ hg branch dev
				marked working directory as branch dev

				$ echo x > x

				$ hg add x

				$ hg ci -m 'extra named branch'

				$ hg tglog
				@ 6: 'extra named branch' dev
				\|
				o 5: 'F'
				\|
				\| o 4: 'E'
				\|/\|
				o \| 3: 'D'
				\| \|
				\| o 2: 'C'
				\|/
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 5 -d 6
				abort: source is ancestor of destination
				[255]

				$ cd ..