Merge with crew-stable

convert: read git output in binary mode under Windows (issue 1359)

util: add 'mode' argument to popen()

inotify: avoid passing potentially stale stat to update

inotify: add debugging mode to inotify compare inotify results with dirstate results and report any changes return dirstate results for safety

inotify: auto-start by default when enabled

inotify: friendlier message when daemon not running

extensions: use new wrapper functions

extensions: add wrapping functions

run-tests: --interactive overrides -j

findcmd: have dispatch look up strict flag

imported patch filteruser.patch

Autodetect static-http

help: update help make help description 'topic'-oriented rather than 'command'-oriented change 'special' to 'additional'

chmod -x simplemerge.py

findincoming: do the binary search in branches in parallel

protocol/between: the protocol expects to have ' '-separated tuples

tests: log and show errors

theme/monoblue: put the search box entirely in the header

Remove trailing space

theme/monoblue: do not use a fixed width for the overview box

tests: add more testing for webdir nesting

hgwebdir: show nested repositories (issue1336)

patch/diff: use a separate function to write the first line of a file diff

patch: consolidate two different regexes for parsing of git diffs

patch: extract local function addmodehdr

help: show extension commands in short list, separate extension list in help In 'hg', we now show a short list of commands, including extension commands. In 'hg help', we show core commands, a list of enabled extensions, and topics.

help: show help topics by default in 'hg help', with longest available id

mail: correct typo in variable name

merge with crew

mail: test patch mime encoding for patchbomb

patchbomb: mime-encode clean utf-8 patches (issue814) Fixes issue814, but only for utf.

mail: mime-encode patches that are utf-8 utf-8 can be safely detected without making assumptions on the encoding/locale used by the recipient. Content-Transfer-Encoding for utf-8 patches is base64 (default of python's email module).

Some additional space/tab cleanups

merge with crew-stable, again

merge with crew-stable

spaces->tabs in one line of a C extension for consistency

clean up trailing spaces, leading spaces in C

merge with crew-stable

clean up trailing spaces

hgweb: working diff for removed files

hgweb: remove links to non-existent file versions

coal/paper: widen author column in log table

hgweb: be sure to drain request data even in early error conditions Thanks to Mads Kiilerich with noticing this. The hg client can only read data after all the sent data has been read, so we have to read all the request data even if we're not going to do anything with it (in error conditions). This is not easy to fix in the client, because we're using Python's httplib, which is strictly stateful. Abstracted the draining into a separate method.

merge with crew-stable

Fix Debian bug #494889 (fetching from static-http://... broken) Changeset 6605a03cbf87 which fixed issue965 (hg clone static-http does not work for empty repos) broke cloning of repos with old layout (without store) via static-http. This fix makes cloning from old-style repositories possible again, but will not allow cloning of empty old-style repositories as this can not be detected reliably.

mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.

merge with crew

parsers.c: do not try to untrack after a failure

parsers.c: fix integer overflows thanks to zzuf for helping finding those

Merge with crew

Use dummy diffstat in tests and remove older diffstat workaround. This makes test-notify pass on systems without diffstat installed or where the diffstat version yields a different output.

Fix test-bundle-type output by changing head|cut to cut|head. With some versions of cut the output otherwise has no end of line.

convert documentation: --config argument with spaces needs quoting.

Copy index before parsing to enforce alignment with inline data present. Fixes issue1348 (Bus error in parsers.c) on Solaris/sparc.

parsers.c: there is no reference to data_obj, so it shouldn't be decref'ed

merge with crew

hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it.

Fix test-notify output for older diffstat versions.

Add util.popen3 fallback, simplify import of Popen3

Fix util.popen2 for Python 2.3 1. trigger ImportError early, so fallbacks are activated 2. util.popen2 replaces previous usage of os.popen2, not popen2.popen2

mq: heavy rearrangement of qnew to make it recover reliably from errors. Closes issue1269.

mq: abort qnew -f if any file in an explicit list cannot be read

mq: make qimport -f work properly. Closes issue1255. From Bernhard Leiner.

Merge with crew

mq: let qimport read patches from URLs

mq: do not invoke editor until just before patch creation. Closes issue1346.

merge with crew

add a missing +x to test-inotify-lookup

index parser: fix refcounting in case of errors, refactor due to incorrect refcounting, on a bad revlog it was failing with: *** glibc detected *** /usr/bin/python: corrupted double-linked list: 0x0816d318 *** and a backtrace.

patch: pass linereader to binaryhunk.extract() instead of wrapped fp It unifies input patch file access methods

patch: pass linereader to scangitpatch(), extract from iterhunks() It's good because it unifies the patch file access methods.

patch: change functions definition order for readability

patch: map changed files to patchmeta directly

patch: patchmeta gives (islink, isexec) tuple instead of int mode

patch: extract and rename gitpatch into patchmeta, document

patch: remove applydiff() useless updatedir and rejmerge arguments

merge with crew

inotify: fix status not showing "clean" files (issue907) The inotify server uses 'c' for clean, not 'n'.

run-tests.py: report missing file as an error

Merge with crew

Prevent import over an applied patch (closes issue795)

issue 1144: prevent traceback on verify of bundles

merge with crew

run-tests.py: use --prefix instead of --home Some SUSE version don't like --home, they fail with: "error: must supply either home or prefix/exec-prefix -- not both" this is due to SUSE shipping a distutils.cfg conflicting with --home.

test-permission: put sane permissions at the end of the test If we don't do that, we won't delete all directories at the end of the test

util: handle EINVAL in _statfiles_clustered() Raised when osutil.listdir is called on a non-directory entry.

_listdir only uses dfd if AT_SYMLINK_NOFOLLOW is defined

merge with crew

fix issue with strip() for revlog with non-monotonic linkrevs (issue1342) extra nodes should always be included, do the call after the pruning

revlog parser: use ntohl() instead of ntohll() (fix endianness issues)

tests: fix output for test-notify

commands: optional options where possible This makes life a lot easier on API users.

rebase: disable rollback after rebasing

churn: corrected help output

get rid of semi-colon introduced in 16bafcebd3d1

help: better documentation intro for a few extensions

remove extension commands from global help

show enabled extensions in hg help

graph: replace the blinking no javascript message

util: subprocess close_fds option is unix only

Fix missing uint64_t definition in parsers.c under Windows

rename: handle renaming to a target marked removed

highlight: convert text to local before passing to pygmentize (issue1341) Example case: Display file written in iso-8859-1 with current HGENCODING utf-8. At the moment only an Error page appears because pygmentize chokes on the replacement chars. Alternatives: 1) Turn off highlighting and avoid UnicodeDecodeError for files that are not in HGENCODING. 2) [this patch] use util.tolocal to display these files. Alternative 2) seems ok, as this only concerns display and readability. See also: fe38b0a3a928, apparently put aside during refactor of highlight. Add test for UnicodeDecodeError with iso-8859-1 file contents.

