upstream/mercurial-mirror Files · mercurial/templates/monoblue/filediff.tmpl

subrepo: handle svn tracked/unknown directory collisions...

subrepo: handle svn tracked/unknown directory collisions This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant and only works with svn >= 1.5 but the only alternative I can think of is to write our own purge command for subversion.

Yuya Nishihara - - Load All Authors

File last commit:

r13860:b5b84dd4 stable


                r14050:9e8a9d45

stable

Download file

             filediff.tmpl
        
                    56 lines
            
             | 2.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / filediff.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

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

          <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file diff</h1>

              <form action="{url}log">

                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

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

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

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

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

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

        Yuya Nishihara
    
hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)

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

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

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

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

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

              r12680
            
                  <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>

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

              r9999
            
              </ul>

          </div>

          <ul class="submenu">

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

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

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

              <li class="current">diff</li>

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

          </ul>

          <h2 class="no-link no-border">diff: {file|escape}</h2>

          <h3 class="changeset">{file|escape}</h3>

          <dl class="overview">

              {branch%filerevbranch}

              <dt>changeset {rev}</dt>

              <dd><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>

              {parent%filediffparent}

              {child%filediffchild}

          </dl>

          <div class="diff">

          {diff}

          </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}: diff {file\|escape}</title>
		<link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
		</head>

		<body>
		<div id="container">
		<div class="page-header">
		<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / file diff</h1>

		<form action="{url}log">
		{sessionvars%hiddenformentry}
		<dl class="search">
		<dt><label>Search: </label></dt>
		<dd><input type="text" name="rev" /></dd>
		</dl>
		</form>

		<ul class="page-nav">
		<li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
		<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
Yuya Nishihara hgweb: add separate bookmarks listing to monoblue theme (based on 38c9837b1f75)	r13860	<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
		<li><a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
Augie Fackler hgweb: add help link to templates missed in ead4e21f49f1	r12680	<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<ul class="submenu">
		<li><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
		<li><a href="{url}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a></li>
		<li><a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li class="current">diff</li>
		<li><a href="{url}raw-diff/{node\|short}/{file\|urlescape}">raw</a></li>
		</ul>

		<h2 class="no-link no-border">diff: {file\|escape}</h2>
		<h3 class="changeset">{file\|escape}</h3>

		<dl class="overview">
		{branch%filerevbranch}
		<dt>changeset {rev}</dt>
		<dd><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
		{parent%filediffparent}
		{child%filediffchild}
		</dl>

		<div class="diff">
		{diff}
		</div>

		{footer}