[PATCH 2 of 3] vfs: extract 'vfs' class and related code to a new 'vfs' module (API)

2017-03-07 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488362412 -3600 # Wed Mar 01 11:00:12 2017 +0100 # Node ID 69ef1663d5fe2a3bf7bd4138b98ae373b1848591 # Parent a588ab7f18eccd4bf734416d8d1fbf2858ace67c # EXP-Topic vfs.cleanup # Available At

[PATCH 1 of 3] vfs: replace 'scmutil.opener' usage with 'scmutil.vfs'

2017-03-07 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488423156 -3600 # Thu Mar 02 03:52:36 2017 +0100 # Node ID a588ab7f18eccd4bf734416d8d1fbf2858ace67c # Parent c32f9eeec75445bfbbc55df4c1fcc584d3cf45cd # EXP-Topic vfs.cleanup # Available At

[PATCH 3 of 3] vfs: use 'vfs' module directly in 'mercurial.hg'

2017-03-07 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1488457662 -3600 # Thu Mar 02 13:27:42 2017 +0100 # Node ID b033990d12c81527cb1be32b6941086e5f419ad1 # Parent 69ef1663d5fe2a3bf7bd4138b98ae373b1848591 # EXP-Topic vfs.cleanup # Available At

Re: [PATCH 1 of 3 V3] chgcache: introduce a new global state

2017-03-07 Thread Jun Wu
This is actually a redesign of "chgcache", focusing on "cache" - how to get, set, invalidate things. It seems to me that the IPC, fork, repo path reporting etc. fit better in chgserver, dispatch and elsewhere. This layout looks cleaner to me. Excerpts from Jun Wu's message of 2017-03-07 22:35:57

[PATCH 3 of 3 V3] chgcache: implement repocache

2017-03-07 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488953311 28800 # Tue Mar 07 22:08:31 2017 -0800 # Node ID d136f214b3a5bd4698dfd96c641ad73f96a743cb # Parent f0bded8d53c5c9a5cfb25d29dd99cf4eb3fb79b2 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 2 of 3 V3] chgcache: implement a smartcache layer

2017-03-07 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488949878 28800 # Tue Mar 07 21:11:18 2017 -0800 # Node ID f0bded8d53c5c9a5cfb25d29dd99cf4eb3fb79b2 # Parent 60eb2c2b5196a62d635dbe0eb1e29fdd945d5058 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 1 of 3 V3] chgcache: introduce a new global state

2017-03-07 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1488947963 28800 # Tue Mar 07 20:39:23 2017 -0800 # Node ID 60eb2c2b5196a62d635dbe0eb1e29fdd945d5058 # Parent c32f9eeec75445bfbbc55df4c1fcc584d3cf45cd # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

Re: [PATCH website] downloads: add link to PPA for ubuntu/debian

2017-03-07 Thread Sean Farley
Kevin Bullock writes: >> On Feb 26, 2017, at 02:52, Anton Shestakov wrote: >> >> On Sat, 25 Feb 2017 13:02:15 -0800 >> heatherboo wrote: >> >>> # HG changeset patch >>> # User heatherboo

Re: [PATCH website] downloads: add link to PPA for ubuntu/debian

2017-03-07 Thread Sean Farley
Anton Shestakov writes: > On Sat, 25 Feb 2017 13:02:15 -0800 > heatherboo wrote: > >> # HG changeset patch >> # User heatherboo >> # Date 1488054963 28800 >> # Sat Feb 25 12:36:03 2017 -0800 >> # Node ID

[PATCH 07 of 10 V2] context: remove uses of manifest.matches

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488937965 28800 # Tue Mar 07 17:52:45 2017 -0800 # Node ID 822259e9f117b11cd54d6a13565a3202b508eae8 # Parent d2850df6c891a20585a0d5eac370c1c2f4463cad context: remove uses of manifest.matches This removes the uses of

[PATCH 09 of 10 V2] treemanifest: add tests covering hg diff of partial trees

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488940198 28800 # Tue Mar 07 18:29:58 2017 -0800 # Node ID 611fac63adb09c326912e56df59c828ad12ffd9f # Parent b76e7da4fb9ab00c3b98e5613d7caa0b4aceaf8b treemanifest: add tests covering hg diff of partial trees Previously the hg

