Greg Ward
5495f8a314
shrink-revlog: rename some local variables for consistency.
2010-03-09 21:30:19 -05:00
Greg Ward
b1905b686f
shrink-revlog: instrument sort code to record statistics.
...
Notably, count "suboptimal" nodes (predecessor is not first parent)
and (with -v) report them at the end of the run.
2010-03-09 21:13:39 -05:00
Patrick Mezard
86436bee09
Merge with crew-stable
2010-03-09 22:18:37 +01:00
Patrick Mezard
5f49cde57a
convert: handle svn tree with empty roots (issue2079)
2010-03-09 22:11:43 +01:00
Benoit Boissinot
812d07b742
merge with stable
2010-03-09 20:47:35 +01:00
Benoit Boissinot
65a86e1b8e
bundle: fix bundle generation for empty changegroup
2010-03-09 20:38:23 +01:00
Benoit Boissinot
5af4a60795
patch/diff: move diff related code next to each other
2010-03-09 19:04:18 +01:00
Benoit Boissinot
621e9c06bf
remove header handling out of mdiff.bunidiff, rename it
2010-03-09 18:31:57 +01:00
Benoit Boissinot
dff5eacc8e
remove contrib/hgdiff, it makes refactoring diff/patch harder
...
it can always be revived if needed
2010-03-09 18:27:02 +01:00
Dirkjan Ochtman
8ea7020d75
demandimport: blacklist _ssl (issue1964)
2010-03-09 16:03:57 +01:00
Benoit Boissinot
04d99f9fbc
patch/diff: move patch.export() to cmdutil.export()
...
This API change will allow us to break a cycle between patch and cmdutil.
2010-03-08 19:43:24 +01:00
Steve Borho
5e4444fb42
wix: pre-check the 'I approve this license' checkbox
...
This is simply a convenience to the user, they can click next until the
installer goes away. Optimally, the checkbox would be hidden or removed,
but that requires rewriting the UI.
2010-03-08 11:12:48 -06:00
Matt Mackall
d003bb863e
Merge with stable
2010-03-07 22:04:35 -06:00
Benoit Boissinot
7c20de57d6
addremove: avoid fetching data again and again
2010-03-08 00:01:12 +01:00
Benoit Boissinot
467b4c41ef
addremove: add progress support for similarity search
2010-03-08 00:00:03 +01:00
Benoit Boissinot
fe5ad60ee3
addremove: atomically update the dirstate
...
In case someone hits ^C during the similarity search, properly rollback
2010-03-07 23:59:28 +01:00
Greg Ward
f43d8c7735
inotify: expose the same dirstate.status() interface as dirstate.
...
The real dirstate.status() does not have any keyword args. For
consistency, wrappers or subclasses should not have them either.
2010-03-07 13:10:23 -05:00
Christian Ebert
540e13ee5e
keyword: remove spurious locks, improve handling of wlock
...
- kwcommitctx is inside the wlock of repo.commit: no lock
- _kwfwrite only needs wlock
wlock outside try block, so we don't need to import lock.release
_kwfwrite should even be safer that way, as we moved the status
call inside the try-except block.
Thanks to Benoit Boissinot for help.
2010-03-07 13:03:03 +01:00
Christian Ebert
a54f17c396
keyword: use status' names instead of index
2010-03-07 13:03:03 +01:00
Benoit Boissinot
d40d4a3c0e
hgweb/graph: edge should be same color as the destination
2010-03-07 17:44:43 +01:00
Benoit Boissinot
10e5d90501
templatefilters: store the agescales in reverseorder directly
2010-03-06 13:29:54 +01:00
Benoit Boissinot
e13b5a5439
hgweb: separate generation of entries and sorting (cleanup)
2010-03-06 12:45:14 +01:00
Matt Mackall
4ad7bbe193
Added signature for changeset 5de69f546cce
2010-03-05 18:26:13 -06:00
Matt Mackall
84afa4dd8f
mq: drop -Q in favor of --mq only
2010-03-05 17:24:52 -06:00
Sune Foldager
12da123bee
mq: correct test output
2010-03-05 12:27:23 +01:00
Sune Foldager
533ddd28b6
mq: disallow : in patch names (issue2065)
2010-03-05 10:49:56 +01:00
Sune Foldager
868689388b
mq: disallow # (and : on Windows) in patch names (issue2065)
2010-03-04 14:23:54 +01:00
Sune Foldager
2600e9adfd
Merge with stable
2010-03-04 13:11:29 +01:00
Sune Foldager
b18c5efa94
win32/hgwebdir_wsgi: clarify documentation and clean up script a bit
2010-03-04 13:10:48 +01:00
Martin Geisler
44f5ed50bc
Merge with hg-i18n
2010-03-04 10:05:12 +01:00
Jens Bäckman
1ec358519d
i18n-sv: translated bisect, dates, locate, manifest
2010-03-04 07:34:22 +01:00
FUJIWARA Katsunori
bfcf4becb4
i18n-ja: synchronized with 1116f5493f5b
2010-03-04 11:56:53 +09:00
Steve Borho
b62e9661c6
test-fetch: use relative URL to avoid echoing TMP path
2010-03-03 17:37:50 -06:00
Wagner Bruna
45f6e50210
i18n-pt_BR: synchronized with 338a8a6aee57
2010-03-03 18:46:22 -03:00
Sune Foldager
ff514439e6
fetch: fix newheads calculation (issue2047)
2010-03-03 22:32:51 +01:00
Thomas Arendsen Hein
20c8c9dcb9
Make annotate --follow an alias for -f/--file to behave like in older versions
...
Since 461b5218840e annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
2010-03-03 22:04:59 +01:00
Martin Geisler
ef18417e98
win32/hgwebdir_wsgi: clarify copyright license
2010-03-03 20:35:20 +01:00
Adrian Buehlmann
48a03e4f27
store: only add new entries to the fncache file
...
Newly added fncache entries were not added to the in-memory cache,
making it possible for 'hg convert' to cause duplicates in
.hg/store/fncache.
Duplicates in the fncache file are harmless, but excessive numbers
of duplicates from large converted repositories may slow down
execution speed considerably.
2010-03-03 14:50:35 +01:00
Thomas Arendsen Hein
1c68d90cec
Updated test output of test-convert-baz after bfc8a096e3db
2010-03-03 16:00:02 +01:00
Thomas Arendsen Hein
7c30fd48c7
trailing spaces (and one stray tab)
2010-03-03 15:37:41 +01:00
Sune Foldager
c997398f3f
Merge with stable
2010-03-03 14:43:27 +01:00
Sune Foldager
a27039877b
add wsgi script for Microsoft IIS with isapi-wsgi
2010-03-03 14:42:43 +01:00
Martin Geisler
01d542a46d
doc/ja: remove old Japanese man page translations
...
They were added way back in 2005 and haven't been updated since. They
are no longer referenced by the Makefiles at upper levels and have not
been shipped with a recent version of Mercurial.
2010-03-02 21:34:24 +01:00
Martin Geisler
e1bcd68962
Merge with hg-i18n
2010-03-02 20:58:58 +01:00
Jens Bäckman
447526b443
i18n-sv: synchronized with 170c6b9d107d
2010-03-02 18:36:37 +01:00
Yuya Nishihara
56bfdbef10
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
...
HGPLAIN should suppress them because they change Mercurial's default
output.
2010-03-03 00:12:05 +09:00
Wagner Bruna
5dc625355a
i18n-pt_BR: synchronized with 64ba5d075415
2010-03-02 11:12:14 -03:00
Martin Geisler
549b358caa
Merge with hg-i18n
2010-03-02 10:40:58 +01:00
FUJIWARA Katsunori
cc8621fa83
i18n-ja: synchronized with 96246e32ac3b
2010-03-02 12:41:27 +09:00
Martin Geisler
994df41a91
Merge with hg-i18n
2010-03-01 22:47:39 +01:00