##// END OF EJS Templates
changegroup: introduce requests to define delta generation...
changegroup: introduce requests to define delta generation Currently, we iterate through each revision we will be producing a delta for then call into 1 of 2 functions for generating that delta. Deltas are emitted as we iterate. A problem with this model is that revision generation is tightly coupled to the changegroup code. And the storage layer needs to expose APIs like deltaparent() so changegroup delta generation can produce a delta with that knowledge. Another problem is that in this model, deltas can only be produced sequentially after the previous delta was produced and emitted. Some storage backends might be capable of producing deltas in parallel (e.g. if the changegroup deltas are cached somewhere). This commit aims to solve these problems by turning delta generation into a 2 phase implementation where the first phase determines info about all the deltas that need to be generated and the 2nd phase resolves those deltas. We introduce a "revisiondeltarequest" object that holds data about a to-be-generated delta. We perform a full pass over all revisions whose delta is to be generated and generate a "revisiondeltarequest" for each. Then we iterate over the "revisiondeltarequest" instances and derive a "revisiondelta" for each. This patch was quite large. In order to avoid even more churn, aspects of the implementation are less than ideal. e.g. we're recording revision numbers instead of nodes in a few places and we don't yet have a formal API for resolving an iterable of revisiondeltarequest instances. Things will be improved in subsequent commits. Unfortunately, this commit reduces performance substantially. For `hg perfchangegroupchangelog` on my hg repo: ! wall 1.512607 comb 1.510000 user 1.490000 sys 0.020000 (best of 7) ! wall 2.150863 comb 2.150000 user 2.150000 sys 0.000000 (best of 5) And for `hg bundle -t none-v2 -a` for the mozilla-unified repo: 178.32user 4.22system 3:02.59elapsed 190.97user 4.17system 3:15.19elapsed Some of this was attributed to changelog slowdown. `hg perfchangegroupchangelog` on mozilla-unified: ! wall 21.688715 comb 21.690000 user 21.570000 sys 0.120000 (best of 3) ! wall 25.683659 comb 25.680000 user 25.540000 sys 0.140000 (best of 3) Profiling seems to reveal that the changelog slowdown is due to reading changelog revisions multiple times. First in the linknode callback to resolve the set of files changed. Second in the delta generation. Before, we likely had hit the last revision cache in the revlog when doing delta generation since we performed that immediately after performing the linknode callback. I'm not exactly sure where the other ~8s are being spent. It might be from overhead of constructing a few million revisiondeltarequest objects. I'm OK with the regression for now because it is in service of a larger cause (storage abstraction). I'll try to profile later and claw back the performance. Differential Revision: https://phab.mercurial-scm.org/D4215

File last commit:

