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

transaction: issue "new obsmarkers" message at the end of the transaction...

transaction: issue "new obsmarkers" message at the end of the transaction Instead of making bundle2 code responsible for this, it seems better to have it handled and the transaction level. First, it means the message will be more consistently printed. Second it means we won't spam the message over and over if the data arrive in multiple piece. Third, we are planning to move other similar message at the same level (for the same reason) so having them all at the same location will help us to control the order they are displayed.

Valentin Gatien-Baron - - Load All Authors

File last commit:

r42649:773b0222 default


                r43164:38392d5b

default

Download file

             test-dirstate-race2.t
        
                    37 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dirstate-race2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Checking the size/permissions/file-type of files stored in the

      dirstate after an update where the files are changed concurrently

      outside of hg's control.

        $ hg init repo

        $ cd repo

        $ echo a > a

        $ hg commit -qAm _

        $ echo aa > a

        $ hg commit -m _

        $ hg debugdirstate --no-dates

        n 644          3 (set  |unset)               a (re)

        $ cat >> $TESTTMP/dirstaterace.py << EOF

        > from mercurial import (

        >     extensions,

        >     merge,

        > )

        > def extsetup(ui):

        >     extensions.wrapfunction(merge, 'applyupdates', wrap)

        > def wrap(orig, *args, **kwargs):

        >     res = orig(*args, **kwargs)

        >     with open("a", "w"):

        >         pass # just truncate the file

        >     return res

        > EOF

      Do an update where file 'a' is changed between hg writing it to disk

      and hg writing the dirstate. The dirstate is correct nonetheless, and

      so hg status correctly shows a as clean.

        $ hg up -r 0 --config extensions.race=$TESTTMP/dirstaterace.py

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

        $ hg debugdirstate --no-dates

        n 644          2 (set  |unset)               a (re)

        $ echo a > a; hg status; hg diff

	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

				Checking the size/permissions/file-type of files stored in the
				dirstate after an update where the files are changed concurrently
				outside of hg's control.

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ hg commit -qAm _
				$ echo aa > a
				$ hg commit -m _

				$ hg debugdirstate --no-dates
				n 644 3 (set \|unset) a (re)

				$ cat >> $TESTTMP/dirstaterace.py << EOF
				> from mercurial import (
				> extensions,
				> merge,
				> )
				> def extsetup(ui):
				> extensions.wrapfunction(merge, 'applyupdates', wrap)
				> def wrap(orig, args, *kwargs):
				> res = orig(args, *kwargs)
				> with open("a", "w"):
				> pass # just truncate the file
				> return res
				> EOF

				Do an update where file 'a' is changed between hg writing it to disk
				and hg writing the dirstate. The dirstate is correct nonetheless, and
				so hg status correctly shows a as clean.

				$ hg up -r 0 --config extensions.race=$TESTTMP/dirstaterace.py
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg debugdirstate --no-dates
				n 644 2 (set \|unset) a (re)
				$ echo a > a; hg status; hg diff