tags: fix abababa case, with test case

Merge with crew

Make import opportunistically use merge information

Add import --exact. When this option is set, import will apply the patch (which must be generated by export) to the parents specified in the patch, and check that the node produced by the patch matches the node ID in the patch.

Add --outgoing option to patchbomb

restructure changelog file appending - make appending code proper part of changelog with delayupdate/finalize - use simplified appender that tracks pending data in memory - eliminate old appendfile and helper classes - update addchangegroup to use new interface and reuse the existing changelog

appendfile: handle only changelog.i file

appendfile: remove unused manifest code

revlog: simplify revlog version handling - pass the default version as an attribute on the opener - eliminate config option mess

revlog: don't pass datafile as an argument

Merge additional fixes for my matcher changes

glob:<directory> patterns match the files in that directory. This makes the behaviour of glob: patterns more consistent: hg status glob:dir and hg status -I glob:dir will match the same files. It's also consistent with the fact that {rel,}path patterns recursively match the contents of a directory.

Pass normalized directory names to the ignore function This fixes a bad performance regression caused by dd0d9bd91e0a.

tests: expand test-commit a bit to test 'hg commit .' too

fix hg commit . in the repo root

transplant: fix ignoring empty changesets (eg after filter)

Merge with crew-stable.

Add hg-relink script to contrib

merge with crew-stable

debugsetparents: wlock the repo before updating the dirstate

avoid _wsgioutputfile <-> _wsgirequest circular reference We use the _wsgirequest object itself as the output file object. To avoid a "self.out = self" which would create another circular reference, we make the "out" attribute a trivial property.

avoid wsgiapplication <-> MercurialHTTPServer circular reference

hgwebdir: break templater -> templater circular reference This is essentially another instance of the same problem fixed by the parent changeset. See its commit message for the details.

hgweb: break templater -> templater circular reference The problem were some functions passed in the "defaults" argument during the templater creation which use "self.t" directly. This creates the cycle: hgweb object -> templater object -> defaults dict -> footer function -> hgweb object Instead of completely avoding the cycle, we break it after using the templater.

Fixed synopsis for some mq commands

hg qseries -m: guards file was not ignored

Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)

Simplified qseries and hg qapplied to fix some bugs caused by optimization: - hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing guarded (or unapplied because they were guarded during hg qpush) patches. - hg qapplied <patchname> now works again

Fix issue443: inconsistent output of "hg qunapplied -v" 1. Don't skip over unpushable (guarded) unapplied patches. 2. Don't display unpushable patches, unless -v is given, otherwise guarded and unguarded patches can't be distinguished.

Merge some matcher fixes/cleanups and add some more hg locate tests