keyword: move commands.inferrepo for code maintenance

largefiles: update lfutil.findoutgoing() discovery method It looks like this method missed the updates in 30273f0c776b (which changed the preferred discovery method from findcommonincoming() to findcommonoutgoing()), and cd956049fc14 (which rolls up the outgoing lists into a single object).

wireproto: fix pushkey hook failure and output on remote http repo Over http, a failed pushkey hook simply crashed the server, and successful hook output was never sent to the client.

phases: add a phase and phasestr method to file context

bookmarks: simplify code Remove some unnecessary return statements and collect some checks into one place. As requested by Thomas Arendsen Hein <thomas@intevation.de>.

bookmarks: abort when incompatible options are used (issue3663) Options like --delete and --rename are incompatible with each other. In this case we abort. We do not abort if the result is a nullop. Nullops are: '--delete --inactive', '--delete --force'.

bookmarks: check bookmark format during rename (issue3662)

color: add additional changeset.phase label to log.changeset and log.parent This allows the user to set different colors for each phase, e.g. [color] changeset.public = blue changeset.draft = green changeset.secret = red In addition, this doesn't affect current configuration for custom log.changeset colors, but rather adds the option for users that want to visually see which changesets are amendable.

http2: make it possible to connect w/o ssl on port 443 The fix is just to make sure we always pass use_ssl=False to non-SSL connections.

branchpoint: remove useless intermediate set creation We don't need to compute the set of all branchpoints. We can just check the number of children that element of subset have. The extra work did not seems to had particular performance impact but the code is simpler this way.

clfilter: use changelog to iterate over the repo in branchpoint Otherwise filtered changesets may cause false positives in `branchpoint()`.

store: fncache may contain non-existent entries (fixes b9a56b816ff2)

store: add new _exists helper function on fncachestore

store: move __contains__() implementation from class fncache into fncachestore This restores the previous semantics of fncache.__contains__(). (a followup to b9a56b816ff2)

test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b test-log.t fails on Windows with --- c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t +++ c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-log.t.err @@ -1225,12 +1225,12 @@ $ echo 1 > d5.d/f1 $ echo 1 > .d6/f1 $ hg add . - adding .d6/f1 - adding D2/f1 - adding D3.i/f1 - adding d1/f1 - adding d4.hg/f1 - adding d5.d/f1 + adding .d6\f1 + adding D2\f1 + adding D3.i\f1 + adding d1\f1 + adding d4.hg\f1 + adding d5.d\f1 $ hg commit -m "a bunch of weird directories" $ hg log -l1 d1/f1 | grep changeset changeset: 0:65624cd9070a