transplant: fix ignoring empty changesets (eg after filter)

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.

Add hg-relink script to contrib

merge with crew-stable

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

util._matcher: remove superfluous variable

add some more tests to hg locate

make the output of test-locate more readable

util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

Merge with crew-stable

avoid a traceback with hg branch newbranch; hg up

Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

pass repo.root to util.pathto() in preparation for the next patch

hgweb: handle IOErrors and OSErrors during unbundle This allows the client to display a reasonable message to the user (e.g. "Permission denied: .hg/lock"), instead of the current "<url> does not appear to be an hg repository".

hgweb.unbundle: call req.httphdr only after the last possible call to bail

Work around a urllib2 bug in Python < 2.4.2 When urllib2 base64-encodes the password needed for the Proxy-authorization header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence is appended to every header, as required by the standard. Some proxies interpret the resulting "\n\r\n" sequence in the same way as "\r\n\r\n": end of headers. This usually doesn't cause trouble for this request, but when the proxy tries to read the next one, it thinks the request starts with some garbage and returns a "400 - Bad Request" error.

Fix confusing message from hg revert (issue332) % mkdir sub1 % touch sub1/file1 % hg add sub1/ adding sub1/file1 % hg rev sub1 sub1: No such file in rev e4c586763258 forgetting sub1/file1

Merge with stable

Merge with crew

revlog: attempt to gracefully handle some interleaved damage

merge with crew-stable

Merge with hg-stable

Merge with mpm

Merge with -stable

tags: add --remove

tags: remove unused variables

Make the tags algorithm smarter

Refactor tags code to prepare for improving the algorithm

merge with crew-stable

Only hg repositories override [paths], not simple directories (fixes issue510)

git-send-email compatibility: stop reading changelog after ^---$

mq: add qparent tag (first parent of qbase)

Merge with -stable, fix small test failure

Remove dummy branch hack from tests

Move branch read/write to dirstate where it belongs

Minor default branch cleanups

Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.

"default" is the default branch name

Make [PATCH] removal slightly more robust

Remove undo log after mq operations that rollback would break

Refresh file size after partial qrefresh. This makes a subsequent hg revert; hg status work.

Clarify update help text for update without an explicit revision

Improve hg branch -f help text

Add test for branch shadowing

branch: require --force to shadow existing branches

Strip [PATCH...] from message subject when importing patches

Merge a bunch of matcher and locate fixes.

Optimize return value of util._matcher for hgignore case

Optimize return value of util._matcher for common command line case This will trigger every time somebody runs something like "hg diff" or "hg status" without any arguments. The important part here is returning util.always as the match function, which is a much simpler (and faster) function than the usual return value, and allows other code to just skip the filtering if it knows all files will match.

remove unused "head" hack from util._matcher