upstream/mercurial-mirror Files · mercurial/templates/paper/shortlog.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.

av6 - - Load All Authors

File last commit:

r25606:3bb6f5f4 default


                r28038:72f2a19c

stable

Download file

             shortlog.tmpl
        
                    93 lines
            
             | 2.8 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

      <div class="menu">

      <div class="logo">

      <a href="{logourl}">

      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

      </div>

      <ul>

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

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

      </ul>

      <ul>

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

      </ul>

      <ul>

      {archives%archiveentry}

      </ul>

      <ul>

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

      </ul>

      <div class="atom-logo">

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

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

      </a>

      </div>

      </div>

      <div class="main">

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

      <h3>log</h3>

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

      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" value="{query|escape}" /></p>

      <div id="hint">{searchhint}</div>

      </form>

      <div class="navigate">

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

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

      | rev {rev}: {changenav%navshort}

      </div>

      <table class="bigtable">

      <thead>

       <tr>

        <th class="age">age</th>

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

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

       </tr>

      </thead>

      <tbody class="stripes2">

      {entries%shortlogentry}

      </tbody>

      </table>

      <div class="navigate">

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

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

      | rev {rev}: {changenav%navshort}

      </div>

      <script type="text/javascript">

          ajaxScrollInit(

                  '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}',

                  '{nextentry%"{node}"}', <!-- NEXTHASH

                  function (htmlText, previousVal) \{

                      var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);

                      return m ? m[1] : null;

                  },

                  '.bigtable > tbody',

                  '<tr class="%class%">\\

                  <td colspan="3" style="text-align: center;">%text%</td>\\

                  </tr>'

          );

      </script>

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

				{header}
				<title>{repo\|escape}: log</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="container">
				<div class="menu">
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
				</div>
				<ul>
				<li class="active">log</li>
				<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></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>
				</ul>
				<ul>
				<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>
				</ul>
				<ul>
				{archives%archiveentry}
				</ul>
				<ul>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				<div class="atom-logo">
				<a href="{url\|urlescape}atom-log" title="subscribe to atom feed">
				<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed" />
				</a>
				</div>
				</div>

				<div class="main">
				<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
				<h3>log</h3>

				<form class="search" action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p><input name="rev" id="search1" type="text" size="30" value="{query\|escape}" /></p>
				<div id="hint">{searchhint}</div>
				</form>

				<div class="navigate">
				<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a>
				\| rev {rev}: {changenav%navshort}
				</div>

				<table class="bigtable">
				<thead>
				<tr>
				<th class="age">age</th>
				<th class="author">author</th>
				<th class="description">description</th>
				</tr>
				</thead>
				<tbody class="stripes2">
				{entries%shortlogentry}
				</tbody>
				</table>

				<div class="navigate">
				<a href="{url\|urlescape}shortlog/{symrev}{lessvars%urlparameter}">less</a>
				<a href="{url\|urlescape}shortlog/{symrev}{morevars%urlparameter}">more</a>
				\| rev {rev}: {changenav%navshort}
				</div>

				<script type="text/javascript">
				ajaxScrollInit(
				'{url\|urlescape}shortlog/%next%{sessionvars%urlparameter}',
				'{nextentry%"{node}"}', <!-- NEXTHASH
				function (htmlText, previousVal) \{
				var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
				return m ? m[1] : null;
				},
				'.bigtable > tbody',
				'<tr class="%class%">\\
				<td colspan="3" style="text-align: center;">%text%</td>\\
				</tr>'
				);
				</script>

				</div>
				</div>

				{footer}