Nicholas Riley <njriley@illinois.edu> [Tue, 12 Jul 2011 12:06:11 -0400] rev 14862
eol: ignore IOError from deleted files in commitctx
A Mercurial repo signals a file is deleted by raising IOError when the
file's data is requested. This IOError is normally caught by
localrepository.commitctx. With the eol extension enabled and EOL
mappings in place, the eolrepo subclass should ignore IOError because
a deleted file has no line endings to process.
This issue exhibited itself when performing an incremental hg convert
of a revision with deleted files to a repo with an existing .hgeol
file.
Steve Borho <steve@borho.org> [Fri, 08 Jul 2011 20:24:19 -0500] rev 14861
scmutil: add missing import of re
see https://bitbucket.org/tortoisehg/thg/issue/929
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:34 -0500] rev 14860
dispatch: fix checking of rpath in _getlocal
This avoids an extra config read
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:22 -0500] rev 14859
ui: rename _is_trusted to _trusted
is and do are pointless, underbar separators are style violations
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:27:03 -0500] rev 14858
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:22:36 -0500] rev 14857
eol: fix silly test-gendoc breakage by escaping control characters
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 12:13:07 +0200] rev 14856
eol: document new eol.fix-trailing-newline setting
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 23:12:52 +0400] rev 14855
eol: fix missing trailing newlines in comitted files
Some text editors (Eclipse, for example) do not add trailing newlines,
so diffs often contain annoying "\ No newline at the end of file".
This patch to eol extension simply adds trailing newline on commit.
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 22:53:58 +0400] rev 14854
eol: eol.only-consistent can now be specified in .hgeol
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:34:19 +0200] rev 14853
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:19:37 +0200] rev 14852
commands: use mergetoolopts when a command supports --tool
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 12:35:03 -0500] rev 14851
revsets: actually catch type error on tip^p1(tip) (issue2884)
The previous commit was empty.
Cédric Krier <ced@b2ck.com> [Sat, 09 Jul 2011 09:44:15 +0200] rev 14850
hgcia: Set default value of strip to -1 (issue2891)
For backward compatibility the root path of the repository is not
displayed unless the user has specified an explicit strip value.
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:32:30 +0200] rev 14849
commands: improve help for -y/--noninteractive
Before, the help text said that Mercurial would assume 'yes' for all
prompts, but this is confusing since many prompts don't have any 'yes'
choice. It now more accurately describes what will happen.