hg: use capable instead of capabilities

fileset: basic pattern and boolean support debugfileset can now generate file lists for things like: "* and not hg*"

tests: fix updated monotone version requirement 0969d91fad5c only updated the comment, not the actual check.

check-code: catch misspellings of descendant This word is fairly common in Mercurial, and easy to misspell.

revert: drop obvious paragraph about filenames

revert: actually add pointer to backout

revert: replace mention of 'roll back' with pointer to 'backout'

revert: simplify description of effect of -r

revert: rearrange the date help

revert: remove some redundancy in basic description

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.

revert: simplify usage note This points people looking for other commands to the right place with a minimum of verbiage.

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.

extensions: make disabled()/disabledext() load prebuilt index if available __index__ contains a dict of {name: desc} of all extensions.

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.

sshrepo: fix addchangegroup's signature Make it mirror the usage found in localrepo.push. This should only affect pushes to pre-unbundle ssh servers.

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.

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.

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.

patch: remove unnecessary exists() call in selectfile()

import: deprecate --base This option was a convenient hack introduced in Mercurial early days which unfortunately survived until now.

patch: remove redundant islink() call

extensions: update doc of enabled() and disabled() according to d5b525697ddb

localrepo: add savecommitmessage() to write last-message.txt

memctx: simplify constructor

scmutil: improve path calculation for install-relative RC files (issue2841) This code was ugly and might do the wrong thing with symlinks.

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.

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.

prepush: eliminate 'if branch' branch is always set anyway No change in program behavior.

revlog: bail out earlier in group when we have no chunks

localrepo: simplify file bundling code and fix progress bug Progress for files was off by one, and the code was rather hackish.

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.

localrepo: add total to changeset progress in bundle/push

statichttprepo: use in-place difference for shorter line

workingctx: eliminate remove function Inlining it into it's last remaining call place in cmdutil.copy. Note that cmdutil.copy is called with the wlock already held, so no additional locking is needed to call util.unlinkpath. We do not need to wrap the util.unlinkpath call into a try block, because at that point we already know whether abssrc exists or not -- thanks to the preceding util.copyfile call. Adding a new local 'srcexists' in cmdutil.copy for that purpose.

test-copy2: add case for moving a missing file

color: check if ui is already a subclass of colorui before wrapping it since it's possible to reuse the ui object (see 80c599eee3f3) between dispatch calls, the ui might have been wrapped already. we could probably move this test up a bit but leaving it here allows updates to take effect by extstyles() and configstyles().

util: add helper function isatty(fd) to check for tty-ness

web: prevent TypeError thrown when using the diffstat templates Remove the lambda used to wrap webutil.diffstat because: - functions passed to the templater must accept keyword arguments - webutil.diffstat is a generator, so already calculates the diffstat lazily This reverts the changes made to 1d3e2349304a after it was submitted to the mailing list but before it was queued.

fileset: fix long line

COPYING: refresh with current address from fsf.org

filesets: introduce basic fileset expression parser

dispatch: add repo to the request allows callers of dispatch.dispatch to pass in an initialized repo object to be used. -R/--repository overrides the request repo.

merge with stable

Added signature for changeset 733af5d9f6b2

Added tag 1.8.4 for changeset 733af5d9f6b2

subrepo: make stdin for svn a pipe for non-interactive use (issue2759) This certainly can't hurt, so go ahead and do it, potentially along with --non-interactive if that flag is safe for the given subcommand.

subrepo: svn abort now depends on exit code (issue2833)

httprepo: send URL redirection notices to stderr (issue2828)

httprepo: proper handling of invalid responses without content-type (issue2019) This can currently be tested on http://sf.net/

strip: make it clear that --force discards changes (issue310)

tags: catch more corruption during cache parsing (issue2779)

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

localrepo: ignore tags to unknown nodes (issue2750)

bookmarks: do not forward merged bookmark (issue1877)

rebase: restore mq guards after rebasing (issue2107) Guards on rebased mq patches were lost. This patch restores them after the qimporting step.

revset: report a parse error if a revset is not parsed completely (issue2654)

color: fix --color=always when output is piped Also restructures the mode determination as discussed on IRC. I tried to simplify the code too, while keeping the original semantics except for the case of --color=always.

check-code: flag 0/1 used as constant Boolean expression

run-tests: allow whitelisting tests that should always run It's desirable to run some tests all the time, for example test-check-pyflakes.t and test-check-code-hg.py. This allows passing --whitelist as a path to a file (flag can be specified more than once) which contains a list of files to whitelist. Whitelisted tests are run even if they're blacklisted or wouldn't match a --keyword test run. For example, to do a quick test of usehttp2, one can now do $ cat > test-whitelist <<EOF > test-check-pyflakes.t > test-check-code-hg.py > EOF $ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true' > -k http -j 8 --whitelist test-whitelist) and have all http-specific tests run as well as the two code linters.