Refactor annotate copy support.

merge with mainline

merge: move partial filtering out of manifest merge

merge: move findcopies after workingmanifest

findcopies: shortcut for empty working dir

do not disclose proxy user and password in debug messages

fix users of dirstate.copies broken by b1f10d3223c1

Merge with crew

findcopies: use dirstate rename information

dirstate: add copies function rename copies to copymap

Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.

context: change filectx repr to use @ Avoids confusion with rev:nodeid syntax used elsewhere

optimize revlog.lookup when passed hex(node)[:...] Instead of converting each node from the filenode to a hex form, convert the arg to a bin form. For a revlog with 26711 entries, doing 100 lookup: before: ~18s after : ~13s

cleanups in revlog.lookup - add comments - do a clean separation of the different cases - don't use a list of each possible node when doing the lookup, just keep the previous entry

context: add __repr__ methods

filectx: lazy linkrev usage

restore filectx.changectx() method

fix newline in error message

add comments in cachefunc

filectx.annotate: return filectx for each line instead of rev

Add cachefunc to abstract function call cache

Make filectx lazier - some users never use filenode

context: handle fileid or changeid == 0

merge with crew

mq: Add --rev argument to qimport, to adopt existing changesets.

manifest.py: remove unnecessary method

Switch revlog.ancestor to use revisions rather than nodeids

mpatch: Fix for malloc corner case on AIX

Merge with crew

Abstract ancestor algorithm into generic function Make depth calculation non-recursive Add simple shortcut for linear ancestry Convert context to use ancestor function make memoized parents function Convert revlog to use ancestor function

Merge with crew

filectx: add rename-aware ancestor algorithm This code works but may trigger recursion depth issues

changectx: add ancestor function

filectx: allow passing filelog in init to avoid opening new filelogs

filelog: make metadata method private

filectx: add rename traversal for parents()

tests: add new test; test-mq-qrefresh

qimport: rename patch to patchname to avoid shadowing module

Move defaultrev into changectx This also causes tag on a repository with no working directory to default to tip.

fix warnings spotted by pychecker

hgweb: fix errors spotted by pychecker

extdiff: use the default option only if the default program is used

Merge with mainline

merge: simplify actions with helper function

merge: simplify local created logic

merge: simplify prompt code

merge: simplify exec flag handling

merge: simplify tests for local changed/remote deleted

merge: more simplification of m2 manifest scanning

merge: reorder tests on m2 items in manifestmerge

merge: eliminate redundant security check duplicated in applyupdates

merge: eliminate confusing queued variable

merge: remove no longer possible clause

merge: move apply and dirstate code into separate functions

merge: remove linear variable

merge: simplify hook code

merge: linear_path -> linear

merge: pull manifest checks and updates into separate functions

merge: remove now unused umap dict

merge: pull manifest comparison out into separate function