upstream/mercurial-mirror Files · mercurial/templates/paper/changeset.tmpl

xdiff: add a preprocessing step that trims files...

xdiff: add a preprocessing step that trims files xdiff has a `xdl_trim_ends` step that removes common lines, unmatchable lines. That is in theory good, but happens too late - after splitting, hashing, and adjusting the hash values so they are unique. Those splitting, hashing and adjusting hash values steps could have noticeable overhead. Diffing two large files with minor (one-line-ish) changes are not uncommon. In that case, the raw performance of those preparation steps seriously matter. Even allocating an O(N) array and storing line offsets to it is expensive. Therefore my previous attempts [1] [2] cannot be good enough since they do not remove the O(N) array assignment. This patch adds a preprocessing step - `xdl_trim_files` that runs before other preprocessing steps. It counts common prefix and suffix and lines in them (needed for displaying line number), without doing anything else. Testing with a crafted large (169MB) file, with minor change: ``` open('a','w').write(''.join('%s\n' % (i % 100000) for i in xrange(30000000) if i != 6000000)) open('b','w').write(''.join('%s\n' % (i % 100000) for i in xrange(30000000) if i != 6003000)) ``` Running xdiff by a simple binary [3], this patch improves the xdiff perf by more than 10x for the above case: ``` # xdiff before this patch 2.41s user 1.13s system 98% cpu 3.592 total # xdiff after this patch 0.14s user 0.16s system 98% cpu 0.309 total # gnu diffutils 0.12s user 0.15s system 98% cpu 0.272 total # (best of 20 runs) ``` It's still slightly slower than GNU diffutils. But it's pretty close now. Testing with real repo data: For the whole repo, this patch makes xdiff 25% faster: ``` # hg perfbdiff --count 100 --alldata -c --blocks [--xdiff] # xdiff, after ! wall 0.058861 comb 0.050000 user 0.050000 sys 0.000000 (best of 100) # xdiff, before ! wall 0.077816 comb 0.080000 user 0.080000 sys 0.000000 (best of 91) # bdiff ! wall 0.117473 comb 0.120000 user 0.120000 sys 0.000000 (best of 67) ``` For files that are long (ex. commands.py), the speedup is more than 3x, very significant: ``` # hg perfbdiff --count 3000 --blocks commands.py.i 1 [--xdiff] # xdiff, after ! wall 0.690583 comb 0.690000 user 0.690000 sys 0.000000 (best of 12) # xdiff, before ! wall 2.240361 comb 2.210000 user 2.210000 sys 0.000000 (best of 4) # bdiff ! wall 2.469852 comb 2.440000 user 2.440000 sys 0.000000 (best of 4) ``` [1]: https://phab.mercurial-scm.org/D2631 [2]: https://phab.mercurial-scm.org/D2634 [3]: ``` // Code to run xdiff from command line. No proper error handling. #include <stdlib.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include "mercurial/thirdparty/xdiff/xdiff.h" #define ensure(x) if (!(x)) exit(255); mmfile_t readfile(const char *path) { struct stat st; int fd = open(path, O_RDONLY); fstat(fd, &st); mmfile_t file = { malloc(st.st_size), st.st_size }; ensure(read(fd, file.ptr, st.st_size) == st.st_size); close(fd); return file; } int main(int argc, char const *argv[]) { mmfile_t a = readfile(argv[1]), b = readfile(argv[2]); xpparam_t xpp = {0}; xdemitconf_t xecfg = {0}; xdemitcb_t ecb = {0}; xdl_diff(&a, &b, &xpp, &xecfg, &ecb); return 0; } ``` Differential Revision: https://phab.mercurial-scm.org/D2686

av6 - - Load All Authors

File last commit:

r36340:f3fd4fe0 default


                r36838:f33a87cf

default

Download file

             changeset.tmpl
        
                    91 lines
            
             | 2.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / changeset.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>{repo|escape}: {node|short}</title>

      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

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

              r9999
            
      </div>

      <ul>

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

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

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

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

              r9999
            
      </ul>

      <ul>

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

        av6
    
hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...

              r25606
            
       <li><a href="{url|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">raw</a></li>

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

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

              r9999
            
      </ul>

      <ul>

       {archives%archiveentry}

      </ul>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </ul>

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

              r9999
            
      </div>

      <div class="main">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

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

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      <h3>

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

        av6
    
hgweb: move changeset "tags" to a template in map file (paper and coal)...

              r35055
            
       {alltags}

        av6
    
hgweb: link to revision by node hash in paper & coal...

              r25617
            
      </h3>

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

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for paper...

              r32758
            
      {searchform}

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

              r9999
            
        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

              r18628
            
      <div class="description">{desc|strip|escape|websub|nonempty}</div>

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

              r9999
            
      <table id="changesetEntry">

      <tr>

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

       <td class="author">{author|obfuscate}</td>

      </tr>

      <tr>

       <th class="date">date</th>

        Anton Shestakov
    
