commit: print "commit message saved in" message also if bookmark update fails The bookmark update is done within the same transaction, so if fails, the commit will also be rolled back. I just happened to notice this while messing with this code; we have not had reports of crashing bookmark updates from our users. The same applies to the clearing of the merge state, although I don't think that's currently tied into the transaction. Differential Revision: https://phab.mercurial-scm.org/D5621

remotefilelog: remove pointless return statement from constructor Differential Revision: https://phab.mercurial-scm.org/D5630

revset: support ranges in #generations relation

tests: fix module-import warnings in test-update-atomic.t These were caught by test-check-module-imports.t on Python 3. This should also make python3-buildbot green again. Differential Revision: https://phab.mercurial-scm.org/D5674

py3: use dict.items() instead of dict.iteritems() in tests/test-lfs-server.t dict.iteritems() is not present on Python 3. Differential Revision: https://phab.mercurial-scm.org/D5673

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

py3: add b'' prefixes in doc/check-seclevel.py # skip-blame because just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D5670

tests: remove some over-globbing in test-dispatch.t Hilariously, this was exposed by Python 3 work. Differential Revision: https://phab.mercurial-scm.org/D5689

py3: port test-parseindex.t to Python 3 Differential Revision: https://phab.mercurial-scm.org/D5686

py3: almost fix test-trusted.py The test now only fails due to output format changes on the repr of mercurial.error.ParseError. I'm not really sure how to approach that for now. Differential Revision: https://phab.mercurial-scm.org/D5685

merge with stable

py3: fix test-update-atomic.t The .replace('o', '') hack on oct() return value is required because: % python -c 'print(oct(10))' 012 % python3 -c 'print(oct(10))' 0o12 Differential Revision: https://phab.mercurial-scm.org/D5684

py3: fix test-newcgi.t Differential Revision: https://phab.mercurial-scm.org/D5683

py3: fix up test-encoding-align.t for python3 I'm not super thrilled with how this reads, but the original didn't thrill me either. Differential Revision: https://phab.mercurial-scm.org/D5682

py3: these two casefolding tests pass for me on my Mac I assume the buildbot didn't catch them because it's on a case-sensitive filesystem. Differential Revision: https://phab.mercurial-scm.org/D5681

py3: port test-bugzilla.t to Python 3 Some assorted fixes required in the extension itself, all around bytes/str issues. Differential Revision: https://phab.mercurial-scm.org/D5680

uncommit: set dirstateparents from within _fixdirstate() It's now done in the same way for uncommit and unamend, so we can share the code. Differential Revision: https://phab.mercurial-scm.org/D5662

unamend: fix unamending of renamed rename Before this patch, we were passing in the result of a status call for a different set of commits than what we calculated copies for, which seemed suspicous to me. The rewritten version gets status and copy information from the same sets of commits. Differential Revision: https://phab.mercurial-scm.org/D5661

uncommit: mark old node obsolete after updating dirstate The next patch will start doing more things with the context object for the old node and that ran into problems without this change. Regardless of that, I think it seems better to first update to the new node and then mark the old node obsolete. Differential Revision: https://phab.mercurial-scm.org/D5660

unamend: import "copies" module as "copiesmod" to avoid shadowing Differential Revision: https://phab.mercurial-scm.org/D5659

tests: add more tests of uncommit/unamend with copies The unamend tests show suboptimal behavior. Differential Revision: https://phab.mercurial-scm.org/D5658

tests: clean up after each test in test-unamend.t Differential Revision: https://phab.mercurial-scm.org/D5657

cleanup: use clang-tidy to add missing {} around one-line statements I find this easier to read. Cleanup performed like this: hg files 'set:(**.c or **.cc or **.h) and not "listfile:contrib/clang-format-ignorelist"' | while read f ; do clang-tidy -fix -checks=readability-braces-around-statements $f -- $(python-config --cflags) -Imercurial/cext -Imercurial done make format-c I had to revert chg/chg.c as it's got a construct that seems to confuse clang-tidy, so I'll work on that file later if this change is acceptable. I only tackle files that are under clang-format's authority because otherwise I'd have to do a bunch of manual formatting. A few files didn't get edited because clang-tidy couldn't find some headers. Again, I'll figure that out later assuming this change is accepted. No check-code rule added for now because writing the regex sounds hard. In a perfect world I guess we could write a test that uses clang-tidy on these files, but I think clang-tidy is pretty rarely installed. :/ Differential Revision: https://phab.mercurial-scm.org/D5675

py3: port test-batching.py to python3 I used byteify-strings.py on this file, then manually added the various pycompat and bprint bits as needed. Differential Revision: https://phab.mercurial-scm.org/D5678

py3: fix missing b prefixes in test-arbitraryfilectx.t Test passes on Python 3. # skip-blame b prefixes Differential Revision: https://phab.mercurial-scm.org/D5679

py3: add missing b prefixes in test-acl.t There's one failure left in the test, which looks like a real problem around executing hooks. I have not investigated further. # skip-blame as just b'' prefixes Differential Revision: https://phab.mercurial-scm.org/D5677

py3: buildbot found more passing tests, thanks to indygreg for most of them Differential Revision: https://phab.mercurial-scm.org/D5676

tests: drop a duplicate definition of a constant Differential Revision: https://phab.mercurial-scm.org/D5663