[PATCH 10 of 10 V2] treemanifest: optimize diff using the matcher

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488943242 28800 # Tue Mar 07 19:20:42 2017 -0800 # Node ID 541bf866729342f534bac425bd8f01b9fe7564e8 # Parent 611fac63adb09c326912e56df59c828ad12ffd9f treemanifest: optimize diff using the matcher This optimizes

[PATCH 04 of 10 V2] status: handle more node indicators in buildstatus

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488909371 28800 # Tue Mar 07 09:56:11 2017 -0800 # Node ID 68644896cbdcfc956079662668e010038bfe8048 # Parent ccec5eeceb85929c5df041b768d01694176b3a9d status: handle more node indicators in buildstatus There are several

[PATCH 03 of 10 V2] merge: remove uses of manifest.matches

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488940700 28800 # Tue Mar 07 18:38:20 2017 -0800 # Node ID ccec5eeceb85929c5df041b768d01694176b3a9d # Parent f70310209acbbcb4cf7cae7c38d94e15c09c1ace merge: remove uses of manifest.matches This gets rid of the manifest.matches

[PATCH 05 of 10 V2] context: move _manifest from committablectx to workingctx

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488938190 28800 # Tue Mar 07 17:56:30 2017 -0800 # Node ID 36bcc5d848c6bdf33d604999631a0708d1b7f067 # Parent 68644896cbdcfc956079662668e010038bfe8048 context: move _manifest from committablectx to workingctx committablectx had

[PATCH 02 of 10 V2] copies: remove use of manifest.matches

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488909371 28800 # Tue Mar 07 09:56:11 2017 -0800 # Node ID f70310209acbbcb4cf7cae7c38d94e15c09c1ace # Parent 5ede3fa3bae6e964b4bce8b36681d203c05e94f7 copies: remove use of manifest.matches Convert the existing use of

[PATCH 08 of 10 V2] manifest: rename matches to _matches

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488937983 28800 # Tue Mar 07 17:53:03 2017 -0800 # Node ID b76e7da4fb9ab00c3b98e5613d7caa0b4aceaf8b # Parent 822259e9f117b11cd54d6a13565a3202b508eae8 manifest: rename matches to _matches Now that there are no external

[PATCH 06 of 10 V2] context: remove duplicate manifest creation during _buildstatus

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488937790 28800 # Tue Mar 07 17:49:50 2017 -0800 # Node ID d2850df6c891a20585a0d5eac370c1c2f4463cad # Parent 36bcc5d848c6bdf33d604999631a0708d1b7f067 context: remove duplicate manifest creation during _buildstatus Previously

[PATCH 01 of 10 V2] manifest: add match argument to diff and filesnotin

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488909371 28800 # Tue Mar 07 09:56:11 2017 -0800 # Node ID 5ede3fa3bae6e964b4bce8b36681d203c05e94f7 # Parent 7433b3bc55eebfa9149280339b406bd4cec64efb manifest: add match argument to diff and filesnotin As part of removing

Re: [PATCH 5 of 6 py3] dispatch: enforce bytes when converting boolean flags to config items

2017-03-07 Thread Augie Fackler
> On Mar 7, 2017, at 22:07, Durham Goode wrote: > > > > On 3/7/17 8:25 AM, Augie Fackler wrote: >> # HG changeset patch >> # User Augie Fackler >> # Date 1488570207 18000 >> # Fri Mar 03 14:43:27 2017 -0500 >> # Node ID

Re: [PATCH 5 of 6 py3] dispatch: enforce bytes when converting boolean flags to config items

2017-03-07 Thread Durham Goode
On 3/7/17 8:25 AM, Augie Fackler wrote: # HG changeset patch # User Augie Fackler # Date 1488570207 18000 # Fri Mar 03 14:43:27 2017 -0500 # Node ID 4801067dee2c77ff4e720c931d8b19cf32515beb # Parent a6e8bb19707e0c7505ccfdf44f7e1b19a0f65d48 dispatch: enforce bytes when

Re: [PATCH 3 of 6 py3] extensions: tapdance to get reasonable import error formatting

2017-03-07 Thread Augie Fackler
> On Mar 7, 2017, at 21:59, Durham Goode wrote: > > > > On 3/7/17 8:25 AM, Augie Fackler wrote: >> # HG changeset patch >> # User Augie Fackler >> # Date 1488568082 18000 >> # Fri Mar 03 14:08:02 2017 -0500 >> # Node ID

Re: [PATCH 3 of 6 py3] extensions: tapdance to get reasonable import error formatting

