i18n, mq: mark command line options for translation

i18n, imerge: mark command line for translation

i18n, hgk: mark command line options for translation

i18n, convert: mark command line options for translation

merge with -stable

inotify: workaround ENAMETOOLONG by using symlinks If we can't create the unix socket because the path is too long we create the socket in a temporary directory and symlink it into the repo. Fix issue1208

inotify: deactivate inotify status on failure workaround issue1208, add test fix traceback handling (socket.error is a singleton in this case)

inotify: fix traceback when the server has been already started

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'

a socket error might be a tuple or a singleton

merge with crew

merge with -stable

fix test-bisect error (because of set -e)

store: pathjoiner default value is os.path.join

Fix for Issue1260

highlight: only pygmentize for HTML mimetypes For non-html mimetypes it doesn't make much sense. This also fixes the issue that highlight unconditionally adds a <link/> tag for its CSS to the template's header (which is pointless in text/plain output).

merge with crew

show extensions loaded on traceback

merge with crew-stable

bisect: only complain when nothing can be done

imported patch test-check

hgweb: Serve raw non-binary files as text/plain Previously these were served as application/octet-stream usually making browsers download them as files though they can be displayed inline just fine. This is useful to refer to e.g. /project/raw-file/tip/README.

allow committing a removed directory fix issue1089

notify: fix diffstat printing notify.diff() keeps line breaks in the diff buffer before calling patch.diffstat(). patch.diffstat() however adds another line break when feeding diffstat input. The added extra empty line leads to erroneous diffstat output. This fix removes the line breaks in notify.diff() and adds it back to print them.

merge with crew

make normalize() work when cwd != repo.root

convert: document source and sink identifiers, fix error message

Fix normalize fail on non-lowercase filename (Issue1273) regression introduced in 1e2850ed8171

fix changegroup.notify hook broken by fb42030d79d6

dirstate: explain why appending instead of os.path.join() is safe

performance: normalize self._root, avoid calling os.path.join() in dirstate In dirstate, self._join() might get called a lot. Instead of calling it we create self._rootdir and we then only need to append the filename.

performance: do not stat() things when not required Ignore unknown files if we don't need them (eg in hg diff). It slows things down a little bit for big trees (kernel repo), since _join() is called for each file instead of for each directory. fix issue567

Merge with crew-stable

graphlog: fix calls from outside the repository (issue1285)

fix test output broken by a04d8cadb6af

web: fix annotate raw template, forgotten in ccc2481e3954

i18n: mark strings for translation in transplant extension

i18n: mark strings for translation in record extension

i18n: mark strings for translation in rebase extension

i18n: mark strings for translation in patchbomb extension

i18n: mark strings for translation in interhg extension

i18n: mark strings for translation in inotify extension

i18n: mark strings for translation in mq extension

i18n: mark strings for translation in imerge extension

i18n: mark strings for translation in hgk extension

i18n: mark strings for translation in extdiff extension

i18n: mark strings for translation in convert extension

i18n: mark strings for translation in churn extension

i18n: mark strings for translation in alias extension

i18n: mark strings for translation in Mercurial

i18n: avoid naive plural tricks

merge with crew-stable

record: catch PatchErrors from internalpatch and display error message This resulted in big ugly tracebacks in issue1282, for example.

record: take diff lines for lack of trailing newlines into account (issue1282) The record extension incorrectly re-calculated the size lines for unified diff hunks. It counted a '\\ No newline at end of file\n' line towards the number of lines of trailing context, while it's not actually part of the context (and certainly isn't added as a line to the resulting output). Use the local name of a variable that was access through the nonlocal scope while we're at it. Seeing the variable was a little bewildering.

fix double indentation and trailing whitespace

increase code coverage of test-clone * add a non-inlined filelog to the test repo * add 'clone --pull' test case

coal/paper: Add link to raw changeset as other styles have it, too

hgweb: return content iterator instead of using write() callable This is a new version of 4879468fa28f (which was backed out in 943f066c0d58), with an extra line removed to fix problems with hg serve. hg's internal web server contains checking if the app isn't trying to write more bytes than specified by the Content-Length header. The first try still contained an old line that wrote the response, so the response was sent twice.

fix regression on empty repo cloning introduced by 0642d9d7ec80 The store directory wasn't copied. Unconditionally create the directories instead.

doc/Makefile: rephrase comment (typo)

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