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

copy: minor cleanups - add after and dryrun variables - add some comments

copy: propagate errors properly

copy: refactor okaytocopy into walkpat - rename core copy function to copyfile - move origsrc details into copyfile - turn okaytocopy loop into walkpat

copy: fix copying back with -A (issue836)

hgwebdir: refactor inner loop

hgwebdir: split out templater creation

hgwebdir: split out makeindex function, facilitate test failure diagnosis

hgweb: explicitly pass around the templater

hgweb: split out templater definition

separate the wire protocol commands from the user interface commands

hgweb: extract constant to global level

hgweb: get rid of some nested functions

fix some imports; pushing bz2 bundles over http is currently untested

coverage: return to not assuming that python is in /usr/bin

Fix breaking test from 05451f6b5f07

import latest coverage.py version

split out hgweb commands into a separate file, move some code around

add more tests for hgweb commands

move commands.docopy to cmdutil.copy

churn: avoid division by zero

update test output

hgwebdir: test virtual paths leading or trailing separators are stripped

Merge with crew-stable

hgwebdir: normalize virtual paths before stripping the separator It is not even clear that virtual paths should be normalized as normal paths at all, we could expect slash to be the natural separator.

win32: read system rcpath from registry Using the module name was not always helpful. It breaks down when Mercurial is installed as source and when the Mercurial libs are used by external applications. This patch allows Mercurial installers to store the system wide rcpath in the registry, where it can always be found. HGRCPATH is a poor option for storing the system wide rcpath, since it overrides both the system and user rcpaths.

Merge with crew-stable

mq: missing target files do not make qpush to fail immediately (issue 835) Reported and explained by Peter Arrenbrecht <peter.arrenbrecht@gmail.com>. Following file additions were skipped but empty files were still created. This situation could lead to qrefresh losing patch information.

Fix style nit and add some comments to tests.

Use SCRIPT_NAME and PATH_INFO instead of REQUEST_URI. This is required by WSGI (fixes issue846).

Add tests for hgwebdir repository names with slashes in them.

CGI compatibility fix for d74fc8dec2b4.

doc: add repo/ to .hgignore and .hgtags These names were disappearing in the asciidoc output and no form of escaping seems to help. Let's just add repo/ to make it explicit that they're in the repository root.

imported patch rollback-help

imported patch rev-help

clarify rm -A

hgweb: make web.name default to repo basename Providing the full path to the repository by default could be considered a security risk.

fix calloc(0, ...) issue

update: default to tipmost branch if default branch doesn't exist

clone: fix race with same target directory (issue716) Whichever side creates .hg first wins the race, and the other aborts politely without deleting the tree.

backout: disallow across branches (issue655)

rename: add test for moving untracked files in directories

Less indirection in the WSGI web interface. This simplifies some code, and makes it more compliant with WSGI.

Drop a bad import that snuck in.

hgweb: account for Python 2.4 in one test

hgweb: fix breaking tests on Python < 2.5

Merge with crew

hgweb: return meaningful HTTP status codes instead of nonsense

hgweb: make notfound templates more informative

hgweb: flesh out raw templates

make LookupError more detailed

Merge with crew-stable

convert: some tidyups, doc improvements, and test fixes The various back end options are now documented. The hg source can now be configured not to hand out a revision ID.

Merge with crew

convert: tell the source repository when a rev has been converted This lets us roundtrip changes between svn and hg.

convert: save hg revision during a convert This breaks hg->hg hash roundtripping, but that was fragile, didn't work reliably, and hence arguably of little value.

Merge with mpm.

Merge with crew-stable

cmdutil: make "files" list all files, add "file_mods" for modified files

hgweb.server: flush log files after every access

test-import: test fuzziness, ambiguous patch locations

patch: fix sort() comparator argument 'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and 'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.

Merge with crew

cmdutil: always expose "files_add", "files_del" and "manifest" templater properties

revlog: make revlogv0 loading more robust against corruption

push/pull: abort if we try to visit a missing or empty revlog

i18n: fix complaints from pygettext

verify: improve handling of empty or missing files - explicitly notice empty or missing changeset, manifest or file revlogs - shortcircuit warnings relating to missing changeset or manifest revlogs - fix changeset/manifest crosscheck swapped variables - properly sort crosscheck messages

