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

clone: make things work when source is a repo object

clone: expand the path before saving it in .hg/hgrc This should fix issue976

better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

better handle errors with date parsing (issue983) Windows cannot always handle a 1970-01-01 parameter to time.mktime().

hgweb: disable cgitb by default in hgwebdir.fcgi too

Document and fix tla/baz conversion tests

convert: detect baz before tla The former seems to handle repositories built by the latter, the opposite is not true.

keyword: add glog to nokwcommands

keyword: enable all monkey patches using _kwtemplater at reposetup - no need for try-except block - underscore prefix for private methods - add doc strings

hgweb: disable cgitb by default

convert: added GNU Arch (tla) tests and related fixes

convert: added gnu arch (baz) tests

convert: try to be smarter about CVS branching Better handles this case: The output from cvsps -A -u --cvs-direct -q: --------------------- PatchSet 1 Date: 2008/02/08 20:33:28 Author: fk Branch: HEAD Tag: (none) Log: initial Members: file_one:INITIAL->1.1 --------------------- PatchSet 2 Date: 2008/02/08 20:33:32 Author: fk Branch: branch_name Ancestor branch: HEAD Tag: (none) Log: new file on branch Members: file_two:1.1->1.1.2.1

filemerge: more backwards compatible behavior for ui.merge if ui.merge matches a tool in [merge-tools], it is used as the default tool selection but may be rejected by binary or gui or other checks. If ui.merge does not match a merge tool, it is used unconditionally.

filemerge: add 'checkchanged' merge tool property

ignore: split up huge patterns Some versions of Python silently mishandle large regexes, so split them up at a conservative 20k.

Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8.

keyword: no expansion in web diffs Expansion in hgweb view of changesets and diffs is not needed and only distracting. Expansion stays enable in file and archive requests where it makes sense.

keyword: make restrict entirely a kwtemplater attribute

keyword: declare globals in a more compact way

keyword: avoid os import by using util.splitpath

Automated merge with http://hg.west.spy.net/hg/hacks/hg

Option to log to only show changesets within a specified branch.

Strip filter name from command before passing to filter function. The new registration of in-process data filters (introduced in f8ad3b76e923 & 11af38a592ae) failed to correctly strip the filter name from its arguments before passing the "command" to the filter function. Thus a registration such as [decode] *.gz = compress: -9 would result in the associated filter function being called with the argument 'compress: -9' rather than just '-9' as expected.

make the journal/undo files from transactions inherit the mode from .hg/store

add test-inherit-mode