upstream/mercurial-mirror Files · tests/test-convert-bzr-merges.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.

Matt Mackall - - Load All Authors

File last commit:

r12516:90efbd1a default


                r14093:ce99d887

default

Download file

             test-convert-bzr-merges.t
        
                    68 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-merges.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-convert-bzr-merges

              r12516
            
      N.B. bzr 1.13 has a bug that breaks this test.  If you see this

      test fail, check your bzr version.  Upgrading to bzr 1.13.1

      should fix it.

        $ . "$TESTDIR/bzr-definitions"

      test multiple merges at once

        $ mkdir test-multimerge

        $ cd test-multimerge

        $ bzr init -q source

        $ cd source

        $ echo content > file

        $ bzr add -q file

        $ bzr commit -q -m 'Initial add'

        $ cd ..

        $ bzr branch -q source source-branch1

        $ cd source-branch1

        $ echo morecontent >> file

        $ echo evenmorecontent > file-branch1

        $ bzr add -q file-branch1

        $ bzr commit -q -m 'Added branch1 file'

        $ cd ../source

        $ sleep 1

        $ echo content > file-parent

        $ bzr add -q file-parent

        $ bzr commit -q -m 'Added parent file'

        $ cd ..

        $ bzr branch -q source source-branch2

        $ cd source-branch2

        $ echo somecontent > file-branch2

        $ bzr add -q file-branch2

        $ bzr commit -q -m 'Added brach2 file'

        $ sleep 1

        $ cd ../source

        $ bzr merge -q ../source-branch1

        $ bzr merge -q --force ../source-branch2

        $ bzr commit -q -m 'Merged branches'

        $ cd ..

        $ hg convert --datesort source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        4 Initial add

        3 Added branch1 file

        2 Added parent file

        1 Added brach2 file

        0 Merged branches

        $ glog -R source-hg

        o    5 "(octopus merge fixup)" files:

        |\

        | o    4 "Merged branches" files: file-branch2

        | |\

        o---+  3 "Added brach2 file" files: file-branch2

         / /

        | o  2 "Added parent file" files: file-parent

        | |

        o |  1 "Added branch1 file" files: file file-branch1

        |/

        o  0 "Initial add" files: file

        $ manifest source-hg tip

        % manifest of tip

        644   file

        644   file-branch1

        644   file-branch2

        644   file-parent

	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-convert-bzr-merges	r12516	N.B. bzr 1.13 has a bug that breaks this test. If you see this
		test fail, check your bzr version. Upgrading to bzr 1.13.1
		should fix it.

		$ . "$TESTDIR/bzr-definitions"

		test multiple merges at once

		$ mkdir test-multimerge
		$ cd test-multimerge
		$ bzr init -q source
		$ cd source
		$ echo content > file
		$ bzr add -q file
		$ bzr commit -q -m 'Initial add'
		$ cd ..
		$ bzr branch -q source source-branch1
		$ cd source-branch1
		$ echo morecontent >> file
		$ echo evenmorecontent > file-branch1
		$ bzr add -q file-branch1
		$ bzr commit -q -m 'Added branch1 file'
		$ cd ../source
		$ sleep 1
		$ echo content > file-parent
		$ bzr add -q file-parent
		$ bzr commit -q -m 'Added parent file'
		$ cd ..
		$ bzr branch -q source source-branch2
		$ cd source-branch2
		$ echo somecontent > file-branch2
		$ bzr add -q file-branch2
		$ bzr commit -q -m 'Added brach2 file'
		$ sleep 1
		$ cd ../source
		$ bzr merge -q ../source-branch1
		$ bzr merge -q --force ../source-branch2
		$ bzr commit -q -m 'Merged branches'
		$ cd ..
		$ hg convert --datesort source source-hg
		initializing destination source-hg repository
		scanning source...
		sorting...
		converting...
		4 Initial add
		3 Added branch1 file
		2 Added parent file
		1 Added brach2 file
		0 Merged branches
		$ glog -R source-hg
		o 5 "(octopus merge fixup)" files:
		\|\
		\| o 4 "Merged branches" files: file-branch2
		\| \|\
		o---+ 3 "Added brach2 file" files: file-branch2
		/ /
		\| o 2 "Added parent file" files: file-parent
		\| \|
		o \| 1 "Added branch1 file" files: file file-branch1
		\|/
		o 0 "Initial add" files: file

		$ manifest source-hg tip
		% manifest of tip
		644 file
		644 file-branch1
		644 file-branch2
		644 file-parent