upstream/mercurial-mirror Files · tests/test-hgk.t

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Siddharth Agarwal - - Load All Authors

File last commit:

r23451:5fb1fc2e default


                r24995:0579b0c2

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 ..