hgweb: clearly outline <tr> block in paper/changeset.tmpl...

              r24130
            
       <td class="date age">{date|rfc822date}</td>

      </tr>

        av6
    
hgweb: display fate of obsolete changesets...

              r35501
            
      {if(obsolete, '<tr>

       <th>obsolete</th>

        av6
    
hgweb: show each obsfateentry on its own line...

              r36340
            
       <td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>

        av6
    
hgweb: display fate of obsolete changesets...

              r35501
            
      </tr>')}

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

              r9999
            
      <tr>

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

        Anton Shestakov
    
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

              r23740
            
       <td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>

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

              r9999
            
      </tr>

      <tr>

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

       <td class="author">{child%changesetchild}</td>

      </tr>

      <tr>

       <th class="files">files</th>

       <td class="files">{files}</td>

      </tr>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
      <tr>

        <th class="diffstat">diffstat</th>

        <td class="diffstat">

          {diffsummary}

        Anton Shestakov
    
hgweb: fix diffstat links in paper/changeset.tmpl...

              r23831
            
          <a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
          <div id="diffstatdetails" style="display:none;">

        Anton Shestakov
    
hgweb: fix diffstat links in paper/changeset.tmpl...

              r23831
            
            <a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>

        Anton Shestakov
    
hgweb: use css margin instead of empty <p> before diffstat table...

              r24042
            
            <table class="diffstat-table stripes2">{diffstat}</table>

        Steven Brown
    
paper, coal: display diffstat on the changeset page...

              r14571
            
          </div>

        </td>

      </tr>

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

              r9999
            
      </table>

      <div class="overflow">

        Alexander Plavin
    
hgweb: add line wrapping switch to file diff and changeset views

              r19433
            
      <div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      <div class="sourcefirst"> line diff</div>

      <div class="stripes2 diffblocks">

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

              r9999
            
      {diff}

      </div>

        Alexander Plavin
    
hgweb: file diff and changesets views behave like file source view...

              r19432
            
      </div>

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

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {node\|short}</title>
		</head>
		<body>
		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
		<ul>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
		<li class="active">changeset</li>
av6 hgweb: don't dereference symbolic revision in paper & coal style (issue2296)...	r25606	<li><a href="{url\|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">raw</a></li>
		<li><a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">browse</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		<ul>
		{archives%archiveentry}
		</ul>
Augie Fackler web: add a help view for getting hg help output	r12666	<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Augie Fackler web: add a help view for getting hg help output	r12666	</ul>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="main">

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
av6 hgweb: link to revision by node hash in paper & coal...	r25617	<h3>
		changeset {rev}:<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a>
av6 hgweb: move changeset "tags" to a template in map file (paper and coal)...	r35055	{alltags}
av6 hgweb: link to revision by node hash in paper & coal...	r25617	</h3>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for paper...	r32758	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<div class="description">{desc\|strip\|escape\|websub\|nonempty}</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table id="changesetEntry">
		<tr>
		<th class="author">author</th>
		<td class="author">{author\|obfuscate}</td>
		</tr>
		<tr>
		<th class="date">date</th>
Anton Shestakov hgweb: clearly outline <tr> block in paper/changeset.tmpl...	r24130	<td class="date age">{date\|rfc822date}</td>
		</tr>
av6 hgweb: display fate of obsolete changesets...	r35501	{if(obsolete, '<tr>
		<th>obsolete</th>
av6 hgweb: show each obsfateentry on its own line...	r36340	<td>{join(succsandmarkers%obsfateentry, '<br>\n')}</td>
av6 hgweb: display fate of obsolete changesets...	r35501	</tr>')}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<tr>
		<th class="author">parents</th>
Anton Shestakov hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...	r23740	<td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</tr>
		<tr>
		<th class="author">children</th>
		<td class="author">{child%changesetchild}</td>
		</tr>
		<tr>
		<th class="files">files</th>
		<td class="files">{files}</td>
		</tr>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	<tr>
		<th class="diffstat">diffstat</th>
		<td class="diffstat">
		{diffsummary}
Anton Shestakov hgweb: fix diffstat links in paper/changeset.tmpl...	r23831	<a id="diffstatexpand" href="javascript:toggleDiffstat()">[<tt>+</tt>]</a>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	<div id="diffstatdetails" style="display:none;">
Anton Shestakov hgweb: fix diffstat links in paper/changeset.tmpl...	r23831	<a href="javascript:toggleDiffstat()">[<tt>-</tt>]</a>
Anton Shestakov hgweb: use css margin instead of empty <p> before diffstat table...	r24042	<table class="diffstat-table stripes2">{diffstat}</table>
Steven Brown paper, coal: display diffstat on the changeset page...	r14571	</div>
		</td>
		</tr>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</table>

		<div class="overflow">
Alexander Plavin hgweb: add line wrapping switch to file diff and changeset views	r19433	<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	<div class="sourcefirst"> line diff</div>
		<div class="stripes2 diffblocks">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{diff}
		</div>
Alexander Plavin hgweb: file diff and changesets views behave like file source view...	r19432	</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		</div>
		</div>
		{footer}