Report branch for hg id

Report branch for hg log and friends

Add branch method to contexts

imported patch b1

add footer to old style

fix rss template

Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.

merge with main

hgweb: hoist changenav up, and use it in the filelog

hgweb: link to file parents in filediff, rather than changeset parents

Test annotate using named rev instead of linkrev

Fix annotate where linkrev != rev without exporting linkrev

Back out d8eba1c3ce9b and a004164dbeef

Make annotate use linkrev instead of rev

Add linkrev to filectx

merge: if filemerge skips merge, report as updated

Catch python2.3's IndexError with bogus http proxy settings. (issue203)

Fixed contrib/hgdiff script to pass diffopts in the new format.

document the diffstat option of the notify extension

hgweb: add diff links in gitweb file revision page

hgweb: add changeset description to file revision page

hgweb: really fix parent/child rename links

hgweb: better file rename links

hgweb: fix parent/child links across renames

hgweb: add changeset description to annotate page

make revlog.addgroup pass its file handles to addrevision This should fix issue255. It looks like the problem there happens when addgroup calls addrevision to add a full revision, and addrevision decides to split the index file into a .i/.d pair. Since addgroup has an open file handle for the index file, the renaming of the new .i file to its final name fails on windows.

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)

merge with upstream

use short hashes with diff -v

Use manifest rev instead of changelog rev for linear manifest test

Removed unused imports of mdiff and templater from ui.py

log --copies: use manifest.find instead of delta when manifest parent is not rev-1 This fixes issue391.

Test case for log --copies on non-linear manifests (issue391)

hgweb: fix path cleaning

Merge with asak

portability fix for test-ssh The __del__ method of sshrepo reads the stderr of the remote process until EOF and prints it. If an exception is raised, this method ends up being called: - on Linux: after the "abort: ..." message is printed - on OS X: before the "abort: ..." message is printed This patch explicitly flushes the stderr of the remote process before raising a RepoError.

Merge with mpm

Add popen2 demandload to patch.py, required by diffstat

rawcommit: add removed files to the changelog file list patch by tonfa.

Update test-mq-qdelete to use qdel -r

mq: make qdelete without -k or a subrepository delete all patches

Use line length field when extracting git binary patches

mq: change qdel --forget to --rev; accept any revision symbol

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

merge: turn followcopies on by default

mq.el: add mode-line hook

python2.5 PyArg_ParseTuple fix Python 2.5 doesn't like it when we mix str objects and the "t#" format in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4 and 2.5.

Add test for git binary diff support