facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity
A Scalable, User-Friendly Source Control System.
24,205 Commits 24 Branches 62 Tags 323 MiB
Rust 45.1%
Python 20.7%
C++ 10.5%
Perl 9.1%
TypeScript 7.4%
Other 7%
c8659cbb76
Go to file
Mads Kiilerich c8659cbb76 convert: optimize convert of files that are unmodified from p2 in merges 
Conversion of a merge starts with p1 and re-adds the files that were changed in
the merge or came unmodified from p2. Files that are unmodified from p1 will
thus not be touched and take no time. Files that are unmodified from p2 would be
retrieved and rehashed. They would end up getting the same hash as in p2 and end
up reusing the filelog entry and look like the p1 case ... but it was slow.

Instead, make getchanges also return 'files that are unmodified from p2' so the
sink can reuse the existing p2 entry instead of calling getfile.

Reuse of filelog entries can make a big difference when files are big and with
long revlong chains so they take time to retrieve and hash, or when using an
expensive custom getfile function (think
http://mercurial.selenic.com/wiki/ConvertExtension#Customization with a code
reformatter).

This in combination with changes to reuse filectx entries in
localrepo._filecommit make 'unchanged from p2' almost as fast as 'unchanged
from p1'.

This is so far only implemented for the combination of hg source and hg sink.

This is a refactoring/optimization. It is covered by existing tests and show no
changes - which is a good thing.
2015-03-19 17:40:19 +01:00
contrib contrib: remove the now useless lock-checker.py extension 2015-03-10 21:25:11 -07:00
doc spelling: fixes from proofreading of spell checker issues 2015-01-18 02:38:57 +01:00
hgext convert: optimize convert of files that are unmodified from p2 in merges 2015-03-19 17:40:19 +01:00
i18n style: kill ersatz if-else ternary operators 2015-03-13 17:00:06 -04:00
mercurial localrepo: reuse commit of parent filectx entries without rehashing 2015-03-19 17:36:17 +01:00
tests tests: avoid deprecation warning 2015-03-19 15:21:08 -05:00
.hgignore hgignore: ignore the PyCharm workspace folder 2014-10-13 11:46:04 +02:00
.hgsigs Added signature for changeset f515b8dd4d3f 2015-03-02 10:29:45 -06:00
CONTRIBUTORS Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
COPYING COPYING: refresh with current address from fsf.org 2011-06-02 11:17:02 -05:00
hg hg: add support for HGUNICODEPEDANTRY environment variable 2014-06-23 09:33:07 -04:00
hgeditor Fixed a bashism with the use of $RANDOM in hgeditor. 2010-05-19 18:06:35 +02:00
hgweb.cgi mq: add a warning about uncommitted changes for qfinish 2011-11-10 15:40:34 -06:00
Makefile Makefile: allow setting HGTESTFLAGS in shell environment for TESTFLAGS 2015-02-04 15:17:13 -05:00
README readme: mention how to run in-place 2012-03-02 21:43:55 +02:00
setup.py manifest.c: new extension code to lazily parse manifests 2015-01-13 14:31:38 -08:00

README 

Mercurial
=========

Mercurial is a fast, easy to use, distributed revision control tool
for software developers.

Basic install:

 $ make            # see install targets
 $ make install    # do a system-wide install
 $ hg debuginstall # sanity-check setup
 $ hg              # see help

Running without installing:

 $ make local      # build for inplace usage
 $ ./hg --version  # should show the latest version

See http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.