Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13356
bookmarks: merge rollback support into localrepo
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13355
bookmarks: move property methods into localrepo
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13354
bookmarks: move diff to core
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13353
bookmarks: move pushkey functions into core
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13352
bookmarks: move update into core
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13351
bookmarks: move read methods to core
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13350
bookmarks: move basic io to core
Matt Mackall <mpm@selenic.com> [Thu, 10 Feb 2011 13:46:27 -0600] rev 13349
extensions: add an ignore list for old extensions
Simon Heimberg <simohe@besonet.ch> [Wed, 02 Feb 2011 23:21:13 +0100] rev 13348
run-tests: only call WIFEXITED on systems it exists
not on Windows or in jython
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Feb 2011 20:47:05 +0100] rev 13347
run-tests: loadable as module
Simon Heimberg <simohe@besonet.ch> [Thu, 03 Feb 2011 07:58:54 +0100] rev 13346
hgignore: ignore more bytecode
ignore optimized bytecode and jython bytecode
Javi Merino <cibervicho@gmail.com> [Sat, 05 Feb 2011 14:37:25 +0000] rev 13345
doc: Capitalize the "options" header of mercurial commands
Javi Merino <cibervicho@gmail.com> [Sat, 05 Feb 2011 13:59:34 +0000] rev 13344
doc: Add back quotes around filenames
Filenames starting with a dot (.hg and .hgignore) confuse man when
creating the ps documentation with "man -t hg >hg.ps" if they are not
enclosed in back quotes.
Martin Geisler <mg@lazybytes.net> [Fri, 04 Feb 2011 09:17:07 +0100] rev 13343
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 02 Feb 2011 13:51:22 +0100] rev 13342
opener: use posixfile to hold file open when calling nlinks()
Mercurial's posixfile is less intrusive on Windows than Python's open
Adrian Buehlmann <adrian@cadifra.com> [Mon, 17 Jan 2011 09:37:20 +0100] rev 13341
remove pointless os.path.join calls when opening files in .hg/cache
Windows deals just fine with '/' in paths and Mercurial on Windows
already does file accesses elsewhere with mixed \ and / in file
paths anyway.
This patch also makes the static-http repo case use proper URLs of the
form
http://example.com/repo/.hg/cache/branchheads
http://example.com/repo/.hg/cache/tags
instead of the entirely pointless
http://example.com/repo/.hg/cache%5Cbranchheads
http://example.com/repo/.hg/cache%5tags
(as introduced by
5ccdca7df211)
Jonathan Nieder <jrnieder@gmail.com> [Thu, 03 Feb 2011 00:27:44 -0600] rev 13340
backout: make help more explicit about what backout does
The help for backout explains:
The backout command merges the reverse effect of the reverted
changeset into the working directory.
Unfortunately, that does not make it obvious to a newcomer what the
backout command does. Since it performs a 3-way merge, what is the
common ancestor? Will the result be automatically committed? What is
this reverted changeset --- is it the rev passed with -r on the
command line or its inverse?
So try to clarify the description, avoiding jargon and being
explicit about what happens from the user's perspective.
Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for
help.
trbs <trbs@trbs.net> [Fri, 04 Feb 2011 09:05:23 +0100] rev 13339
subrepo: fix pruning of subrepo filenames in dirstate (
issue2619)
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:53:50 -0600] rev 13338
merge with self
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:52:25 -0600] rev 13337
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:30:13 -0600] rev 13336
Added signature for changeset
2b2155623ee2
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:30:09 -0600] rev 13335
Added tag 1.7.5 for changeset
2b2155623ee2
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:29:38 -0600] rev 13334
merge with crew
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Feb 2011 21:59:07 +0100] rev 13333
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Feb 2011 21:39:28 +0100] rev 13332
subrepo: fix update -C with svn subrepos when cwd != repo.root
Eric Eisner <ede@mit.edu> [Mon, 31 Jan 2011 19:19:56 -0500] rev 13331
test-subrepo-git.t: make compatible with old git
Javi Merino <cibervicho@gmail.com> [Tue, 01 Feb 2011 07:29:11 +0000] rev 13330
win32mbcs: Fix typo in documentation
extention -> extension
Mads Kiilerich <mads@kiilerich.com> [Tue, 01 Feb 2011 01:55:45 +0100] rev 13329
merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 29 Jan 2011 23:23:24 +0900] rev 13328
url: add --insecure option to bypass verification of ssl certificates
If --insecure specified, it behaves in the same way as no web.cacerts
configured.
Also shows hint for --insecure option when _verifycert() failed. But currently
the hint isn't displayed on SSLError, because it needs a certain level of
changes.
Patrick Mezard <pmezard@gmail.com> [Mon, 31 Jan 2011 22:16:33 +0100] rev 13327
mq: factor out push conditions checks
Some extensions (e.g. hgsubversion) completely override push command. Because
extensions load order is unspecified, if hgsubversion loads before mq, mq
checks about not pushing applied patches will be bypassed. Short of finding a
way to fix load order, extracting the checking logic will allow
hgsubversion-like extensions to run the check themselves.