mq.el: add mq-edit-series function.

mq.el: add mq-new function.

Fix up patchbomb test

add test for patchbomb extension.

contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

Merge with stable

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

branch.cache: silently ignore I/O and OS errors

context: fix workingfilectx._changectx

mercurial.el: don't raise an error from find-file-hook find-file() shouldn't fail even if unreadable .hg directory is exists. Not enabling hg-mode is sufficient for that senario.

mercurial.el: move defmacro of hg-do-across-repo before use Macros must be defined before use to be byte-compiled properly.

Unconfuse font-lock

Add fast-forward branch merging

Merge with crew-stable. HG: changed hgext/mq.py

mq: fix qtop failure when the series ends with guarded patches.

Test qtop breaking when series ends with guarded patches.

simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

Move win32 find_in_files from util_win32 to util.

Merge with stable

Merge with crew-stable

Update Windows build instructions.

merge: reorganize some hunks in findcopies

merge: simplify a check in checkcopies

merge: expand and simplify the invalid handling for directory moves

merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.

merge: clarify the findcopies code

mq: account for readheaders munging in qrefresh

verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.

Also restore old rm -A behavior for inexact patterns

Fix rm -A with no patterns, which I just broke.

Make rm --after simply mark files as removed, unless --force is also given

Add hgwebdir.fcgi to contrib

Flesh out bisect help text

Merge with crew

Merge with stable

hg serve: don't do DNS lookups

Fix minor mismerge. The caching of umask ended up being duplicated.

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Add notes about configuring a merge program

Update copyright year and change to range

Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.

Merge with crew

Fix find_in_path not including some file extension logic under win32. Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.

Fix bad reference to RepoError in import command

Refactor commands.serve to allow other commands to run as services. This introduces a new function, cmdutil.service.

Do not automatically rename an atomicfile if a write to it has generated an exception.

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

Merge additional fixes for my matcher changes

glob:<directory> patterns match the files in that directory. This makes the behaviour of glob: patterns more consistent: hg status glob:dir and hg status -I glob:dir will match the same files. It's also consistent with the fact that {rel,}path patterns recursively match the contents of a directory.

Pass normalized directory names to the ignore function This fixes a bad performance regression caused by dd0d9bd91e0a.

tests: expand test-commit a bit to test 'hg commit .' too

fix hg commit . in the repo root

transplant: fix ignoring empty changesets (eg after filter)

Merge with crew-stable.

debugsetparents: wlock the repo before updating the dirstate

avoid _wsgioutputfile <-> _wsgirequest circular reference We use the _wsgirequest object itself as the output file object. To avoid a "self.out = self" which would create another circular reference, we make the "out" attribute a trivial property.

avoid wsgiapplication <-> MercurialHTTPServer circular reference

hgwebdir: break templater -> templater circular reference This is essentially another instance of the same problem fixed by the parent changeset. See its commit message for the details.

hgweb: break templater -> templater circular reference The problem were some functions passed in the "defaults" argument during the templater creation which use "self.t" directly. This creates the cycle: hgweb object -> templater object -> defaults dict -> footer function -> hgweb object Instead of completely avoding the cycle, we break it after using the templater.

Add hg-relink script to contrib

merge with crew-stable

Fixed synopsis for some mq commands

hg qseries -m: guards file was not ignored

Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)

Simplified qseries and hg qapplied to fix some bugs caused by optimization: - hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing guarded (or unapplied because they were guarded during hg qpush) patches. - hg qapplied <patchname> now works again

Fix issue443: inconsistent output of "hg qunapplied -v" 1. Don't skip over unpushable (guarded) unapplied patches. 2. Don't display unpushable patches, unless -v is given, otherwise guarded and unguarded patches can't be distinguished.

Merge some matcher fixes/cleanups and add some more hg locate tests

util._matcher: remove superfluous variable

add some more tests to hg locate

make the output of test-locate more readable

util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

Merge with crew-stable

