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

Matt Harbison - - Load All Authors

File last commit:

r23348:bbe56e07 default


                r24995:0579b0c2

default

Download file

             test-locate.t
        
                    141 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-locate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo 0 > a

        $ echo 0 > b

        $ echo 0 > t.h

        $ mkdir t

        $ echo 0 > t/x

        $ echo 0 > t/b

        $ echo 0 > t/e.h

        $ mkdir dir.h

        $ echo 0 > dir.h/foo

        $ hg ci -A -m m

        adding a

        adding b

        adding dir.h/foo

        adding t.h

        adding t/b

        adding t/e.h

        adding t/x

        $ touch nottracked

        $ hg locate a

        a

        $ hg locate NONEXISTENT

        [1]

        $ hg locate

        a

        b

        dir.h/foo

        t.h

        t/b

        t/e.h

        t/x

        $ hg rm a

        $ hg ci -m m

        $ hg locate a

        [1]

        $ hg locate NONEXISTENT

        [1]

        $ hg locate relpath:NONEXISTENT

        [1]

        $ hg locate

        b

        dir.h/foo

        t.h

        t/b

        t/e.h

        t/x

        $ hg locate -r 0 a

        a

        $ hg locate -r 0 NONEXISTENT

        [1]

        $ hg locate -r 0 relpath:NONEXISTENT

        [1]

        $ hg locate -r 0

        a

        b

        dir.h/foo

        t.h

        t/b

        t/e.h

        t/x

      -I/-X with relative path should work:

        $ cd t

        $ hg locate

        b

        dir.h/foo

        t.h

        t/b

        t/e.h

        t/x

        $ hg locate -I ../t

        t/b

        t/e.h

        t/x

      Issue294: hg remove --after dir fails when dir.* also exists

        $ cd ..

        $ rm -r t

        $ hg rm t/b

        $ hg locate 't/**'

        t/b (glob)

        t/e.h (glob)

        t/x (glob)

        $ hg files

        b

        dir.h/foo (glob)

        t.h

        t/e.h (glob)

        t/x (glob)

        $ hg files b

        b

        $ mkdir otherdir

        $ cd otherdir

        $ hg locate b

        ../b (glob)

        ../t/b (glob)

        $ hg locate '*.h'

        ../t.h (glob)

        ../t/e.h (glob)

        $ hg locate path:t/x

        ../t/x (glob)

        $ hg locate 're:.*\.h$'

        ../t.h (glob)

        ../t/e.h (glob)

        $ hg locate -r 0 b

        ../b (glob)

        ../t/b (glob)

        $ hg locate -r 0 '*.h'

        ../t.h (glob)

        ../t/e.h (glob)

        $ hg locate -r 0 path:t/x

        ../t/x (glob)

        $ hg locate -r 0 're:.*\.h$'

        ../t.h (glob)

        ../t/e.h (glob)

        $ hg files

        ../b (glob)

        ../dir.h/foo (glob)

        ../t.h (glob)

        ../t/e.h (glob)

        ../t/x (glob)

        $ hg files .

        [1]

        $ 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

				$ hg init repo
				$ cd repo
				$ echo 0 > a
				$ echo 0 > b
				$ echo 0 > t.h
				$ mkdir t
				$ echo 0 > t/x
				$ echo 0 > t/b
				$ echo 0 > t/e.h
				$ mkdir dir.h
				$ echo 0 > dir.h/foo

				$ hg ci -A -m m
				adding a
				adding b
				adding dir.h/foo
				adding t.h
				adding t/b
				adding t/e.h
				adding t/x

				$ touch nottracked

				$ hg locate a
				a

				$ hg locate NONEXISTENT
				[1]

				$ hg locate
				a
				b
				dir.h/foo
				t.h
				t/b
				t/e.h
				t/x

				$ hg rm a
				$ hg ci -m m

				$ hg locate a
				[1]
				$ hg locate NONEXISTENT
				[1]
				$ hg locate relpath:NONEXISTENT
				[1]
				$ hg locate
				b
				dir.h/foo
				t.h
				t/b
				t/e.h
				t/x
				$ hg locate -r 0 a
				a
				$ hg locate -r 0 NONEXISTENT
				[1]
				$ hg locate -r 0 relpath:NONEXISTENT
				[1]
				$ hg locate -r 0
				a
				b
				dir.h/foo
				t.h
				t/b
				t/e.h
				t/x

				-I/-X with relative path should work:

				$ cd t
				$ hg locate
				b
				dir.h/foo
				t.h
				t/b
				t/e.h
				t/x
				$ hg locate -I ../t
				t/b
				t/e.h
				t/x

				Issue294: hg remove --after dir fails when dir.* also exists

				$ cd ..
				$ rm -r t

				$ hg rm t/b

				$ hg locate 't/**'
				t/b (glob)
				t/e.h (glob)
				t/x (glob)

				$ hg files
				b
				dir.h/foo (glob)
				t.h
				t/e.h (glob)
				t/x (glob)
				$ hg files b
				b

				$ mkdir otherdir
				$ cd otherdir

				$ hg locate b
				../b (glob)
				../t/b (glob)
				$ hg locate '*.h'
				../t.h (glob)
				../t/e.h (glob)
				$ hg locate path:t/x
				../t/x (glob)
				$ hg locate 're:.*\.h$'
				../t.h (glob)
				../t/e.h (glob)
				$ hg locate -r 0 b
				../b (glob)
				../t/b (glob)
				$ hg locate -r 0 '*.h'
				../t.h (glob)
				../t/e.h (glob)
				$ hg locate -r 0 path:t/x
				../t/x (glob)
				$ hg locate -r 0 're:.*\.h$'
				../t.h (glob)
				../t/e.h (glob)

				$ hg files
				../b (glob)
				../dir.h/foo (glob)
				../t.h (glob)
				../t/e.h (glob)
				../t/x (glob)
				$ hg files .
				[1]

				$ cd ../..