2017-03-07 Thread Durham Goode
On 3/7/17 6:59 PM, Durham Goode wrote: On 3/7/17 8:25 AM, Augie Fackler wrote: # HG changeset patch # User Augie Fackler # Date 1488568082 18000 # Fri Mar 03 14:08:02 2017 -0500 # Node ID adf7419abb89aef332ac5eac48a0f1c9d3eab527 # Parent

Re: [PATCH 3 of 6 py3] extensions: tapdance to get reasonable import error formatting

2017-03-07 Thread Durham Goode
On 3/7/17 8:25 AM, Augie Fackler wrote: # HG changeset patch # User Augie Fackler # Date 1488568082 18000 # Fri Mar 03 14:08:02 2017 -0500 # Node ID adf7419abb89aef332ac5eac48a0f1c9d3eab527 # Parent 3e82376d7d3f3e11d11f09fceb8b4c79233057a8 extensions: tapdance to get

Re: stable ordering of test output

2017-03-07 Thread Matt Harbison
On Fri, 03 Mar 2017 17:45:56 -0500, Danek Duvall wrote: I frequently get failures like this: --- .../mercurial.hg/tests/test-bundle2-exchange.t +++ .../mercurial.hg/tests/test-bundle2-exchange.t.err @@ -1042,11 +1042,11 @@ $ hg --config

Re: [PATCH] fsmonitor: remove use of repo.opener

2017-03-07 Thread Augie Fackler
On Tue, Mar 07, 2017 at 12:53:25PM -0800, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488919920 28800 > # Tue Mar 07 12:52:00 2017 -0800 > # Node ID 4d485e46a3e5c83ff8d2ae0a4ba8e484a284f65b > # Parent 7433b3bc55eebfa9149280339b406bd4cec64efb >

Re: [PATCH 3 of 6] merge: remove uses of manifest.matches

2017-03-07 Thread Durham Goode
On 3/7/17 4:41 PM, Martin von Zweigbergk wrote: On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: # HG changeset patch # User Durham Goode # Date 1488519936 28800 # Thu Mar 02 21:45:36 2017 -0800 # Node ID 883bb49a3b40609074d56257aab7619f0c306efc #

Re: [PATCH 5 of 6] context: remove uses of manifest.matches

2017-03-07 Thread Martin von Zweigbergk via Mercurial-devel
On Tue, Mar 7, 2017 at 4:13 PM, Durham Goode wrote: > > > On 3/7/17 2:40 PM, Martin von Zweigbergk wrote: >> >> On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: >>> >>> # HG changeset patch >>> # User Durham Goode >>> # Date 1488569391 28800 >>>

Re: [PATCH 3 of 6] merge: remove uses of manifest.matches

2017-03-07 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488519936 28800 > # Thu Mar 02 21:45:36 2017 -0800 > # Node ID 883bb49a3b40609074d56257aab7619f0c306efc > # Parent

[PATCH 1 of 5 V2] rebase: clear updatestate during rebase --abort in more cases

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488925148 28800 # Tue Mar 07 14:19:08 2017 -0800 # Node ID 4eb06495f778ecce2b3644e0d50585495f26162b # Parent 7433b3bc55eebfa9149280339b406bd4cec64efb rebase: clear updatestate during rebase --abort in more cases Previously,

[PATCH 2 of 5 V2] rebase: move storestatus onto rebaseruntime

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488924704 28800 # Tue Mar 07 14:11:44 2017 -0800 # Node ID 9ee513d4a3884d19a85b2aadd7bac362d1530d11 # Parent 4eb06495f778ecce2b3644e0d50585495f26162b rebase: move storestatus onto rebaseruntime The rebaseruntime class already

[PATCH 4 of 5 V2] rebase: allow aborting if last-message.txt is missing

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488933031 28800 # Tue Mar 07 16:30:31 2017 -0800 # Node ID 177c391caab3912e403e0eec469ea45a18c001f2 # Parent 8451bfc2e1d6260a0ce9dac505dd9f34fb3b19aa rebase: allow aborting if last-message.txt is missing Previously, if

[PATCH 5 of 5 V2] rebase: move actual rebase into a single transaction

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488932852 28800 # Tue Mar 07 16:27:32 2017 -0800 # Node ID 39116126d70a5cc2fe330c880093beffa640aa64 # Parent 177c391caab3912e403e0eec469ea45a18c001f2 rebase: move actual rebase into a single transaction Previously, rebasing

