Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 24 Nov 2009 17:26:42 +0100] rev 9925
findrenames: first loop over the removed files, it's faster
Getting the file from the working dir is less expensive than getting it from
the repo history, hence the speedup.
benchmarked on crew repo with:
rm -rf * ; hg up -C ; for i in `find . -name "*.py"` ; do mv $i $i.new;done
followed by:
hg addremove -s 100
before: Time: real 68.760 secs (user 65.760+0.000 sys 2.490+0.000)
after : Time: real 28.890 secs (user 26.920+0.000 sys 1.450+0.000)
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 14:32:19 +0200] rev 9924
localrepo: support 'rev in repo' syntax
Brendan Cully <brendan@kublai.com> [Tue, 24 Nov 2009 11:20:25 -0800] rev 9923
zsh completion: add summary
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:25:11 -0600] rev 9922
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:23:53 -0600] rev 9921
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:15:12 -0600] rev 9920
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:54 -0200] rev 9919
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Nov 2009 15:15:01 -0200] rev 9918
i18n-pt_BR: synchronized with 5d748045c2ae
Matt Mackall <mpm@selenic.com> [Tue, 24 Nov 2009 10:14:27 -0600] rev 9917
Merge with crew
Alexander Solovyov <piranha@piranha.org.ua> [Tue, 24 Nov 2009 16:07:36 +0200] rev 9916
commands.log: getrenamed() cleanup
Sune Foldager <cryo@cyanite.org> [Tue, 24 Nov 2009 09:49:23 +0100] rev 9915
ancestor: improve docstring
The term "least common ancestor" is highly ambiguous.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 23:04:44 +0100] rev 9914
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 23 Nov 2009 22:45:36 +0100] rev 9913
run-tests: always set $COLUMNS, fix running tests under emacs shell
fix tests failure reported by Neal Becker.
Patrick Mezard <pmezard@gmail.com> [Mon, 23 Nov 2009 22:46:48 +0100] rev 9912
Merge with crew-stable
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 23 Nov 2009 22:08:59 +0100] rev 9911
Add help files to win32 installer (issue 1919)
Sune Foldager <cryo@cyanite.org> [Mon, 23 Nov 2009 11:03:55 +0100] rev 9910
hgweb: add support for extension-provided permission hooks
This allows extensions to hook into permission checking, providing both
authentication and authorization as needed. The existing authorization
function has been changed to a hook, which is added by default.
Matt Mackall <mpm@selenic.com> [Sun, 22 Nov 2009 15:36:22 -0600] rev 9909
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 21:34:12 +0100] rev 9908
i18n-da: synchronized with b5170b8b32a5
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:37:19 +0100] rev 9907
i18n-sv: translated seven commands
These commands has been translated:
addremove, archive, backout, config, unbundle, verify, version
Jens Bäckman <jens.backman@gmail.com> [Sun, 22 Nov 2009 19:12:39 +0100] rev 9906
i18n-sv: synchronized with b5170b8b32a5
Patrick Mezard <pmezard@gmail.com> [Sun, 22 Nov 2009 19:11:12 +0100] rev 9905
run-tests: work around a distutils bug triggered by 0a8a43b4ca75
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:27:29 +0100] rev 9904
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Nov 2009 11:25:01 +0100] rev 9903
Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).
Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
Martin Geisler <mg@lazybytes.net> [Sun, 22 Nov 2009 11:19:07 +0100] rev 9902
Merge with stable
Henri Wiechers <hwiechers@gmail.com> [Fri, 20 Nov 2009 14:11:05 +0200] rev 9901
commands: minor refactoring
Renamed local variable i to entry in helpcmd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 19 Nov 2009 11:06:01 +0900] rev 9900
inotify: improve error messages
* prefix messages by inotify-(client|server)
* make sure that all warning and abort messages use the same format.
* in the case where inotify.sock is an old broken symlink, say so and abort
instead of trying to overwrite the already existing link
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9899
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 20 Nov 2009 02:34:56 +0100] rev 9898
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:36:09 +0900] rev 9897
inotify: add a inotify.pidfile configuration possibility
This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.
Also desactivate the workaround introduced in 951ec6c7d703
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 17 Nov 2009 15:00:00 +0900] rev 9896
cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since 7c01599dd340 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.
This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:39:30 +0100] rev 9895
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Thu, 19 Nov 2009 17:33:41 -0500] rev 9894
commands: improve help for "hg clone -r"
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:29:02 +0100] rev 9893
commands, dates: use real lists instead of literal blocks
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 23:27:11 +0100] rev 9892
commands: use field lists instead of literal blocks in docstrings
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 22:25:38 +0100] rev 9891
commands: do not indent list in clone help string
Greg Ward <greg@gerg.ca> [Wed, 18 Nov 2009 22:23:11 -0500] rev 9890
run-tests: give each child its own tmp dir (issue1911)
Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel
mode = fail), and also fixes the long-standing quirk that parallel mode
created multiple /tmp/hgtests.XXXXXX directories. Now there is only one
/tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Martin Geisler <mg@lazybytes.net> [Thu, 19 Nov 2009 21:59:06 +0100] rev 9889
test-non-interactive-wsgi: make output deterministic
Henrik Stuart <hg@hstuart.dk> [Thu, 19 Nov 2009 15:54:57 +0100] rev 9888
hgweb: fix error in 38170eeed18c and introduce test for change
Sune Foldager <cryo@cyanite.org> [Thu, 19 Nov 2009 10:32:33 +0100] rev 9887
ui: add environ property to access os.environ or wsgirequest.environ
The property returns os.environ by default, and is propagated by ui.copy.
During hgweb processing, ui.environ is set to the proper WSGI-request
environment, as contained in wsgirequest.environ. For CGI, this is the
same as os.environ.
The property is meant to be read-only, as with os.environ (generally).
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:27:15 +0100] rev 9886
relink: wrap long lines in docstring
Patrick Mezard <pmezard@gmail.com> [Wed, 18 Nov 2009 21:58:49 +0100] rev 9885
test-convert-filemap: test improved filtering algorithm
Stefan Simek <simek@triaxis.sk> [Tue, 10 Nov 2009 13:04:03 +0100] rev 9884
convert: make filemap favor most specific filtering rule
A filemap like:
exclude "doc"
include "doc/foo.txt"
will now preserve doc/foo.txt and exclude everything else in doc/.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 13:24:58 +0100] rev 9883
run-tests: set --home when building with distutils
If home was set in ~/.pydistutils.cfg, the tests could not run. This
overrides any home setting by supplying --home="" on the command line.
Zhigang Wang <w1z2g3@gmail.com> [Wed, 18 Nov 2009 20:14:17 +0100] rev 9882
gitweb: add a latest link to the gitweb style
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 18 Nov 2009 12:47:58 +0100] rev 9881
httprepo: suppress the `real URL is...' message in safe, common cases.
When the actual and requested URL only differ by trailing slashes,
there is no need to warn. As an example, this easily happens when
accessing repositories on Bitbucket over HTTP(S).
As far as I could tell, there were no existing tests for this
behaviour.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 17:09:00 +0100] rev 9880
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Nov 2009 16:47:20 +0100] rev 9879
Extend test-branchmap to test c51494c53841
(encoding fallback in branchmap to maintain compatibility with 1.3.x)
Sune Foldager <cryo@cyanite.org> [Wed, 18 Nov 2009 15:20:08 +0100] rev 9878
branchmap: fix defective fallback fix 0262bb59016f
The fix applied as 0262bb59016f doesn't work and is essentially a no-op.
This fix also adds a comment about the nature of the problem, and a test.
Martin Geisler <mg@lazybytes.net> [Wed, 18 Nov 2009 00:19:42 +0100] rev 9877
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 11 Nov 2009 17:48:00 +0100] rev 9876
alias: improve help text for command aliases
Displays the line "alias for: hg ..." with the original command including options,
followed by the command's original help text.
Henri Wiechers <hwiechers@gmail.com> [Fri, 13 Nov 2009 16:38:27 +0200] rev 9875
dispatch: minor refactoring
Renamed local variable i to entry in _dispatch.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Nov 2009 22:16:41 +0100] rev 9874
qseries: don't truncate the patch name (issue1912)
Instead of truncating the entire output line of `qseries', only the
summary is truncated.
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:23:05 -0600] rev 9873
summary: note non-default branches with -q
Matt Mackall <mpm@selenic.com> [Tue, 17 Nov 2009 16:22:17 -0600] rev 9872
Add stable branch
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:30 -0600] rev 9871
Added signature for changeset 31ec469f9b55
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 14:50:24 -0600] rev 9870
Added tag 1.4 for changeset 31ec469f9b55
Martin Geisler <mg@lazybytes.net> [Mon, 16 Nov 2009 21:25:36 +0100] rev 9869
i18n-ja: fixed bad indentation
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 13:52:53 -0600] rev 9868
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 16 Nov 2009 11:31:08 -0800] rev 9867
Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
Matt Mackall <mpm@selenic.com> [Mon, 16 Nov 2009 12:51:00 -0600] rev 9866
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 16 Nov 2009 14:37:31 -0200] rev 9865
i18n-pt_BR: synchronized with crew 9c43089b372a
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 16 Nov 2009 09:58:45 +0200] rev 9864
i18n-de: messages for 9e7b2c49d25d and translation of patchbomb
Wagner Bruna <wbruna@yahoo.com> [Sun, 15 Nov 2009 21:57:02 -0200] rev 9863
i18n-pt_BR: messages for 9e7b2c49d25d and cleanup
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 13 Nov 2009 14:30:57 +0900] rev 9862
i18n-ja: synchronized with 004bf1d6e6af
Henrik Stuart <henrik.stuart@edlund.dk> [Mon, 16 Nov 2009 13:35:36 +0100] rev 9861
support encoding fallback in branchmap to maintain compatibility with 1.3.x
Patrick Mezard <pmezard@gmail.com> [Mon, 16 Nov 2009 14:09:31 +0100] rev 9860
convert/svn: fix warning when repo detection failed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:58:03 +0100] rev 9859
inotify: workaround test-inotify-dirty-dirstate failures
- disable inotify during clone
- record inotify daemon PID, in order to have them properly killed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Nov 2009 11:55:29 +0100] rev 9858
lock: the correct way to do a trylock() is to use a timeout of 0
Martin Geisler <mg@lazybytes.net> [Sat, 14 Nov 2009 14:21:53 +0100] rev 9857
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:41:21 +0100] rev 9856
setup: pass LD_LIBRARY_PATH to subprocess when determining version.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 14:38:59 +0900] rev 9855
inotify: Do not access inotify when dirstate is dirty (issue1811)
Original patch was provided by Simon Heimberg
It delegates dirstate computation to dirstate.status when dirstate is dirty:
better be slow from time to time instead of using wrong data.
This solves issue1719. As the last component, issue1810, is still not solved,
test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due
to 7c01599dd340:
changeset: 9515:7c01599dd340
user: Nicolas Dumazet <nicdumz.commits@gmail.com>
date: Sun Aug 16 11:11:37 2009 +0900
summary: inotify: use cmdutil.service instead of local daemonizing code
Ancestors of 7c01599dd30 are passing the test, when applied this patch.
Regression has to be investigated, but this patch is important since it affects
often mq operations.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 13 Nov 2009 08:31:10 +0900] rev 9854
inotify: mark directories visited during lookup (issue1844)
Emulate the match.dir calls that are made in dirstate.walk:
* first mark the visited directories on the server side
* then extend the transmitted response to include this directory list
* and lastly call match.dir on each directory
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:36:26 +0100] rev 9853
Merge with crew-stable
Henrik Stuart <hg@hstuart.dk> [Fri, 13 Nov 2009 06:29:49 +0100] rev 9852
url: generalise HTTPS proxy handling to accomodate Python changes
Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with
the way HTTPS proxying is handled in Mercurial. This fix generalises it to work
on Python 2.4 to 2.6.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 12 Nov 2009 14:05:52 -0800] rev 9851
Make it possible to debug failed hook imports via use of --traceback
Prior to this change, if a Python hook module failed to load (e.g. due
to an import error or path problem), it was impossible to figure out
why the error occurred, because the ImportErrors that got raised were
caught but never displayed.
If run with --traceback or ui.traceback=True, hg now prints tracebacks
of both of the ImportError instances that get raised before it bails.
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 14:34:07 -0600] rev 9850
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 12 Nov 2009 16:51:32 -0200] rev 9849
i18n-pt_BR: synchronized with crew d3dbdca92458
messages for a40ec11795c3 still included
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:55:44 +0100] rev 9848
i18n-da: translate parentrevspec and record
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 00:44:40 +0100] rev 9847
i18n-da: translations in color, graphlog, mq
Martin Geisler <mg@lazybytes.net> [Tue, 10 Nov 2009 20:51:11 +0100] rev 9846
i18n-da: synchronized with a40ec11795c3
Jens Bäckman <jens.backman@gmail.com> [Tue, 10 Nov 2009 20:07:32 +0100] rev 9845
i18n-sv: synchronized with a40ec11795c3
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 19:46:08 -0200] rev 9844
i18n-pt_BR: synchronized with a40ec11795c3
Matt Mackall <mpm@selenic.com> [Thu, 12 Nov 2009 12:03:39 -0600] rev 9843
merge: fix changectx.ancestor(workingctx) (issue1327)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 16:39:11 +0100] rev 9842
hgweb: don't choke when an inexistent style is requested (issue1901)
Brodie Rao <me+hg@dackz.net> [Thu, 12 Nov 2009 10:29:40 -0500] rev 9841
pager: provide a default attend list
The default list includes commands which normally print large amounts of
text. This should be more user-friendly than paging all commands by default,
which can be confusing when the pager swallows input prompts (with, e.g.,
record, merge, HTTP/SSH authentication, etc.)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Nov 2009 12:46:00 +0100] rev 9840
Add missing bash_completion for qfinish
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 12 Nov 2009 13:43:36 +0100] rev 9839
help: don't show extension list on extension help
Patrick Mezard <pmezard@gmail.com> [Thu, 12 Nov 2009 12:05:43 +0100] rev 9838
convert/svn: fix HTTP detection bug introduced by 1b2516a547d4
The probe expected response is a 404 with content, and while urllib returns the
response body in this case, urllib2 raises an HTTP error.
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 22:53:01 +0100] rev 9837
record: handle translated prompt correctly
The prompt function would return 'y' or 'n' untranslated. This should
therefore not be compared to _('y') and _('n'). However, it turns out
that prompt could just as well return a good old Boolean.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 11 Nov 2009 21:52:02 +0100] rev 9836
doc/style: add orange border color to notes
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:45:13 +0100] rev 9835
hgrc.5: mark some words as inline literals
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:29:35 +0100] rev 9834
hgignore.5: fix typo
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 21:16:20 +0100] rev 9833
doc/style: fix typo in comment (by timeless)
Yuya Nishihara <yuya@tcha.org> [Tue, 10 Nov 2009 21:48:10 +0900] rev 9832
doc/style: use default font color specified by user
* it's bad to specify only foreground color:
http://www.w3.org/QA/Tips/color
* some people prefer dark background
* `color: #111' is mostly the same as `color: black',
which is the default of almost all popular browsers.
so it's preferable to delete `color: #111', rather than adding
`background-color: white'.
Stuart W Marks <smarks@smarks.org> [Tue, 10 Nov 2009 22:27:31 -0800] rev 9831
help: improve wording of update help text
Martin Geisler <mg@lazybytes.net> [Wed, 11 Nov 2009 20:08:26 +0100] rev 9830
hgrc.5: oft-requested "hg update" hook example