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

patchbomb: consistently use opts.get

annotate: fix bug when annotating multiple files

dirstate: C parsing extension

parsers: speed up hex decoding for manifests

parsers: clean up whitespace

diff: pass contexts to status Allow status() to take contexts as well as nodes. This lets us avoid unpacking manifests multiple times and intelligently unpack manifests in revision order. Also, we can avoid unpacking manifests at all when there are no changes in the working directory.

revlog: fix heads performance regression

zeroconf: advertise a proper hostname for _hg services

zeroconf: use only first part of hostname for building local name

inotify: avoid status getting out of sync Always looking up oldstatus keeps us from failing to update our state when we disagree with the dirstate.

inotify: fixup rebuilding ignore

inotify: add a test for lookup bug

inotify: skip deactivation message