Merge with crew

bundlerepo: don't hardcode the revlog filename

make hg commit <dirname> work again

imported patch collision

imported patch folding

Make quoting in test-encoding simpler

update test-debugcomplete

hgweb: report detected character set Add comments on overriding charset to CGI scripts

test-encoding: copy a bundle from TESTDIR rather than constructing one

Hex-encode ! in test-encoding printf Naked ! tends to confuse shells

Add output for encoding test

Add a charset encoding test case

tests: set a default encoding for running tests (ASCII)

Add documentation for charset encoding options

Add global options for setting encoding and encodingmode

Handle transcoding of branch names

Handle transcoding of tags

Handle transcoding of username and description in changelog

Add functions for transcoding and manipulating multibyte strings

Add encoding detection

merge with crew

Move ellipsis code to util.ellipsis() and improve maxlength handling.

Use UnexpectedOutput exception instead of RepoError in sshrepo, too.

Change sshrepo.repoerror() into a more flexible sshrepo.raise_(). Now every exception can be raised with a cleanup, not only hg.RepoError.

Don't show traceback on 'hg clone -r unknown ssh://hg.example.com/'.

fix qseries -v and guards interaction - rename "status" variable to avoid shadowing an argument - use a better test to determine whether a patch is applied

changegroup.py: delay the loading of the bz2 and zlib modules

Ignore all errors while parsing the branch cache.

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0"

transplant: split filter args into changelog entry and patch

transplant: log source node when recovering too.

transplant: clobber old series when transplant fails

merge with crew

Use unsigned version format. This way can use one additional bit, and when encountering invalid revlogs with the first bit set don't produce python warnings or strange error messages.

Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...

Merge with crew

transplant: "filtering %s\n"

Don't require a diff which accepts the -N option.

Compatibility fix for 'ln -sf'. ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't needed here, I simply dropped it.

additional fixes for issue436

Fix test-rename-dir-merge for different implementations of ls.

Fix test-notify for systems without or with a different version of diffstat. Some diffstat versions say "1 file changed", others "1 files changed".

merge with upstream

add test for issue436

verify: add rename link checking

Make revlog error slightly less scary

Fix argument handling for hg -v pull -v x (issue 436)

update bugzilla extension to use ui buffers

add test for the notify extension

fix notify with new ui buffering

use ui buffering in changeset printer delete old uibuffer class delete old stringio class move show to _show add new show that uses ui.pushbuffer to buffer add new flush that writes buffered data add props arg to changeset_printer to match _templater

add a simple nested buffering scheme to ui

make manifest friendlier switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests

Add missing test output

Fix test permission

merge: handle directory renames commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test

merge: pull findcopies helpers inside, refactor checkpair to checkcopies

merge: move check for empty ancestor into findcopies

merge: only store one direction of copies in the copy map simplify checkpair generate copied hash from copy map make copy cases more symmetrical

merge: add copied hash to simplify copy logic