Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

Update tests to match new addremove chattiness.

Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.

Hack to fix missing '/' problem in URLs

Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.

Added deprecation warnings if -t or --text is used for commits.

Changed more occurances of 'text' to 'message'.

Change all references to -t --text commit message to -m and --message.

Changed coding hint to BOM

Updated TODO.

There was an extra space after 'hg id' when there are no tags.

Updated help strings and test-help: - options -I/-X: always at the end, don't include them in the synopsis. - NAME is optional for hg revert - other small changes.

Added new code contributors, fixed Vincent's name, added hint on encoding.

Show filenames for hg export in verbose mode on a separate lines. This makes parsing by external tools much easier.

Fixes and cleanups to hgeditor: - "HG: merge resolve" isn't supported for a long time now. - detection of unchanged commit message if signing is turned off. - don't add manifest hash to commit message if not signing.

Check protocol versions This also allows the old unidentified protocol

Simplify content type checking

When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) you geta pretty obscure error (zlib: uknown compression type). The attached patch modifies hgweb.py and hg.py to supply and check a 'Content-type: application/hg-0.1' HTTP header for the branches, between and changegroup commands, so that we know it's a proper hg repo before snarfing the input. Comments appreciated!

Add tag -t, deprecate tag -m manifest hash: 893aa9732b500edfa6ffc099f76b00a88a5b1943

Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05

Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0

Add -m for rawcommit manifest hash: cf066b609ab4854a731c103f1d456d89cf5e1312

Change C to M in status

Add -m for commit and deprecate -t Index: hg/doc/hg.1.txt ===================================================================

Handle empty file list for annotate

Remove ls command

Refactor matchpats and walk Move core match function code to util Add some comments and whitespace Simplify options Use lambdas instead of always and never

Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6

Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659

Split make_file back out into make_filename and make_file. It turns out that make_filename is useful by itself.

If the argument to make_file can act like a file, return it. This is useful for code that calls command functions, but doesn't want to send I/O through the filesystem.

Merge with Matt's tip.