Merge with crew-stable

convert: read CVS files in chunks (issue 800) socket.makefile() fails on large read requests (more than 10MB) with MemoryError.

test-convert-svn-sink: test directory additions

convert: add directories to subversion from root to leaves

convert: force svn:executable when execute-bit is not supported The util.is_exec fallback would be to ask subversion for the current value of svn:executable. Setting it directly is just simpler.

convert: fix svn file:// URL generation under Windows

mq: avoid qnew committing everything on invalid paths (issue 803) If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.

highlight: clean up coding style a little

extension for synax highlighting in the hgweb file revision view Depends on the pygments syntax highlighting library: http://pygments.org/

Change standard streams mode to binary at hg startup Standard streams are expected to operate in binary mode everywhere, especially with archive, cat, diff and export commands. Rewriting these to separate informational output from binary content is complicated to do and to maintain, nonwithstanding mode switching reliability. Changing all output mode to binary should not have much impact on Windows were stream processing tools are barely used and usually cope with unix style endings. Streams mode being process wide, the switch is performed in the startup script to avoid polluting existing API users who may have solved this issue already or ignored it at least for the mercurial part.

test-import: read email payload in binary mode

convert: fix util.popen regression in darcs converter

merge with crew-stable

mq: really remove undo after a qpush (and after a strip) For qpush, removeundo has to be called after the transaction has finished. strip may use unbundle, which also leaves an undo file. Fixes issue780.

httprepo: give self._url and the netloc to the password manager This should hide some differences between different python versions.

Do not display passwords with pull/push/incoming/outgoing Passwords specified in the repository URL are now displayed as '***' when accessing the remote repository.

run-tests.py: add a default --date "0 0" argument to commit et al Part of test-tags was modified just to be sure this works. The change in test-archive-symlinks is necessary to avoid a "helpful" warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").

