contrib: remove deprecated darcs2hg.py script We've have support for darcs in the convert extension for a while now.

fetch: linearize code by eliminating nested functions

qimport: report filename in case of IOError The old behaviour was to say "abort: unable to read" since the patchname variable was always None.

Fix wrong redirection in test-rebase-parameters

highlight: split code to improve startup times

qfinish: document --applied instead of --all

Merge with Gilles Moris

Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash.

Backed out changeset d557749c627a Replace this change with a better one.

keyword: avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.

Have verbose flag print the changeset hash when committing

test-rebase-mq: '|' is a GNU sed extension, unfold it

merge with crew-stable

bisect: status message when no action is specified

bisect: expand help text to explain REV argument and --noupdate

keyword: thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding

hgweb: raise ErrorResponses to communicate protocol errors

make streamclone.stream_out() a generator

hgweb: generate error message only if nothing is passed

strip trailing whitespace, replace tabs by spaces

hgweb: fix WSGI iterators handling in CGI adapter (issue1254)

merge with crew-stable

Make test-hardlinks-safety portable On some systems cp cannot create/preserve hardlinks. Use util.copyfiles instead, after making sure it actually does create hardlinks.

merge with crew-stable

Adjust test output for hg help qrecord since ef14c773b3d6

merge with crew-stable

update copyright dates in Windows installer's readme file

mq: fix docs for qrefresh -D (issue1234)

hgweb: removed unnecessary del before function return Deleting tmpl just before the return statement should have no effect since tmpl goes out of scope anyway. But it confuses pyflakes who thinks tmpl is undefined when it is used in the except blocks below.

move % out of translatable strings The translators need to see the raw format string, not the result of using the format string.

Fixed docstring typos

Begin commit messages with two empty lines. This makes editors like Emacs wrap the commit message correctly. With no empty line between the commit message and the 'HG:' lines, the 'HG:' lines would be wrapped as if they belonged to the commit message and so lose their significance to Mercurial. This makes no difference to what is stored by the commit -- whitespace was already stripped from the beginning and end of commit messages.

Debashify rebase tests

Use relative imports in inotify.server. Fixes an import failure I was getting under hgtk and hgweb: *** failed to import extension inotify: 'module' object has no attribute 'inotify'

Do not sort hgwebdir repositories if python list or tuple is given. This was introduced by changeset f67d1468ac50 (util: add sort helper)

Fix up tests

Add rebase extension

coal/paper: make output well-formed and fix css syntax error breaking rendering

Merge with stable

clone: get a list of files to clone from store

store: drop self.encodefn

streamclone: fold in localrepo.storefiles

store: change handling of decoding errors

store: simplify walking - fold in main walking function - eliminate recursion (especially recursive yielding!) - eliminate default args

store: simplify class hierarchy

statichttp: use store class This lets us nix store.encodefn.

store: take opener as an argument

localrepo: simplify requirements checking

localrepo: kill _createmode

add test-verify

verify: check repo.store

revlog: add files method

store.py: accept empty repos Fixes a traceback on the server side when trying to streamclone an empty repo (this was *not* introduced by 80e51429cb9a).

verify: only warn on copy nullid

make commit fail when committing unresolved files

Update win32mbcs extension * Code cleanup by Matt. * Fix the issue with case-insensitive fs support by wrapping also util.fspath() and util.checkcase() * Abort program when path conversion is failed.

Merge with stable

convert: implement startrev for hg source

merge with crew-stable

Added signature for changeset d2375bbee6d4