Mon, 13 Jun 2016 22:41:45 +0100 rebase: move local variable 'targetancestors' to the RR class
Kostia Balytskyi <ikostia@fb.com> [Mon, 13 Jun 2016 22:41:45 +0100] rev 29361
rebase: move local variable 'targetancestors' to the RR class
Mon, 13 Jun 2016 22:40:59 +0100 rebase: move local variable 'skipped' to the RR class
Kostia Balytskyi <ikostia@fb.com> [Mon, 13 Jun 2016 22:40:59 +0100] rev 29360
rebase: move local variable 'skipped' to the RR class
Mon, 13 Jun 2016 22:38:54 +0100 rebase: move local variable 'target' to the RR class
Kostia Balytskyi <ikostia@fb.com> [Mon, 13 Jun 2016 22:38:54 +0100] rev 29359
rebase: move local variable 'target' to the RR class
Mon, 13 Jun 2016 22:36:13 +0100 rebase: introduce a rebaseruntime (RR) class
Kostia Balytskyi <ikostia@fb.com> [Mon, 13 Jun 2016 22:36:13 +0100] rev 29358
rebase: introduce a rebaseruntime (RR) class rebaseruntime is a class that will in future contain all of the state necessary to perform rebase operation and have pieces of rebase logic as its methods. This commit introduces the class and moves the following local variables to be its fields: - originalwd - external - state - activebookmark
Wed, 15 Jun 2016 21:36:31 +0100 chg: change default connect timeout to 60 seconds
Jun Wu <quark@fb.com> [Wed, 15 Jun 2016 21:36:31 +0100] rev 29357
chg: change default connect timeout to 60 seconds As discussed at https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-June/085290.html The default 10-second timeout is not enough if the machine is overloaded. Let's increase it to 60 seconds.
Tue, 14 Jun 2016 18:14:42 -0700 tests: increase test-https malform error glob
Durham Goode <durham@fb.com> [Tue, 14 Jun 2016 18:14:42 -0700] rev 29356
tests: increase test-https malform error glob The recently introduced (ecc9b788fd690a0a) test around malformed pem files hard codes an error message which doesn't appear to be cross platform agnostic. On our machines (centos6 if it matters) the test output differs: - abort: error: unknown error* (glob) + abort: error: _ssl.c:330: error:00000000:lib(0):func(0):reason(0) This patch increases the glob to cover the entire error message.
Tue, 14 Jun 2016 11:21:41 +0200 largefiles: make storefactory._openstore public
liscju <piotr.listkiewicz@gmail.com> [Tue, 14 Jun 2016 11:21:41 +0200] rev 29355
largefiles: make storefactory._openstore public In storefactory opening store is the main functionality, so it shouldn't be marked as private with underscore.
Mon, 13 Jun 2016 23:50:26 +0200 bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com> [Mon, 13 Jun 2016 23:50:26 +0200] rev 29354
bookmarks: abort 'push -B .' when no active bookmark
Mon, 13 Jun 2016 05:11:56 +0900 transaction: avoid ambiguity of file stat at restoring from backup
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 13 Jun 2016 05:11:56 +0900] rev 29353
transaction: avoid ambiguity of file stat at restoring from backup In some cases below, copying from backup is used to restore original contents of a file, which is backuped via addfilegenerator(). If copying keeps ctime, mtime and size of a file, restoring is overlooked, and old contents cached before restoring isn't invalidated as expected. - failure of transaction (from '.hg/journal.backup.*') - rollback of previous transaction (from '.hg/undo.backup.*') To avoid ambiguity of file stat at restoring, this patch invokes util.copyfile() with checkambig=True. This patch is a part of "Exact Cache Validation Plan": https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan
Mon, 13 Jun 2016 05:11:56 +0900 localrepo: make restoring from backup at rollback avoid ambiguity of file stat
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 13 Jun 2016 05:11:56 +0900] rev 29352
localrepo: make restoring from backup at rollback avoid ambiguity of file stat Rollback of previous transaction restores contents of files below by renaming from 'undo.*' file. If renaming keeps ctime, mtime and size of a file, restoring is overlooked, and old contents cached before restoring isn't invalidated as expected. - .hg/bookmarks - .hg/phaseroots To avoid ambiguity of file stat at restoring, this patch invokes vfs.rename() with checkambig=True. BTW, .hg/dirstate is also restored at rollback. But it is restored by dirstate.restorebackup(), and previous patch already made it invoke vfs.rename() with checkambig=True. This patch is a part of "Exact Cache Validation Plan": https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan
Mon, 13 Jun 2016 05:11:56 +0900 dirstate: make restoring from backup avoid ambiguity of file stat
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 13 Jun 2016 05:11:56 +0900] rev 29351
dirstate: make restoring from backup avoid ambiguity of file stat File .hg/dirstate is restored by renaming from backup in failure inside scopes below. If renaming keeps ctime, mtime and size of a file, restoring is overlooked, and old contents cached before restoring isn't invalidated as expected. - dirstateguard scope (from '.hg/dirstate.SUFFIX') - transaction scope (from '.hg/journal.dirstate') To avoid ambiguity of file stat at restoring, this patch invokes vfs.rename() with checkambig=True. This patch is a part of "Exact Cache Validation Plan": https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan
Sat, 11 Jun 2016 20:59:49 +0200 tests: drop a duplicated instruction
Denis Laxalde <denis.laxalde@logilab.fr> [Sat, 11 Jun 2016 20:59:49 +0200] rev 29350
tests: drop a duplicated instruction
Tue, 14 Jun 2016 14:52:58 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 14 Jun 2016 14:52:58 -0500] rev 29349
merge with stable
Mon, 13 Jun 2016 18:20:00 +0100 revset: add new topographical sort
Martijn Pieters <mjpieters@fb.com> [Mon, 13 Jun 2016 18:20:00 +0100] rev 29348
revset: add new topographical sort Sort revisions in reverse revision order but grouped by topographical branches. Visualised as a graph, instead of: o 4 | | o 3 | | | o 2 | | o | 1 |/ o 0 revisions on a 'main' branch are emitted before 'side' branches: o 4 | o 1 | | o 3 | | | o 2 |/ o 0 where what constitutes a 'main' branch is configurable, so the sort could also result in: o 3 | o 2 | | o 4 | | | o 1 |/ o 0 This sort was already available as an experimental option in the graphmod module, from which it is now removed. This sort is best used with hg log -G: $ hg log -G "sort(all(), topo)"
Mon, 13 Jun 2016 18:20:00 +0100 revset: move groupbranchiter over from graphmod
Martijn Pieters <mjpieters@fb.com> [Mon, 13 Jun 2016 18:20:00 +0100] rev 29347
revset: move groupbranchiter over from graphmod This move is to prepare the adaptation of this function into a toposort predicate.
Tue, 14 Jun 2016 11:05:36 +0100 revset: record if a set is in topographical order
Martijn Pieters <mjpieters@fb.com> [Tue, 14 Jun 2016 11:05:36 +0100] rev 29346
revset: record if a set is in topographical order A later revision adds actual topographical sorting. Recording if a set is in this order allows hg log -G to avoid re-sorting the revset.
Mon, 13 Jun 2016 21:30:14 +0100 chg: make timeout adjustable
Jun Wu <quark@fb.com> [Mon, 13 Jun 2016 21:30:14 +0100] rev 29345
chg: make timeout adjustable Before this patch, chg will give up when it cannot connect to the new server within 10 seconds. If the host has high load during that time, 10 seconds is not enough. This patch makes it adjustable using the CHGTIMEOUT environment variable.
Sat, 11 Jun 2016 20:25:49 +0100 chg: exec pager in child process
Jun Wu <quark@fb.com> [Sat, 11 Jun 2016 20:25:49 +0100] rev 29344
chg: exec pager in child process Before this patch, chg uses the old pager behavior (pre 369741ef7253), which executes pager in the main process. The user will see the exit code of the pager, instead of the hg command. Like 369741ef7253, this patch fixes the behavior by executing the pager in the child process, and wait for it at the end of the main process.
Mon, 13 Jun 2016 13:16:17 +0100 tests: move chg pager test to test-pager.t
Jun Wu <quark@fb.com> [Mon, 13 Jun 2016 13:16:17 +0100] rev 29343
tests: move chg pager test to test-pager.t The test is valid for both hg and chg. Since we are adding another chg-related pager test, let's put them together.
Fri, 10 Jun 2016 00:13:23 -0400 util: drop local aliases for md5, sha1, sha256, and sha512
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:13:23 -0400] rev 29342
util: drop local aliases for md5, sha1, sha256, and sha512 This used to be needed to paper over hashlib not being in all Pythons we support, but that's not a problem anymore, so we can simplify things a little bit.
Fri, 10 Jun 2016 00:12:33 -0400 cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:12:33 -0400] rev 29341
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1 All versions of Python we support or hope to support make the hash functions available in the same way under the same name, so we may as well drop the util forwards.
Fri, 10 Jun 2016 00:25:07 -0400 pathencode: use hashlib.sha1 directly instead of indirecting through util
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:25:07 -0400] rev 29340
pathencode: use hashlib.sha1 directly instead of indirecting through util
Fri, 10 Jun 2016 00:10:34 -0400 revlog: use hashlib.sha1 directly instead of through util
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:10:34 -0400] rev 29339
revlog: use hashlib.sha1 directly instead of through util Also remove module-local _sha alias, which was barely used.
Fri, 10 Jun 2016 00:10:06 -0400 store: use hashlib.sha1 directly instead of through util
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:10:06 -0400] rev 29338
store: use hashlib.sha1 directly instead of through util Also remove module-local alias to _sha, since it's not used that much.
Fri, 10 Jun 2016 00:14:43 -0400 similar: delete extra newline at EOF
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:14:43 -0400] rev 29337
similar: delete extra newline at EOF Spotted by my emacs config that cleans up extra whitespace.
Fri, 10 Jun 2016 00:14:10 -0400 scmutil: delete extra newline at EOF
Augie Fackler <raf@durin42.com> [Fri, 10 Jun 2016 00:14:10 -0400] rev 29336
scmutil: delete extra newline at EOF Spotted by my emacs config that cleans up extra whitespace.
Wed, 08 Jun 2016 16:18:43 +0100 graphmod: avoid sorting when already sorted
Martijn Pieters <mjpieters@fb.com> [Wed, 08 Jun 2016 16:18:43 +0100] rev 29335
graphmod: avoid sorting when already sorted This is somewhat redundant now, but allows us to add a toposort that should not be re-sorted either.
Tue, 07 Jun 2016 20:29:54 -0700 sslutil: per-host config option to define certificates
Gregory Szorc <gregory.szorc@gmail.com> [Tue, 07 Jun 2016 20:29:54 -0700] rev 29334
sslutil: per-host config option to define certificates Recent work has introduced the [hostsecurity] config section for defining per-host security settings. This patch builds on top of this foundation and implements the ability to define a per-host path to a file containing certificates used for verifying the server certificate. It is logically a per-host web.cacerts setting. This patch also introduces a warning when both per-host certificates and fingerprints are defined. These are mutually exclusive for host verification and I think the user should be alerted when security settings are ambiguous because, well, security is important. Tests validating the new behavior have been added. I decided against putting "ca" in the option name because a non-CA certificate can be specified and used to validate the server certificate (commonly this will be the exact public certificate used by the server). It's worth noting that the underlying Python API used is load_verify_locations(cafile=X) and it calls into OpenSSL's SSL_CTX_load_verify_locations(). Even OpenSSL's documentation seems to omit that the file can contain a non-CA certificate if it matches the server's certificate exactly. I thought a CA certificate was a special kind of x509 certificate. Perhaps I'm wrong and any x509 certificate can be used as a CA certificate [as far as OpenSSL is concerned]. In any case, I thought it best to drop "ca" from the name because this reflects reality.
Fri, 27 May 2016 23:18:38 +0900 tests: add basic tests for SMTP over SSL
Yuya Nishihara <yuya@tcha.org> [Fri, 27 May 2016 23:18:38 +0900] rev 29333
tests: add basic tests for SMTP over SSL SSL handling in mail.py wasn't covered by our test suite, therefore it was sometimes broken. This patch introduces pretty minimal tests that only cover the default path. We can extend it later. Tested with python 2.6.9 and 2.7.11 on Debian sid.
Fri, 27 May 2016 22:43:47 +0900 tests: add dummy SMTP daemon for SSL tests
Yuya Nishihara <yuya@tcha.org> [Fri, 27 May 2016 22:43:47 +0900] rev 29332
tests: add dummy SMTP daemon for SSL tests Currently it only supports SMTP over SSL since SMTPS should be simpler than handling StartTLS. Since we don't need asynchronous server for our tests, it does TLS handshake in blocking way. But asyncore is required by Python smtpd module.
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 tip