upstream/mercurial-mirror Files · tests/test-impexp-branch.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-impexp-branch.t
        
                    81 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-impexp-branch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo '[extensions]' >> $HGRCPATH

        $ echo 'strip =' >> $HGRCPATH

        $ cat >findbranch.py <<EOF

        > import re, sys

        > 

        > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')

        > 

        > for line in sys.stdin:

        >     hmatch = head_re.match(line)

        >     if not hmatch:

        >         sys.exit(1)

        >     if hmatch.group(1) == 'Branch':

        >         sys.exit(0)

        > sys.exit(1)

        > EOF

        $ hg init a

        $ cd a

        $ echo "Rev 1" >rev

        $ hg add rev

        $ hg commit -m "No branch."

        $ hg branch abranch

        marked working directory as branch abranch

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

        $ echo "Rev  2" >rev

        $ hg commit -m "With branch."

        $ hg export 0 > ../r0.patch

        $ hg export 1 > ../r1.patch

        $ cd ..

        $ if $PYTHON findbranch.py < r0.patch; then

        >     echo "Export of default branch revision has Branch header" 1>&2

        >     exit 1

        > fi

        $ if $PYTHON findbranch.py < r1.patch; then

        >     :  # Do nothing

        > else

        >     echo "Export of branch revision is missing Branch header" 1>&2

        >     exit 1

        > fi

      Make sure import still works with branch information in patches.

        $ hg init b

        $ cd b

        $ hg import ../r0.patch

        applying ../r0.patch

        $ hg import ../r1.patch

        applying ../r1.patch

        $ cd ..

        $ hg init c

        $ cd c

        $ hg import --exact --no-commit ../r0.patch

        applying ../r0.patch

        warning: can't check exact import with --no-commit

        $ hg st

        A rev

        $ hg revert -a

        forgetting rev

        $ rm rev

        $ hg import --exact ../r0.patch

        applying ../r0.patch

        $ hg import --exact ../r1.patch

        applying ../r1.patch

      Test --exact and patch header separators (issue3356)

        $ hg strip --no-backup .

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

        >>> import re

        >>> p = file('../r1.patch', 'rb').read()

        >>> p = re.sub(r'Parent\s+', 'Parent ', p)

        >>> file('../r1-ws.patch', 'wb').write(p)

        $ hg import --exact ../r1-ws.patch

        applying ../r1-ws.patch

        $ cd ..

	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

				$ echo '[extensions]' >> $HGRCPATH
				$ echo 'strip =' >> $HGRCPATH

				$ cat >findbranch.py <<EOF
				> import re, sys
				>
				> head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_])(?:\\s.)?)\|(?:\\s*))$')
				>
				> for line in sys.stdin:
				> hmatch = head_re.match(line)
				> if not hmatch:
				> sys.exit(1)
				> if hmatch.group(1) == 'Branch':
				> sys.exit(0)
				> sys.exit(1)
				> EOF

				$ hg init a
				$ cd a
				$ echo "Rev 1" >rev
				$ hg add rev
				$ hg commit -m "No branch."
				$ hg branch abranch
				marked working directory as branch abranch
				(branches are permanent and global, did you want a bookmark?)
				$ echo "Rev 2" >rev
				$ hg commit -m "With branch."

				$ hg export 0 > ../r0.patch
				$ hg export 1 > ../r1.patch
				$ cd ..

				$ if $PYTHON findbranch.py < r0.patch; then
				> echo "Export of default branch revision has Branch header" 1>&2
				> exit 1
				> fi

				$ if $PYTHON findbranch.py < r1.patch; then
				> : # Do nothing
				> else
				> echo "Export of branch revision is missing Branch header" 1>&2
				> exit 1
				> fi

				Make sure import still works with branch information in patches.

				$ hg init b
				$ cd b
				$ hg import ../r0.patch
				applying ../r0.patch
				$ hg import ../r1.patch
				applying ../r1.patch
				$ cd ..

				$ hg init c
				$ cd c
				$ hg import --exact --no-commit ../r0.patch
				applying ../r0.patch
				warning: can't check exact import with --no-commit
				$ hg st
				A rev
				$ hg revert -a
				forgetting rev
				$ rm rev
				$ hg import --exact ../r0.patch
				applying ../r0.patch
				$ hg import --exact ../r1.patch
				applying ../r1.patch

				Test --exact and patch header separators (issue3356)

				$ hg strip --no-backup .
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				>>> import re
				>>> p = file('../r1.patch', 'rb').read()
				>>> p = re.sub(r'Parent\s+', 'Parent ', p)
				>>> file('../r1-ws.patch', 'wb').write(p)
				$ hg import --exact ../r1-ws.patch
				applying ../r1-ws.patch

				$ cd ..