acl: clarify acl.sources, fix typo

convert/svn: remove unused variable

Merge with crew-stable

convert/svn: handle files/links replaced by dirs (issue2166)

convert/svn: do not retrieve removed files It gives us a way to not retrieve content of entries we know are no longer files. And it is faster when converting remote repositories.

convert/svn: correctly encode deleted entry paths This recode call was removed in ede2247e61aa, because it looked the encode(decode()) construct was a no-op. In fact, the first decode() call was wrong, and entries still have to be encoded before being passed to the sink.

convert/svn: remove broken but unused copy filtering code For some reason, if a copy source is deleted in the same revision it is referenced, it is filtered out. This is silly, because this happens all the time with move operations. Fortunately, the filtering code is buggy and ends being a no-op 99% of the time, since it does not delete the right key. Just remove all this nonsense.

test-convert-svn-move: test moved dirs copy records

convert/svn: tree conflicts no longer happen now we use memctx

clean up remaining generic exceptions

mq: make use of output labeling for summary

mq: mark error message for translation

mq: mark string for translation

color: add some missing background colors for win32 console

subrepo: fix 2.5ism in url parsing

acl: update test output

acl: update docstring to describe section [acl.groups]

acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups

subrepo: fix test output

subrepo: print paths relative to upper repo root for push/pull/commit This makes more sense when using multiple levels of nesting. This happens to help a lot in a case where 3 projects of mine all use the same makefile helper project as a sub. A fourth project use these first three projects and current output made it very hard to figure which makefile helper was committed. it looked more like the project was committed/pushed/pulled three times in a row than dealing on three different repos.

subrepo: print pushing url

subrepo: dirtiness checks should iterate over subrepos

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