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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24995:0579b0c2

default

Download file

             test-1102.t
        
                    17 lines
            
             | 354 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-1102.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg tag t1 # 1

        $ hg tag --remove t1 # 2

        $ hg co 1

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

        $ hg tag -f -r0 t1

        $ hg tags

        tip                                3:a49829c4fc11

        t1                                 0:f7b1eb17ad24

        $ 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

				$ rm -rf a
				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Am0
				adding a
				$ hg tag t1 # 1
				$ hg tag --remove t1 # 2

				$ hg co 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg tag -f -r0 t1
				$ hg tags
				tip 3:a49829c4fc11
				t1 0:f7b1eb17ad24

				$ cd ..