[PATCH] extdiff: copy back execbit-only changes to the working directory

2017-05-11 Thread Matt Harbison
# HG changeset patch # User Matt Harbison # Date 1494556425 14400 # Thu May 11 22:33:45 2017 -0400 # Node ID 862a9d7605a23d7108e54b1a533dd3b091a6b12d # Parent b83aecac21cae0ea9e0256a00c744ca120799bc3 extdiff: copy back execbit-only changes to the working directory

Re: [PATCH] merge: use repo.wvfs.setflags() instead of util.setflags()

2017-05-11 Thread Sean Farley
Phil Cohen writes: > # HG changeset patch > # User Phil Cohen > # Date 1494553123 25200 > # Thu May 11 18:38:43 2017 -0700 > # Node ID 90180de768113d9f6b1ec990a634ec4b872636a0 > # Parent 8f1a2b848b52ea7bf3fe2404e3b62924c7aae93f > merge: use

Re: [PATCH 1 of 2] sslutil: tweak the legacy [hostfingerprints] warning message

2017-05-11 Thread Matt Harbison
On Thu, 11 May 2017 03:02:42 -0400, Gregory Szorc wrote: # HG changeset patch # User Gregory Szorc # Date 1494485377 25200 # Wed May 10 23:49:37 2017 -0700 # Node ID fc01a88a85d64a3a440971c5e3b6c8f7db030170 # Parent

[PATCH] merge: use repo.wvfs.setflags() instead of util.setflags()

2017-05-11 Thread Phil Cohen
# HG changeset patch # User Phil Cohen # Date 1494553123 25200 # Thu May 11 18:38:43 2017 -0700 # Node ID 90180de768113d9f6b1ec990a634ec4b872636a0 # Parent 8f1a2b848b52ea7bf3fe2404e3b62924c7aae93f merge: use repo.wvfs.setflags() instead of util.setflags() Most merge.py code

[PATCH 1 of 2] verify: always check rawsize

2017-05-11 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1494539522 25200 # Thu May 11 14:52:02 2017 -0700 # Node ID 1008583138d3dca114bc9d4998a27e845fbc13b0 # Parent 1ada3d18e7fbc9069910f2c036992d2f2b28e058 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 2 of 2] verify: add an option to skip checking transformed revisions

2017-05-11 Thread Jun Wu
# HG changeset patch # User Jun Wu # Date 1494543792 25200 # Thu May 11 16:03:12 2017 -0700 # Node ID f63f6396ebda80cd0462aaedc4dc0d95fa5ca7b0 # Parent 1008583138d3dca114bc9d4998a27e845fbc13b0 # Available At https://bitbucket.org/quark-zju/hg-draft # hg pull

[PATCH 4 of 4 shelve-ext v5] shelve: make shelvestate use simplekeyvaluefile

2017-05-11 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1494537058 25200 # Thu May 11 14:10:58 2017 -0700 # Node ID 5a494382891182deaddd2b18642d5c0320684bc4 # Parent 9170d8e0460bfe9ae4ea79394786cf2cac686fcb shelve: make shelvestate use simplekeyvaluefile Currently shelvestate

[PATCH 1 of 4 shelve-ext v5] scmutil: add simplekeyvaluefile reading test

2017-05-11 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1494517184 25200 # Thu May 11 08:39:44 2017 -0700 # Node ID ebf9affb2f7013a6a597ddd0765c786ed36f3722 # Parent 1ada3d18e7fbc9069910f2c036992d2f2b28e058 scmutil: add simplekeyvaluefile reading test Before this patch, mockvfs

[PATCH 3 of 4 shelve-ext v5] shelve: refactor shelvestate loading

2017-05-11 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1494520029 25200 # Thu May 11 09:27:09 2017 -0700 # Node ID 9170d8e0460bfe9ae4ea79394786cf2cac686fcb # Parent b79f27451d7af524c07b89a983cf750bd96292c5 shelve: refactor shelvestate loading This is a preparatory patch which

