Move import's working dir update code into patch.updatedir

Solaris portability fixes

Fix bug #345. The last hit for a file might have been before the last window, so we can't clear copies. To reduce the load, we only store real copy entries instead of storing hashes for every revision.

patchbomb: import new mail module

mail: fix connect

merge with tah

Fix hgweb's patch display in changeset view.

hgext: more patchbomb documentation + Add a description of how to enable this extension + Note which command it provides (it's not very easy to guess that "hgext.patchbomb" enables the "email" command, unless one can read Python sources) + Expand the descriptions of the -n and -m options of "hg email". + Mention that formail is (commonly) part of the procmail package.

make new tests executable.

tests: new test for the bisect extension

tests: new test for "hg annotate"

override previous merge with mpm. merge at ef8ee4477019 was bad.

redo merge with mpm. previous merge at ef8ee4477019 was bad.

merge with mpm.

merge: consolidate dirstate updates

merge: use file size stored in revlog index Add size method to filelog to handle nodes with renames

merge: move forgets to the apply stage

trivial bool() cleanup

filelog.cmp: return 0 for equality spotted by Alexis Carvalho

merge: hoist some working manifest logic out of merge loop

merge: working manifest new/changed To remove dependence on m1 during manifest comparison, we distinguish between new and changed states in mw.

merge: factor out exec bit merge function

Use revlog hash comparison technique in merge

Move cmp bits from filelog to revlog

Move ui.sendmail to mail.connect/sendmail

Move ui.diffopts to patch.diffopts where it belongs

Unify mq and hg patch invocation. This makes patch a little less verbose by default, so the tests had to be updated.

merge.

make test-mq-qdiff executable.

tests: new test for mq qdiff command `hg qdiff .' is supposed to work but it is currently broken. This test should help us verify when it gets fixed.

merge with other head by default, not tip. fixes issue 339.

merge with mpm.

Tune a bit the extdiff toplevel comments/samples. * Capitalize the first letter of all sentences * Add an example for GNU diff(1) 'context diff' mode. * Explain the requirement for separate cmd.xxx and opts.xxx options in .hgrc, which hopefully will guard against users trying to add: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff -Nprc5 which fails for recent crew builds with: $ hg cdiff . making snapshot of 1 files from rev 07dc4a569f4e making snapshot of 1 files from working dir diff -Nprc5: not found The correct way to do this is by separating the cmd.cdiff and opts.cdiff parts like this: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff opts.cdiff = -Nprc5 so add it as a new example and explicitly describe it in the extdiff comments.

filelog: add hash-based comparisons For status, rather than reconstruct full file versions from revlog for comparison, compare hashes.

Merge with crew

merge: minor simplification

Fixed test-extdiff. diff-like tools usually return 1 if differences are found. Currently the extdiff returns 256, but that's a different topic (consolidating return code handling in hg).

A fix for --prune.

Adjusted test to changed help output.

merge with jeffpc

Use demandload in hgk

Add diff --git option

extdiff: fix bugs. add test.

Allow qdel to delete multiple patches.

Replace qdel/qfold -f option with -k/--keep.

Properly shell-quote arguments in extdiff

Update extdiff for recent refactoring

Test for log --prune.

hgweb: partially revert 4ec58b157265 The change from self.repo.ui.diffopts() to ui.diffopts() causes a traceback when the diff of a changeset should be displayed in the web interface. Revert to self.repo.ui.diffopts() for now.

cmdutil.matchpats: allow include/exclude to be optional.

add default values to arguments of walk etc.

move commands.addremove_lock to cmdutil.addremove

move walk and matchpats from commands to cmdutil.

fix patch.patch.filterfiles. now test-diff-subdir passes.

make test-diff-subdir executable.

tests: new test for hg diff of a subdirectory only