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.

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

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