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

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r33052:45b0e9d0

default

Download file

             test-convert-clonebranches.t
        
                    87 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-clonebranches.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > convert =

        > [convert]

        > hg.tagsbranch = 0

        > EOF

        $ hg init source

        $ cd source

        $ echo a > a

        $ hg ci -qAm adda

      Add a merge with one parent in the same branch

        $ echo a >> a

        $ hg ci -qAm changea

        $ hg up -qC 0

        $ hg branch branch0

        marked working directory as branch branch0

        (branches are permanent and global, did you want a bookmark?)

        $ echo b > b

        $ hg ci -qAm addb

        $ hg up -qC

        $ hg merge default

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

        (branch merge, don't forget to commit)

        $ hg ci -qm mergeab

        $ hg tag -ql mergeab

        $ cd ..

      Miss perl... sometimes

        $ cat > filter.py <<EOF

        > import sys, re

        > 

        > r = re.compile(r'^(?:\d+|pulling from)')

        > sys.stdout.writelines([l for l in sys.stdin if r.search(l)])

        > EOF

      convert

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     $PYTHON filter.py

        3 adda

        2 changea

        1 addb

        pulling from default into branch0

        1 changesets found

        0 mergeab

        pulling from default into branch0

        1 changesets found

      Add a merge with both parents and child in different branches

        $ cd source

        $ hg branch branch1

        marked working directory as branch branch1

        $ echo a > file1

        $ hg ci -qAm c1

        $ hg up -qC mergeab

        $ hg branch branch2

        marked working directory as branch branch2

        $ echo a > file2

        $ hg ci -qAm c2

        $ hg merge branch1

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

        (branch merge, don't forget to commit)

        $ hg branch branch3

        marked working directory as branch branch3

        $ hg ci -qAm c3

        $ cd ..

      incremental conversion

        $ hg convert -v --config convert.hg.clonebranches=1 source dest |

        >     $PYTHON filter.py

        2 c1

        pulling from branch0 into branch1

        4 changesets found

        1 c2

        pulling from branch0 into branch2

        4 changesets found

        0 c3

        pulling from branch1 into branch3

        5 changesets found

        pulling from branch2 into branch3

        1 changesets found

	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


				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> convert =
				> [convert]
				> hg.tagsbranch = 0
				> EOF
				$ hg init source
				$ cd source
				$ echo a > a
				$ hg ci -qAm adda

				Add a merge with one parent in the same branch

				$ echo a >> a
				$ hg ci -qAm changea
				$ hg up -qC 0
				$ hg branch branch0
				marked working directory as branch branch0
				(branches are permanent and global, did you want a bookmark?)
				$ echo b > b
				$ hg ci -qAm addb
				$ hg up -qC
				$ hg merge default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -qm mergeab
				$ hg tag -ql mergeab
				$ cd ..

				Miss perl... sometimes

				$ cat > filter.py <<EOF
				> import sys, re
				>
				> r = re.compile(r'^(?:\d+\|pulling from)')
				> sys.stdout.writelines([l for l in sys.stdin if r.search(l)])
				> EOF

				convert

				$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
				> $PYTHON filter.py
				3 adda
				2 changea
				1 addb
				pulling from default into branch0
				1 changesets found
				0 mergeab
				pulling from default into branch0
				1 changesets found

				Add a merge with both parents and child in different branches

				$ cd source
				$ hg branch branch1
				marked working directory as branch branch1
				$ echo a > file1
				$ hg ci -qAm c1
				$ hg up -qC mergeab
				$ hg branch branch2
				marked working directory as branch branch2
				$ echo a > file2
				$ hg ci -qAm c2
				$ hg merge branch1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg branch branch3
				marked working directory as branch branch3
				$ hg ci -qAm c3
				$ cd ..

				incremental conversion

				$ hg convert -v --config convert.hg.clonebranches=1 source dest \|
				> $PYTHON filter.py
				2 c1
				pulling from branch0 into branch1
				4 changesets found
				1 c2
				pulling from branch0 into branch2
				4 changesets found
				0 c3
				pulling from branch1 into branch3
				5 changesets found
				pulling from branch2 into branch3
				1 changesets found