upstream/mercurial-mirror Files · tests/test-merge-symlinks.t

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r25878:800e090e

stable

Download file

             test-merge-symlinks.t
        
                    63 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-symlinks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-merge-symlinks

              r12459
            
        $ cat > echo.py <<EOF

        > #!/usr/bin/env python

        > import os, sys

        > try:

        >     import msvcrt

        >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

        >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

        > except ImportError:

        >     pass

        > 

        > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):

        >     print k, os.environ[k]

        > EOF

      Create 2 heads containing the same file, once as

      a file, once as a link. Bundle was generated with:

      # hg init t

      # cd t

      # echo a > a

      # hg ci -qAm t0 -d '0 0'

      # echo l > l

      # hg ci -qAm t1 -d '1 0'

      # hg up -C 0

      # ln -s a l

      # hg ci -qAm t2 -d '2 0'

      # echo l2 > l2

      # hg ci -qAm t3 -d '3 0'

        $ hg init t

        $ cd t

        Nicolas Dumazet
    
tests: move test bundles in a bundles/ subdirectory

              r14116
            
        $ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"

        Matt Mackall
    
tests: unify test-merge-symlinks

              r12459
            
        $ hg up -C 3

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

      Merge them and display *_ISLINK vars

      merge heads

        Steve Borho
    
merge: implement --tool arguments using new ui.forcemerge configurable...

              r12788
            
        $ hg merge --tool="python ../echo.py"

        Mads Kiilerich
    
util: flush stdout before calling external processes...

              r13439
            
        merging l

        Matt Mackall
    
tests: unify test-merge-symlinks

              r12459
            
        HG_FILE l

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        (branch merge, don't forget to commit)

      Test working directory symlink bit calculation wrt copies,

      especially on non-supporting systems.

      merge working directory

        $ hg up -C 2

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

        $ hg copy l l2

        $ HGMERGE="python ../echo.py" hg up 3

        Mads Kiilerich
    
util: flush stdout before calling external processes...

              r13439
            
        merging l2

        Matt Mackall
    
tests: unify test-merge-symlinks

              r12459
            
        HG_FILE l2

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: unify test-merge-symlinks	r12459	$ cat > echo.py <<EOF
		> #!/usr/bin/env python
		> import os, sys
		> try:
		> import msvcrt
		> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
		> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
		> except ImportError:
		> pass
		>
		> for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
		> print k, os.environ[k]
		> EOF

		Create 2 heads containing the same file, once as
		a file, once as a link. Bundle was generated with:

		# hg init t
		# cd t
		# echo a > a
		# hg ci -qAm t0 -d '0 0'
		# echo l > l
		# hg ci -qAm t1 -d '1 0'
		# hg up -C 0
		# ln -s a l
		# hg ci -qAm t2 -d '2 0'
		# echo l2 > l2
		# hg ci -qAm t3 -d '3 0'

		$ hg init t
		$ cd t
Nicolas Dumazet tests: move test bundles in a bundles/ subdirectory	r14116	$ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
Matt Mackall tests: unify test-merge-symlinks	r12459	$ hg up -C 3
		3 files updated, 0 files merged, 0 files removed, 0 files unresolved

		Merge them and display *_ISLINK vars
		merge heads

Steve Borho merge: implement --tool arguments using new ui.forcemerge configurable...	r12788	$ hg merge --tool="python ../echo.py"
Mads Kiilerich util: flush stdout before calling external processes...	r13439	merging l
Matt Mackall tests: unify test-merge-symlinks	r12459	HG_FILE l
		HG_MY_ISLINK 1
		HG_OTHER_ISLINK 0
		HG_BASE_ISLINK 0
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		Test working directory symlink bit calculation wrt copies,
		especially on non-supporting systems.
		merge working directory

		$ hg up -C 2
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg copy l l2
		$ HGMERGE="python ../echo.py" hg up 3
Mads Kiilerich util: flush stdout before calling external processes...	r13439	merging l2
Matt Mackall tests: unify test-merge-symlinks	r12459	HG_FILE l2
		HG_MY_ISLINK 1
		HG_OTHER_ISLINK 0
		HG_BASE_ISLINK 0
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..