avoid a traceback with hg branch newbranch; hg up

Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

pass repo.root to util.pathto() in preparation for the next patch

hgweb: handle IOErrors and OSErrors during unbundle This allows the client to display a reasonable message to the user (e.g. "Permission denied: .hg/lock"), instead of the current "<url> does not appear to be an hg repository".

hgweb.unbundle: call req.httphdr only after the last possible call to bail

Work around a urllib2 bug in Python < 2.4.2 When urllib2 base64-encodes the password needed for the Proxy-authorization header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence is appended to every header, as required by the standard. Some proxies interpret the resulting "\n\r\n" sequence in the same way as "\r\n\r\n": end of headers. This usually doesn't cause trouble for this request, but when the proxy tries to read the next one, it thinks the request starts with some garbage and returns a "400 - Bad Request" error.

Fix confusing message from hg revert (issue332) % mkdir sub1 % touch sub1/file1 % hg add sub1/ adding sub1/file1 % hg rev sub1 sub1: No such file in rev e4c586763258 forgetting sub1/file1

Merge with stable

Merge with crew

revlog: attempt to gracefully handle some interleaved damage

merge with crew-stable

Merge with hg-stable

Merge with mpm

Merge with -stable

tags: add --remove

tags: remove unused variables

Make the tags algorithm smarter

Refactor tags code to prepare for improving the algorithm

merge with crew-stable

Only hg repositories override [paths], not simple directories (fixes issue510)

git-send-email compatibility: stop reading changelog after ^---$

mq: add qparent tag (first parent of qbase)

Merge with -stable, fix small test failure

Remove dummy branch hack from tests

Move branch read/write to dirstate where it belongs

Minor default branch cleanups

Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.

"default" is the default branch name

Make [PATCH] removal slightly more robust

Remove undo log after mq operations that rollback would break

Refresh file size after partial qrefresh. This makes a subsequent hg revert; hg status work.

Clarify update help text for update without an explicit revision

Improve hg branch -f help text

Add test for branch shadowing

branch: require --force to shadow existing branches

Strip [PATCH...] from message subject when importing patches

Merge a bunch of matcher and locate fixes.

Optimize return value of util._matcher for hgignore case

Optimize return value of util._matcher for common command line case This will trigger every time somebody runs something like "hg diff" or "hg status" without any arguments. The important part here is returning util.always as the match function, which is a much simpler (and faster) function than the usual return value, and allows other code to just skip the filtering if it knows all files will match.

remove unused "head" hack from util._matcher

locate: exit(1) if we didn't print any file

change locate to use relglobs by default This makes its default behaviour useful again (issue108), and changes it search the entire repository by default (instead of just the cwd), just like all other commands. It also hides issue204 by default, but you'll still see the same behaviour if you give it a relpath: pattern.

localrepo.walk: if we're walking a specific revision, sort the files This is more consistent with our behaviour while walking the working directory.

dirstate.statwalk: explicitly test for ignored directories This removes a hack where we appended '/' to a dirname so that: - it would not appear on the "dc" dict - it would always be matched by the match function This was a contorted way of checking if the directory was matched by some hgignore pattern, and it would still fail with some uses of --include/--exclude patterns. Things would still work fine if we removed the check altogether and just appended things to "work" directly, but then we would end up walking ignored directories too, which could be quite a bit of work. This allows further simplification of the match function returned by util._matcher, and fixes walking the working directory with a --include pattern that matches only the end of a name.

util._matcher: unify pattern normalization This should fix issue347. It also highlights one issue with the directory walking code when you have an --include pattern that matches the end of a filename. This is fixed by the next patch.

make the output of test-walk more readable

util.*matcher: change default "names" argument names=['.'] means "include (recursively) only files from the current subdir"; the function then did a hack to walk the whole tree. Clean that up. This also fixes a problem where "--include ." works in a subdir, but not on the tree root.

util._matcher: fix handling of path: patterns