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

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r24995:0579b0c2

default

Download file

             test-backwards-remove.t
        
                    16 lines
            
             | 280 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-backwards-remove.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ ls

        a

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ hg co 0

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

      B should disappear

        $ ls

        a

	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

				$ hg init
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ ls
				a
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ hg co 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				B should disappear

				$ ls
				a