Re: [PATCH 6 of 6] manifest: rename matches to _matches

2017-03-07 Thread Durham Goode
On 3/7/17 2:29 PM, Martin von Zweigbergk wrote: On Tue, Mar 7, 2017 at 9:37 AM, Durham Goode wrote: On 3/6/17 10:31 PM, Martin von Zweigbergk wrote: On Mon, Mar 6, 2017 at 5:40 PM, Durham Goode wrote: On 3/6/17 5:32 PM, Martin von Zweigbergk wrote:

Re: [PATCH 5 of 5] localrepo: deprecated 'repo.opener' (API)

2017-03-07 Thread Durham Goode
On 3/3/17 7:42 AM, Pierre-Yves David wrote: On 03/03/2017 02:50 PM, Yuya Nishihara wrote: On Thu, 02 Mar 2017 03:58:45 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1470398170 -7200 # Fri Aug 05 13:56:10 2016

[PATCH] fsmonitor: remove use of repo.opener

2017-03-07 Thread Durham Goode
# HG changeset patch # User Durham Goode # Date 1488919920 28800 # Tue Mar 07 12:52:00 2017 -0800 # Node ID 4d485e46a3e5c83ff8d2ae0a4ba8e484a284f65b # Parent 7433b3bc55eebfa9149280339b406bd4cec64efb fsmonitor: remove use of repo.opener This has been deprecated, so we need to

[PATCH V2] merge: add `internal:dumpjson` tool to `resolve`, which outputs conflict state

2017-03-07 Thread Phil Cohen
# HG changeset patch # User Phil Cohen # Date 1488915535 28800 # Tue Mar 07 11:38:55 2017 -0800 # Node ID bbce62e3790220f19e7b37160a2f8351b7461272 # Parent 91e86a6c61c0c6a3b554eefeba906311aa29 merge: add `internal:dumpjson` tool to `resolve`, which outputs conflict state

[PATCH 3 of 3 py3] repoview: convert attribute names to unicodes on Python 3

2017-03-07 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1488914355 -19800 # Wed Mar 08 00:49:15 2017 +0530 # Node ID 3f1b6aded120622ec0195ab180cddd8cf09dc59e # Parent 6ff8f348d278599b1dd79aa6b4d7c7c231ca7b58 repoview: convert attribute names to unicodes on Python 3 In Python

[PATCH 1 of 3 py3] store: slice over a bytestring to get characters instead of ascii values

2017-03-07 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1488913815 -19800 # Wed Mar 08 00:40:15 2017 +0530 # Node ID f8ec9104d219a01357e8f6118286d9b212695bbe # Parent b9834a28d200fad7584c6c98efb1b81bdc5f4106 store: slice over a bytestring to get characters instead of ascii

[PATCH 2 of 3 py3] parsers: alias long to int on Python 3

2017-03-07 Thread Pulkit Goyal
# HG changeset patch # User Pulkit Goyal <7895pul...@gmail.com> # Date 1488914119 -19800 # Wed Mar 08 00:45:19 2017 +0530 # Node ID 6ff8f348d278599b1dd79aa6b4d7c7c231ca7b58 # Parent f8ec9104d219a01357e8f6118286d9b212695bbe parsers: alias long to int on Python 3 diff -r f8ec9104d219 -r

Re: [PATCH 6 of 6 py3] schemes: move re construction to module-level and python3-ify

2017-03-07 Thread Augie Fackler
> On Mar 7, 2017, at 9:03 AM, Yuya Nishihara wrote: > >> diff --git a/hgext/schemes.py b/hgext/schemes.py >> --- a/hgext/schemes.py >> +++ b/hgext/schemes.py >> @@ -63,6 +63,7 @@ command = cmdutil.command(cmdtable) >> # leave the attribute unspecified. >> testedwith =

Re: Deltas, compression, and zstd

2017-03-07 Thread Gregory Szorc
On Tue, Jan 10, 2017 at 10:34 AM, Gregory Szorc wrote: > A few of us started an off-list conversation with Yann Collett (author of > lz4 and zstd and general compression guru) about deltas, compression, and > zstd. Most of that conversation is suitable for the public

[PATCH stable] pycompat: verify sys.argv exists before forwarding it (issue5493)

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488911064 18000 # Tue Mar 07 13:24:24 2017 -0500 # Branch stable # Node ID b1e649de4c276133444234f33638cde393cbbfc8 # Parent 6b00c3ecd15b26587de8cca6fab811069cba3b2f pycompat: verify sys.argv exists before forwarding it

