subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test

mq: fix test

mq: add a line to hg summary

changectx: change diff() to accept keyword opts

changectx: use repo.ui diffopts, allow argument override

Merge with stable

commands: explain that "hg serve" does not do authentication

commands: explain that "hg serve" is mostly for ad-hoc sharing

context: only scan unknowns when needed

context: use asserts for ignored and clean exceptions

workingctx: use member variables to store ignored and clean If some code tries to query ignored or clean files without first calling the explicit status() method to query them, it will raise an exception (indicating a software bug).

workingctx: add explicit status method, add ignored and fix clean workingctx.clean() and memctx.clean() have both been returning ignored files since their creation. This patch fixes clean() while introducing a method for querying ignored files. The new status() method can be used to explicitly override the default (fast) arguments used by the _status property.

context: add a changectx.diff() convenience function With this function, extracting diffs becomes trivial: repo = hg.repository(ui.ui(), path=root) ctx = repo['tip'] for out in ctx.diff(): print out

keyword: omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().

acl: more consistent docstring

acl: fix reST syntax

acl: update test output for branch-based access control

acl: add support for branch-based access control

Merge with main

Merge with stable

grep: clarify help for -r

summary: add subrepo status

keyword: simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible

Adjusted output of test-subrepo for issue1977 to 05856e682521

fix coding style

color: fix typo in w32effect for bold_background

Merge with stable

Added signature for changeset 39f725929f0c