Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 15:19:54 +0200] rev 13959
merge with stable
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 15:15:56 +0200] rev 13958
hgweb: detect change based on changelog size too
Before, there was a race between an access and a modification made
within the same second.
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 13:25:19 +0200] rev 13957
rollback: lower-case warning issued when branch cannot be reset
Also improved the word order.
Martin Geisler <mg@lazybytes.net> [Tue, 19 Apr 2011 12:04:44 +0200] rev 13956
tests: remove redundant mkdir
There are still many tests that check that a bare 'hg init'
initializes the current directory.
Martin Geisler <mg@lazybytes.net> [Mon, 18 Apr 2011 13:57:22 +0200] rev 13955
help config: explain that config files do not exist by default
Inspired by critique given on StackOverflow where a user writes:
I can have a good guess at what "%USERPROFILE%" might signify but
none of the files listed in the "hg help config" output exist after
running the installer. Previous experience would suggest that
missing files mean something somewhere has gone seriously wrong.
http://stackoverflow.com/questions/2329023/2351139#2351139
Matt Mackall <mpm@selenic.com> [Mon, 18 Apr 2011 20:52:08 -0500] rev 13954
merge with stable
Idan Kamara <idankk86@gmail.com> [Tue, 19 Apr 2011 01:08:35 +0300] rev 13953
identify: restructure code to make it more readable
Idan Kamara <idankk86@gmail.com> [Tue, 19 Apr 2011 00:41:47 +0300] rev 13952
identify/help: say what the command does first, mention bookmarks
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 21:34:25 +0200] rev 13951
templatefilters: improve person() for john.doe@example.com
BEFORE: person('john.doe@example.com') -> 'john'
AFTER: person('john.doe@example.com') -> 'john doe'
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 11:37:11 +0200] rev 13950
help: do not show full help text for command on option errors
Example
$ hg clone --jump foo bar
hg clone: option --jump not recognized
hg clone [OPTION]... SOURCE [DEST]
make a copy of an existing repository
options:
-U --noupdate the clone will include an empty working copy (only a
repository)
-u --updaterev REV revision, tag or branch to check out
-r --rev REV [+] include the specified changeset
-b --branch BRANCH [+] clone only the specified branch
--pull use pull protocol to copy metadata
--uncompressed use uncompressed transfer (fast over LAN)
-e --ssh CMD specify ssh command to use
--remotecmd CMD specify hg command to run on the remote side
--insecure do not verify server certificate (ignoring
web.cacerts config)
[+] marked option can be specified multiple times
use "hg help clone" to show the full help text
Motivation for this change
If the user already has specified the command, he probably already knows
the command to some extent. Apparently, he has a problem with the options,
so we show him just the synopsis with the short help and the details about
the options, with a hint on the last line how to get the full help text.
Why is Mercurial better with this change?
Experts who just forgot about the details of an option don't get that
much text thrown at them, while the newbies still get a hint on the last
line how to get the full help text.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 17:55:34 +0200] rev 13949
store: add some doctests
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Apr 2011 01:44:09 +0200] rev 13948
paper: don't add breaks on the remaining instances of desc
fixes
ebe1ddbbefd7