upstream/mercurial-mirror Files · tests/test-subrepo-relative-path.t

extensions: register functions always at loading extension (issue5601)...

extensions: register functions always at loading extension (issue5601) Before this patch, functions defined in extensions are registered via extra loaders only in _dispatch(). Therefore, loading extensions in other code paths like below omits registration of functions. - WSGI service - operation across repositories (e.g. subrepo) - test-duplicateoptions.py, using extensions.loadall() directly To register functions always at loading new extension, this patch moves implementation for extra loading from dispatch._dispatch() to extensions.loadall(). AFAIK, only commands module causes cyclic dependency between extensions module, but this patch imports all related modules just before extra loading in loadall(), in order to centralize them. This patch makes extensions.py depend on many other modules, even though extensions.py itself doesn't. It should be avoided if possible, but I don't have any better idea. Some other places like below aren't reasonable for extra loading, IMHO. - specific function in newly added module: existing callers of extensions.loadall() should invoke it, too - hg.repository() or so: no-repo commands aren't covered by this. BTW, this patch removes _loaded.add(name) on relocation, because dispatch._loaded is used only for extraloaders (for similar reason, "exts" variable is removed, too).

Matt Harbison - - Load All Authors

File last commit:

r25495:c63bf97c default


                r33052:45b0e9d0

default

Download file

             test-subrepo-relative-path.t
        
                    105 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-relative-path.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require killdaemons

      Preparing the subrepository 'sub'

        $ hg init sub

        $ echo sub > sub/sub

        $ hg add -R sub

        adding sub/sub (glob)

        $ hg commit -R sub -m "sub import"

      Preparing the 'main' repo which depends on the subrepo 'sub'

        $ hg init main

        $ echo main > main/main

        $ echo "sub = ../sub" > main/.hgsub

        $ hg clone sub main/sub

        updating to branch default

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

        $ hg add -R main

        adding main/.hgsub (glob)

        adding main/main (glob)

        $ hg commit -R main -m "main import"

      Cleaning both repositories, just as a clone -U

        $ hg up -C -R sub null

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

        $ hg up -C -R main null

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

        $ rm -rf main/sub

      hide outer repo

        $ hg init

      Serving them both using hgweb

        $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf

        $ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \

        >    -A /dev/null -E /dev/null --pid-file hg.pid -d

        $ cat hg.pid >> $DAEMON_PIDS

      Clone main from hgweb

        $ hg clone "http://localhost:$HGPORT/main" cloned

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        updating to branch default

        cloning subrepo sub from http://localhost:$HGPORT/sub

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

      Checking cloned repo ids

        $ hg id -R cloned

        fdfeeb3e979e tip

        $ hg id -R cloned/sub

        863c1745b441 tip

      subrepo debug for 'main' clone

        $ hg debugsub -R cloned

        path sub

         source   ../sub

         revision 863c1745b441bd97a8c4a096e87793073f4fb215

        $ killdaemons.py

      subrepo paths with ssh urls

        $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 3 changes to 3 files

        updating to branch default

        cloning subrepo sub from ssh://user@dummy/sub

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

        $ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned

        pushing to ssh://user@dummy/$TESTTMP/cloned

        pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub

        searching for changes

        no changes found

        searching for changes

        no changes found

        [1]

        $ cat dummylog

        Got arguments 1:user@dummy 2:hg -R cloned serve --stdio

        Got arguments 1:user@dummy 2:hg -R sub serve --stdio

        Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio

        Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio

	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

				Preparing the subrepository 'sub'

				$ hg init sub
				$ echo sub > sub/sub
				$ hg add -R sub
				adding sub/sub (glob)
				$ hg commit -R sub -m "sub import"

				Preparing the 'main' repo which depends on the subrepo 'sub'

				$ hg init main
				$ echo main > main/main
				$ echo "sub = ../sub" > main/.hgsub
				$ hg clone sub main/sub
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg add -R main
				adding main/.hgsub (glob)
				adding main/main (glob)
				$ hg commit -R main -m "main import"

				Cleaning both repositories, just as a clone -U

				$ hg up -C -R sub null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg up -C -R main null
				0 files updated, 0 files merged, 3 files removed, 0 files unresolved
				$ rm -rf main/sub

				hide outer repo
				$ hg init

				Serving them both using hgweb

				$ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf
				$ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \
				> -A /dev/null -E /dev/null --pid-file hg.pid -d
				$ cat hg.pid >> $DAEMON_PIDS

				Clone main from hgweb

				$ hg clone "http://localhost:$HGPORT/main" cloned
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				updating to branch default
				cloning subrepo sub from http://localhost:$HGPORT/sub
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Checking cloned repo ids

				$ hg id -R cloned
				fdfeeb3e979e tip
				$ hg id -R cloned/sub
				863c1745b441 tip

				subrepo debug for 'main' clone

				$ hg debugsub -R cloned
				path sub
				source ../sub
				revision 863c1745b441bd97a8c4a096e87793073f4fb215

				$ killdaemons.py

				subrepo paths with ssh urls

				$ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 3 changes to 3 files
				updating to branch default
				cloning subrepo sub from ssh://user@dummy/sub
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned
				pushing to ssh://user@dummy/$TESTTMP/cloned
				pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
				searching for changes
				no changes found
				searching for changes
				no changes found
				[1]

				$ cat dummylog
				Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
				Got arguments 1:user@dummy 2:hg -R sub serve --stdio
				Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio
				Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio