Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color.

merge with main

extensions: fix lookup of hgext.foo modules

localrepo: demand-load changeset, manifest, and dirstate

Merge with crew

extensions: fix load of module/__init__.py on OS X

localrepo.status: only append stuff to the clean list if list_clean is true This is consistent with dirstate.status.

mq: reduce matcher abuse The match function should match only the files we're interested in.

commands.remove: don't use the unknown list

commands.commit: don't use the unknown list

localrepo.add: avoid some stats There's still an extra lstat done by dirstate.update.

revert: use util.lexists

addremove: use util.lexists

commands.commit: symlinks are supported

mq: grab locks before starting a transaction

Merge with crew

extensions: load modules in module/__init__.py form. For example, convert=/path/to/convert now works.

test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.

Correct tests/test-patchbomb* files: mv test-patchbomb test-patchbomb.out hg revert -r 1cf908c00479 test-patchbomb

patchbomb: add --date option

Don't validate email config if we're not sending email.

patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil

dispatch: restore a dropped shlex import Add test-dispatch as a place for command parsing and dispatch tests.

merge with main

extensions: add missing sys import

Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.

dispatch: accept an abbreviation of --repository

dispatch: move findrepo to cmdutil

localrepo: don't search from path All current callers already pass in the repo root. This normalizes things a bit. Now all repo types take a direct path to repo root and only the command line interface (or the dispatcher) searches from the current directory.

dispatch: use the repo path found by early parsing This lets us simplify things a bit.

dispatch: parse and apply -R early This allows us to use extensions specified in .hg/hgrc. Unfortunately, this requires us to parse that file twice, but performance impact on the version command appears to be less than 1%.

dispatch: parse and apply cwd opt early

dispatch: rename variables after code motion

dispatch: hoist debugging hook to runcatch

dispatch: move dispatching code to cmdutil

dispatch: move runcommand to cmdutil

dispatch: pull final command execution into its own function

dispatch: reduce nesting by moving parsing exceptions

dispatch: move signal and exception handling to its own function

Create a separate module for managing extensions

extensions: separate function for loading single extensions

dispatch: reorder functions

localrepo: break out the repo-finding walk into its own function

Respect locale environment variables on darwin. In python 2.4+ on darwin, locale.getpreferredencoding() returns mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can produce hard-to-notice conversion errors if input text is not in mac-roman. So this patch overrides it with setlocale/getlocale if the environment has been customized, on the assumption that the user has done so deliberately.

Small cleanups for the new tag code

gitweb: Display branch and tag labels Pages which display labels: - summary - shortlog - changelog - changeset - search

Merge with mpm

commit: fix bug where dirstate for removed file is confused This fixes issue586

hg serve: don't lookup user-supplied names/addresses

Split convert extension into common and repository type modules

Removed trailing \n in calls to util.Abort()

Some small cleanups for convert extension: - repo doesn't need to be imported - util.Abort doesn't need \n - space after comma - long lines - spacing

Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

Make sure the changelog mentions files whose flags changed These changes don't actually need a new filelog entry (see next patch), but if we don't mention the files in the changelog, it becomes much harder to find all changesets that touch a file (not even a "hg log --removed file" will work).

run-tests.py: set ui.slash = True This should make things easier for pysh.

test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.