keyword: do not inspect node1 for diff if node2 is given

keyword: add test for patch.diff monkey

keyword: make main class and hg command accessible Switch from global vars to top level dictionary. Goal: make it easier for external tools (like tortoisehg) to hook into keyword extension.

keyword: move expand/shrink decisions into kwtemplater - do not clobber wrapper code - get rid of clumsy kwtemplater attributes

try to fix test-inherit-mode on HFS+ HFS+ doesn't like setgid directories, so avoid them in most of the test and do a quick check that doesn't change the output when everything's OK.

cmdutil.commit: use relative paths in the error messages This is more consistent with other error messages and requires less makeup in test-commit and test-symlink-basic.

util.pathto: return '.' instead of an empty string This could happen with something like pathto(repo.root, 'foo/bar', 'foo/bar')

status: put added files that have disappeared in the deleted list This gives the user an indication that something went wrong with this file: $ hg add foo $ rm foo $ hg status foo ! foo Fixes issue212.

revert: unify forget and remove lists This doesn't make a difference right now, but after the next revision some files in state 'a' may end up in the deleted list, and revert won't be able to just remove all files in that list.

revert: only call dirstate.normal when we know the file is clean

commands.revert: don't call hg.revert commands.revert calculates everything that has to be done and then calls hg.revert to checkout and remove files. Unfortunately, hg.revert has to recalculate everything and that can take a long while, since it always operates on the whole working dir. Changing commands.revert to manually checkout and remove files makes things considerably faster, especially if we're reverting a single file in a repo with a huge number of files. This should be enough to close issue857.

revert: don't let repo.status walk the whole working dir Problem diagnosed by pmezard.

Set bundle.mainreporoot only after checking that it's a local repo Fixes issue977.

Fix test-hgweb-commands.out after 9b817c0a82f1

Propagating changes back to working dirs when changing files in external

test-convert-baz: set username with baz, not tla

Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.

convert: fix --datesort ordering Two branches a and b starting at root, with commits interleaved like: root a0 a1 b0 a2 a3 b1 were converted in the following order: root a0 b0 a1 b1 a2 a3 Replace depth based toposort with a more classic traversal method.

[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.

push: exit(1) if "push creates new remote branches!"

hgweb: Fix stray quote in logo img tag

hgweb: add new logos

Add the new "droplet" logo

cat --decode: Drop short option, use opts.get() instead of opts[] - hg archive --no-decode has no short option, too, and maybe both could use -d in the future to select revisions by date. - opts.get makes python scripts calling cat() happy, because they don't have to pass the new option.

Option --decode for hg cat to apply decode filters. (Does not trigger expansion of keyword arguments when using keyword extension, though that might be desirable as well.)

keyword: monkeypatch patch.diff for non-interactive diffs Avoid clobbering diffs with expanded keywords eg. for notify extension.

merge with main

merge with crew-stable