upstream/mercurial-mirror Files · mercurial/templates/gitweb/filecomparison.tmpl

exchange: backout changeset c26335fa4225...

exchange: backout changeset Changeset has good intends but introduce significant behavior regressions for multiple important cases. In short there are many case where push would have caught instability creation/propagation that are no longer covered. These behavior have been covered for many years and even if some related case are not currently caught, the covered one should not be regressed. The next four changesets introduce tests for some of these cases. However we could produce many more tests cases since the area is wide and they are many possible combination. (And we should cover them when getting back to this issue) Since 5.5 is one week away, the most reasonable approach seems to back this out while we devise a new way to move forward that preserve the current behavior, catch more issues and also improves the situation that target. In addition to the behavior change, also introduced output changes. These output changes does not requires a backout per-se, but are part of the same changeset. However they come with a couple of issues that also requires attention: 1) the bulk of the error message have been shoehorned into a multiple line abort message. This seems quite different from what we usually do. The abort message should be a compact and efficient message, with extra details being issued as normal error output beforehand. (with --verbose/--quiet) support. 2) the current output is unbounded, so if there is many (tens, hundreds, thousands, …) of unstable/obsolete changeset involved in the push, the output can quickly become a scary and un-usuable wall of text. So we need some limitation here (same as we have with the remote head list that says A, B , C and # others).

Gregory Szorc - - Load All Authors

File last commit:

r32762:2d93d215 default


                r45782:6063c185

stable

Download file

             filecomparison.tmpl
        
                    75 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / filecomparison.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: comparison {file|escape}</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}"/>

      <link rel="alternate" type="application/rss+xml"

         href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div class="page_header">

      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

      <a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison

      </div>

      <div class="page_nav">

      <div>

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

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

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

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

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

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

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

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

      <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> |

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

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

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

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

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

      comparison |

      <a href="{url|urlescape}raw-diff/{symrev}/{file|urlescape}">raw</a> |

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

      </div>

      {searchform}

      </div>

      <div class="title">{file|escape}</div>

      <table>

      {branch%filerevbranch}

      <tr>

       <td>changeset {rev}</td>

       <td style="font-family:monospace"><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

      </tr>

      {parent%filecompparent}

      {child%filecompchild}

      </table>

      <div class="list_head"></div>

      <div class="page_body">

      <div class="legend">

        <span class="legendinfo equal">equal</span>

        <span class="legendinfo delete">deleted</span>

        <span class="legendinfo insert">inserted</span>

        <span class="legendinfo replace">replaced</span>

      </div>

      <div class="comparison">

        <table style="border-collapse:collapse;">

          <thead class="header">

            <tr>

              <th>{leftrev}:{leftnode|short}</th>

              <th>{rightrev}:{rightnode|short}</th>

            </tr>

          </thead>

          {comparison}

        </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

				{header}
				<title>{repo\|escape}: comparison {file\|escape}</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml"
				href="{url\|urlescape}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>
				<body>

				<div class="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / comparison
				</div>

				<div class="page_nav">
				<div>
				<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
				<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
				<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
				<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
				<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
				<a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a> \|
				<a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> \|
				<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a> \|
				<a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a> \|
				<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a> \|
				<a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a> \|
				<a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a> \|
				comparison \|
				<a href="{url\|urlescape}raw-diff/{symrev}/{file\|urlescape}">raw</a> \|
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>
				{searchform}
				</div>

				<div class="title">{file\|escape}</div>

				<table>
				{branch%filerevbranch}
				<tr>
				<td>changeset {rev}</td>
				<td style="font-family:monospace"><a class="list" href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%filecompparent}
				{child%filecompchild}
				</table>

				<div class="list_head"></div>

				<div class="page_body">

				<div class="legend">
				<span class="legendinfo equal">equal</span>
				<span class="legendinfo delete">deleted</span>
				<span class="legendinfo insert">inserted</span>
				<span class="legendinfo replace">replaced</span>
				</div>

				<div class="comparison">
				<table style="border-collapse:collapse;">
				<thead class="header">
				<tr>
				<th>{leftrev}:{leftnode\|short}</th>
				<th>{rightrev}:{rightnode\|short}</th>
				</tr>
				</thead>
				{comparison}
				</table>
				</div>

				</div>

				{footer}