dirstate: always add times to map as integers Fix bug spotted by Dov Feldstern

Take advantage of fstat calls clustering per directory if OS support it. util module implements two versions of statfiles function _statfiles calls lstat per file _statfiles_clustered takes advantage of optimizations in osutil.c, stats all files in directory at once when new directory is hit and caches the results util.statfiles dispatches to appropriate version during module loading The speedup on directory tree with 2k directories and 63k files is about factor of 1.8 (1.3s -> 0.8s for hg diff - hg startup overhead about .2s) At this point only Win32 now benefit from this patch. Rest of OSes use the non clustered implementation.

Document email.charsets in hgrc.5 hgrc.5.ja.txt probably should include an example like: [email] charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2, windows-1250, iso-2022-jp, iso-2022-jp-ms

notify: mime-encode messages - addresses will be properly encoded - message bodies will also be encoded as we are not sending patches that are meant to be applied - update test output - adapt test-keyword to ignore the new headers

patchbomb: mime-encode headers and parts not containing patches Do nothing for "hg email --test" to preserve display.

mail: add methods to handle non-ascii chars - headencode, addressencode: encode headers - mimeencode: encode message parts not containing patches - new email config "charsets" Users may configure email.charsets as a list of charsets they consider appropriate for the recipients of their outgoing mails. Conversion is tried in this order: 1. us-ascii (ascii, us-ascii are removed from email.charsets if present) 2. email.charsets (if present) in order given 3. util._fallbackencoding, util._encoding, utf-8 if not already in email.charsets

mq: Allow qrefresh --silent to take parameters 'hg qrefresh --short file.txt' now adds changes made to file.txt to current patch. This builds on a patch for implementing --amend by Kirill Smelkov as discussed in issue933. FIXME: Why do mq refresh have two matchers if we only need one?

[PATCH 2 of 2] Re: created hgweb theme - monoblue

added monoblue hgweb theme

Add parseindex2.py test case Make sure that the new implementation in C return that same values as the original Python implementation.

use the new parseindex implementation C in parsers

C implementation of revlog index parsing

Allow hgweb to search for templates in more than one path. This patch is constructed to make it easy for external extensions to provide their own templates, by updating templater.path.

python2.6: use subprocess if available

tests: add some testing for patch.diffstat()

bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

merge with crew

hgweb: cleanup the manifest generation

convert: make built-in cvsps the default Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>

merge with crew

dirstate.walk: skip unreadable directories (issue1213) Do not abort on permission denied error, just skip the directory.

osutil.c: refactor argument parsing, allow skip=None being passed

convert: fix builtin cvsps under Windows Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.

dirstate._dirs: fix refcounting broken by 7dfac37cfabf reported by Patrick Waugh