Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 10 Oct 2010 19:07:58 +0200] rev 12706
localrepo: have _loadfilter return the loaded filter patterns
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 13:26:29 -0500] rev 12705
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:47:11 -0500] rev 12704
wireproto/http: drain the incoming bundle in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:45:36 -0500] rev 12703
wireproto: introduce pusherr() to deal with "unsynced changes" error
The behaviour between http and ssh still differ:
- the "unsynced changes" is seen as a remote output in the http cases
- but it is correctly seen as a push error for ssh
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:44:33 -0500] rev 12702
wireproto: redirect the output earlier
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:44:11 -0500] rev 12701
wireproto: return in finally was messing with the return inside the block
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 11 Oct 2010 13:51:10 +0200] rev 12700
tests: use a glob for all of the host, might not be localhost
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 11 Oct 2010 13:49:53 +0200] rev 12699
commands: add move alias for the rename command
svn provides move, and it's also a standard tool on Windows.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 18:02:52 -0500] rev 12698
util: make wrap() require a width argument
This keeps hgweb's help engine from poking at file descriptors that
don't exist.
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 16:55:33 -0500] rev 12697
showconfig: don't accept multiple sections and one config item
Showconfig now behaves as documented and only accepts one section.name argument
or a number of section names.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 17:35:28 -0500] rev 12696
hgweb: another fix for the help termwidth bug
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:49 -0500] rev 12695
pager: don't run pager if nothing is written to stdout/stderr
This decides when to run the pager based on the first call to
ui.write() and ui.write_err(). This has the side effect of not the
output of subprocesses that write output before hg does.
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:48 -0500] rev 12694
pager: add global --pager=<auto/boolean> option
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:36 -0500] rev 12693
color: add global option in extsetup() instead of globally
This prevents side effects from occurring when importing the color
extension.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 11:05:06 -0500] rev 12692
hgweb: more ui fiddling
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:42:44 -0500] rev 12691
hgweb: fix hgweb_mod as well as hgwebdir_mod
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:07:17 -0500] rev 12690
hgwebdir_mod: use fake termwidth to avoid mod_wsgi's wrath
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:06:36 -0500] rev 12689
termwidth: move to ui.ui from util
Kevin Bullock <kbullock@ringworld.org> [Thu, 07 Oct 2010 23:34:21 -0500] rev 12688
help: improve description of update --check
Adrian Buehlmann <adrian@cadifra.com> [Sat, 09 Oct 2010 21:54:50 +0200] rev 12687
store: encode first period or space in filenames (
issue1713)
- Mac OS X has problems with filenames starting with '._'
(e.g. '.FOO' -> '._f_o_o' is now encoded as '~2e_f_o_o')
- Explorer of Windows Vista and Windows 7 strip leading spaces of
path elements of filenames when copying trees
Above problems are avoided by encoding the first space (as '~20') or
period (as '~2e') of all path elements.
This introduces a new entry 'dotencode' in .hg/requires, that is,
a new repository filename layout (inside .hg/store).
Newly created repositories require 'dotencode' by default. Specifying
[format]
dotencode = False
in a config file will use the old format instead.
Prior Mercurial versions will abort with the message
abort: requirement 'dotencode' not supported!
when trying to access a local repository that requires 'dotencode'.
New 'dotencode' repositories can be converted to the previous
repository format with
hg --config format.dotencode=0 clone --pull repoA repoB
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 14 Sep 2010 23:00:39 +0200] rev 12686
demandimport: fix an obscure corner-case.
Python's __import__() function has 'level' as the fourth argument, not the
third. The code path in question probably never worked.
(This was seen trying to run Mercurial in PyPy. Fixing this made it
die somewhere else...)
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 00:38:57 +0100] rev 12685
keyword: enforce subn method via boolean switch
There are only 2 patterns to choose, and so far only 1 case
where kwtemplater.re_kw.subn is applied on data read from
the working directory: when recording added files.
With this change the code reflects more closely the boolean
character of the switch and underlines the special case.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 00:30:09 +0100] rev 12684
keyword: fix weeding of expansion candidates when recording
Rearrange tests to check this, i.e. that there are changes
in other files, not only the recorded one.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:48:37 -0500] rev 12683
copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)