Matt Mackall <mpm@selenic.com> [Fri, 18 Jul 2014 17:52:18 -0500] rev 21919
run-tests: make --view work again
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jul 2014 02:56:41 +0900] rev 21918
filemerge: use 'basic' as the default of '[ui] mergemarkers' for safety
Before this patch, 'detailed' is used as the default of '[ui]
mergemarkers'. This embeds non-ASCII characters in tags, branches,
bookmarks, author and/or commit descriptions into merged files in the
encoding specified by '--encoding' global option, 'HGENCODING' or
other locale setting environment variables.
But, if files to be merged use another encoding, this behavior breaks
consistency of encoding in merged files.
For example, ISO-2022-JP or EUC-JP are sometimes used as the file
encoding for Japanese characters, because of historical and/or
environmental reasons, even though UTF-8 or Shift-JIS are ordinarily
used as the terminal encoding.
This can't be resolved automatically, because Mercurial doesn't aware
encoding of managed files.
This patch uses 'basic' as the default of '[ui] mergemarkers' to avoid
embedding encoding sensitive characters for safety.
This patch puts '[ui] mergemarkers = detailed' into default hgrc file
for tests, to reduce changes for tests in this patch.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 17 Jul 2014 20:17:17 -0400] rev 21917
largefiles: avoid unnecessary creation of .hg/largefiles when opening lfdirstate
Previously, the directory '.hg/largefiles' would always be created if it didn't
exist when the lfdirstate was opened. If there were no standin files, no
dirstate file would be created in the directory. The end result was that
enabling the largefiles extension globally, but not explicitly adding a
largefile would result in the repository eventually sprouting this directory.
Creation of this directory effectively changes readonly operations like summary
and status into operations that require write access. Without write access,
commands that would succeed without the extension loaded would abort with a
surprising error when the extension is loaded, but not actively used:
$ hg sum -R /tmp/thg --config extensions.largefiles=
parent: 16541:
00dc703d5aed
repowidget: specify incoming bundle by plain file path to avoid url parsing
branch: default
abort: Permission denied: '/tmp/thg/.hg/largefiles'
This change is simpler than changing the callers of openlfdirstate() to use the
'create' parameter that was introduced in
ae57920ac188, and probably how that
should have been implemented in the first place.
Augie Fackler <raf@durin42.com> [Tue, 05 Nov 2013 14:47:35 -0500] rev 21916
run-tests: write out scripts in binary mode
Caught because Python 3 refuses to write bytes to a non-binary fd.
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 15:34:50 -0700] rev 21915
match: use util.re.escape instead of re.escape
For a pathological .hgignore with over 2500 glob lines and over 200000 calls to
re.escape, and with re2 available, this speeds up parsing the .hgignore from
0.75 seconds to 0.20 seconds. This causes e.g. 'hg status' with hgwatchman
enabled to go from 1.02 seconds to 0.47 seconds.
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 15:14:45 -0700] rev 21914
util.re: add an escape method
The escape method in at least one of the modules called 're2' is in C. This
means it is significantly faster than the Python code written in 're'.
An upcoming patch will have benchmarks.
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 15:01:52 -0700] rev 21913
util.re: move check for re2 into a separate method
We're going to use the same check for another method in an upcoming patch.
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:52:40 -0700] rev 21912
util: remove no longer used compilere
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:52:22 -0700] rev 21911
commands: use util.re.compile instead of util.compilere
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:50:58 -0700] rev 21910
config: use util.re.compile instead of util.compilere
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:49:45 -0700] rev 21909
match: use util.re.compile instead of util.compilere
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:40:43 -0700] rev 21908
util: move compilere to a class
We do this to allow us to use descriptors for other related methods.
For now, util.compilere does the same thing. Upcoming patches will remove it.
Siddharth Agarwal <sid0@fb.com> [Tue, 15 Jul 2014 14:35:19 -0700] rev 21907
util: rename 're' to 'remod'
Upcoming patches will introduce a binding called 're'.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 02 Jul 2014 15:47:39 +0200] rev 21906
bundle2-push: drop _pushbundle2extraparts
All core user are now using the new way. We drop the old way.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 02 Jul 2014 16:10:14 +0200] rev 21905
bundle2-test: use the new way to extend push content
The only core user of the old way were tests. We update them.