upstream/mercurial-mirror Files · mercurial/templates/map-cmdline.xml

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

Yuya Nishihara - - Load All Authors

File last commit:

r34715:f4aeb952 default


                r38829:6c8e3c84

default

Download file

             map-cmdline.xml
        
                    21 lines
            
             | 1.6 KiB
            
                | application/xml
            
             |
                XmlLexer
            
             / mercurial / templates / map-cmdline.xml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      [templates]

      docheader = '<?xml version="1.0"?>\n<log>\n'

      docfooter = '</log>\n'

      changeset = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n</logentry>\n'

      changeset_verbose = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}</logentry>\n'

      changeset_debug = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author|email|xmlescape}">{author|person|xmlescape}</author>\n<date>{date|rfc3339date}</date>\n<msg xml:space="preserve">{desc|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}{extras}</logentry>\n'

      file_add  = '<path action="A">{file_add|xmlescape}</path>\n'

      file_mod  = '<path action="M">{file_mod|xmlescape}</path>\n'

      file_del  = '<path action="R">{file_del|xmlescape}</path>\n'

      start_file_copies = '<copies>\n'

      file_copy = '<copy source="{source|xmlescape}">{name|xmlescape}</copy>\n'

      end_file_copies = '</copies>\n'

      parent = '<parent revision="{rev}" node="{node}" />\n'

      branch = '<branch>{branch|xmlescape}</branch>\n'

      tag = '<tag>{tag|xmlescape}</tag>\n'

      bookmark = '<bookmark>{bookmark|xmlescape}</bookmark>\n'

      extra = '<extra key="{key|xmlescape}">{value|xmlescape}</extra>\n'

	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

				[templates]
				docheader = '<?xml version="1.0"?>\n<log>\n'
				docfooter = '</log>\n'

				changeset = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author\|email\|xmlescape}">{author\|person\|xmlescape}</author>\n<date>{date\|rfc3339date}</date>\n<msg xml:space="preserve">{desc\|xmlescape}</msg>\n</logentry>\n'
				changeset_verbose = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author\|email\|xmlescape}">{author\|person\|xmlescape}</author>\n<date>{date\|rfc3339date}</date>\n<msg xml:space="preserve">{desc\|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}</logentry>\n'
				changeset_debug = '<logentry revision="{rev}" node="{node}">\n{branches}{bookmarks}{tags}{parents}<author email="{author\|email\|xmlescape}">{author\|person\|xmlescape}</author>\n<date>{date\|rfc3339date}</date>\n<msg xml:space="preserve">{desc\|xmlescape}</msg>\n<paths>\n{file_adds}{file_dels}{file_mods}</paths>\n{file_copies}{extras}</logentry>\n'

				file_add = '<path action="A">{file_add\|xmlescape}</path>\n'
				file_mod = '<path action="M">{file_mod\|xmlescape}</path>\n'
				file_del = '<path action="R">{file_del\|xmlescape}</path>\n'

				start_file_copies = '<copies>\n'
				file_copy = '<copy source="{source\|xmlescape}">{name\|xmlescape}</copy>\n'
				end_file_copies = '</copies>\n'

				parent = '<parent revision="{rev}" node="{node}" />\n'
				branch = '<branch>{branch\|xmlescape}</branch>\n'
				tag = '<tag>{tag\|xmlescape}</tag>\n'
				bookmark = '<bookmark>{bookmark\|xmlescape}</bookmark>\n'
				extra = '<extra key="{key\|xmlescape}">{value\|xmlescape}</extra>\n'