contexts: add working dir and working file contexts add workingctx add workingfilectx extend filectx.annotate for rev=None extend filectx.ancestor

context: simplify repr methods

contexts: use __getattr__ rather than try/except in changectx

context: make filectx remember changectx in changectx.filectx

Make filectx lazier Lazy opening of filelog, lazy lookup of filenode and changeid

merge: remove old merge function

merge: extend file merge function for renames

correctly find the type of 'id' in revlog.lookup

merged brendan's hgweb cleanups

hgweb: teach siblings and callers to use contexts

Add lookup method to filectx

hgweb: kill off #filenode#

hgweb: kill #manifest#

Remove duplicate walkopts + dryrunopts from addremove.

Merge with upstream

Remove unneeded (and bashismic) export HGMERGE=true.

Templater expects an iterable copies variable (fixes notify).

Remove single character equivalent of --nodates (was -D)

Add -D/--nodates options to hg diff/export that removes dates from diff headers and replace uses of sed in the tests with --nodates.

Documentation clarification for --update option to pull and unbundle

Show copies in hg log. The format is: copies: destination (source)...

Abstract manifest block parsing.

Make hg.repository work with no path argument

merge with crew

Make "hg log --style=changelog > changelog" work (issue338) Style files in templates/ now take precedence over current directory. This can be overridden with --style=./changelog if really neeeded. Added test for issue338.

Clarify precedence for template/style in commands.show_changeset(): Display format will be the first non-empty hit of: 1. option 'template' 2. option 'style' 3. [ui] setting 'logtemplate' 4. [ui] setting 'style' If all of these values are either the unset or the empty string, regular display via changeset_printer() is done.

add remoteopts to bundle command

factor opts: remote repo access options

factor opts: --dry-run option

factor opts: walk options

factor opts: move globalopts to a more logical place we will put other options at the same place

mq: raise util.Abort instead of using sys.exit(1)

mq: don't write applied patches into series twice in restore

mq: bail out if a patch appears more than once in the series file. Closes: #379.

mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev This moves most of the queue display code into qseries.

Merge with crew

Documentation fixes for addremove. - It is no longer deprecated, but the short help still included (DEPRECATED). - Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.

hgk: fix mixup of --limit and REVRANGE in hgk call

gitweb: cosmetic fixes. Fix the padding around the changelog description. Alternate row colours for the changeset file list.

hgweb: yield filenode as well as node in annotate, use filenode in annotateline

hgweb: fix changeset link in annotate view.

shortuser should stop before the first space character. Examples: "Foo Bar <foo.bar AT example DOT com>" -> "foo.bar" (instead of "foo.bar AT example DOT com>" as it was before.) "Foo Bar" -> "Foo"

hgweb: make annotate line revisions point to annotation for that rev

hgweb: fix annotate bugs The parent and child links were broken.

hgweb: use filectx.annotate instead of filelog

Refactor annotate copy support.

merge with mainline

do not disclose proxy user and password in debug messages

merge: minor nullid cleanup

context: add __nonzero__ methods

merge: use repo.parents and parent contexts in update

Add str methods to contexts

Add equality operators to changectx and filectx

localrepo.parents: return null context for no parents

Add localrepo.parents to get parent changectxs.

merge: move partial filtering out of manifest merge

merge: move findcopies after workingmanifest

findcopies: shortcut for empty working dir

fix users of dirstate.copies broken by b1f10d3223c1

Merge with crew