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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Augie Fackler - - Load All Authors

File last commit:

r38107:f97c83d9 default


                r38817:bb54db4a

@96 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

        Augie Fackler
    
tests: fix test-subrepo-paths.t on Python 3...

              r38107
            
        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
Augie Fackler tests: fix test-subrepo-paths.t on Python 3...	r38107	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 ..