upstream/mercurial-mirror Files · tests/test-template-engine.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.

Yuya Nishihara - - Load All Authors

File last commit:

r28957:d813132e default


                r32255:7e35d31b

default

Download file

             test-template-engine.t
        
                    54 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-template-engine.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > engine.py << EOF

        > 

        > from mercurial import templater

        > 

        > class mytemplater(object):

        >     def __init__(self, loader, filters, defaults, aliases):

        >         self.loader = loader

        > 

        >     def process(self, t, map):

        >         tmpl = self.loader(t)

        >         for k, v in map.iteritems():

        >             if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'):

        >                 continue

        >             if hasattr(v, '__call__'):

        >                 v = v(**map)

        >             v = templater.stringify(v)

        >             tmpl = tmpl.replace('{{%s}}' % k, v)

        >         yield tmpl

        > 

        > templater.engines['my'] = mytemplater

        > EOF

        $ hg init test

        $ echo '[extensions]' > test/.hg/hgrc

        $ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc

        $ cd test

        $ cat > mymap << EOF

        > changeset = my:changeset.txt

        > EOF

        $ cat > changeset.txt << EOF

        > {{rev}} {{node}} {{author}}

        > EOF

        $ hg ci -Ama

        adding changeset.txt

        adding mymap

        $ hg log --style=./mymap

        0 97e5f848f0936960273bbf75be6388cd0350a32b test

        $ cat > changeset.txt << EOF

        > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}

        > EOF

        $ hg ci -Ama

        $ hg log --style=./mymap

        0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000

        -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000

      invalid engine type:

        $ echo 'changeset = unknown:changeset.txt' > unknownenginemap

        $ hg log --style=./unknownenginemap

        abort: invalid template engine: unknown

        [255]

        $ 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


				$ cat > engine.py << EOF
				>
				> from mercurial import templater
				>
				> class mytemplater(object):
				> def __init__(self, loader, filters, defaults, aliases):
				> self.loader = loader
				>
				> def process(self, t, map):
				> tmpl = self.loader(t)
				> for k, v in map.iteritems():
				> if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'):
				> continue
				> if hasattr(v, '__call__'):
				> v = v(**map)
				> v = templater.stringify(v)
				> tmpl = tmpl.replace('{{%s}}' % k, v)
				> yield tmpl
				>
				> templater.engines['my'] = mytemplater
				> EOF
				$ hg init test
				$ echo '[extensions]' > test/.hg/hgrc
				$ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
				$ cd test
				$ cat > mymap << EOF
				> changeset = my:changeset.txt
				> EOF
				$ cat > changeset.txt << EOF
				> {{rev}} {{node}} {{author}}
				> EOF
				$ hg ci -Ama
				adding changeset.txt
				adding mymap
				$ hg log --style=./mymap
				0 97e5f848f0936960273bbf75be6388cd0350a32b test

				$ cat > changeset.txt << EOF
				> {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
				> EOF
				$ hg ci -Ama
				$ hg log --style=./mymap
				0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
				-1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000

				invalid engine type:

				$ echo 'changeset = unknown:changeset.txt' > unknownenginemap
				$ hg log --style=./unknownenginemap
				abort: invalid template engine: unknown
				[255]

				$ cd ..