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

Siddharth Agarwal - - Load All Authors

File last commit:

r23451:5fb1fc2e default


                r32255:7e35d31b

default

Download file

             test-hgk.t
        
                    47 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgk.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Minimal hgk check

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "hgk=" >> $HGRCPATH

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ hg debug-cat-file commit 0

        tree a0c8bcbbb45c

        parent 000000000000

        author test 0 0

        revision 0

        branch default

        phase draft

        adda

        $ echo b > b

        $ hg ci -Am addb

        adding b

        $ hg log -T '{node}\n'

        102a90ea7b4a3361e4082ed620918c261189a36a

        07f4944404050f47db2e5c5071e0e84e7a27bba9

        $ hg debug-diff-tree 07f494440405 102a90ea7b4a

        :000000 100664 000000000000 1e88685f5dde N	b	b

        $ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch

        diff --git a/b b/b

        new file mode 100644

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +b

      Ensure that diff-tree output isn't affected by diffopts

        $ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a

        :000000 100664 000000000000 1e88685f5dde N	b	b

        $ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a

        diff --git a/b b/b

        new file mode 100644

        --- /dev/null

        +++ b/b

        @@ -0,0 +1,1 @@

        +b

        $ 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

				Minimal hgk check

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "hgk=" >> $HGRCPATH
				$ hg init repo
				$ cd repo
				$ echo a > a
				$ hg ci -Am adda
				adding a
				$ hg debug-cat-file commit 0
				tree a0c8bcbbb45c
				parent 000000000000
				author test 0 0
				revision 0
				branch default
				phase draft

				adda
				$ echo b > b
				$ hg ci -Am addb
				adding b
				$ hg log -T '{node}\n'
				102a90ea7b4a3361e4082ed620918c261189a36a
				07f4944404050f47db2e5c5071e0e84e7a27bba9

				$ hg debug-diff-tree 07f494440405 102a90ea7b4a
				:000000 100664 000000000000 1e88685f5dde N b b
				$ hg debug-diff-tree 07f494440405 102a90ea7b4a --patch
				diff --git a/b b/b
				new file mode 100644
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+b

				Ensure that diff-tree output isn't affected by diffopts
				$ hg --config diff.noprefix=True debug-diff-tree 07f494440405 102a90ea7b4a
				:000000 100664 000000000000 1e88685f5dde N b b
				$ hg --config diff.noprefix=True debug-diff-tree --patch 07f494440405 102a90ea7b4a
				diff --git a/b b/b
				new file mode 100644
				--- /dev/null
				+++ b/b
				@@ -0,0 +1,1 @@
				+b

				$ cd ..