upstream/mercurial-mirror Files · tests/test-eolfilename.t

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r32255:7e35d31b

default

Download file

             test-eolfilename.t
        
                    78 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eolfilename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require eol-in-paths

      https://bz.mercurial-scm.org/352

      test issue352

        $ hg init foo

        $ cd foo

        $ A=`printf 'he\rllo'`

        $ echo foo > "$A"

        $ hg add

        adding he\r (no-eol) (esc)

        llo

        abort: '\n' and '\r' disallowed in filenames: 'he\rllo'

        [255]

        $ hg ci -A -m m

        adding he\r (no-eol) (esc)

        llo

        abort: '\n' and '\r' disallowed in filenames: 'he\rllo'

        [255]

        $ rm "$A"

        $ echo foo > "hell

        > o"

        $ hg add

        adding hell

        o

        abort: '\n' and '\r' disallowed in filenames: 'hell\no'

        [255]

        $ hg ci -A -m m

        adding hell

        o

        abort: '\n' and '\r' disallowed in filenames: 'hell\no'

        [255]

        $ echo foo > "$A"

        $ hg debugwalk

        f  he\r (no-eol) (esc)

        llo  he\r (no-eol) (esc)

        llo

        f  hell

        o  hell

        o

        $ echo bla > quickfox

        $ hg add quickfox

        $ hg ci -m 2

        $ A=`printf 'quick\rfox'`

        $ hg cp quickfox "$A"

        abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'

        [255]

        $ hg mv quickfox "$A"

        abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'

        [255]

      https://bz.mercurial-scm.org/2036

        $ cd ..

      test issue2039

        $ hg init bar

        $ cd bar

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > color =

        > [color]

        > mode = ansi

        > EOF

        $ A=`printf 'foo\nbar'`

        $ B=`printf 'foo\nbar.baz'`

        $ touch "$A"

        $ touch "$B"

        $ hg status --color=always

        \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)

        \x1b[0;35;1;4mbar\x1b[0m (esc)

        \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)

        \x1b[0;35;1;4mbar.baz\x1b[0m (esc)

        $ 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

				#require eol-in-paths

				https://bz.mercurial-scm.org/352

				test issue352

				$ hg init foo
				$ cd foo
				$ A=`printf 'he\rllo'`
				$ echo foo > "$A"
				$ hg add
				adding he\r (no-eol) (esc)
				llo
				abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
				[255]
				$ hg ci -A -m m
				adding he\r (no-eol) (esc)
				llo
				abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
				[255]
				$ rm "$A"
				$ echo foo > "hell
				> o"
				$ hg add
				adding hell
				o
				abort: '\n' and '\r' disallowed in filenames: 'hell\no'
				[255]
				$ hg ci -A -m m
				adding hell
				o
				abort: '\n' and '\r' disallowed in filenames: 'hell\no'
				[255]
				$ echo foo > "$A"
				$ hg debugwalk
				f he\r (no-eol) (esc)
				llo he\r (no-eol) (esc)
				llo
				f hell
				o hell
				o

				$ echo bla > quickfox
				$ hg add quickfox
				$ hg ci -m 2
				$ A=`printf 'quick\rfox'`
				$ hg cp quickfox "$A"
				abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
				[255]
				$ hg mv quickfox "$A"
				abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
				[255]

				https://bz.mercurial-scm.org/2036

				$ cd ..

				test issue2039

				$ hg init bar
				$ cd bar
				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> color =
				> [color]
				> mode = ansi
				> EOF
				$ A=`printf 'foo\nbar'`
				$ B=`printf 'foo\nbar.baz'`
				$ touch "$A"
				$ touch "$B"
				$ hg status --color=always
				\x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
				\x1b[0;35;1;4mbar\x1b[0m (esc)
				\x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
				\x1b[0;35;1;4mbar.baz\x1b[0m (esc)

				$ cd ..