merge with self.

load extensions from every hgrc. before this change only extensions in global hgrc files were loaded. now extensions in per-repo hgrc are loaded.

refactor extension loading.

merge with brendan.

mq: fix appliedname

mq help text updates and speling fixes

Add qnew -e option.

allow qrefresh to take a list of files; closes #96.

Fix test-mq-qdiff; add -I and -X options to qdiff

Fix qfold after recent changes

sed portability fixes

Teach mq about git patches

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

Make clear that hg pull -r REV pulls "up to" a revision. The existing message was a bit confusing, making the reader believe that only the specific revision is pulled.

Use cached hg-root-dir instead of rediscovering by a second call to (hg-root). We have the path we need already as the value of hg-root-dir.

hgweb: repo.changes() is now called repo.status()

remove localrepository.changes. use localrepository.status instead.

refactor text diff/patch code. rename commands.dodiff to patch.diff. rename commands.doexport to patch.export. move some functions from commands to new mercurial.cmdutil module. turn list of diff options into mdiff.diffopts class. patch.diff and patch.export now has clean api for call from 3rd party python code.

merge.

manifest.execf is now a function.

merge.

grep: add --follow support.

grep: display correct user/revision for --all in reverse. Also handle multiple occurrences of the same line by storing linestates in an array instead of a dict, and using difflib to compute the difference between linestates.

util: qualify name properly.

mq: demandload more

commands.import: refactor patch parsing into patch.extract.

merge git patch code.

Tests for git import

Remove debugging line

Fix bad merge with crew

Move patch-related code into its own module.

Teach import to understand git diff extensions. Vanilla patch chokes on git patches that include files that are copied or renamed, then modified. So this code detects that case and rewrites the patch if necessary.

update copyrights.

merge.

Fix some bugs introduced during the manifest refactoring

Fix "hg qnew -f foo" without -m The refresh method assumes it has a string.

merge with mpm.

Remove manifest.readflags

Change remaining users of manifest flags

Switch to simpler manifestdict

Merge: use single objects for tracking manifests

Merge: save away mode bit so that we don't need manifest later

Merge manifest refactor work

Combine manifest dict and flags dict into a single object This gets rid of the need to track two objects and might save memory. This might be faster implemented as a subclassed dict with auxiliary functions to access a sparse flags dict.

manifestflags: eliminate remaining users of direct dict access

Use strings for manifestflags to allow storing multiple flags

Start using manifestflags methods

Add manifestflags class

import: get lock and wlock one time this makes import of many patches 6x faster in kernel repo.

Adjusted documentation for hgrc's "[smtp] host" for change in 9f745d3675d4.

fix test output

mq: only add mq attribute to local repo

mq: apply patch is any posative guard matches this is like guards command from quilt package.

fetch: fix test fail

mq: do not allow to push from repo with patches applied

call reposetup functions of extension modules whenever repo created

mq: test commit in repo with patches applied

Disallow commit over an applied mq patch.

qselect: add --pop, --reapply options

Fix some tests for portability.

Merge with crew, fix most tests

Merge: combine force and forcemerge arguments

Merge: move most tests to the beginning

Merge: refactor err and failedmerge -> unresolved

Refactor update locking slightly