RE: [PATCH 4 of 4 shelve-ext v4] shelve: make shelvestate use simplekeyvaluefile

2017-05-11 Thread Kostia Balytskyi
> -Original Message- > From: Yuya Nishihara [mailto:you...@gmail.com] On Behalf Of Yuya > Nishihara > Sent: Thursday, 11 May, 2017 14:48 > To: Kostia Balytskyi > Cc: mercurial-devel@mercurial-scm.org > Subject: Re: [PATCH 4 of 4 shelve-ext v4] shelve: make shelvestate use

[PATCH v2] rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)

2017-05-11 Thread Martin von Zweigbergk via Mercurial-devel
# HG changeset patch # User Martin von Zweigbergk # Date 1494527838 25200 # Thu May 11 11:37:18 2017 -0700 # Node ID 14379c69a54f03157b09410dbc0116d7410d6623 # Parent 1ada3d18e7fbc9069910f2c036992d2f2b28e058 rebase: allow rebase even if some revisions need no rebase

Re: [PATCH 2 of 3] rebase: allow rebase even if some revisions need no rebase (BC) (issue5422)

2017-05-11 Thread Martin von Zweigbergk via Mercurial-devel
On Fri, May 5, 2017 at 11:14 PM, Martin von Zweigbergk wrote: > On Fri, May 5, 2017 at 7:19 PM, Yuya Nishihara wrote: >> On Thu, 04 May 2017 13:20:11 -0700, Martin von Zweigbergk via >> Mercurial-devel wrote: >>> # HG changeset patch >>> # User Martin von

[PATCH 4 of 4 V2] clone: add a server-side option to disable full getbundles (pull-based clones)

2017-05-11 Thread Siddharth Agarwal
# HG changeset patch # User Siddharth Agarwal # Date 1494525005 25200 # Thu May 11 10:50:05 2017 -0700 # Node ID fa570690257581e3197f8730b6522e80d58a3f45 # Parent 052bd5cfe3769b10c64a4a39d9734a2740d44e16 clone: add a server-side option to disable full getbundles (pull-based

[PATCH 2 of 4 V2] clone: test streaming disabled because client is missing requirement

2017-05-11 Thread Siddharth Agarwal
# HG changeset patch # User Siddharth Agarwal # Date 149429 25200 # Mon May 08 18:47:24 2017 -0700 # Node ID 16696b166a70288f05d9306591d66fdd87c51702 # Parent b433f29233e32d1c1e665b0c04ae0ef356ce0396 clone: test streaming disabled because client is missing requirement

[PATCH 3 of 4 V2] clone: warn when streaming was requested but couldn't be performed

2017-05-11 Thread Siddharth Agarwal
# HG changeset patch # User Siddharth Agarwal # Date 1494298866 25200 # Mon May 08 20:01:06 2017 -0700 # Node ID 052bd5cfe3769b10c64a4a39d9734a2740d44e16 # Parent 16696b166a70288f05d9306591d66fdd87c51702 clone: warn when streaming was requested but couldn't be performed This

[PATCH 1 of 4 V2] bundle2: don't check for whether we can do stream clones

2017-05-11 Thread Siddharth Agarwal
# HG changeset patch # User Siddharth Agarwal # Date 1494289851 25200 # Mon May 08 17:30:51 2017 -0700 # Node ID b433f29233e32d1c1e665b0c04ae0ef356ce0396 # Parent 8f1a2b848b52ea7bf3fe2404e3b62924c7aae93f bundle2: don't check for whether we can do stream clones At the moment

RE: [PATCH 3 of 4 shelve-ext v4] shelve: refactor shelvestate loading

2017-05-11 Thread Kostia Balytskyi
> -Original Message- > From: Yuya Nishihara [mailto:you...@gmail.com] On Behalf Of Yuya > Nishihara > Sent: Thursday, 11 May, 2017 14:38 > To: Kostia Balytskyi > Cc: mercurial-devel@mercurial-scm.org > Subject: Re: [PATCH 3 of 4 shelve-ext v4] shelve: refactor

