upstream/mercurial-mirror Files · mercurial/templates/spartan/search.tmpl

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:

r37418:47aea60d default


                r38817:bb54db4a

@96 default

Download file

             search.tmpl
        
                    37 lines
            
             | 946 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / search.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: searching for {query|escape}</title>

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a>

      <a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a>

      <a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a>

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>

      <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a>

      {archives%archiveentry}

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      </div>

      <h2>searching for {query|escape}</h2>

      <form>

      {sessionvars%hiddenformentry}

      <p>

      search:

      <input name="rev" type="text" width="30" value="{query|escape}">

      </p>

      </form>

      {entries%changelogentry}

      <form>

      {sessionvars%hiddenformentry}

      <p>

      search:

      <input name="rev" type="text" width="30" value="{query|escape}">

      </p>

      </form>

      {footer}

	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

				{header}
				<title>{repo\|escape}: searching for {query\|escape}</title>
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

				<h2>searching for {query\|escape}</h2>

				<form>
				{sessionvars%hiddenformentry}
				<p>
				search:
				<input name="rev" type="text" width="30" value="{query\|escape}">
				</p>
				</form>

				{entries%changelogentry}

				<form>
				{sessionvars%hiddenformentry}
				<p>
				search:
				<input name="rev" type="text" width="30" value="{query\|escape}">
				</p>
				</form>

				{footer}