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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24997:12f3c714

default

Download file

             test-simple-update.t
        
                    58 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-simple-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init test

        $ cd test

        $ echo foo>foo

        $ hg addremove

        adding foo

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg clone . ../branch

        updating to branch default

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

        $ cd ../branch

        $ hg co

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

        $ echo bar>>foo

        $ hg commit -m "2"

        $ cd ../test

        $ hg pull ../branch

        pulling from ../branch

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

        $ hg co

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

        $ cat foo

        foo

        bar

        $ hg manifest --debug

        6f4310b00b9a147241b071a60c28a650827fb03d 644   foo

      update to rev 0 with a date

        $ hg upd -d foo 0

        abort: you can't specify a revision and a date

        [255]

        $ 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 test
				$ cd test
				$ echo foo>foo
				$ hg addremove
				adding foo
				$ hg commit -m "1"

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ hg clone . ../branch
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ../branch
				$ hg co
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo bar>>foo
				$ hg commit -m "2"

				$ cd ../test

				$ hg pull ../branch
				pulling from ../branch
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 2 changesets, 2 total revisions

				$ hg co
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat foo
				foo
				bar

				$ hg manifest --debug
				6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

				update to rev 0 with a date

				$ hg upd -d foo 0
				abort: you can't specify a revision and a date
				[255]

				$ cd ..