upstream/mercurial-mirror Files · tests/test-fix-clang-format.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

Danny Hooper - - Load All Authors

File last commit:

r37200:ded5ea27 default


                r38817:bb54db4a

@96 default

Download file

             test-fix-clang-format.t
        
                    34 lines
            
             | 755 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-fix-clang-format.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require clang-format

      Test that a simple "hg fix" configuration for clang-format works.

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > fix =

        > [experimental]

        > evolution.createmarkers=True

        > evolution.allowunstable=True

        > [fix]

        > clang-format:command=clang-format --style=Google --assume-filename={rootpath}

        > clang-format:linerange=--lines={first}:{last}

        > clang-format:fileset=set:**.cpp or **.hpp

        > EOF

        $ hg init repo

        $ cd repo

        $ printf "void foo(){int x=2;}\n" > foo.cpp

        $ printf "void\nfoo();\n" > foo.hpp

        $ hg commit -Am "foo commit"

        adding foo.cpp

        adding foo.hpp

        $ hg cat -r tip *

        void foo(){int x=2;}

        void

        foo();

        $ hg fix -r tip

        $ hg cat -r tip *

        void foo() { int x = 2; }

        void foo();

        $ 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 clang-format

				Test that a simple "hg fix" configuration for clang-format works.

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> fix =
				> [experimental]
				> evolution.createmarkers=True
				> evolution.allowunstable=True
				> [fix]
				> clang-format:command=clang-format --style=Google --assume-filename={rootpath}
				> clang-format:linerange=--lines={first}:{last}
				> clang-format:fileset=set:.cpp or .hpp
				> EOF

				$ hg init repo
				$ cd repo

				$ printf "void foo(){int x=2;}\n" > foo.cpp
				$ printf "void\nfoo();\n" > foo.hpp
				$ hg commit -Am "foo commit"
				adding foo.cpp
				adding foo.hpp
				$ hg cat -r tip *
				void foo(){int x=2;}
				void
				foo();
				$ hg fix -r tip
				$ hg cat -r tip *
				void foo() { int x = 2; }
				void foo();

				$ cd ..