Merge with crew-stable

use repo.wjoin(f) instead of os.path.join(repo.root, f)

correctly update dirstate after update+mode change (issue1456)

mq: don't warn about ambiguous patch name when using patch index (issue1439)

convert/gnuarch: fix switched copy source and destination Reported by Edouard Gomez <ed.gomez@free.fr>

mq: drop copy records when refreshing regular patches (issue1441) Copy information was saved in a common loop, then refined in a git-only block. The problem was the latter did filter out renames occuring in the current patch and irrelevant to commit. In the non-git case, copy records still existed in the dirstate, referencing removed files, making the commit to fail. Git and non-git copy handling paths are now separated for simplicity. Reported by Gary Bernhardt

hgweb: fix problems with empty repositories

localrepo: fix bad manifest delta generation (issue1433) The issue came from the 720ae5085ee3 fix for issue586 working only for manifest.add() fast path, where the incorrect removed file set was ignored. This path was no longer taken after 716a1296e182 refactoring.

hgweb: send HTTP unauthorized error when denying pull

hgweb: allow static content when deny_read denies access

patch: kill some trailing whitespace

hgwebdir_mod: fix a performance issue with static files

Merge with -stable

setup: warn about missing standard Python components

Circumvent removal of valid bisect candidates due to previously skipped ones As reported in issue 1445: A valid candidate revision for a bisect test is not considered for testing due to its skipped ancestor. If this revision is the only untested one left an assertion error occurs.

Added signature for changeset 11a4eb81fb4f

Added tag 1.1.2 for changeset 11a4eb81fb4f

test-audit-path: add more tests (issue 1450)

audit: reject paths with .hg (issue 1450) Spotted by Peter Arrenbrecht

merge bookmarks

bookmarks: tests for track.current option

bookmarks: set the current bookmark to the new name if we rename the current bookmark If we rename the current bookmark, we have to set the current bookmark to the new name.

merge with crew-stable

monoblue: add less/more links to graph page

python implementation of diffstat Implemented as two functions: diffstat, which yields lines of text, formatted as a usual diffstat output, and diffstatdata, which is called inside diffstat to do real performing and yield file names with appropriate data (numbers of added and removed lines).

add a comment about the need of hg._update()

merge with -stable

test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here.

Merge crew and stable

merge with stable

Merge with stable

merge with stable