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

zeroconf: forward all arguments passed to ui.configitems() wrapper...

zeroconf: forward all arguments passed to ui.configitems() wrapper added 'ignoresub' argument to ui.configitems(), but zeroconf wrapper wasn't updated. It caused the following crash: Traceback (most recent call last): File "bin/hg", line 43, in <module> mercurial.dispatch.run() File "lib/python/mercurial/dispatch.py", line 54, in run sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) File "lib/python/mercurial/dispatch.py", line 120, in dispatch ret = _runcatch(req) File "lib/python/mercurial/dispatch.py", line 191, in _runcatch return _dispatch(req) File "lib/python/mercurial/dispatch.py", line 924, in _dispatch cmdpats, cmdoptions) File "lib/python/mercurial/dispatch.py", line 681, in runcommand ret = _runcommand(ui, options, cmd, d) File "lib/python/mercurial/extensions.py", line 195, in closure return func(*(args + a), **kw) File "lib/python/hgext/zeroconf/__init__.py", line 180, in cleanupafterdispatch return orig(ui, options, cmd, cmdfunc) File "lib/python/mercurial/dispatch.py", line 1055, in _runcommand return checkargs() File "lib/python/mercurial/dispatch.py", line 1015, in checkargs return cmdfunc() File "lib/python/mercurial/dispatch.py", line 921, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) File "lib/python/mercurial/util.py", line 991, in check return func(*args, **kwargs) File "lib/python/mercurial/commands.py", line 5405, in paths pathitems = sorted(ui.paths.iteritems()) File "lib/python/mercurial/util.py", line 723, in __get__ result = self.func(obj) File "lib/python/mercurial/ui.py", line 619, in paths return paths(self) File "lib/python/mercurial/ui.py", line 1099, in __init__ for name, loc in ui.configitems('paths', ignoresub=True): File "lib/python/mercurial/extensions.py", line 195, in closure return func(*(args + a), **kw) TypeError: configitems() got an unexpected keyword argument 'ignoresub' We have no test coverage for zeroconf, so I've added a minimal test that could reproduce this problem.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r27913:91ac8cb7 stable


                r28038:72f2a19c

stable

Download file

             graph.tmpl
        
                    118 lines
            
             | 4.6 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|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}"/>

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

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>

              <form action="{url|urlescape}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|urlescape}summary{sessionvars%urlparameter}">summary</a></li>

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

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

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

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

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

                  <li><a href="{url|urlescape}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="{canvaswidth}" 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});

          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.bg_height - this.box_size) + (this.columns + 1) * this.box_size;

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

              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>';

              }

              var item = '<li style="' + nstyle + '"><span class="desc">';

              item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';

              item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

              return [bg, item];

          }

          graph.render(data);

          // stop hiding script -->

          </script>

          <div class="page-path">

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

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

              | {changenav%navgraph}

          </div>

          <script type="text/javascript">

          ajaxScrollInit(

                  '{url|urlescape}graph/{rev}?revcount=%next%&style={style}',

                  {revcount}+60,

                  function (htmlText, previousVal) \{ return previousVal + 60; },

                  '#wrapper',

                  '<div class="%class%" style="text-align: center;">%text%</div>',

                  'graph'

          );

          </script>

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

				<body>
				<div id="container">
				<div class="page-header">
				<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / graph</h1>

				<form action="{url\|urlescape}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\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
				<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
				<li><a href="{url\|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
				<li class="current">graph</li>
				<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>
				<li><a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
				<li><a href="{url\|urlescape}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="{canvaswidth}" 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});

				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.bg_height - this.box_size) + (this.columns + 1) * this.box_size;
				var nstyle = 'padding-left: ' + left + 'px;';

				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>';
				}

				var item = '<li style="' + nstyle + '"><span class="desc">';
				item += '<a href="{url\|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>';
				item += '</span>' + tagspan + '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>';

				return [bg, item];

				}

				graph.render(data);

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

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

				<script type="text/javascript">
				ajaxScrollInit(
				'{url\|urlescape}graph/{rev}?revcount=%next%&style={style}',
				{revcount}+60,
				function (htmlText, previousVal) \{ return previousVal + 60; },
				'#wrapper',
				'<div class="%class%" style="text-align: center;">%text%</div>',
				'graph'
				);
				</script>

				{footer}