upstream/mercurial-mirror Files · tests/test-subrepo-paths.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Simon Heimberg - - Load All Authors

File last commit:

r19380:ee07f9d1 default


                r23524:a1a7c94d

default

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 ..