upstream/mercurial-mirror Files · mercurial/templates/gitweb/changelogentry.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

av6 - - Load All Authors

File last commit:

r35052:e9a8a941 default


                r38817:bb54db4a

@96 default

Download file

             changelogentry.tmpl
        
                    16 lines
            
             | 489 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changelogentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <div>

        av6
    
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)

              r35051
            
       <a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">

        <span class="age">{date|rfc822date}</span>

        {desc|strip|firstline|escape|nonempty}

        av6
    
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...

              r35052
            
        {alltags}

        av6
    
hgweb: split long lines in gitweb and monoblue (changeset summary and tags)

              r35051
            
       </a>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <div class="title_text">

      <div class="log_link">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>

      </div>

        Gregory Szorc
    
gitweb: preserve whitespace in description...

              r33557
            
      <div class="log_body description">{desc|strip|escape|websub|nonempty}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

	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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<div>
av6 hgweb: split long lines in gitweb and monoblue (changeset summary and tags)	r35051	<a class="title" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">
		<span class="age">{date\|rfc822date}</span>
		{desc\|strip\|firstline\|escape\|nonempty}
av6 hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...	r35052	{alltags}
av6 hgweb: split long lines in gitweb and monoblue (changeset summary and tags)	r35051	</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<div class="title_text">
		<div class="log_link">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">changeset</a><br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<i>{author\|obfuscate} [{date\|rfc822date}] rev {rev}</i><br/>
		</div>
Gregory Szorc gitweb: preserve whitespace in description...	r33557	<div class="log_body description">{desc\|strip\|escape\|websub\|nonempty}

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>