upstream/mercurial-mirror Files · mercurial/templates/paper/filelog.tmpl

split: new extension to split changesets...

split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082

Jordi Gutiérrez Hermoso - - Load All Authors

File last commit:

r35089:79cbf5cc default


                r35471:02ea370c

@7 default

Download file

             filelog.tmpl
        
                    83 lines
            
             | 3.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / filelog.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

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

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

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

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

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

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

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

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

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

              r9999
            
      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        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}" alt="mercurial" /></a>

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

              r9999
            
      </div>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

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

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

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

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

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

              r9999
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

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

              r9999
            
      </ul>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

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

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

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

              r9999
            
      <li class="active">file log</li>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

              r9999
            
      </ul>

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      <ul>

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

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

        Augie Fackler
    
hgweb: add help link to templates missed in ead4e21f49f1

              r12680
            
      </ul>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      <div class="atom-logo">

        Yoshinari Takaoka
    
hgweb: fixed invalid atom-log feed url in file log page...

              r27554
            
      <a href="{url|urlescape}atom-log/tip/{file|urlescape}" title="subscribe to atom feed">

        Anton Shestakov
    
hgweb: close <img> elements...

              r23830
            
      <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />

      </a>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      </div>

        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>

        av6
    
paper: show current revision on file log page...

              r27081
            
      <h3>

       log {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>

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

              r35055
            
       {alltags}

        Denis Laxalde
    
hgweb: handle a "linerange" request parameter in filelog command...

              r31665
            
       {if(linerange,

        Jordi Gutiérrez Hermoso
    
templates: reword 'back to filelog' link anchor text...

              r35089
            
      ' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')}

        av6
    
paper: show current revision on file log page...

              r27081
            
      </h3>

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

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

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

              r9999
            
        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      <div class="navigate">

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
      <a href="{url|urlescape}log/{symrev}/{file|urlescape}{lessvars%urlparameter}">less</a>

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

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      | {nav%filenav}</div>

        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 class="age">age</th>

        <th class="author">author</th>

        <th class="description">description</th>

       </tr>

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

              r24054
            
      </thead>

        Alexander Plavin
    
hgweb: make stripes in file log with CSS

              r19454
            
      <tbody class="stripes2">

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

              r9999
            
      {entries%filelogentry}

        Alexander Plavin
    
hgweb: make stripes in file log with CSS

              r19454
            
      </tbody>

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

              r9999
            
      </table>

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      <div class="navigate">

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
      <a href="{url|urlescape}log/{symrev}/{file|urlescape}{lessvars%urlparameter}">less</a>

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

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      | {nav%filenav}

        Dirkjan Ochtman
    
hgweb: add less/more links to shortlog/filelog nav

              r10246
            
      </div>

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

              r9999
            
      </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>{repo\|escape}: {file\|escape} history</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="Atom feed for {repo\|escape}:{file}" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log/tip/{file\|urlescape}" title="RSS feed for {repo\|escape}:{file}" />
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
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}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
		<li><a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">browse</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
		<li><a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
		<li><a href="{url\|urlescape}comparison/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
		<li><a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="active">file log</li>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}raw-file/{symrev}/{file\|urlescape}">raw</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	</ul>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	<div class="atom-logo">
Yoshinari Takaoka hgweb: fixed invalid atom-log feed url in file log page...	r27554	<a href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="subscribe to atom feed">
Anton Shestakov hgweb: close <img> elements...	r23830	<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed" />
		</a>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	</div>
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>
av6 paper: show current revision on file log page...	r27081	<h3>
		log {file\|escape} @ {rev}:<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}
Denis Laxalde hgweb: handle a "linerange" request parameter in filelog command...	r31665	{if(linerange,
Jordi Gutiérrez Hermoso templates: reword 'back to filelog' link anchor text...	r35089	' (following lines {linerange}{if(descend, ', descending')} <a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')}
av6 paper: show current revision on file log page...	r27081	</h3>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	<div class="navigate">
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| {nav%filenav}</div>
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 class="age">age</th>
		<th class="author">author</th>
		<th class="description">description</th>
		</tr>
Anton Shestakov hgweb: replace implicit <tbody> with explicit <thead> where appropriate...	r24054	</thead>
Alexander Plavin hgweb: make stripes in file log with CSS	r19454	<tbody class="stripes2">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{entries%filelogentry}
Alexander Plavin hgweb: make stripes in file log with CSS	r19454	</tbody>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>

Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	<div class="navigate">
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{lessvars%urlparameter}">less</a>
		<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{morevars%urlparameter}">more</a>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	\| {nav%filenav}
Dirkjan Ochtman hgweb: add less/more links to shortlog/filelog nav	r10246	</div>

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

		{footer}