merge with stable

Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize() - fix off by 11 when checking if there are more hunks (found by Maris Fogels) - bail out if start is greater than end - check if new hunk starts after start/end/len block of current hunk as the pointer can wrap around on very large values, reproducible with import mpatch; mpatch.patchedsize(12, 'x'*12)

Make copy --after work for files that have been hg added.

When reloading the dirstate, recompute ignore information if needed.

dirstate: speed up write by 50%.

dirstate: make parents() faster. This allows localrepository.status() to avoid reading all but the first 40 bytes of the dirstate in the common case of running "hg status".

localrepository.status: only acquire wlock if actually needed. This speeds up the common case of not needing to update the dirstate, and avoids the need to reload and parse the dirstate "just in case".

util._matcher: speed up regexp matching. In 4babaa52badf, Benoit made a change that substantially slows matching when a big .hgignore file is in play, because it calls into the regexp matching engine potentially hundreds of times per file to be matched. I've partly rolled back his change, so that we only call into the matcher once per file, but preserved the ability to report a meaningful error message if there's a syntax error in the regexp.

Merge with crew-stable

Work around python 2.5.1 tarfile regression

Merge with crew-stable

Avoid float rounding errors when checking http protocol version.

Work around problem where 'del os.environ["FOO"]' doesn't update environment. test-hook failed since changeset 949516072388 because of this on Solaris 8.

Use python instead of shell printf with \x for test-simplemerge-cmd Needed e.g. to be compatible with Solaris.

Merge with crew.

change tests to use simplemerge by default

polish the simplemerge command; add a test

actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py

add mdiff.get_matching_blocks

Merge with stable

Merge with crew

merge: fix quadratic behavior in find-copies

Merge with crew-stable.

test-command-template: improve test coverage

command line templates: add formatnode filter This will print a full hash node with --debug and a short one otherwise. Use it with some default templates and in map-cmdline.default to print the parents. This should fix issue538.

fix 'hg <not-log> -v --template foo' with revisions without copies

Merge with stable

hgweb: fix rfind bug in PATH_INFO handling

Merge with crew

Merge with stable

Merge with crew

hgweb: make PATH_INFO handling slightly more robust

Merge with crew

Merge with Matt

Merge with stable

Add graphlog extension

Merge with crew-stable

mq: fix qtop when some patches beneath are guarded

mq: test qtop with holes in the patch sequence.

Merge with crew-stable

minor typo fix in templater's docstring

Merge with crew-stable.

Add test for issue 529 - "mq aborts when merging patch deleting files".

mq: don't abort when merging a patch that removes files

atomicfile: don't copy the original file if it'll be truncated

use atomictemp files to write the dirstate

use atomictemp files to write branch.cache

util.opener: if requested, use atomicfile even if the file doesn't exist Right now, surprisingly enough, if you request an atomic file but the file still doesn't exist, you get a regular file. AFAICS, the only time this happens is during the initial creation of the dirstate.

cache os.umask even on windows

pull umask-checking up

Merge with crew-stable.

help: log --keyword is case-insensitive

hgweb: expand keyword search to full list of files

log: expand keyword search to full list of files

run-tests.py: use coverage.py with "#!/usr/bin/env python" tests

run-tests.py: small cleanup

run-tests.py: use coverage.py with *.py tests

run-tests.py: tell coverage.py to ignore errors Otherwise there'll be some IOErrors when it tries to open python files created during the execution of e.g. test-hook.

test-bad-pull: try to avoid timing-related failures

Try to find diffstat in PATH before calling it At least on Solaris, /bin/sh will print a "command not found" message even if we redirect stderr.

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates

revlog.py: fix/tweak read ahead code in lazyparser

Merge with Matt

Merge with stable

merge: fix a bug where copies were ignored

Merge with Matt

merge: fix a bug where copies were getting ignored

Move back the purge extension in hgext

purge: abort with missing files avoiding problems with name-mangling fs In a name mangling filesystem (e.g. a case insensitive one) dirstate.walk() can yield filenames different from the ones stored in the dirstate. This already confuses the status and add commands, but with purge this may cause data loss. To prevent this purge refuses to work if there are missing files and has a 'force' option if the user knows it is safe. Even with the force option purge checks if any of the missing files is still available in the working dir: if so there may be some problem with the underlying filesystem, so it unconditionally aborts.

Merge last few matcher/locate fixes.

locate: don't print "file not found" messages. This should fix issue204.

change relglob: patterns to be consistent with glob: patterns With this change, you have to use "hg locate 'hgweb/**'" to locate all the files in directories named hgweb. OTOH, "hg locate '*l'" will locate only files that end with "l" - e.g. a file called "hg.py" will not be matched just because it's in a directory whose name ends with "l" (e.g. "mercurial").

Revert changeset ef1f1a4b2efb; add another test for glob: patterns With that changeset, it's impossible to use a glob: pattern to match e.g. all files ending in .py - glob:**.py would also match all files in a directory called dir.py.

Fixups for recent changes in revlog version handling

hgweb: don't display heads in gitweb-style summary page

hgweb: display named branches in gitweb-style summary page

test-ssh-clone-r: avoid a shell script

test-ssh: avoid a shell script

test-init: avoid a shell script

test-rename-merge2: avoid a shell script

test-merge6: avoid a shell script

test-merge1: avoid a shell script

test-filebranch: avoid a shell script

Use printf(1) instead of using bash-specific shell code. Submitted by: Benoit Boissinot <bboissin@gmail.com>

test-ssh: use printenv.py

test-static-http: use printenv.py

test-http: use printenv.py

test-push-http: use printenv.py

test-bundle: use printenv.py

test-hook: use printenv.py

Add tests/printenv.py This is a small script that can be used as a hook to print the HG_* environment variables without relying on the shell.

Add a filename for the bundle

Slight refining to help text in patchbomb.py

hgweb: short hash for tip archive name

add util.lexists

Improve documentation for patchbomb and email

Add common bundle/outgoing options to hg email

Add ability to send bundles to patchbomb extension

Fixed spacing in assignment of REVLOG_DEFAULT_VERSION

Merge with crew

changelog: optimize delayed updates for clone vs pull pull index updates get redirected to memory, then appended on finalize clone index updates get sent to 00changelog.i.a, then renamed on finalize

Merge with -stable

tags: require -f to replace an existing tag based on a patch from Johan Herland <johherla@online.no>

tags: fix abababa case, with test case

Merge with crew

restructure changelog file appending - make appending code proper part of changelog with delayupdate/finalize - use simplified appender that tracks pending data in memory - eliminate old appendfile and helper classes - update addchangegroup to use new interface and reuse the existing changelog

appendfile: handle only changelog.i file

appendfile: remove unused manifest code

revlog: simplify revlog version handling - pass the default version as an attribute on the opener - eliminate config option mess

revlog: don't pass datafile as an argument

use os.path.islink instead of util.is_link; remove util.is_link

Add some tests for symlink tracking

Fix localrepo.copy to deal with symbolic links.

Backup symbolic links when reverting

fix util.copyfile to deal with symlinks

hg-relink: do not compare .d files

Make import opportunistically use merge information

Add import --exact. When this option is set, import will apply the patch (which must be generated by export) to the parents specified in the patch, and check that the node produced by the patch matches the node ID in the patch.

Add --outgoing option to patchbomb