[Bug 5564] New: The execution bit is lost when merging conflicts with an external merge tool

2017-05-11 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5564 Bug ID: 5564 Summary: The execution bit is lost when merging conflicts with an external merge tool Product: Mercurial Version: stable branch Hardware: PC

Re: [PATCH 08 of 11] filecommit: reuse filenode matching fparents regardless of type(fctx)

2017-05-11 Thread Jun Wu
Excerpts from Yuya Nishihara's message of 2017-05-12 00:15:41 +0900: > Nit: it appears fctx.filenode() is a mandatory API of basefilectx. Good catch. The only exception is tests/drawdag.py. I'll update it. > I've double-reviewed up to this patch, and timed out. I'll look the > remainder

[PATCH 1 of 2 stable v2] graft: test coverage of grafts and how merges can break duplicate detection

2017-05-11 Thread Mads Kiilerich
# HG changeset patch # User Mads Kiilerich # Date 1494281490 -7200 # Tue May 09 00:11:30 2017 +0200 # Branch stable # Node ID 6710017995b4e8b361d6ad5b897ff7d0cc658285 # Parent 247bb7a2c492d8a946cc7ed61a627d53566b7c16 graft: test coverage of grafts and how merges can

[PATCH 2 of 2 stable v2] graft: fix graft across merges of duplicates of grafted changes

2017-05-11 Thread Mads Kiilerich
# HG changeset patch # User Mads Kiilerich # Date 1494515920 -7200 # Thu May 11 17:18:40 2017 +0200 # Branch stable # Node ID cf6482170698ea9cd590f6e72745348bef5703b4 # Parent 6710017995b4e8b361d6ad5b897ff7d0cc658285 graft: fix graft across merges of duplicates of

Re: [PATCH 12 of 12 RFC] policy: add helper to import cext/pure module

2017-05-11 Thread Yuya Nishihara
On Wed, 10 May 2017 11:04:41 -0700, Sean Farley wrote: > Yuya Nishihara writes: > > On Tue, 9 May 2017 11:08:03 -0700, Jun Wu wrote: > >> > > Patch 12 is where I disagree. _dualmod still requires careful renaming > >> > > and > >> > > could cause subtle problems that does not get

Re: [PATCH 08 of 11] filecommit: reuse filenode matching fparents regardless of type(fctx)

2017-05-11 Thread Yuya Nishihara
On Wed, 10 May 2017 01:34:27 -0700, Jun Wu wrote: > # HG changeset patch > # User Jun Wu > # Date 1494387835 25200 > # Tue May 09 20:43:55 2017 -0700 > # Node ID e4ad86c15b06986e51d4754f3c11bd24cbae30bb > # Parent eb7b96bc42d08670983d5d75635198f62c3459a8 > # Available At

Re: [PATCH 2 of 2 stable] graft: fix graft across merges of duplicates of grafted changes

2017-05-11 Thread Mads Kiilerich
On 05/10/2017 03:42 PM, Yuya Nishihara wrote: On Tue, 09 May 2017 00:45:02 +0200, Mads Kiilerich wrote: # HG changeset patch # User Mads Kiilerich # Date 1494283376 -7200 # Tue May 09 00:42:56 2017 +0200 # Branch stable # Node ID

Re: [PATCH V2 STABLE] serve: move hg-ssh readonly logic into hg serve

2017-05-11 Thread Yuya Nishihara
On Wed, 10 May 2017 08:50:38 -0700, Durham Goode wrote: > On 5/10/17 7:29 AM, Yuya Nishihara wrote: > > On Tue, 9 May 2017 15:48:50 -0700, Durham Goode wrote: > >> On 4/28/17 6:27 AM, Yuya Nishihara wrote: > >>> On Thu, 27 Apr 2017 10:13:21 -0400, Augie Fackler wrote: > On Wed, Apr 26, 2017

Re: [PATCH 2 of 4 shelve-ext v4] scmutil: make simplekeyvaluefile able to have a non-key-value first line

