upstream/mercurial-mirror Files · tests/test-unbundlehash.t

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Matt Mackall - - Load All Authors

File last commit:

r25474:8c14f87b default


                r28189:fac3a24b

default

Download file

             test-unbundlehash.t
        
                    45 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unbundlehash.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require killdaemons

      Test wire protocol unbundle with hashed heads (capability: unbundlehash)

        $ cat << EOF >> $HGRCPATH

        > [experimental]

        > # This tests is intended for bundle1 only.

        > # bundle2 carries the head information inside the bundle itself and

        > # always uses 'force' as the heads value.

        > bundle2-exp = False

        > EOF

      Create a remote repository.

        $ hg init remote

        $ hg serve -R remote --config web.push_ssl=False --config web.allow_push=* -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log

        $ cat hg1.pid >> $DAEMON_PIDS

      Clone the repository and push a change.

        $ hg clone http://localhost:$HGPORT/ local

        no changes found

        updating to branch default

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

        $ touch local/README

        $ hg ci -R local -A -m hoge

        adding README

        $ hg push -R local

        pushing to http://localhost:$HGPORT/

        searching for changes

        remote: adding changesets

        remote: adding manifests

        remote: adding file changes

        remote: added 1 changesets with 1 changes to 1 files

      Ensure hashed heads format is used.

      The hash here is always the same since the remote repository only has the null head.

        $ cat access.log | grep unbundle

        * - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f (glob)

      Explicitly kill daemons to let the test exit on Windows

        $ killdaemons.py

	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

				#require killdaemons

				Test wire protocol unbundle with hashed heads (capability: unbundlehash)

				$ cat << EOF >> $HGRCPATH
				> [experimental]
				> # This tests is intended for bundle1 only.
				> # bundle2 carries the head information inside the bundle itself and
				> # always uses 'force' as the heads value.
				> bundle2-exp = False
				> EOF

				Create a remote repository.

				$ hg init remote
				$ hg serve -R remote --config web.push_ssl=False --config web.allow_push=* -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
				$ cat hg1.pid >> $DAEMON_PIDS

				Clone the repository and push a change.

				$ hg clone http://localhost:$HGPORT/ local
				no changes found
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ touch local/README
				$ hg ci -R local -A -m hoge
				adding README
				$ hg push -R local
				pushing to http://localhost:$HGPORT/
				searching for changes
				remote: adding changesets
				remote: adding manifests
				remote: adding file changes
				remote: added 1 changesets with 1 changes to 1 files

				Ensure hashed heads format is used.
				The hash here is always the same since the remote repository only has the null head.

				$ cat access.log \| grep unbundle
				* - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f (glob)

				Explicitly kill daemons to let the test exit on Windows

				$ killdaemons.py