Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Sep 2008 14:22:14 +0200] rev 7010
enhance the error output in case of failure during http push
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Sep 2008 14:04:10 +0200] rev 7009
tag: without a checkout, base the tag changeset on tip instead of nullid
issue916
Peter Ruibal <peter.ruibal@intel.com> [Mon, 08 Sep 2008 13:07:00 +0200] rev 7008
use Exception(args)-style raising consistently (py3k compatibility)
Sune Foldager <cryo@cyanite.org> [Mon, 08 Sep 2008 12:55:46 +0200] rev 7007
fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
Sune Foldager <cryo@cyanite.org> [Mon, 08 Sep 2008 12:55:27 +0200] rev 7006
branch: added more support for named branches
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
Martin Geisler <mg@daimi.au.dk> [Mon, 08 Sep 2008 11:32:53 +0200] rev 7005
do not pretend to lock static-http repositories (issue994)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Sep 2008 00:50:34 +0200] rev 7004
c0bd7d8b69ef uses err() instead of warn() but prototype doesn't match
we might want to make warn() look more like err() in the future
to avoid this kind of problem.
Martin Geisler <mg@daimi.au.dk> [Sat, 06 Sep 2008 17:44:07 +0200] rev 7003
i18n: mark command line for translation
Martin Geisler <mg@daimi.au.dk> [Sat, 06 Sep 2008 17:44:03 +0200] rev 7002
i18n, mq: mark command line options for translation
Martin Geisler <mg@daimi.au.dk> [Sat, 06 Sep 2008 17:44:02 +0200] rev 7001
i18n, imerge: mark command line for translation
Martin Geisler <mg@daimi.au.dk> [Sat, 06 Sep 2008 17:44:01 +0200] rev 7000
i18n, hgk: mark command line options for translation
Martin Geisler <mg@daimi.au.dk> [Sat, 06 Sep 2008 17:43:59 +0200] rev 6999
i18n, convert: mark command line options for translation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Sep 2008 17:04:01 +0200] rev 6998
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Sep 2008 14:11:33 +0200] rev 6997
inotify: workaround ENAMETOOLONG by using symlinks
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.
Fix issue1208
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Sep 2008 12:49:20 +0200] rev 6996
inotify: deactivate inotify status on failure
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Sep 2008 12:48:52 +0200] rev 6995
inotify: fix traceback when the server has been already started
Brendan Cully <brendan@kublai.com> [Tue, 19 Aug 2008 15:36:03 -0700] rev 6994
Use relative imports in inotify.server.
Fixes an import failure I was getting under hgtk and hgweb:
*** failed to import extension inotify: 'module' object has no attribute 'inotify'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 06 Sep 2008 00:45:13 +0200] rev 6993
a socket error might be a tuple or a singleton
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Sep 2008 11:04:36 +0200] rev 6992
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Sep 2008 11:03:34 +0200] rev 6991
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Sep 2008 11:02:12 +0200] rev 6990
fix test-bisect error (because of set -e)
Patrick Mezard <pmezard@gmail.com> [Fri, 05 Sep 2008 11:00:07 +0200] rev 6989
store: pathjoiner default value is os.path.join
Adrian Buehlmann <adrian@cadifra.com> [Sun, 31 Aug 2008 00:22:20 +0200] rev 6988
Fix for Issue1260
Rocco Rutte <pdmef@gmx.net> [Fri, 05 Sep 2008 10:39:57 +0200] rev 6987
highlight: only pygmentize for HTML mimetypes
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Sep 2008 10:39:19 +0200] rev 6986
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Sep 2008 10:00:57 +0200] rev 6985
show extensions loaded on traceback
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 03 Sep 2008 19:03:57 +0200] rev 6984
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 03 Sep 2008 19:00:43 +0200] rev 6983
bisect: only complain when nothing can be done
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 03 Sep 2008 19:01:35 +0200] rev 6982
imported patch test-check
Rocco Rutte <pdmef@gmx.net> [Wed, 03 Sep 2008 15:46:46 +0200] rev 6981
hgweb: Serve raw non-binary files as text/plain
Previously these were served as application/octet-stream usually making
browsers download them as files though they can be displayed inline just
fine. This is useful to refer to e.g. /project/raw-file/tip/README.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 03 Sep 2008 02:27:25 +0200] rev 6980
allow committing a removed directory
fix issue1089
divy@chelsio.com [Wed, 03 Sep 2008 01:49:16 +0200] rev 6979
notify: fix diffstat printing
notify.diff() keeps line breaks in the diff buffer before calling
patch.diffstat().
patch.diffstat() however adds another line break when feeding diffstat input.
The added extra empty line leads to erroneous diffstat output.
This fix removes the line breaks in notify.diff() and adds it back to print them.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 03 Sep 2008 01:29:03 +0200] rev 6978
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 22:04:09 +0200] rev 6977
make normalize() work when cwd != repo.root
Patrick Mezard <pmezard@gmail.com> [Tue, 02 Sep 2008 22:21:19 +0200] rev 6976
convert: document source and sink identifiers, fix error message
Andrei Vermel <avermel@mail.ru> [Sat, 02 Aug 2008 19:34:50 +0400] rev 6975
Fix normalize fail on non-lowercase filename (Issue1273)
regression introduced in 1e2850ed8171
Dennis Schoen <dennis.schoen@epublica.de> [Tue, 02 Sep 2008 15:41:51 +0200] rev 6974
fix changegroup.notify hook broken by fb42030d79d6
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 17:32:07 +0200] rev 6973
dirstate: explain why appending instead of os.path.join() is safe
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 15:12:50 +0200] rev 6972
performance: normalize self._root, avoid calling os.path.join() in dirstate
In dirstate, self._join() might get called a lot. Instead of calling it
we create self._rootdir and we then only need to append the filename.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 15:08:26 +0200] rev 6971
performance: do not stat() things when not required
Ignore unknown files if we don't need them (eg in hg diff).
It slows things down a little bit for big trees (kernel repo), since _join()
is called for each file instead of for each directory.
fix issue567
Patrick Mezard <pmezard@gmail.com> [Tue, 02 Sep 2008 09:47:40 +0200] rev 6970
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 02 Sep 2008 09:25:29 +0200] rev 6969
graphlog: fix calls from outside the repository (issue1285)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 01:19:12 +0200] rev 6968
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 01 Sep 2008 17:23:26 +0200] rev 6967
web: fix annotate raw template, forgotten in ccc2481e3954
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6966
i18n: mark strings for translation in transplant extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6965
i18n: mark strings for translation in record extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6964
i18n: mark strings for translation in rebase extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6963
i18n: mark strings for translation in patchbomb extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6962
i18n: mark strings for translation in interhg extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6961
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:03 +0200] rev 6960
i18n: mark strings for translation in mq extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6959
i18n: mark strings for translation in imerge extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6958
i18n: mark strings for translation in hgk extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6957
i18n: mark strings for translation in extdiff extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6956
i18n: mark strings for translation in convert extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6955
i18n: mark strings for translation in churn extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6954
i18n: mark strings for translation in alias extension
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6953
i18n: mark strings for translation in Mercurial
Martin Geisler <mg@daimi.au.dk> [Sun, 31 Aug 2008 16:12:02 +0200] rev 6952
i18n: avoid naive plural tricks
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 31 Aug 2008 12:05:29 +0200] rev 6951
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 31 Aug 2008 11:36:07 +0200] rev 6950
record: catch PatchErrors from internalpatch and display error message
This resulted in big ugly tracebacks in issue1282, for example.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 31 Aug 2008 11:34:52 +0200] rev 6949
record: take diff lines for lack of trailing newlines into account (issue1282)
The record extension incorrectly re-calculated the size lines for unified
diff hunks. It counted a '\\ No newline at end of file\n' line towards the
number of lines of trailing context, while it's not actually part of the
context (and certainly isn't added as a line to the resulting output).
Use the local name of a variable that was access through the nonlocal scope
while we're at it. Seeing the variable was a little bewildering.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 31 Aug 2008 11:41:52 +0200] rev 6948
fix double indentation and trailing whitespace
Adrian Buehlmann <adrian@cadifra.com> [Sat, 30 Aug 2008 18:47:54 +0200] rev 6947
increase code coverage of test-clone
* add a non-inlined filelog to the test repo
* add 'clone --pull' test case
Rocco Rutte <pdmef@gmx.net> [Fri, 29 Aug 2008 15:16:50 +0200] rev 6946
coal/paper: Add link to raw changeset as other styles have it, too
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 30 Aug 2008 17:13:23 +0200] rev 6945
hgweb: return content iterator instead of using write() callable
This is a new version of 4879468fa28f (which was backed out in 943f066c0d58),
with an extra line removed to fix problems with hg serve. hg's internal web
server contains checking if the app isn't trying to write more bytes than
specified by the Content-Length header. The first try still contained an old
line that wrote the response, so the response was sent twice.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Aug 2008 16:50:11 +0200] rev 6944
fix regression on empty repo cloning introduced by 0642d9d7ec80
The store directory wasn't copied. Unconditionally create the directories
instead.
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Aug 2008 13:06:24 +0200] rev 6943
doc/Makefile: rephrase comment (typo)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 28 Aug 2008 13:16:15 +0200] rev 6942
contrib: remove deprecated darcs2hg.py script
We've have support for darcs in the convert extension for a while now.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 28 Aug 2008 11:19:17 +0200] rev 6941
fetch: linearize code by eliminating nested functions
Martin Geisler <mg@daimi.au.dk> [Tue, 26 Aug 2008 00:04:18 +0200] rev 6940
qimport: report filename in case of IOError
The old behaviour was to say "abort: unable to read" since the
patchname variable was always None.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Wed, 27 Aug 2008 12:49:39 +0200] rev 6939
Fix wrong redirection in test-rebase-parameters
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Aug 2008 23:04:56 +0200] rev 6938
highlight: split code to improve startup times
Martin Geisler <mg@daimi.au.dk> [Mon, 25 Aug 2008 01:26:08 +0200] rev 6937
qfinish: document --applied instead of --all
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:40:34 +0200] rev 6936
Merge with Gilles Moris
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 22:32:53 +0200] rev 6935
Have verbose and debug flag print the changeset rev and hash when committing.
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset 4386a7706828, because it was using the
current date for commit and was randomizing the subsequent hash.
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 6934
Backed out changeset d557749c627a
Replace this change with a better one.
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 6933
keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 6932
Have verbose flag print the changeset hash when committing
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 19:24:47 +0200] rev 6931
test-rebase-mq: '|' is a GNU sed extension, unfold it
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 19:05:18 +0200] rev 6930
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 19:02:56 +0200] rev 6929
bisect: status message when no action is specified
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 19:02:46 +0200] rev 6928
bisect: expand help text to explain REV argument and --noupdate
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 6927
keyword: thorough hgweb testing
- test hgweb while keyword extension is _enabled_
- check expansion with hgweb.file
- besides log and diff, also check annotate for not expanding
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jul 2008 18:23:20 +0200] rev 6926
hgweb: raise ErrorResponses to communicate protocol errors
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 15 Aug 2008 13:25:57 +0200] rev 6925
make streamclone.stream_out() a generator
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 22 Jul 2008 18:21:37 +0200] rev 6924
hgweb: generate error message only if nothing is passed
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 11:35:17 +0200] rev 6923
strip trailing whitespace, replace tabs by spaces
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 21 Aug 2008 10:55:24 +0200] rev 6922
hgweb: fix WSGI iterators handling in CGI adapter (issue1254)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 20 Aug 2008 19:00:39 +0200] rev 6921
merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Aug 2008 17:58:12 +0200] rev 6920
Make test-hardlinks-safety portable
On some systems cp cannot create/preserve hardlinks.
Use util.copyfiles instead, after making sure it actually does
create hardlinks.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 20 Aug 2008 15:05:43 +0200] rev 6919
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 20 Aug 2008 15:04:45 +0200] rev 6918
Adjust test output for hg help qrecord since ef14c773b3d6
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 20 Aug 2008 11:09:53 +0200] rev 6917
merge with crew-stable
TK Soh <teekaysoh@yahoo.com> [Wed, 20 Aug 2008 10:31:19 +0200] rev 6916
update copyright dates in Windows installer's readme file
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 20 Aug 2008 10:30:53 +0200] rev 6915
mq: fix docs for qrefresh -D (issue1234)