r35792:854a7315 default
r39054:e793e11e default
Show More
ReadMe.html
162 lines | 4.6 KiB | text/html | HtmlLexer
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Mercurial for Windows</title>
Thomas Arendsen Hein
Remove trailing spaces
r5081 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
Lee Cantey
update windows readme to document msys/mingw rxvt problems.
r2091 <style type="text/css">
<!--
Martin Geisler
contrib/win32: add simple style sheet
r8441 html {
font-family: sans-serif;
margin: 1em 2em;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
pre {
margin: 0.25em 0em;
padding: 0.5em;
background-color: #EEE;
border: thin solid #CCC;
}
.indented {
padding-left: 10pt;
Lee Cantey
update windows readme to document msys/mingw rxvt problems.
r2091 }
-->
</style>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 </head>
<body>
Matt Mackall
Remove hard-coded version numbers and release notes from packaging
r3863 <h1>Mercurial for Windows</h1>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
<p>Welcome to Mercurial for Windows!</p>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
Mercurial is a command-line application. You must run it from
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 the Windows command prompt (or if you're hard core, a <a
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 href="http://www.mingw.org/">MinGW</a> shell).
</p>
Thomas Arendsen Hein
Remove trailing spaces
r5081
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p class="indented">
<i>Note: the standard <a href="http://www.mingw.org/">MinGW</a>
msys startup script uses rxvt which has problems setting up
standard input and output. Running bash directly works
correctly.</i>
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
For documentation, please visit the <a
Matt Mackall
urls: bulk-change primary website URLs
r26421 href="https://mercurial-scm.org/">Mercurial web site</a>.
Bryan O'Sullivan
Update binary installer files.
r4723 You can also download a free book, <a
Kevin Bullock
packaging: update book URL in Mac and Windows READMEs
r34922 href="https://book.mercurial-scm.org/">Mercurial: The Definitive
Martin Geisler
contrib/win32: updated title of the hgbook
r8440 Guide</a>.
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 </p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
By default, Mercurial installs to <tt>C:\Program
Files\Mercurial</tt>. The Mercurial command is called
<tt>hg.exe</tt>.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
<h1>Testing Mercurial after you've installed it</h1>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
The easiest way to check that Mercurial is installed properly is
to just type the following at the command prompt:
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
<pre>
hg
</pre>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
This command should print a useful help message. If it does,
other Mercurial commands should work fine for you.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Lee Cantey
Add section for configuration notes with initial note about the default editor
r2307 <h1>Configuration notes</h1>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <h4>Default editor</h4>
<p>
The default editor for commit messages is 'notepad'. You can set
Martin Geisler
contrib/win32: format file names and env vars with <tt>
r8439 the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable
to specify your preference or set it in <tt>mercurial.ini</tt>:
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 </p>
Lee Cantey
Update configuration note with mercurial.ini change from Thomas
r2321 <pre>
[ui]
editor = whatever
</pre>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <h4>Configuring a Merge program</h4>
<p>
It should be emphasized that Mercurial by itself doesn't attempt
to do a Merge at the file level, neither does it make any
attempt to Resolve the conflicts.
</p>
Lee Cantey
Add notes about configuring a merge program
r4386
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
By default, Mercurial will use the merge program defined by the
Martin Geisler
contrib/win32: format file names and env vars with <tt>
r8439 <tt>HGMERGE</tt> environment variable, or uses the one defined
in the <tt>mercurial.ini</tt> file. (see <a
Matt Mackall
urls: bulk-change primary website URLs
r26421 href="https://mercurial-scm.org/wiki/MergeProgram">MergeProgram</a>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 on the Mercurial Wiki for more information)
</p>
Lee Cantey
Add section for configuration notes with initial note about the default editor
r2307
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 <h1>Reporting problems</h1>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
Before you report any problems, please consult the <a
Matt Mackall
urls: bulk-change primary website URLs
r26421 href="https://mercurial-scm.org/">Mercurial web site</a>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 and see if your question is already in our list of <a
Matt Mackall
urls: bulk-change primary website URLs
r26421 href="https://mercurial-scm.org/wiki/FAQ">Frequently
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 Answered Questions</a> (the "FAQ").
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
If you cannot find an answer to your question, please feel free
to send mail to the Mercurial mailing list, at <a
av6
win32: update link to mailing list in readme
r29666 href="mailto:mercurial@mercurial-scm.org">mercurial@mercurial-scm.org</a>.
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 <b>Remember</b>, the more useful information you include in your
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 report, the easier it will be for us to help you!
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
If you are IRC-savvy, that's usually the fastest way to get
help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
<h1>Author and copyright information</h1>
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
Mercurial was written by <a href="http://www.selenic.com">Matt
Mackall</a>, and is maintained by Matt and a team of volunteers.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
The Windows installer was written by <a
href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
av6
copyright: update to 2018...
r35792 Mercurial is Copyright 2005-2018 Matt Mackall and others. See
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 the <tt>Contributors.txt</tt> file for a list of contributors.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
Mercurial is free software; you can redistribute it and/or
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 modify it under the terms of the <a
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
Matt Mackall
Update license to GPLv2+
r10263 General Public License version 2</a> or any later version.
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 </p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288
Martin Geisler
contrib/win32: indent and word wrap consistently
r8438 <p>
Mercurial is distributed in the hope that it will be useful, but
<b>without any warranty</b>; without even the implied warranty
of <b>merchantability</b> or <b>fitness for a particular
purpose</b>. See the GNU General Public License for more
details.
</p>
Bryan O'Sullivan
Turn the win32 README into a HTML file for now.
r1288 </body>
</html>