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

dirstate: preserve path components case on renames (issue3402)...

dirstate: preserve path components case on renames (issue3402) The original issue was something like: $ hg init repo $ cd repo $ mkdir D $ echo a > D/a $ hg ci -Am adda adding D/a $ mv D temp $ mv temp d $ echo b > d/b $ hg add d/b adding D/b $ hg ci -m addb $ hg mv d/b d/c moving D/b to d/c $ hg st A d/c R D/b Here we expected: A D/c R D/b the logic being we try to preserve case of path components already known in the dirstate. This is fixed by the current patch. Note the following stories are not still not supported: Changing directory case $ hg mv D d moving D/a to D/D/a moving D/b to D/D/b $ hg st A D/D/a A D/D/b R D/a R D/b or: $ hg mv D/* d D/a: not overwriting - file exists D/b: not overwriting - file exists And if they were, there are probably similar issues with diffing/patching.

Patrick Mezard - - Load All Authors

File last commit:

r16137:8fd18eb8 default


                r16542:e596a631

stable

Download file

             graph.tmpl
        
                    115 lines
            
             | 4.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / graph.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

          <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph</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}changelog{sessionvars%urlparameter}">changelog</a></li>

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

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

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

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

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

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

              </ul>

          </div>

          <h2 class="no-link no-border">graph</h2>

          <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>

          <div id="wrapper">

              <ul id="nodebgs"></ul>

              <canvas id="graph" width="480" height="{canvasheight}"></canvas>

              <ul id="graphnodes"></ul>

          </div>

          <script>

          <!-- hide script content

          document.getElementById('noscript').style.display = 'none';

          var data = {jsdata|json};

          var graph = new Graph();

          graph.scale({bg_height});

          var revlink = '<li style="_STYLE"><span class="desc">';

          revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';

          revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';

          graph.vertex = function(x, y, color, parity, cur) \{

              this.ctx.beginPath();

              color = this.setColor(color, 0.25, 0.75);

              this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);

              this.ctx.fill();

              var bg = '<li class="bg parity' + parity + '"></li>';

              var left = (this.columns + 1) * this.bg_height;

              var nstyle = 'padding-left: ' + left + 'px;';

              var item = revlink.replace(/_STYLE/, nstyle);

              item = item.replace(/_PARITY/, 'parity' + parity);

              item = item.replace(/_NODEID/, cur[0]);

              item = item.replace(/_NODEID/, cur[0]);

              item = item.replace(/_DESC/, cur[3]);

              item = item.replace(/_USER/, cur[4]);

              item = item.replace(/_DATE/, cur[5]);

              var tagspan = '';

              if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{

                  tagspan = '<span class="logtags">';

                  if (cur[6][1]) \{

                      tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';

                      tagspan += cur[6][0] + '</span> ';

                  } else if (!cur[6][1] && cur[6][0] != 'default') \{

                      tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';

                      tagspan += cur[6][0] + '</span> ';

                  }

                  if (cur[7].length) \{

                      for (var t in cur[7]) \{

                          var tag = cur[7][t];

                          tagspan += '<span class="tagtag">' + tag + '</span> ';

                      }

                  }

                  if (cur[8].length) \{

                      for (var t in cur[8]) \{

                          var bookmark = cur[8][t];

                          tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';

                      }

                  }

                  tagspan += '</span>';

              }

              item = item.replace(/_TAGS/, tagspan);

              return [bg, item];

          }

          graph.render(data);

          // stop hiding script -->

          </script>

          <div class="page-path">

              <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>

              <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>

              | {changenav%navgraph}

          </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}: graph</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}"/>
				<!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
				</head>

				<body>
				<div id="container">
				<div class="page-header">
				<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / graph</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}changelog{sessionvars%urlparameter}">changelog</a></li>
				<li class="current">graph</li>
				<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				<li><a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a></li>
				<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<h2 class="no-link no-border">graph</h2>

				<div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
				<div id="wrapper">
				<ul id="nodebgs"></ul>
				<canvas id="graph" width="480" height="{canvasheight}"></canvas>
				<ul id="graphnodes"></ul>
				</div>

				<script>
				<!-- hide script content

				document.getElementById('noscript').style.display = 'none';

				var data = {jsdata\|json};
				var graph = new Graph();
				graph.scale({bg_height});

				var revlink = '<li style="_STYLE"><span class="desc">';
				revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
				revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>';

				graph.vertex = function(x, y, color, parity, cur) \{

				this.ctx.beginPath();
				color = this.setColor(color, 0.25, 0.75);
				this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
				this.ctx.fill();

				var bg = '<li class="bg parity' + parity + '"></li>';
				var left = (this.columns + 1) * this.bg_height;
				var nstyle = 'padding-left: ' + left + 'px;';
				var item = revlink.replace(/_STYLE/, nstyle);
				item = item.replace(/_PARITY/, 'parity' + parity);
				item = item.replace(/_NODEID/, cur[0]);
				item = item.replace(/_NODEID/, cur[0]);
				item = item.replace(/_DESC/, cur[3]);
				item = item.replace(/_USER/, cur[4]);
				item = item.replace(/_DATE/, cur[5]);

				var tagspan = '';
				if (cur[7].length \|\| cur[8].length \|\| (cur[6][0] != 'default' \|\| cur[6][1])) \{
				tagspan = '<span class="logtags">';
				if (cur[6][1]) \{
				tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
				tagspan += cur[6][0] + '</span> ';
				} else if (!cur[6][1] && cur[6][0] != 'default') \{
				tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
				tagspan += cur[6][0] + '</span> ';
				}
				if (cur[7].length) \{
				for (var t in cur[7]) \{
				var tag = cur[7][t];
				tagspan += '<span class="tagtag">' + tag + '</span> ';
				}
				}
				if (cur[8].length) \{
				for (var t in cur[8]) \{
				var bookmark = cur[8][t];
				tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
				}
				}
				tagspan += '</span>';
				}

				item = item.replace(/_TAGS/, tagspan);
				return [bg, item];

				}

				graph.render(data);

				// stop hiding script -->
				</script>

				<div class="page-path">
				<a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
				<a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
				\| {changenav%navgraph}
				</div>

				{footer}