Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:18:35 +0200] rev 14552
hg: use capable instead of capabilities
Matt Mackall <mpm@selenic.com> [Wed, 08 Jun 2011 13:44:41 -0500] rev 14551
fileset: basic pattern and boolean support
debugfileset can now generate file lists for things like:
"* and not hg*"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 16:50:45 +0200] rev 14550
tests: fix updated monotone version requirement
0969d91fad5c only updated the comment, not the actual check.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 17:02:54 -0500] rev 14549
check-code: catch misspellings of descendant
This word is fairly common in Mercurial, and easy to misspell.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:02:51 -0500] rev 14548
revert: drop obvious paragraph about filenames
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:01:38 -0500] rev 14547
revert: actually add pointer to backout
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:54:17 -0500] rev 14546
revert: replace mention of 'roll back' with pointer to 'backout'
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:51:18 -0500] rev 14545
revert: simplify description of effect of -r
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:49:04 -0500] rev 14544
revert: rearrange the date help
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.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:11 +0200] rev 14533
patch: remove unnecessary exists() call in selectfile()
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:02 +0200] rev 14532
import: deprecate --base
This option was a convenient hack introduced in Mercurial early days which
unfortunately survived until now.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 13:27:06 +0200] rev 14531
patch: remove redundant islink() call
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:01:01 +0900] rev 14530
extensions: update doc of enabled() and disabled() according to
d5b525697ddb
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:56:48 +0200] rev 14529
localrepo: add savecommitmessage() to write last-message.txt
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:20:49 +0200] rev 14528
memctx: simplify constructor
Matt Mackall <mpm@selenic.com> [Fri, 03 Jun 2011 15:08:08 -0500] rev 14527
scmutil: improve path calculation for install-relative RC files (
issue2841)
This code was ugly and might do the wrong thing with symlinks.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 13:10:22 +0200] rev 14526
prepush: show details about new remote heads with --verbose
previously, this info was only shown with --debug
Note that the new remote heads are only shown if the command aborts,
that is, they are *not* shown if --force was specified.
See also change
91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 12:16:17 +0200] rev 14525
prepush: print short hash of first new head in abort message
and don't mention the branch if it's the default branch.
OLD:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote heads on branch 'default'!
(you should pull and merge or use push -f to force)
NEW:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote head
1e108cc5548c!
(you should pull and merge or use push -f to force)
This helps to identify which local head is causing troubles.
See also change
91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 11:26:43 +0200] rev 14524
prepush: eliminate 'if branch'
branch is always set anyway
No change in program behavior.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:32:54 +0200] rev 14523
revlog: bail out earlier in group when we have no chunks
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:23:32 +0200] rev 14522
localrepo: simplify file bundling code and fix progress bug
Progress for files was off by one, and the code was rather hackish.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:15:06 +0200] rev 14521
localrepo: use list comprehension instead of generators
The lists in question are iterated and kept in memory further down the code
path anyway, and this simplifies things.