cmdutil: reorder optional arguments passed to makefileobj() **props will be passed directly to templater.

cmdutil: strip "%m" pattern (first line of commit message) from both ends This matches the behavior of the template keyword {desc}.

test-acl: mock up util.getuser() to trust $LOGNAME on Windows The test relies on POSIX-like getuser() behavior, so we can't use windows.getuser().

fileset: drop bad "elif:" trying to check invalid size expression Since str.isdigit is a function, the last "elif" was always true. An invalid expression is rejected by util.sizetoint(), so we don't need "elif".

py3: fix test-command-template.t to write files in binary mode

py3: use bytestr() to coerce position carried by ParseError to string The position value is either int or byte string.

py3: use bytes.endswith('\n') to strip off '\n' from debug color output

py3: fix type of attribute names forwarded by templatekw._hybrid # skip-blame because just r'' prefixes

py3: move between bytes and unicode when re-raising IOError IOError is a Python exception, which argument must be a system string.

py3: use '%d' to format diffstat sum

py3: make regexp literal bytes in templatefilters.py # skip-blame because just b'' prefixes

templatefilters: use encoding.unifromlocal/unitolocal() for py3 compatibility

py3: replace str() with it's bytes equivalent in hgext/shelve.py Internally we are dealing with bytes everywhere, so anything returning a unicode results in an error or some change in behaviour. Differential Revision: https://phab.mercurial-scm.org/D2520

py3: make sure we write bytes in a file open in bytes mode # skip-blame just b'' prefix Differential Revision: https://phab.mercurial-scm.org/D2519

py3: add b'' prefixes in tests/test-obsolete.t # skip-blame because it's just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2518

py3: add a b'' prefix in tests/test-fncache.t # skip-blame because it's just b'' prefix Differential Revision: https://phab.mercurial-scm.org/D2517

py3: use pycompat.bytestr() to convert error instances to bytes Differential Revision: https://phab.mercurial-scm.org/D2516

py3: listify the return value of filter() filter() on Python 3 returns a filter object. Differential Revision: https://phab.mercurial-scm.org/D2515

py3: use '%d' instead of '%s' for ints Differential Revision: https://phab.mercurial-scm.org/D2514

py3: add 14 new passing tests to whitelist Differential Revision: https://phab.mercurial-scm.org/D2511

py3: use util.forcebytestr to convert str to bytes Differential Revision: https://phab.mercurial-scm.org/D2498

sshpeer: factor out code for creating peers from pipes An upcoming commit will want to instantiate an SSH peer via an alternate mechanism that doesn't require running a new `ssh` command. To facilitate that, we extract the code for creating a peer from pipes to its own function. Differential Revision: https://phab.mercurial-scm.org/D2391

py3: add b'' prefixes in tests/test-rollback.t This makes the test run succesfully on Python 3. There is just a b'' prefix extra in the output. # skip-blame because we added just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2510

py3: add b'' prefix in tests/test-revlog-v2.t After this, the test works on Python 3. There is some extra return value by open().write() I think which needs to be handled. # skip-blame because just b'' prefix Differential Revision: https://phab.mercurial-scm.org/D2509

py3: add b'' prefixes in tests/test-revlog.t # skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2508

py3: make sure we open the file in bytes mode This makes the test pass on Python 3. Differential Revision: https://phab.mercurial-scm.org/D2507

py3: add b'' prefixes in tests/test-revlog-ancestry.py # skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2506

py3: port the markdirver extension in tests/test-resolve.t Differential Revision: https://phab.mercurial-scm.org/D2505

py3: backout changeset 56635c506608 which wrongly added couple of b'' I am not sure what I was thinking when I added that but while fixing rebase tests, I revisited the file and found that I did wrong. I am sorry for this. Differential Revision: https://phab.mercurial-scm.org/D2504

py3: add a missing b'' in tests/bruterebase.py Differential Revision: https://phab.mercurial-scm.org/D2503

py3: use '%d' for integers instead of b'%s' Differential Revision: https://phab.mercurial-scm.org/D2502

py3: make sure we write in mergestate in bytes mode Differential Revision: https://phab.mercurial-scm.org/D2501

py3: add b'' prefixes in tests/test-rebase-scenario-global.t # skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2500

py3: replace str() calls with their preferred bytes equivalent Differential Revision: https://phab.mercurial-scm.org/D2499

py3: convert error messages to bytes using util.forcebytestr() Differential Revision: https://phab.mercurial-scm.org/D2497

py3: slice over bytes or use startswith() to prevent getting ascii values Differential Revision: https://phab.mercurial-scm.org/D2496

narrow: drop safehasattr() checks for always-present repo.narrowmatch I've added checks for repo.narrowmatch().always() in order to restore some of the fast paths for non-narrow repos. Differential Revision: https://phab.mercurial-scm.org/D2495

narrow: move narrowmatch-related methods to localrepo This patch makes it so localrepo.narrowmatch() and a few more are always available, which will let us simplify the use sites a bit. narrowmatch() will return an always-matcher in non-narrow repos (just like it did when it lived in the narrow extension). Differential Revision: https://phab.mercurial-scm.org/D2494

narrow: remove dependency from narrowspec module to hg module Differential Revision: https://phab.mercurial-scm.org/D2493

narrow: reduce depedence on narrowspec.save() I think narrowspec should be a simple, low-level module and not depend on the hg module. This prepares for moving that dependency out of narrowspec. Differential Revision: https://phab.mercurial-scm.org/D2492

