util: rename argument of isatty() In general, "fd" is a file descriptor, but isatty() expects a file object. We should call it "fp" or "fh".

posix: remove unixdomainserver class It's no longer used since the removal of the inotify extension.

revlog: use absolute_import

windows: use absolute_import

similar: use absolute_import

util: use absolute_import

util: make hashlib import unconditional hashlib was added in Python 2.5. As far as I can tell, SHA-512 is always available in 2.6+. So move the hashlib import to the top of the file and remove the one-off handling of SHA-512.

encoding: use double backslash In Python 2, '\u' == '\\u'. However, in Python 3, '\u' results in: SyntaxError: (unicode error) 'unicodeescape' codec can't decode bytes in position 0-1: truncated \uXXXX escape The minor change in this patch allows Python 3 to ast parse encoding.py.

encoding: use absolute_import

hg: establish function for performing post-share actions As part of writing an extension that wished to share an arbitrary piece of data among shared repos, I had to reimplement a significant part of hg.share in order to obtain localrepository instances for the source and destination. This patch establishes a function in hg.py that will be called after a share is performed. It is passed localrepository instances so extensions can easily perform additional actions at share time. We move hgrc and shared file writing there because this function is a logical place for it. A side effect of the refactor is writing of the shared file now occurs before updating. This seems more appropriate and shouldn't have any impact on real world behavior.

share: pass named arguments They are defined as named arguments and previous called as positional arguments. As part of wrapping hg.share in an extension, I had to extract arguments using some hacky techniques. Using named arguments makes wrapping much simpler.

commandserver: cut import cycle by itself We generally make modules importable from the front-end layer, dispatch -> commands -> x. So the import cycle to dispatch should be resolved by the commandserver module.

commandserver: use absolute_import

tests: histedit-helpers fixbundle should not complain about no input

tests: relax histedit issue4251 and issue3893 backups I'm globbing these because some are globbed, and this pair gets in the way of the main parts of the series.

setup.py: use bytes literals The b() helper was needed because Python < 2.6 didn't support bytes literals (b''). Now that we don't support Python < 2.6, we no longer need this helper.

clonebundles: fix typo

merge: rework manifestmerge to use a matcher This opens the door to working slightly more closely with the manifest type and letting it optimize out some of the diff comparisons for us, and also makes life significantly easier for narrowhg.

merge: restate calculateupdates in terms of a matcher Once we get a matcher down into manifestmerge, we can make narrowhg work more easily and potentially let manifest.match().diff() do less work in manifestmerge.

merge: have merge.update use a matcher instead of partial fn This is relatively rarely used functionality, but migrating this to a matcher will make future work on narrow clones more feasible.

treemanifest: don't iterate entire matching submanifests on match() Before 2773540c3650 (match: remove unnecessary optimization where visitdir() returns 'all', 2015-05-06), match.visitdir() used to return the special value 'all' to indicate that it was known that all subdirectories would also be included in the match. The purpose for that value was to avoid calling the matcher on all the paths. It turned out that calling the matcher was not a problem, so the special return value was removed and the code was simplified. However, if we use the same special value for not just avoiding calling the matcher on each file, but to avoid iterating over each file, it's a much bigger win. On commands like hg st --rev .^ --rev . dom/ we run the matcher (dom/) on the two manifests, then diff the narrowed manifest. If the size of the match is much larger than the size of the diff, this is wasteful. In the above case, we would end up iterating over the 15k-or-so files in dom/ for each of the manifests, only to later discover that they are mostly the same. This means that runningt the command above is usually slower than getting the status for the entire repo, because that code avoids calling treemanifest.match() and only calls treemanifest.diff(), which loads only what's needed for the diff. Let's fix this by reintroducing the 'all' value in match.visitdir() and making treemanifest.match() return a lazy copy of the manifest from dom/ and down (in the above case). This speeds up the above command on the Firefox repo from 0.357s to 0.137s (best of 5). The wider the match, the bigger the speedup.

pathencode: remove an unused assignment

parsers: narrow scope of a variable to be less confusing

manifest: fix formatting One poor unfortunate line was hanging way off the right hand side of the universe. Rescued it.