Re: [PATCH] rebase: move actual rebase into a single transaction

2017-03-07 Thread Augie Fackler
On Sat, Mar 04, 2017 at 02:08:26PM -0800, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488665211 28800 > # Sat Mar 04 14:06:51 2017 -0800 > # Node ID 9c3ea2112952f398aaa7625f43dcfa36cfd34379 > # Parent b4cd912d7704cd976e1bee3a3c927e0e578ec88f >

Re: stable ordering of test output

2017-03-07 Thread Danek Duvall
Pierre-Yves David wrote: > >>It's also a problem on the FreeBSD buildbot. I don't know enough about > >>the bundle2 code to understand how to fix it, but maybe we can figure > >>out a way to get marmoute an account on a machine taht would help him > >>diagnose? Danek, do you have a solaris

Re: [PATCH RFC] help: align description of 'base rev' with reality [issue5488]

2017-03-07 Thread Augie Fackler
On Tue, Feb 28, 2017 at 03:33:36PM +0100, Kim Alvefur wrote: > # HG changeset patch > # User Kim Alvefur > # Date 1488291548 -3600 > # Tue Feb 28 15:19:08 2017 +0100 > # Node ID 397c0aa1cd18439d2ce90a68cd5737fb8dafab49 > # Parent a185b903bda3c64678d1f9399bfa0be8d326dbff >

[PATCH evolve-ext] evolve: switch away from deprecated repo.opener

2017-03-07 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1488908857 28800 # Tue Mar 07 09:47:37 2017 -0800 # Node ID 5cf7a405f0e5c089a6da86583eed7c3f99c4ccde # Parent a4b09789117a64e4672ba6a2626bbaf965476e91 evolve: switch away from deprecated repo.opener diff -r

Re: [PATCH] help: fix internals.changegroups

2017-03-07 Thread Augie Fackler
On Wed, Mar 01, 2017 at 06:38:20PM -0800, Siddharth Agarwal wrote: > # HG changeset patch > # User Kyle Lippincott > # Date 1488422254 28800 > # Wed Mar 01 18:37:34 2017 -0800 > # Node ID f39bcd3a0f6d7c2e68948020c243ee53138db7bd > # Parent

Re: [PATCH 2 of 2] share: drop 'relshared' requirement as well

2017-03-07 Thread Augie Fackler
On Thu, Mar 02, 2017 at 08:11:18AM -0800, Ryan McElroy wrote: > This series looks good to me. Agreed, queued, thanks. > > > On 3/2/17 7:35 AM, Yuya Nishihara wrote: > > # HG changeset patch > > # User Yuya Nishihara > > # Date 1488467511 -32400 > > # Fri Mar 03 00:11:51 2017

Re: [PATCH V2] similar: compare between actual file contents for exact identity

2017-03-07 Thread Augie Fackler
On Fri, Mar 03, 2017 at 03:02:27AM +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1488477426 -32400 > # Fri Mar 03 02:57:06 2017 +0900 > # Node ID d7d47f54019fa900968245163e67ca6f02378995 > # Parent

Re: [PATCH 6 of 6] manifest: rename matches to _matches

2017-03-07 Thread Durham Goode
On 3/6/17 10:31 PM, Martin von Zweigbergk wrote: On Mon, Mar 6, 2017 at 5:40 PM, Durham Goode wrote: On 3/6/17 5:32 PM, Martin von Zweigbergk wrote: On Fri, Mar 3, 2017 at 11:34 AM, Durham Goode wrote: # HG changeset patch # User Durham Goode

Re: [PATCH 3 of 5 V2] localrepo: handle rename with hardlinks properly

2017-03-07 Thread Augie Fackler
On Thu, Mar 02, 2017 at 10:13:29PM -0800, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1488520170 28800 > # Thu Mar 02 21:49:30 2017 -0800 > # Node ID 1cf153ec3faaef92c9ad3515372a6d8591195d6e > # Parent 406f94842e3372f241a151a3ee6ea5f39c04758d > # Available At

Re: [PATCH 2 of 2 V2] dirstate: track otherparent files same as nonnormal

