Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 21:41:41 +0200] rev 13971
move canonpath from util to scmutil
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 19:54:57 +0200] rev 13970
move opener from util to scmutil
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Apr 2011 23:30:07 +0200] rev 13969
merge with stable
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Apr 2011 23:15:18 +0200] rev 13968
convert: make filemap prune useless branch closing revs (issue2774)
A branch closing revision only applies if one of its parents belongs to the
branch being closed. Otherwise the filemap can prune it too.
Matt Mackall <mpm@selenic.com> [Wed, 20 Apr 2011 14:28:40 -0500] rev 13967
dispatch: improve repository not found message
This should help clarify what the problem is in various problematic
cases like ssh.
Steven Stallion <sstallion@gmail.com> [Wed, 20 Apr 2011 00:01:50 -0400] rev 13966
hgweb: support disabling page cache
By default, hgweb_mod supports caching via the ETag header. This can
cause some confusion with browsers which cache aggressively. This change
preserves existing behavior while giving the administrator a knob to
disable the ETag header.
Matt Mackall <mpm@selenic.com> [Wed, 20 Apr 2011 12:44:32 -0500] rev 13965
merge with stable
Steven Stallion <sstallion@gmail.com> [Tue, 19 Apr 2011 23:37:06 -0400] rev 13964
hgweb: support alternate logo url
Clicking on the logo image/text in the hgweb interface brings the
user to the Mercurial project page. The majority of users expect that
this would bring them to the top level index. I have added a new template
variable named `logourl' which allows an administrator to change this
behavior. To stay compatible with existing behavior, `logourl' will
default to http://mercurial.selenic.com/. This change is very useful in
large installations where jumping to the index is common.
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Apr 2011 13:33:43 -0500] rev 13963
identify: further clarification of help
Following on to 1416b9118540, correct a minor grammar issue, re-wrap to
72 columns, and further clarify wording.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Apr 2011 12:42:53 +0200] rev 13962
add: introduce a warning message for non-portable filenames (issue2756) (BC)
On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now
warn if a file has a name that can't be checked out on Windows.
Example:
$ hg add con.xml
warning: filename contains 'con', which is reserved on Windows: 'con.xml'
$ hg status
A con.xml
The file is added despite the warning.
The warning is ON by default. It can be suppressed by setting the config option
'portablefilenames' in section 'ui' to 'ignore' or 'false':
$ hg --config ui.portablefilenames=ignore add con.xml
$ hg sta
A con.xml
If ui.portablefilenames is set to 'abort', then the command is aborted:
$ hg --config ui.portablefilenames=abort add con.xml
abort: filename contains 'con', which is reserved on Windows: 'con.xml'
On Windows, the ui.portablefilenames config setting is irrelevant and the
command is always aborted if a problematic filename is found.