Patrick Mezard <pmezard@gmail.com> [Sat, 25 Oct 2008 13:24:14 +0200] rev 7266
test-mq-qimport: fix URL generation under windows
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 22:07:39 +0100] rev 7265
test-patchbomb: write in binary mode, force non-interactive mode (win32)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 17:37:37 +0100] rev 7264
test-http-proxy: print the log from the proxy
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 13:52:55 +0100] rev 7263
merge with dsop
Dmitriy Taychenachev <dimichxp@gmail.com> [Sun, 26 Oct 2008 17:08:48 +0800] rev 7262
bookmarks: do nothing if commit was not successful.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7261
bookmarks: Add tests
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7260
bookmarks: Strip bookmark names of whitespace, just like tag names
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7259
bookmarks: Correctly reject newlines in bookmark names
Without this fix, a single newline is a valid bookmark name since
strip() removes it.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7258
bookmarks: Require a bookmark name when a revision is specified
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7257
bookmarks: Improve documentation
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7256
bookmarks: Avoid unconditional forwarding of bookmarks for the null revision
This patch fixes the following minor problem:
% hg bookmark -r null test
% hg bookmarks
test -1:
000000000000
[...]
% hg commit
% hg bookmarks
* test 17:
861ce7a241f9
That is: Bookmarks referring to the null revision are always forwarded
to the current revision.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7255
bookmarks: Rename --move to --rename
To me, --move sounds like "make an existing bookmark refer to another
revision", but --move currently means "rename an existing bookmark".
This patch renames the switch to --rename to make it easier to
understand.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7254
bookmarks: Require new bookmark name when renaming
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:52 +0200] rev 7253
bookmarks: Only save undo.bookmarks if bookmarks exist
Otherwise the command will abort when there is no .hg/bookmarks file.
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 19:05:42 +0200] rev 7252
bookmarks: Avoid long lines
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 16:30:11 +0200] rev 7251
bookmarks: Fix spelling and grammar
Joel Rosdahl <joel@rosdahl.net> [Sat, 25 Oct 2008 16:29:58 +0200] rev 7250
bookmarks: Remove trailing space
Adrian Buehlmann <adrian@cadifra.com> [Mon, 27 Oct 2008 13:22:45 +0100] rev 7249
test-init: add test with format.usefncache=false
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 13:17:26 +0100] rev 7248
merge with crew
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 17:26:28 +0100] rev 7247
patch: fix patched files records in externalpatcher()
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 14:02:32 +0100] rev 7246
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Oct 2008 15:34:58 +0200] rev 7245
merge with crew
Bartosz SKOWRON <getxsick at gmail dot com> [Fri, 24 Oct 2008 20:46:56 +0200] rev 7244
patch: remove double variables in copyfile() func
Edouard Gomez <ed.gomez@free.fr> [Sun, 19 Oct 2008 00:32:23 +0200] rev 7243
convert: return remote branches in git source
When converting git repos, all stuff happening on branches
seems to be ignored.
This is caused by the fact a "git clone" of a remote git
repo has all its branches prefixed with "origin/". By
chance, the "origin/master" branch is always linked to a
local "master" branch. So getheads() returns only the
master head, and it ignores all the other heads.
Make sure getheads() returns all heads, forcing remote
branches to be return by git-rev-parse.
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Oct 2008 13:23:02 +0100] rev 7242
convert: fix non-ASCII filenames retrieval from git sources (issue 1360)
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Oct 2008 11:57:20 +0200] rev 7241
hgrc.5: explain order of mail.charsets
TODO: add mail.charsets section to hgrc.5.ja.txt
Christian Ebert <blacktrash@gmx.net> [Fri, 24 Oct 2008 08:16:01 +0200] rev 7240
test
261a9f47b44b: grep w/ match in last line w/o newline
Last character in match output omitted to avoid infinite loop.
David Soria Parra <dsp@php.net> [Wed, 22 Oct 2008 21:53:27 +0200] rev 7239
Bookmarks: Add the bookmarks extension
Mercurial bookmarks are local moveable pointers to changesets.
If you commit a changeset that is based on a changeset that has a
bookmark on it, the bookmark is forwarded to the new changeset.
Thanks to Ian Dees, Ronny Pfannschmidt for their patches,
Thanks to ronny, tonfa, prianha, mpm, #mercurial for their comments
and their support that helped me to get things done.