use context for part of localrepo status

context: add __contains__, __getitem__, and __iter__

dirstate: get rid of default args for status

dirstate: make filterfiles private

dirstate: add __contains__ and make __getitem__ more useful dirstate.state(f) == '?' -> f not in dirstate dirstate.state(f) -> dirstate[f]

dirstate: make wjoin function private

dirstate: break update into separate functions

dirstate: use True and false for _dirty

doc: typo, -x bit

Update test output to reflect small changes in patch chattiness.

patch.py: re-add the ability to use an external patch program This is now invoked by default only if ui.patch is set. Otherwise, we use our built-in patch. If that fails because it can't find any valid hunks, we'll fall back to trying the external patch command.

patch.py: don't mark files as changed unless they have actually been changed

patch.py: fix some incorrect uses of _() for i18n

Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch

merge with crew-stable

convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.

hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.

merge with main

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

contexts: improve filectx eq test

Merge with -stable

patchbomb: add --desc, to specify a file containing a series description

merge with crew-stable

Merge with crew-stable.

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.

convert: Use clone's behaviour for the default destionation name. Adjusted the documentation for this and for the fact that the destionation is created even if a name is specified.

test-symlink-basic: require symlinks availability

Add hghave utility and run-tests.py support. hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with: "$TESTDIR/hghave" symlink || exit 80 The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.