2017-05-11 Thread Yuya Nishihara
On Sun, 7 May 2017 06:07:04 -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1494158131 25200 > # Sun May 07 04:55:31 2017 -0700 > # Node ID d78507e5b31ac9d5dbf3b8ab45c0c94b01491a0b > # Parent e9b77b6f16c04efced06169735a813d5db82dddf >

Re: [PATCH 4 of 4 shelve-ext v4] shelve: make shelvestate use simplekeyvaluefile

2017-05-11 Thread Yuya Nishihara
On Sun, 7 May 2017 06:07:06 -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1494162279 25200 > # Sun May 07 06:04:39 2017 -0700 > # Node ID 9f24868156f15473b08a418765411341c96e892b > # Parent 497904bddbaa75b9086c168ab2e03381dfaff165 >

Re: [PATCH 3 of 4 shelve-ext v4] shelve: refactor shelvestate loading

2017-05-11 Thread Yuya Nishihara
On Sun, 7 May 2017 06:07:05 -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1494113427 25200 > # Sat May 06 16:30:27 2017 -0700 > # Node ID 497904bddbaa75b9086c168ab2e03381dfaff165 > # Parent d78507e5b31ac9d5dbf3b8ab45c0c94b01491a0b >

Re: [PATCH 1 of 4 shelve-ext v4] scmutil: add simplekeyvaluefile reading test

2017-05-11 Thread Yuya Nishihara
On Sun, 7 May 2017 06:07:03 -0700, Kostia Balytskyi wrote: > # HG changeset patch > # User Kostia Balytskyi > # Date 1494157223 25200 > # Sun May 07 04:40:23 2017 -0700 > # Node ID e9b77b6f16c04efced06169735a813d5db82dddf > # Parent 31f42e683321f225eb9c306f8d4b3a9e8d82a1da >

[PATCH STABLE] hghave: prefill more version of Mercurial

2017-05-11 Thread Pierre-Yves David
# HG changeset patch # User Pierre-Yves David # Date 1494335327 -7200 # Tue May 09 15:08:47 2017 +0200 # Branch stable # Node ID 7a61f40a4fada0ccadc65d9e6c8fae4483f00b85 # Parent bb96d4a497432722623ae60d9bc734a1e360179e # EXP-Topic hghave # Available At

Re: [PATCH 1 of 8] transaction: introduce "changes" dictionary to precisely track updates

2017-05-11 Thread Pierre-Yves David
So, what is the status of this series? I've important speedup work stuck behind it so I would like to see the topic move forward. On 05/03/2017 09:09 PM, Pierre-Yves David wrote: On 05/03/2017 03:46 PM, Yuya Nishihara wrote: On Wed, 3 May 2017 15:06:05 +0200, Pierre-Yves David wrote: On

[PATCH 2 of 2] help: clarify that colons are allowed in fingerprints values

2017-05-11 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1494486152 25200 # Thu May 11 00:02:32 2017 -0700 # Node ID 202d58d5b516b5daf8262d9901a7dd456556127d # Parent fc01a88a85d64a3a440971c5e3b6c8f7db030170 help: clarify that colons are allowed in fingerprints values This

[PATCH 1 of 2] sslutil: tweak the legacy [hostfingerprints] warning message

2017-05-11 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1494485377 25200 # Wed May 10 23:49:37 2017 -0700 # Node ID fc01a88a85d64a3a440971c5e3b6c8f7db030170 # Parent 1ada3d18e7fbc9069910f2c036992d2f2b28e058 sslutil: tweak the legacy [hostfingerprints] warning message Lars

[PATCH] sslutil: remove conditional cipher code needed for Python 2.6

2017-05-11 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1494484320 25200 # Wed May 10 23:32:00 2017 -0700 # Node ID c277c388f639a12de90093897f8e3471c59cf1e7 # Parent 1ada3d18e7fbc9069910f2c036992d2f2b28e058 sslutil: remove conditional cipher code needed for Python 2.6 We