Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:47:54 -0500] rev 14543
revert: remove some redundancy in basic description
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:19:05 -0500] rev 14542
revert: drop requirement to use -r to revert with two parents
This reduces documentation confusion between the need to:
a) hg revert -a -r . (drop all changes from a merge)
b) hg up -C . (drop the second parent entirely)
Currently revert is one of two commands (the other being tag) that
still complains about uncommitted merges, dating from its former use
of a generic defaultrev function that aborted.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:18:39 -0500] rev 14541
revert: simplify usage note
This points people looking for other commands to the right place with
a minimum of verbiage.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 17:38:32 -0500] rev 14540
revert: rewrite help summary
New users have a tendency to mistake 'revert' as the command to use to
check out old revisions. They also occasionally mistake revert for a
generalized undo (compare rollback).
This version intentionally aims to avoid mentioning 'earlier' and thus
intentionally no longer alludes to the (secondary) -r behavior (which
in fact is not actually limited to 'earlier').
Instead, we mention checkout state, to convey that we can
restore things to the way they were when checked out.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:19:30 +0900] rev 14539
extensions: make disabled()/disabledext() load prebuilt index if available
__index__ contains a dict of {name: desc} of all extensions.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:11:10 +0900] rev 14538
setup: add command to generate index of extensions
It generates prebuilt index of all extensions, which will be used by
frozen exe when running 'hg help extensions'.
Now py2exe invokes this command automatically.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:02:48 +0200] rev 14537
sshrepo: fix addchangegroup's signature
Make it mirror the usage found in localrepo.push. This should only
affect pushes to pre-unbundle ssh servers.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 15:17:40 -0500] rev 14536
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
We shouldn't try to process subrepos if .hgsub isn't present and we
should remove .hgsubstate if .hgsub is marked for removal.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:26:01 +0200] rev 14535
patch: dot not ignore hunk of files marked as 'deleted'
git 'deleted' flag was processed unconditionnally and the file removed even if
the related hunk was not matching.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:19 +0200] rev 14534
patch: fix patchmeta/hunk synchronization in iterhunks()
Synchronizing on bfile does not work on file removal where bfile is /dev/null.
We match items on afile or bfile instead. The incorrect code makes iterhunks()
to emit patchmeta and hunks separately in some cases. This is currently hidden
by applydiff() being too tolerant when processing patchmeta, and will be fixed
later.