2017-03-07 Thread Augie Fackler
On Sun, Mar 05, 2017 at 04:51:01PM -0800, Durham Goode wrote: > # HG changeset patch > # User Durham Goode > # Date 1488761157 28800 > # Sun Mar 05 16:45:57 2017 -0800 > # Node ID a465bc91a3c1a04c9c75a3cbd13fd5b777487de9 > # Parent 4a751a57ef0682dc3d7e46bdfa67a26b13cd9031 >

Re: [PATCH] hook: give exthooks tags for blocking time

2017-03-07 Thread Augie Fackler
On Mon, Mar 06, 2017 at 03:09:27AM -0800, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth > # Date 1488798555 28800 > # Mon Mar 06 03:09:15 2017 -0800 > # Node ID 9bdc781849eb9bba369cf9698cb8a1f5aef2b966 > # Parent

Re: [PATCH] filemerge: tag merge tool for blocked times

2017-03-07 Thread Augie Fackler
On Mon, Mar 06, 2017 at 03:19:56AM -0800, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth > # Date 1488799180 28800 > # Mon Mar 06 03:19:40 2017 -0800 > # Node ID bca31954883ec7ffd16ee940bb84f12f60d286c8 > # Parent

Re: [PATCH 7 of 7] hgk: set a blocked tag when the user invokes view

2017-03-07 Thread Augie Fackler
On Mon, Mar 06, 2017 at 03:28:08AM -0800, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth > # Date 1488799672 28800 > # Mon Mar 06 03:27:52 2017 -0800 > # Node ID a24141da65e18e293bcd62f85f05050f01815942 > # Parent

Re: [PATCH] revert: always display hunks reversed when reverting to parent

2017-03-07 Thread Augie Fackler
On Tue, Mar 07, 2017 at 12:18:14AM -0800, Martin von Zweigbergk via Mercurial-devel wrote: > On Mon, Mar 6, 2017 at 5:25 AM, Denis Laxalde wrote: > > # HG changeset patch > > # User Denis Laxalde > > # Date 1488805881 -3600 > > # Mon Mar 06

Re: [PATCH 8 of 8 V2] fileset: add a 'status(...)' predicate to control evaluation context

2017-03-07 Thread Augie Fackler
On Mon, Mar 06, 2017 at 10:36:55AM +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488546500 -3600 > # Fri Mar 03 14:08:20 2017 +0100 > # Node ID 41ea8aee85ca16d652dfdb4afe37053b291702b4 > # Parent

Re: [PATCH 6 of 6] patchbomb: add config knob to generate flags by template (issue5354)

2017-03-07 Thread Augie Fackler
On Tue, Mar 07, 2017 at 11:35:38PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1488015660 -32400 > # Sat Feb 25 18:41:00 2017 +0900 > # Node ID 90a019a9df1bfb1d65bd729f40cb0b72ff5a896d > # Parent

Re: stable ordering of test output

2017-03-07 Thread Pierre-Yves David
On 03/07/2017 05:56 PM, Pierre-Yves David wrote: On 03/07/2017 05:49 PM, Augie Fackler wrote: On Fri, Mar 03, 2017 at 04:37:54PM -0800, Jun Wu wrote: Excerpts from Danek Duvall's message of 2017-03-03 14:45:56 -0800: I frequently get failures like this: ---

Re: stable ordering of test output

2017-03-07 Thread Pierre-Yves David
On 03/07/2017 05:49 PM, Augie Fackler wrote: On Fri, Mar 03, 2017 at 04:37:54PM -0800, Jun Wu wrote: Excerpts from Danek Duvall's message of 2017-03-03 14:45:56 -0800: I frequently get failures like this: --- .../mercurial.hg/tests/test-bundle2-exchange.t +++

Re: stable ordering of test output

2017-03-07 Thread Augie Fackler
On Fri, Mar 03, 2017 at 04:37:54PM -0800, Jun Wu wrote: > Excerpts from Danek Duvall's message of 2017-03-03 14:45:56 -0800: > > I frequently get failures like this: > > > > --- .../mercurial.hg/tests/test-bundle2-exchange.t > > +++ .../mercurial.hg/tests/test-bundle2-exchange.t.err > >

Re: [PATCH 11 of 11 V5] update: allow setting default update check to "noconflict"

2017-03-07 Thread Augie Fackler
On Wed, Mar 01, 2017 at 11:54:21AM -0800, Ryan McElroy wrote: > I'm a very big +1 on this direction -- this is a huge usability improvment. > > Facebook currently adds a "--nocheck" flag and turns on "check" by default > in our "tweakdefaults" extension, but this direction is strictly better than