tests/*: avoid losing the original settings from $HGRCPATH

convert: make sure mercurial_source has a local hg repo

convert: display all errors if we couldn't open the source repo This should give the user a better hint of what's going wrong. Improve some error messages. In particular, mention "CVS checkout" instead of "CVS repo". Fixes issue822 and issue826.

test-convert-darcs: skip if we can't find the elementtree module This patch is a bit dirty to avoid having to repeat the dance required to import elementtree.

test-permissions: add a chmod +w to allow the directory to be removed

run-tests.py: don't print a dot for skipped tests

purge: simplify safety net for case mangling filesystems Relying on the exact return of statwalk would cause us to abort when there was at least one tracked file inside an ignored directory. This patch forces an extra walk of the whole working directory even on sane filesystems, where it wouldn't be needed. Fixes issue621.

Fix dir-changed-to-file updates on clean workdir. Workaround for dir-changed-to-file updates mentioned in rev 7a64931e2d76 doesn't actually work since tests introduced in mentioned changeset prevented dirstate updates even if working directory updates succeded. Make tests more relaxed for dirstate operations not directly accessible from cli. See also issue660. While here, move _dirs existance check from _decpath() to _changepath() for unification.

Merge with crew

Add note to CONTRIBUTORS file

convert: add support for Subversion as a sink

convert: abstract darcs's commandline handling

convert: iterate

convert: abstract map files into a class

Mark failing test as a known bug

Merge with -stable

Support qgoto in contrib/bash_completion.

hgk: change config file from .gitk to .hgk Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible. Whenever I run one, the other gets reset to the default screen position. This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.

Merge with crew-stable

Merge with stable.

Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.

Merge with -stable.

Merge with crew.

Merge with crew-stable.

Merge with crew-stable.

Merge with crew-stable

convert: fail if an external required tool is not found

Merge with crew-stable

test-execute-bit: skip if execute-bit is not supported

See if execute bit is honoured when we go back in time

merge with -stable

merge with crew-stable

Merge with crew-stable

See if execute bit is honoured when we go back in time

Honour the exec bit when we go back in time. Fixes issue801.

fix typo in convert help text, update test

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

hgweb_mod: update unidiff() calls and finish e5eedd74e70f job

Fix context iterator.

Update convert help text Add Mercurial as a source format, clarify that the include directive triggers the exclusion of all not explicitely included files/dirs and use MAPFILE instead of revmapfile in the text, following the short message convention.

Handle patches with misformatted empty lines Insert a space on empty lines which are missing a control character. Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com> --- I frequently receive emailed patches with empty lines represented as "\n\n", where Mercurial expects them to be "\n \n". patch(1) applies these patches without complaint, but qpush fails all hunks.

Use both the from and to name in mdiff.unidiff. This fixes a compatibility issue with git diffs. * * *

Fix Windows os.popen bug with interleaved stdout/stderr output See python bug 1366 "popen spawned process may not write to stdout under windows" for more details.

https url handling: usernames and passwords were registered to the wrong url

patchbomb: no traceback if (diffstat) confirmation is refused

patchbomb: fix traceback when diffstat isn't available

Only set mode of new patch if the target file was removed before. If the file is writable by the user, but owned by a different user, the chmod will otherwise fail with "Operation not permitted". Additionally make very sure that the file is only written if either the number of links is <= 1 or the file was successfully removed. Maybe this minimal COW code should be replaced by something from util.

httprepo: ignore environment proxies when proxies are disabled

gpg: use the same log message format as hg tag

Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb

Added tag 0.9.5 for changeset 23889160905a

Catch smtp exceptions

tests: make test-mq-guards work with ksh

tests: tidy up reporting of skipped tests if not verbose: - print 's' rather than '.' - pass skipped test reports back to parent for -j - report which tests were skipped at the end - print '.' after test completion

Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.

mq.el: define keymaps as convensions

mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs

mq.el: declare variable mq-top

mercurial.el, mq.el: remove runtime dependencies on CL package * (require 'cl) at compile-time * don't use map()

hgk: colorize commits by authors Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.

osutil: use fdopendir instead of dirfd

convert: svn -- fix tags handling They were simply not detected.

convert: svn -- fix 'exists' Previously 'exists' erroneously returned False for empty dirictories. This is wrong since we want to detect even empty 'branches/' or 'tags/'.

merge with goto

mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t. See also PEP 353. NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.

mpatch: use int rather than ssize_t We might need to be more clever than this to make Py2.5 happy.

osutil: improve portability - manually inline mode_to_kind - remove unused alloca include - remove fstatat and associated bits It's not obvious that there's an advantage to using fstatat in terms of performance. The race-avoidance properties of fstatat aren't terribly useful to us either. So best to avoid it until we figure out how to use it portably.

fix typo

import gettext since '_' is used

explicitely use integer division

fix UnboundLocalError, refactor a bit bin wasn't defined in all branches (bug introduced in 82b4ff3abbcd

bdiff: tweaks for large files - adjust the common line threshold to .1% this speeds up a delta of 7M lines of source from 10m to 40s - adjust the scaling of the hash array down a bit as it was raising the peak memory usage significantly

revlog: break up compression of large deltas Python's zlib apparently makes an internal copy of strings passed to compress(). To avoid this, compress strings 1M at a time, then join them at the end if the result would be smaller than the original. For initial commits of large but compressible files, this cuts peak memory usage nearly in half.

revlog: fix caching of buffer objects

chunkiter: handle large reads more efficiently - for large reads, don't attempt to read more than necessary - if we've gathered the exact number of bytes needed, avoid a string copy

revlog: avoid large yields in group() Split large yields so that the downstream consumer (chunkbuffer) will avoid some pain when reading ahead.

chunkiter: simplify iter logic

chunkbuffer: removed unused method and arg

revlog: reduce memory usage in addgroup - use a buffer to extract the delta from a chunk - avoid concatenating to a compressed delta - use a buffer to directly extra full text from a trivial delta - delete chunk and delta objects after use

mpatch: allow buffer objects for input

Merge with crew Those crew folks are getting lazy about pulling from upstream before committing.

test-convert-darcs: don't let $HOME/.darcs pollute the test environment

convert: refactor sink initialisation, to remove hardcoding of hg We also introduce options to explicitly set the source and destination repository types. Improve testing of corner cases a little.

convert: add default constructor for converter_sink

convert: make contents of "extra" dict available from sources, for sinks. This breaks hash preservation for hg->hg conversion, as each converted change gets a convert_revision item added to its extra dict. Ugh.

convert: rename convert_svn to svn_source

convert: report errors more meaningfully if run with --traceback

Merge with crew

osutil: Solaris build fix

Merge with -stable

findcopies: fix rename bug We've fiddled with this line several times, and an old bug has reappeared from it. Let's take a peek at the history. The original "or" (rev 3674, in 0.9.2 and 0.9.3): http://www.selenic.com/hg/rev/9103dab96093 Then I changed it to an "and" to fix a bug (rev 4304): http://www.selenic.com/hg/rev/4787e2b0dd03 Then for reasons now lost in the mists of time, I dropped half (rev 4399): http://www.selenic.com/hg/rev/93652499bed3 Then we added back the "or" (rev 4416, in 0.9.4): http://www.selenic.com/hg/rev/bb1800a7d7e1 So it seems it ought to be "and".

mq: clarify queue top message

Fix build error with Sun C compiler.

osutil.c: use strncpy instead of strncat

findcopies: fix rename bug We've fiddled with this line several times, and an old bug has reappeared from it. Let's take a peek at the history. The original "or" (rev 3674, in 0.9.2 and 0.9.3): http://www.selenic.com/hg/rev/9103dab96093 Then I changed it to an "and" to fix a bug (rev 4304): http://www.selenic.com/hg/rev/4787e2b0dd03 Then for reasons now lost in the mists of time, I dropped half (rev 4399): http://www.selenic.com/hg/rev/93652499bed3 Then we added back the "or" (rev 4416, in 0.9.4): http://www.selenic.com/hg/rev/bb1800a7d7e1 So it seems it ought to be "and".

osutil: more tidying - do_stat -> keep_stat - all_kinds -> !need_stat - simplify main error logic - reorder declarations

osutil: move file list loop to its own function

osutil: simplify DT_REG support

osutils: pull file stat loop into its own function

osutil: fold stat paths together - simplify st/py_st logic - use stp to point to stat buffer - combine stat paths

osutil: more cleanups - eliminate a level of nesting - untab targets of gotos

osutil: eliminate alloca call - make full_path a PATH_MAX + epsilon local buffer - use strncpy and strncat

osutil: cleanups - use tabs - eliminate old-style function pointer calls - eliminate weird scoping - eliminate assignment-in-iff - use !foo rather than foo == NULL

Execution bit detection fixes for VFAT on Linux On Linux VFAT execution mode can be modified, but changes don't persist a filesy stem remount. The current test can be trickled by this. We can help with the det ection of VFAT checking whether new files get created with the execution bits on (as usually these partitions are mounted with the exec option, for convenience) .

churn: simplify code to get terminal width

patch: fix git sendmail handling without proper mail headers

hgk: allow any extdiff command for visual diff

osutil.c: style fix - delete trailing end-of-line spaces

convert: do not output when trying to load svn bindings

convert: split converters into sink/source

Test darcs converter

convert: fix darcs_source.pull() under windows

convert: fix darcs_source._run() under windows

hghave: detect darcs client

hghave: reorder check functions and entries

Test workingctx exec/link bit for copies. Also, make the test runnable on platforms without symlinks.

Fix workingctx exec/link bit of copies on non-supporting systems

test-manifest: test symlink and exec bit display

Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l

convert: quote "^" to avoid windows using it as an escape char.

Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.

mercurial_sink: regrab locks in setbranch

convert --filemap: reduce memory usage

convert: change SKIPREV to 'SKIP'

Fix bad lambda prototype in workingctx.fileflags()

osutil.c: use readdir instead of readdir64 Some systems (e.g. *BSD) don't have a readdir64 function - the regular readdir already uses 64-bit types. On other systems (Linux, Solaris, ...), if Python was compiled with large file support, Python.h will define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS=64, so that any call to readdir will actually be a call to readdir64. If Python was not compiled with large file support, we probably don't want to define these macros to avoid ABI problems.

osutil.c: include Python.h before the other headers This is recommended by the Python documentation, since Python.h defines some constants.

Add osutil module, containing a listdir function. This is similar to os.listdir, only it returns a sorted list of tuples.

hgk: add basic usage and configuration documentation

hgk: add context menu visual diff action * * *

hgk: add debug-config command to pass configuration options

hgk: fix right-mouse button handling under macosx

Test *_ISLINK merge environment vars

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.