##// END OF EJS Templates
copies: move from a copy on branchpoint to a copy on write approach...
copies: move from a copy on branchpoint to a copy on write approach Before this changes, any branch points results in a copy of the dictionary containing the copy information. This can be very costly for branchy history with few rename information. Instead, we take a "copy on write" approach. Copying the input data only when we are about to update them. In practice we where already doing the copying in half of these case (because `_chain` makes a copy), so we don't add a significant cost here even in the linear case. However the speed up in branchy case is very significant. Here are some timing on the pypy repository. revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29 before: ! wall 1.399863 comb 1.400000 user 1.370000 sys 0.030000 (median of 10) after: ! wall 0.766453 comb 0.770000 user 0.750000 sys 0.020000 (median of 11) revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2 before: ! wall 1.876748 comb 1.890000 user 1.870000 sys 0.020000 (median of 10) after: ! wall 1.167223 comb 1.170000 user 1.150000 sys 0.020000 (median of 10) revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0 before: ! wall 0.242457 comb 0.240000 user 0.240000 sys 0.000000 (median of 39) after: ! wall 0.211476 comb 0.210000 user 0.210000 sys 0.000000 (median of 45) revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f before: ! wall 0.013193 comb 0.020000 user 0.020000 sys 0.000000 (median of 224) after: ! wall 0.013290 comb 0.010000 user 0.010000 sys 0.000000 (median of 222) revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63 before: ! wall 0.001673 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000) after: ! wall 0.001677 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000) revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e before: ! wall 0.000119 comb 0.000000 user 0.000000 sys 0.000000 (median of 8023) after: ! wall 0.000119 comb 0.000000 user 0.000000 sys 0.000000 (median of 7997) revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe before: ! wall 0.201898 comb 0.210000 user 0.200000 sys 0.010000 (median of 48) after: ! wall 0.167415 comb 0.170000 user 0.160000 sys 0.010000 (median of 58) revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d before: ! wall 0.036820 comb 0.040000 user 0.040000 sys 0.000000 (median of 100) after: ! wall 0.035797 comb 0.040000 user 0.040000 sys 0.000000 (median of 100) The extra cost in the linear case can be reclaimed later with some extra logic. Differential Revision: https://phab.mercurial-scm.org/D7124

File last commit:

r41534:8427fea0 stable
r43594:ffd04bc9 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 2019...
r41534 Mercurial is Copyright 2005-2019 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>