[PATCH 6 of 6 py3] config: guard against setconfig specifying unicode values on py3

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488570176 18000 # Fri Mar 03 14:42:56 2017 -0500 # Node ID 1bd41b5fdf2b19d4c3bf9fc47a81fc3b85cddf79 # Parent 4801067dee2c77ff4e720c931d8b19cf32515beb config: guard against setconfig specifying unicode values on py3 This

[PATCH 3 of 6 py3] extensions: tapdance to get reasonable import error formatting

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488568082 18000 # Fri Mar 03 14:08:02 2017 -0500 # Node ID adf7419abb89aef332ac5eac48a0f1c9d3eab527 # Parent 3e82376d7d3f3e11d11f09fceb8b4c79233057a8 extensions: tapdance to get reasonable import error formatting I'm not

[PATCH 5 of 6 py3] dispatch: enforce bytes when converting boolean flags to config items

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488570207 18000 # Fri Mar 03 14:43:27 2017 -0500 # Node ID 4801067dee2c77ff4e720c931d8b19cf32515beb # Parent a6e8bb19707e0c7505ccfdf44f7e1b19a0f65d48 dispatch: enforce bytes when converting boolean flags to config items

[PATCH 4 of 6 py3] py3: add a test that proves %include and missing-extension code works

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488567128 18000 # Fri Mar 03 13:52:08 2017 -0500 # Node ID a6e8bb19707e0c7505ccfdf44f7e1b19a0f65d48 # Parent adf7419abb89aef332ac5eac48a0f1c9d3eab527 py3: add a test that proves %include and missing-extension code works

[PATCH 2 of 6 py3] extensions: use [0:1] slice on config path instead of [0]

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488565930 18000 # Fri Mar 03 13:32:10 2017 -0500 # Node ID 3e82376d7d3f3e11d11f09fceb8b4c79233057a8 # Parent 48c957d67d0f40a7134aeca72b98c33eb1546f17 extensions: use [0:1] slice on config path instead of [0] This behaves

[PATCH 1 of 6 py3] extensions: use inspect module instead of func_code.co_argcount

2017-03-07 Thread Augie Fackler
# HG changeset patch # User Augie Fackler # Date 1488565641 18000 # Fri Mar 03 13:27:21 2017 -0500 # Node ID 48c957d67d0f40a7134aeca72b98c33eb1546f17 # Parent 150cd51257221fad5ccba5794e7a21837afba479 extensions: use inspect module instead of func_code.co_argcount Fixes

[PATCH 6 of 6] patchbomb: add config knob to generate flags by template (issue5354)

2017-03-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1488015660 -32400 # Sat Feb 25 18:41:00 2017 +0900 # Node ID 90a019a9df1bfb1d65bd729f40cb0b72ff5a896d # Parent 471a972c189c7afa01da72df70463717e57032fe patchbomb: add config knob to generate flags by template (issue5354) This

[PATCH 5 of 6] patchbomb: pass around ui and revs that are needed for flag template

2017-03-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1488015334 -32400 # Sat Feb 25 18:35:34 2017 +0900 # Node ID 471a972c189c7afa01da72df70463717e57032fe # Parent 619df871ab3248552a7ac982c3916a7632639acd patchbomb: pass around ui and revs that are needed for flag template See

[PATCH 4 of 6] patchbomb: build patch texts by _getpatchmsgs()

2017-03-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1488014884 -32400 # Sat Feb 25 18:28:04 2017 +0900 # Node ID 619df871ab3248552a7ac982c3916a7632639acd # Parent 3ce342fc93179cfec1b85722f79d9861cabb52de patchbomb: build patch texts by _getpatchmsgs() Now _getpatchmsgs() knows

[PATCH 1 of 6] formatter: add argument to change output file of non-plain formatter

2017-03-07 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1421571884 -32400 # Sun Jan 18 18:04:44 2015 +0900 # Node ID f56b72c28430d0275457b9b7500df05fdb3d58df # Parent 052e4f1ffce964ffae6333aec4883ef2b4080e4f formatter: add argument to change output file of non-plain formatter This

Re: [PATCH 8 of 8 V2] fileset: add a 'status(...)' predicate to control evaluation context

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 10:36:55 +0100, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1488546500 -3600 > # Fri Mar 03 14:08:20 2017 +0100 > # Node ID 41ea8aee85ca16d652dfdb4afe37053b291702b4 > # Parent

