Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 16 Sep 2008 17:51:14 +0200] rev 7278
rebase: avoid redundant merges (issue1301)
Mads Kiilerich <mads@kiilerich.com> [Mon, 06 Oct 2008 14:41:22 +0200] rev 7277
Make contrib/buildrpm work on Fedora 9.
mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable.
Only minimal changes has been made, and there is plenty of room for improvement.
Greg Ward <gerg.ward+hg@gmail.com> [Mon, 27 Oct 2008 13:38:31 -0400] rev 7276
help: Refine a bit the help text of "hg update"
Parts of the original text were submitted by Hubert Kauker (Hubert
dot Kauker at travelbasys.de). This is a slightly revised version
of Hubert's original text.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 27 Oct 2008 19:39:41 +0100] rev 7275
add new test-hybridencode.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 08:26:18 +0100] rev 7274
statichttprepo: cleanups, use url.py (proxy, password support)
- unify httprangereader.py and statichttprepo.py:rangegreader()
- build the opener from url.py, that allows use to puse username and password
in the url, to follow the proxy settings from hgrc, etc.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 08:18:11 +0100] rev 7273
'\' should be escaped twice, for the shell, and for tr
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Oct 2008 00:03:28 +0100] rev 7272
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 21:50:16 +0100] rev 7271
use our urlopener (proxy handling, etc) instead of urllib
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 21:50:01 +0100] rev 7270
factor out the url handling from httprepo
Create url.py to handle all the url handling:
- proxy handling
- workaround various python bugs
- handle username/password embedded in the url
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 27 Oct 2008 17:48:05 +0100] rev 7269
httprepo: factor out proxy handling
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 23:47:17 +0100] rev 7268
test-http-proxy: hide logged URL port number, works with--jobs
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Oct 2008 22:57:55 +0100] rev 7267
patch: rewrite diffstat with util.filter()
Simpler and works under Windows.
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()