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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Pierre-Yves David - - Load All Authors

File last commit:

r29686:6e375ba0 default


                r32255:7e35d31b

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

        > [devel]

        > # This tests is intended for bundle1 only.

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

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

        > legacy.exchange = bundle1

        > 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
				> [devel]
				> # This tests is intended for bundle1 only.
				> # bundle2 carries the head information inside the bundle itself and
				> # always uses 'force' as the heads value.
				> legacy.exchange = bundle1
				> 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