Re: [PATCH 4 of 6 py3] dispatch: allow testedwith to be bytes or str

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 18:23:08 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1488565765 18000 > # Fri Mar 03 13:29:25 2017 -0500 > # Node ID 00547c2e1a71fc5d3efd13e5c766fda8bc398e6a > # Parent cf5be2a3d1804666dff9a4c99a33354dab7cc322 >

Re: [PATCH 6 of 6 py3] schemes: move re construction to module-level and python3-ify

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 18:23:10 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1488565530 18000 > # Fri Mar 03 13:25:30 2017 -0500 > # Node ID e36144b27c88bf5a0f2f520d2f2352c290ea4f15 > # Parent c28e0b997db472d0286927234bf06cc9848b6ff7 >

Re: [PATCH 2 of 2] update: for "noconflict" updates, print "conflicting changes" on conflict

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 23:50:38 -0800, Martin von Zweigbergk via Mercurial-devel wrote: > # HG changeset patch > # User Martin von Zweigbergk > # Date 1488871287 28800 > # Mon Mar 06 23:21:27 2017 -0800 > # Node ID 426835372fed3048a413eb210ed527886912cbfc > # Parent

Re: [PATCH 1 of 6 py3] config: add sanity assert that files are opened as binary

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 18:23:05 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1488563711 18000 > # Fri Mar 03 12:55:11 2017 -0500 > # Node ID 428615d799a9115249f3aab8d6481e384e879f6a > # Parent 41a9edc5d00f2b5744e1edaf2edaa10084099f53 >

Re: [PATCH 3 of 6 py3] ui: fix ui.traceback on Python 3

2017-03-07 Thread Yuya Nishihara
On Mon, 06 Mar 2017 18:23:07 -0500, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler > # Date 1488568154 18000 > # Fri Mar 03 14:09:14 2017 -0500 > # Node ID cf5be2a3d1804666dff9a4c99a33354dab7cc322 > # Parent 2e19b1921f0ba7f3550c11f7f3c85e88e732e3a0 >

Re: [PATCH stable] fsmonitor: match watchman and local encoding

2017-03-07 Thread Olivier Trempe
On Mon, Mar 6, 2017 at 8:14 PM, Siddharth Agarwal wrote: > On 3/6/17 09:50, Olivier Trempe wrote: > >> # HG changeset patch >> # User Olivier Trempe >> # Date 1488810111 18000 >> # Mon Mar 06 09:21:51 2017 -0500 >> # Branch stable >> # Node ID

Re: [PATCH] revert: always display hunks reversed when reverting to parent

2017-03-07 Thread Denis Laxalde
Martin von Zweigbergk a écrit : Relatedly, did you ever resend you patch from last fall that stopped even reading from revertalternateinteractivemode or was that blocked by some discussion taking place? No, I didn't resend it and there was no clear conclusion to the discussion as far as I can

Re: RFC: bitmap storage for precursors and phases

2017-03-07 Thread Pierre-Yves David
On 02/18/2017 04:51 AM, Jun Wu wrote: Excerpts from Stanislau Hlebik's message of 2017-02-17 16:06:33 +: This is implementation of two caches (nonpublic + precursor) using serialized sorted lists and sets

Re: RFC: bitmap storage for precursors and phases

2017-03-07 Thread Pierre-Yves David
On 02/14/2017 02:04 AM, Sean Farley wrote: Jun Wu writes: In general, I think this is a good direction. Some random thoughts: - general purposed I think the bitmap is not always a cache, so it should only have operations like set/unset/readfromdisk/writetodisk.

Re: [PATCH] localrepo: avoid unnecessary conversion from node to rev

2017-03-07 Thread Pierre-Yves David
On 02/11/2017 07:44 PM, Gregory Szorc wrote: On Feb 3, 2017, at 05:16, Yuya Nishihara wrote: On Thu, 2 Feb 2017 15:06:46 +, Jun Wu wrote: This patch looks good to me. See inline comment about how to make it faster. That could probably be fixed in flight. Excerpts from

Re: [PATCH] revert: always display hunks reversed when reverting to parent

2017-03-07 Thread Martin von Zweigbergk via Mercurial-devel
On Mon, Mar 6, 2017 at 5:25 AM, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1488805881 -3600 > # Mon Mar 06 14:11:21 2017 +0100 > # Node ID 9f2b436197b02608e1546f57ac6426ec1427c7fd > # Parent