upstream/mercurial-mirror Files · tests/test-revset-dirstate-parents.t

mq: use dirstateguard instead of dirstate.invalidate (qrefresh)...

mq: use dirstateguard instead of dirstate.invalidate (qrefresh) Before this patch, "mq.queue.refresh()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Yuya Nishihara - - Load All Authors

File last commit:

r24458:7d87f672 default


                r24997:12f3c714

default

Download file

             test-revset-dirstate-parents.t
        
                    66 lines
            
             | 889 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-dirstate-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ HGENCODING=utf-8

        $ export HGENCODING

        $ try() {

        >   hg debugrevspec --debug $@

        > }

        $ log() {

        >   hg log --template '{rev}\n' -r "$1"

        > }

        $ hg init repo

        $ cd repo

        $ try 'p1()'

        (func

          ('symbol', 'p1')

          None)

        * set:

        <baseset []>

        $ try 'p2()'

        (func

          ('symbol', 'p2')

          None)

        * set:

        <baseset []>

        $ try 'parents()'

        (func

          ('symbol', 'parents')

          None)

        * set:

        <baseset+ []>

      null revision

        $ log 'p1()'

        $ log 'p2()'

        $ log 'parents()'

      working dir with a single parent

        $ echo a > a

        $ hg ci -Aqm0

        $ log 'p1()'

        0

        $ log 'tag() and p1()'

        $ log 'p2()'

        $ log 'parents()'

        0

        $ log 'tag() and parents()'

      merge in progress

        $ echo b > b

        $ hg ci -Aqm1

        $ hg up -q 0

        $ echo c > c

        $ hg ci -Aqm2

        $ hg merge -q

        $ log 'p1()'

        2

        $ log 'p2()'

        1

        $ log 'tag() and p2()'

        $ log 'parents()'

        1

        2

        $ 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

				$ HGENCODING=utf-8
				$ export HGENCODING

				$ try() {
				> hg debugrevspec --debug $@
				> }

				$ log() {
				> hg log --template '{rev}\n' -r "$1"
				> }

				$ hg init repo
				$ cd repo

				$ try 'p1()'
				(func
				('symbol', 'p1')
				None)
				* set:
				<baseset []>
				$ try 'p2()'
				(func
				('symbol', 'p2')
				None)
				* set:
				<baseset []>
				$ try 'parents()'
				(func
				('symbol', 'parents')
				None)
				* set:
				<baseset+ []>

				null revision
				$ log 'p1()'
				$ log 'p2()'
				$ log 'parents()'

				working dir with a single parent
				$ echo a > a
				$ hg ci -Aqm0
				$ log 'p1()'
				0
				$ log 'tag() and p1()'
				$ log 'p2()'
				$ log 'parents()'
				0
				$ log 'tag() and parents()'

				merge in progress
				$ echo b > b
				$ hg ci -Aqm1
				$ hg up -q 0
				$ echo c > c
				$ hg ci -Aqm2
				$ hg merge -q
				$ log 'p1()'
				2
				$ log 'p2()'
				1
				$ log 'tag() and p2()'
				$ log 'parents()'
				1
				2

				$ cd ..