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

Added tag 1.0.2 for changeset d2375bbee6d4

Folding correction and missing import

util: disinfect lookup_reg strings (issue1126) lookup_reg could return Unicode strings, which would infect other strings and generate unexpected tracebacks. Spotted by Rémy Roy. Fold in silly nested function while we're at it.

test symlinks on symlink-capable os but non-capable filesystem (issue1149) The "real" way to test this is to mount a non-symlink-capable filesystem, and try working on it; however, I don't know how to mount filesystems as a non-priveleged user from within the testing framework. So instead, os.symlink is overridden to raise the exception that would be raised on such a filesystem.

util: set_flags should survive failure to create link

util: set_flags shouldn't know about repo flag formats

Merge with stable Simplify the copy search algorithm

add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.

commit: simplify file copy logic

Make test-convert-mtn pass on systems where mtn add -R uses different order

Add ancestors and descendants to revlog This patch adds two methods to revlog: - ancestors: given a list of revisions returns their ancestors - descendants: given a list of revisions return their descendants

mdiff: compare content of binary files directly A plain Python string comparison stops when the first mismatch is found, whereas the call to md5 would need to compute the hash over the entire string and only then do the comparison.

merge with crew-stable

Make test-hardlinks-safety repeatable and executable

convert: Fix debugging output when running multiple commands with xargs.

keyword: add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.

merge with crew-stable

Let the notify extension use [diff] options too.

coal/paper: fixed box via an expression for IE < 7

Fix intermittent broken pipe in test-highlight

ui: add an option to prompt for the username when it isn't provided When ui.askusername is set and not username are specified on the command line, in hgrc or in the variables $HGUSER or $EMAIL, then hg will prompt for the username. Feature requested, and documentation provided by Mark Edgington.

Merge with crew-stable

add additional bisect tests

add additional complex bisect tests (with non-linear history)

Add support for multiple possible bisect results (issue1228, issue1182) The real reason for both issue is that bisect can not handle cases where there are multiple possibilities for the result. Example (from issue1228): rev 0 -> good rev 1 -> skipped rev 2 -> skipped rev 3 -> skipped rev 4 -> bad Note that this patch does not only fix the reported Assertion Error but also the problem of a non converging bisect: hg init for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done hg bisect -b 2 hg bisect -g 0 hg bisect -s From this state on, you can: a) mark as bad forever (non converging!) b) mark as good to get an inconsistent state c) skip for the Assertion Error Minor description and code edits by pmezard.

Merge with crew-stable

Add a reset before and after colorized output This is how GNU's ls --color works, and it clears up problems in xterm and Windows command prompt windows.

Apply color to output of qseries --verbose Fixes issue 1173.

color: improve mq extension detection

hgweb: do not use unassigned variables in exception handling

Merge with crew-stable

Fix subversion tests with svn 1.5

convert: normalize paths sent to svn get_log (issue 1219)

Merge with crew-stable

convert: remove leading slash from ra.check_path inputs (issue 1236)

convert: restore previous svn transport parent correctly

context: get rid of unused changectx.filectxs() method

context: fix workingctx's __contains__ method