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

Anton Shestakov - - Load All Authors

File last commit:

r24054:fdf7794b default


                r38817:bb54db4a

@96 default

Download file

             index.tmpl
        
                    31 lines
            
             | 795 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / index.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>Mercurial repositories index</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

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

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>

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

              r9999
            
      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

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

              r9999
            
      <table class="bigtable">

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
          <thead>

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

              r9999
            
          <tr>

              <th><a href="?sort={sort_name}">Name</a></th>

              <th><a href="?sort={sort_description}">Description</a></th>

              <th><a href="?sort={sort_contact}">Contact</a></th>

        Dan Villiom Podlaski Christiansen
    
templates: rename `Last change' column in hgwebdir repository list....

              r10301
            
              <th><a href="?sort={sort_lastchange}">Last modified</a></th>

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

              r9999
            
              <th>&nbsp;</th>

        Angel Ezquerra
    
hgweb, paper: add (Atom) subscribe links to the repository index...

              r18201
            
              <th>&nbsp;</th>

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

              r9999
            
          </tr>

        Anton Shestakov
    
hgweb: replace implicit <tbody> with explicit <thead> where appropriate...

              r24054
            
          </thead>

        Alexander Plavin
    
hgweb: make stripes in repo list with CSS

              r19450
            
          <tbody class="stripes2">

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

              r9999
            
          {entries%indexentry}

        Alexander Plavin
    
hgweb: make stripes in repo list with CSS

              r19450
            
          </tbody>

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

              r9999
            
      </table>

      </div>

      </div>

      {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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>Mercurial repositories index</title>
		</head>
		<body>

		<div class="container">
		<div class="menu">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table class="bigtable">
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	<thead>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th><a href="?sort={sort_name}">Name</a></th>
		<th><a href="?sort={sort_description}">Description</a></th>
		<th><a href="?sort={sort_contact}">Contact</a></th>
Dan Villiom Podlaski Christiansen templates: rename `Last change' column in hgwebdir repository list....	r10301	<th><a href="?sort={sort_lastchange}">Last modified</a></th>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<th> </th>
Angel Ezquerra hgweb, paper: add (Atom) subscribe links to the repository index...	r18201	<th> </th>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
Alexander Plavin hgweb: make stripes in repo list with CSS	r19450	<tbody class="stripes2">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{entries%indexentry}
Alexander Plavin hgweb: make stripes in repo list with CSS	r19450	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>
		</div>
		</div>
		{footer}