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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

             test-unbundlehash.t
        
                    37 lines
            
             | 1.2 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)

      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

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

	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)

				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

				$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS