Martin von Zweigbergk <martinvonz@google.com> [Wed, 16 Jan 2019 17:34:59 -0800] rev 41363
localrepo: use context manager for locks in commit()
Differential Revision: https://phab.mercurial-scm.org/D5623
Martin von Zweigbergk <martinvonz@google.com> [Wed, 16 Jan 2019 17:33:47 -0800] rev 41362
localrepo: use context manager for transaction in commit()
A side-effect is that the transaction is released a little earlier, so
the "commit message saved in ..." messages now comes after the
"rollback completed" message. That seems slightly better to me.
Differential Revision: https://phab.mercurial-scm.org/D5622
Martin von Zweigbergk <martinvonz@google.com> [Wed, 16 Jan 2019 17:46:39 -0800] rev 41361
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
Martin von Zweigbergk <martinvonz@google.com> [Thu, 17 Jan 2019 22:07:58 -0800] rev 41360
remotefilelog: remove pointless return statement from constructor
Differential Revision: https://phab.mercurial-scm.org/D5630
Anton Shestakov <av6@dwimlabs.net> [Tue, 15 Jan 2019 22:57:09 +0800] rev 41359
revset: support ranges in #generations relation
Pulkit Goyal <pulkit@yandex-team.ru> [Thu, 24 Jan 2019 18:14:39 +0300] rev 41358
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
Pulkit Goyal <pulkit@yandex-team.ru> [Fri, 18 Jan 2019 19:28:31 +0530] rev 41357
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
Pulkit Goyal <pulkit@yandex-team.ru> [Fri, 18 Jan 2019 19:26:28 +0530] rev 41356
py3: add b'' prefixes in tests/test-lfs-serve.t
# skip-blame because just b'' prefixes
Differential Revision: https://phab.mercurial-scm.org/D5672
Pulkit Goyal <pulkit@yandex-team.ru> [Thu, 24 Jan 2019 18:09:34 +0300] rev 41355
py3: add b'' prefixes in doc/check-seclevel.py
# skip-blame because just b'' prefixes
Differential Revision: https://phab.mercurial-scm.org/D5670
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 15:52:59 -0500] rev 41354
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
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 15:23:20 -0500] rev 41353
py3: port test-parseindex.t to Python 3
Differential Revision: https://phab.mercurial-scm.org/D5686
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 15:04:30 -0500] rev 41352
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
Yuya Nishihara <yuya@tcha.org> [Fri, 25 Jan 2019 18:55:23 +0900] rev 41351
merge with stable
Georges Racinet <georges.racinet@octobus.net> [Wed, 23 Jan 2019 07:49:36 -0500] rev 41350
rust-cpython: raising error.WdirUnsupported
The Graph implementation of hg-cpython returns the appropriate error
upon encounter with the working directory special revision number, and
this gives us in particular a code path to test from test-rust-ancestors.py
In the current implementation, the exception is actually raised from
the iterator instantiation; we are nonetheless consuming the iterator
in the test with `list()` in order not to depend on implementation details.
Georges Racinet <georges.racinet@octobus.net> [Wed, 23 Jan 2019 07:47:04 -0500] rev 41349
rust: error for WdirUnsupported with cpython conversion as exception
This introduces WorkingDirectoryUnsupported as an enum variant
of GraphError in the core and converts it to the expected
`mercurial.error.WdirUnsupported`.
Georges Racinet <georges.racinet@octobus.net> [Wed, 23 Jan 2019 07:39:27 -0500] rev 41348
rust: working directory revision number constant
This introduces the constant, but does not use it anywhere yet.
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 15:03:00 -0500] rev 41347
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
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 15:02:28 -0500] rev 41346
py3: fix test-newcgi.t
Differential Revision: https://phab.mercurial-scm.org/D5683
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 14:12:00 -0500] rev 41345
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
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 13:57:23 -0500] rev 41344
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
Augie Fackler <augie@google.com> [Thu, 24 Jan 2019 13:54:45 -0500] rev 41343
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
Martin von Zweigbergk <martinvonz@google.com> [Sun, 20 Jan 2019 21:49:58 -0800] rev 41342
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
Martin von Zweigbergk <martinvonz@google.com> [Sun, 20 Jan 2019 22:00:25 -0800] rev 41341
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
Martin von Zweigbergk <martinvonz@google.com> [Sun, 20 Jan 2019 22:00:21 -0800] rev 41340
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