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

filemerge: call premerge directly from main merge function...

filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r26567:f18646cf

default

Download file

             shortlog.tmpl
        
                    44 lines
            
             | 1.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / shortlog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: shortlog</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="buttons">

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

      <a href="{url|urlescape}graph/{symrev}{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/{symrev}/{sessionvars%urlparameter}">files</a>

      {archives%archiveentry}

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

      <a type="application/rss+xml" href="{url|urlescape}rss-log">rss</a>

      <a type="application/rss+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}">atom</a>

      </div>

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

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

      navigate: <small class="navigate">{changenav%navshort}</small>

      </p>

      </form>

      {entries%shortlogentry}

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search2">search:</label>

      <input name="rev" id="search2" type="text" size="30">

      navigate: <small class="navigate">{changenav%navshort}</small>

      </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}: shortlog</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="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}graph/{symrev}{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/{symrev}/{sessionvars%urlparameter}">files</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<a type="application/rss+xml" href="{url\|urlescape}rss-log">rss</a>
				<a type="application/rss+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}">atom</a>
				</div>

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

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search1">search:</label>
				<input name="rev" id="search1" type="text" size="30">
				navigate: <small class="navigate">{changenav%navshort}</small>
				</p>
				</form>

				{entries%shortlogentry}

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search2">search:</label>
				<input name="rev" id="search2" type="text" size="30">
				navigate: <small class="navigate">{changenav%navshort}</small>
				</p>
				</form>

				{footer}