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

Merge with mainline

merge: move set_exec to actions

merge: add forget to action list

merge: add codes to action list, eliminate None elements

merge: convert actions to list

Merge with backout

Back out trusted hgrc change for now Backed out changeset 494521a3f1425

Merge with crew

merge: fold umap and added into m1 manifest

merge: make unresolved a counter

merge: use context code to retrieve manifests

Update [extdiff] configuration sample for vimdiff, taking acount cmd.xxx and opts.xxx configurations item.

Add support for diffstat in commit emails, and move diffstat from patchbomb to patch

cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.

merge with brendan

hgk: add --limit, and revranges

hgk: add revision numbers

mq: handle patch names containing ":"

Move revision parsing into cmdutil.

Avoid negative block sizes in lazyparser. This fixes a bug introduced by changeset baa3873eb387 .

mq: add qdelete --forget option This removes an applied patch from the series and status files without popping it. It is useful when an mq patch has been applied upstream.

mq: do not update an empty working directory after strip. Closes #296.

mq: Add --git option to qrefresh

Add the -s option to `hg help qseries`.

sshrepo: don't try to validate when creating the repo - This removes the "repo not found" error when cloning or init-ing a remote repo. - Since the remote hg will abort if the repo already exists we don't need to validate it.

Make qrename handle directory targets; closes #333.

Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.

Added tests for qpush/qpop with index.

Fixed OSError "No such file or directory: None" and make IOError consistent. The None error occurs when the current working directory is no longer available, e.g. because it was removed in another shell.

If local repository is missing, make error message clearer. Faheem Mitha suggested finding a better error message. The nice error message is taken from cogito.

don't let lazyparser read more data than it can handle This should fix issue368.

document changelog format

merge with brendan

strip: strip changelog before manifest

extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf

Include section name and parameter name (if available) in config errors. Added tests for this.

Never apply string formatting to generated errors with util.Abort. Otherwise error messages containing % chars yield errors or worse. Fixed (hopefully) all users of util.Abort.

hg merge: fix lookup of branch add some tests for branch usage

merge with crew

hgk.py: fix for a bug introduced in 32fd512ca7c0

allow shell-quoting in command defaults

hgk.py: use mercurial.patch functions when possible

git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase

hgk.py: use nullid instead of a constant

hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)

hgk.py: add an optional file list to debug-diff-tree this solves a problem when hgk was trying to display merges diff

really treat the right side of acl.{allow,deny} as a list of users the current implementation seems to expect only user per pattern, which contradicts the documentation available at the file beginning.

merge crew with hg-churn

Fix for Python 2.3 compatibility. Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3 and "cmp" in Python 2.4.

hgk: use short changeset hashes this fixes the missing tags on hgk window

merge with brendan

unlink temporary patch files even when an exception is raised

Remove temporary git patch files

Fix git patch application when cwd != repo.root

Detect git patches in patchbomb makepatch function

merge with hg-churn

[churn] Moved churn extension from hgext to contrib

[churn] Fix progress bar not incrementing when merge cset is encountered

[churn] progress meter

[churn] Ignore merge csets Merge changesets attributed a large number of lines to people that didn't actually develop it, but simply merged the code. By ignoring merges, we get a more accurate picture of how much code everyone changed.

[churn] repo.changes was renamed to repo.status

Merge with mpm

Merge with Brendan Cully

Add revision range support

[churn] Fixed churn ignoring the first commit

[churn] Trivial cleanup

[churn] Trivial cleanup suggested by Thomas

[churn] Cleanup suggestions from tonfa Use demandload Be smarter about the final list creation

Churn extension

add document on command defaults

do not enable verbose output if quiet is specified in the cmdline

clone: simplifying dest repo creation since creating a repo raises an exception if the repo already exists, there's no need to try to create one. add some test for repo creation when the destination exists

sshrepo: when creating a repo, raise an error if it already exists

localrepo: move the repo creation code, fail if the repo exists