Fix test-convert-darcs output on Debian etch (issue779) The CR characters of darcs get confused the output. Additionally this darcs version printed: darcs: <stdin>: hGetLine: end of file

fix spelling error

Merge with stable

Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

Add output markers to test-bundle so it's easier to spot the source of output diffs.

hgk: add black and blue as preferred colors

Remove spurious escape attempt in hg.1.txt

Use VISUAL in addition to EDITOR when choosing the editor to use.

util: get rid of is_win_9x wart

Add --verbose support to tags command.

Properly check tag's existence as a local/global tag when removing it.

[RFC] convert: fix --datesort The problem is that previously commit.date was used for sorting, but it's a string like "1 Jan xxx 2007", so it it wrong to use it for sorting. Another problem is that why we are using depth for sorting -- I have no clear answer -- it seems to be plain wrong. This patch is just an RFC.

highlight: pass encoding to lexers and formatter Try to avoid UnicodeDecodeError by: - encoding to local - passing util._encoding as lexer input encoding - passing hgweb.encoding as formatter output encoding

highlight: mandatory arguments where possible

patch: simplify directory creation

patch: write rej files for missing targets (issue 853)

patch: avoid file existence tests when possible in selectfile()

patch: move diff parsing in iterhunks generator

patch: move NoHunk detection up with parsing code

merge with main

Workaround for "Not enough space" error due to the bug of Windows. Large write requests fail when stdout is switched to binary mode. As a workaround, limit the data size to write once.

fix typo in sshargs the original typo dated back to early 2005

mq: drop obsolete reference to 'qversion'

win32: fix ssh://host:port when using Plink Moves ssh argument building to platform specific utils code. The win32 version looks for plink in ssh command string and uses '-P' in lieu of '-p' for specifying a port

patchbomb: make "hg email -b" w/o destination work as advertised

Default to 10.5 version using the default python 2.5

patchbomb: prompt with ui.prompt() Avoid Windows raw_input() issue introduced by a3fe91b4f6eb. Found by Steve Borho <steve@borho.org>.

ignore: fix up comment parsing - remove redundant newline bits - change loop to use regex - eliminate escaping of # in internal representation

demandload: give better diagnostic for call of an unloaded module

fancyopts: lots of cleanups

commit: avoid losing edits during commit If a file is edited between the time we record file states in the repo and update the dirstate, that change can be lost to hg status. Because we invoke the editor between these two points, that window can be arbitrarily large. This greatly shrinks the window by recording the commit change immediately. If our checkin fails, we simply invalidate the dirstate.

rm: complain more about removing added files

merge: make return codes more sensible Commands that call merge were exiting with a return code equal to the number of unresolved files. We now return 1 if there are unresolved files.

doc: correct preoutgoing description

dispatch: report OOM rather than traceback

Merge with crew-stable

convert: move commands definition to ease demandload job (issue 860)

win32: remove text man pages from Windows package The HTML versions are still packaged, and do not suffer from eoln problems. This solves issue531 (addition through subtraction)

Merge with mpm

win32: include zsh_completion in Windows package

win32: include contrib/vim in Windows package

win32: use relative path to install source Remove hard-coded path to the source repo to be packaged.

win32: move default install path inside program files All of the 'space in path' problems have been resolved, so we can install Mercurial the Windows standard location. The {pf} InnoSetup variable is locale aware.

win32: it is no longer necessary to bundle patch.exe Mercurial can use it's built-in mpatch library

win32: do not install bash hgmerge on Windows

win32: ignore all installers generated in Output/

convert: move commands definition to ease demandload job (issue 860)

Merge with crew

win32: favor local mercurial.ini over registry key Hopefully this is the best of both worlds. Multiple py2exe based installers can coexist on one machine, while source and lib based Mercurial users can still use a registry key in lieu of resorting to HGRCPATH.

Merge with stable

convert: fix SVN date parser dropping the final whole second digit

highlight: adapt to hgweb_mode refactoring

Merge with -stable

Fix bdiff test failures on AIX. The test fails when, in the call to calloc(), the number of elements (bn) is 0. In that case, calloc() on AIX will return NULL, while the code expects a valid heap pointer. Both results are permissible under C99, Unix98 etc. Work around by ensuring that at least 1 element is requested.

workaround for raw_input() on Windows Since change a3fe91b4f6eb, Mercurial has set_binary() on stdin, stdout, and stderr. On Windows, this had the side effect of causing raw_input() to emit trailing carriage returns on it's returned strings. This was causing web authentication problems.

Merge with crew-stable

utils_win32: calling SHGetPathFromIDList under NT is useless and broken The call was done under NT when running as a service (CGI script for instance) and always crash, even in interactive processes.

copy: handle rename internally - add rename parameter - don't collect copied list - report "moving" rather than "copying" - remove renamed files - don't return copied list - simplify callers

copy: move rename logic

copy: simplify inner copy - save dirstate lookup and exists check - do all fs work inside a single dryrun clause - move unlinking into inner copy section - move target dir creation - eliminate undelete mess - fix a bug on mv a -> b -> a after merge