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

Simon Heimberg - - Load All Authors

File last commit:

r19380:ee07f9d1 default


                r25878:800e090e

stable

Download file

             test-subrepo-paths.t
        
                    61 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-paths.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
        $ hg init outer

        $ cd outer

        Martin Geisler
    
subrepo: try remapping subpaths using the "final" path...

              r15150
            
        $ echo '[paths]' >> .hg/hgrc

        $ echo 'default = http://example.net/' >> .hg/hgrc

        Martin Geisler
    
test-subrepo-paths: moved comment lines to where they belong

              r11959
            
      hg debugsub with no remapping

        Martin Geisler
    
subrepo: try remapping subpaths using the "final" path...

              r15150
            
        $ echo 'sub = libfoo' > .hgsub

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
        $ hg add .hgsub

        $ hg debugsub

        path sub

        Martin Geisler
    
subrepo: try remapping subpaths using the "final" path...

              r15150
            
         source   libfoo

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
         revision 

        Martin Geisler
    
test-subrepo-paths: moved comment lines to where they belong

              r11959
            
      hg debugsub with remapping

        Martin Geisler
    
subrepo: try remapping subpaths using the "final" path...

              r15150
            
        $ echo '[subpaths]' >> .hg/hgrc

        Simon Heimberg
    
check-code: do not warn on printf \\x or \\[1-9]...

              r19380
            
        $ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
        $ hg debugsub

        path sub

        Martin Geisler
    
subrepos: handle backslashes in subpaths

              r11961
            
         source   C:\libs\foo-lib\

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
         revision 

        Martin Geisler
    
test-subrepo-paths: fix typo

              r13582
            
      test cumulative remapping, the $HGRCPATH file is loaded first

        Martin Geisler
    
test-subrepo-paths: test cummulative remapping

              r13578
            
        $ echo '[subpaths]' >> $HGRCPATH

        $ echo 'libfoo = libbar' >> $HGRCPATH

        $ hg debugsub

        path sub

         source   C:\libs\bar-lib\

         revision 

        Martin Geisler
    
subrepo: try remapping subpaths using the "final" path...

              r15150
            
      test absolute source path -- testing with a URL is important since

      standard os.path.join wont treat that as an absolute path

        $ echo 'abs = http://example.net/abs' > .hgsub

        $ hg debugsub

        path abs

         source   http://example.net/abs

         revision 

        $ echo 'abs = /abs' > .hgsub

        $ hg debugsub

        path abs

         source   /abs

         revision 

        Martin Geisler
    
tests: unify test-subrepo-paths

              r11914
            
      test bad subpaths pattern

        $ cat > .hg/hgrc <<EOF

        > [subpaths]

        > .* = \1

        > EOF

        $ hg debugsub

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        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

Martin Geisler tests: unify test-subrepo-paths	r11914	$ hg init outer
		$ cd outer

Martin Geisler subrepo: try remapping subpaths using the "final" path...	r15150	$ echo '[paths]' >> .hg/hgrc
		$ echo 'default = http://example.net/' >> .hg/hgrc

Martin Geisler test-subrepo-paths: moved comment lines to where they belong	r11959	hg debugsub with no remapping

Martin Geisler subrepo: try remapping subpaths using the "final" path...	r15150	$ echo 'sub = libfoo' > .hgsub
Martin Geisler tests: unify test-subrepo-paths	r11914	$ hg add .hgsub

		$ hg debugsub
		path sub
Martin Geisler subrepo: try remapping subpaths using the "final" path...	r15150	source libfoo
Martin Geisler tests: unify test-subrepo-paths	r11914	revision

Martin Geisler test-subrepo-paths: moved comment lines to where they belong	r11959	hg debugsub with remapping

Martin Geisler subrepo: try remapping subpaths using the "final" path...	r15150	$ echo '[subpaths]' >> .hg/hgrc
Simon Heimberg check-code: do not warn on printf \\x or \\[1-9]...	r19380	$ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc
Martin Geisler tests: unify test-subrepo-paths	r11914
		$ hg debugsub
		path sub
Martin Geisler subrepos: handle backslashes in subpaths	r11961	source C:\libs\foo-lib\
Martin Geisler tests: unify test-subrepo-paths	r11914	revision

Martin Geisler test-subrepo-paths: fix typo	r13582	test cumulative remapping, the $HGRCPATH file is loaded first
Martin Geisler test-subrepo-paths: test cummulative remapping	r13578
		$ echo '[subpaths]' >> $HGRCPATH
		$ echo 'libfoo = libbar' >> $HGRCPATH
		$ hg debugsub
		path sub
		source C:\libs\bar-lib\
		revision

Martin Geisler subrepo: try remapping subpaths using the "final" path...	r15150	test absolute source path -- testing with a URL is important since
		standard os.path.join wont treat that as an absolute path

		$ echo 'abs = http://example.net/abs' > .hgsub
		$ hg debugsub
		path abs
		source http://example.net/abs
		revision

		$ echo 'abs = /abs' > .hgsub
		$ hg debugsub
		path abs
		source /abs
		revision

Martin Geisler tests: unify test-subrepo-paths	r11914	test bad subpaths pattern

		$ cat > .hg/hgrc <<EOF
		> [subpaths]
		> .* = \1
		> EOF
		$ hg debugsub
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..