narrow: always wrap repo It's simpler to always wrap the repo. This prepares for moving narrowrepo.narrowmatch() onto localrepo by showing that it's now safe to always wrap the repo (and thus always define narrowmatch() etc.). Note that since narrowmatch() returns an always-matcher (rather than None) in non-narrow repos, this may mean a performance hit when the narrow extension is enabled because it adds a no-op filtering step in various places against the always-matcher. I'll restore some of that soon. Differential Revision: https://phab.mercurial-scm.org/D2491

narrow: consider both local and remote matchers in narrowchangegroup The existing code that picked one or the other seemed very suspicious. This patch makes us intersect the local matcher with the matcher from the remote, which seems better. It fixes one test case and makes another one that used to crash no longer crash, but instead silently succeed with a push that's lossy, so that remains to be fixed. The real reason for doing this now is that I'm going to move narrowrepo.narrowmatch() onto localrepo and then it will always be defined, which would otherwise break this code. Differential Revision: https://phab.mercurial-scm.org/D2490

narrow: move checking for narrow requirement into _narrowmatch() We want to move narrowmatch() and others into core, so we need to get rid of the dependence on the "narrow_opts" from the closure in narrowrepo.wraprepo(). We can simply check if the narrow requirement is set. I think that seems like an improvement regardless of moving narrowmatch(). Differential Revision: https://phab.mercurial-scm.org/D2489

narrow: move changegroup.supportedoutgoingversions() override to core Also document why we need cg3 or higher. Differential Revision: https://phab.mercurial-scm.org/D2488

narrow: move requirement constant to core My short-term goal is to move narrowrepo.narrowmatch() onto localrepo and this is a necessary step for that. I put the constant in changegroup.py, unlike REVLOGV2_REQUIREMENT, which is in localrepo.py, since we'll need to access it from the changegroup module eventually. Differential Revision: https://phab.mercurial-scm.org/D2487

remotenames: don't inherit the remotenames class from dict class The remotenames class was moved from hgremotenames extension. The class in hgremotenames extension used to extend dict because updating bookmark was done through a dict-like interface or Sean (smf) wanted it to be that way. But now, we can remove the inheritance from the dict class as updating bookmark is not done using a dict-like interface. Thanks to Martin von Zweigbergk for spotting this. Differential Revision: https://phab.mercurial-scm.org/D2361

run-tests: cache hghave results Spawning a process on Windows is expensive. I've got a version of test-lfs-test-server.t locally which prints the http request/responses that totals 819 lines, with 149 conditional lines, 11 #if tests, and 2 test cases. It takes just under 1 minute with this change to run both cases, vs just over 2 minutes without this change. Worse, when I explored adding ui.debug to the test, it takes 13 minutes due to all of the mismatches and retests, vs less than 1 minute with this change. Overall, the difference when running all tests is negligible- 103 minutes with this change, vs 105 without when using -j9. It also looks like an exit value of 2 from `hghave` is treated specially, but there's nothing preventing 2 missing features from also using this value.

run-tests: resume raising an exception when a server fails to start Prior to 93228b2a1fc0, this exception was raised before the diff could be printed. By raising the exception after printing the diff, the location of the failure can be identified, but it is also easier to locate test runs where this occurs. The test bot maintains a list of failed tests, separate from the wall of diff output.

py3: use print as a function in tests/test-hgrc.t print was made a function in Python 3. Differential Revision: https://phab.mercurial-scm.org/D2480

py3: use '%d' to convert integers to bytes Differential Revision: https://phab.mercurial-scm.org/D2479

py3: add b'' prefixes in tests/test-extension.t We are now close to getting this test pass on Python 3. # skip-blame because just b'' prefixes. Differential Revision: https://phab.mercurial-scm.org/D2478

py3: convert os.devnull to bytes using pycompat.bytestr os.devnull returns str on Python 3. Differential Revision: https://phab.mercurial-scm.org/D2477

py3: fix more keyword arguments handling Differential Revision: https://phab.mercurial-scm.org/D2476

py3: make sure regexes are bytes # skip-blame because we are adding just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D2475

py3: use pycompat.strurl to convert url to str Differential Revision: https://phab.mercurial-scm.org/D2474

bookmarks: write bookmarks file deterministically Bookmarks are internally stored as an unsorted dictionary. Let's at least write out the bookmarks file in a deterministic order so it is easier to test, diff, etc. Differential Revision: https://phab.mercurial-scm.org/D2469

phases: write phaseroots deterministically self.phaseroots is a list of sets of binary nodes. Let's sort the nodes before writing so the phaseroots file is written out deterministically. Differential Revision: https://phab.mercurial-scm.org/D2468

internals: document bundle2 format It seems like a good idea to have thorough documentation of the bundle2 data format, including the format of each part and the capabilities. The added documentation is far from complete. For example, we don't fully capture the semantics of each capability and part. But a start is better than nothing, which was pretty much where we were before. Differential Revision: https://phab.mercurial-scm.org/D2298

py3: convert bytes to str using encoding.strfromlocal using encoding.strfromlocal because sender is provided from user config or argument. Differential Revision: https://phab.mercurial-scm.org/D2460

py3: use encoding.strtolocal() to convert str to bytes Differential Revision: https://phab.mercurial-scm.org/D2459