Re: [PATCH STABLE] test-bookmarks: factor hooks out to a shell script for Windows

2017-04-28 Thread Gregory Szorc
On Thu, Apr 27, 2017 at 5:55 PM, Augie Fackler wrote: > > > On Apr 27, 2017, at 20:55, Sean Farley wrote: > > > > Matt Harbison writes: > > > >> On Thu, 27 Apr 2017 10:47:14 -0400, Augie Fackler > wrote: > >> > >>> On Tue, Apr 25, 2017 at 10:34:00PM -0400, Matt Harbison wrote: > # HG chan

[Bug 5554] New: Error in `python': free(): invalid pointer: 0x00007ff368007640 when running tests

2017-04-28 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5554 Bug ID: 5554 Summary: Error in `python': free(): invalid pointer: 0x7ff368007640 when running tests Product: Mercurial Version: 4.0 Hardware: PC OS: Linu

Re: [PATCH 1 of 2 STABLE] tests: demonstrate `hg show` mapping to showconfig

2017-04-28 Thread Gregory Szorc
On Fri, Apr 28, 2017 at 4:04 PM, Yuya Nishihara wrote: > On Fri, 28 Apr 2017 10:30:00 -0700, Gregory Szorc wrote: > > On Fri, Apr 28, 2017 at 6:04 AM, Yuya Nishihara wrote: > > > On Thu, 27 Apr 2017 16:11:34 -0700, Gregory Szorc wrote: > > > > This series is a "pick your poison" if you are a rev

Re: [PATCH 1 of 2 STABLE] tests: demonstrate `hg show` mapping to showconfig

2017-04-28 Thread Yuya Nishihara
On Fri, 28 Apr 2017 10:30:00 -0700, Gregory Szorc wrote: > On Fri, Apr 28, 2017 at 6:04 AM, Yuya Nishihara wrote: > > On Thu, 27 Apr 2017 16:11:34 -0700, Gregory Szorc wrote: > > > This series is a "pick your poison" if you are a reviewer. I'm partial to > > > the more complex one adding an argume

Re: [PATCH 1 of 2 STABLE] tests: demonstrate `hg show` mapping to showconfig

2017-04-28 Thread Gregory Szorc
On Fri, Apr 28, 2017 at 6:04 AM, Yuya Nishihara wrote: > On Thu, 27 Apr 2017 16:11:34 -0700, Gregory Szorc wrote: > > This series is a "pick your poison" if you are a reviewer. I'm partial to > > the more complex one adding an argument to @command. But it may not be > > appropriate for stable. So

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread lothiraldan
On 28/04/2017 18:38, Augie Fackler wrote: On Fri, Apr 28, 2017 at 12:34 PM, lothiraldan wrote: On 28/04/2017 17:43, Augie Fackler wrote: On Fri, Apr 28, 2017 at 11:36 AM, lothiraldan wrote: On 28/04/2017 16:51, Augie Fackler wrote: [...] but if adding bash to the command line also works f

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread Augie Fackler
On Fri, Apr 28, 2017 at 12:34 PM, lothiraldan wrote: > On 28/04/2017 17:43, Augie Fackler wrote: >> >> On Fri, Apr 28, 2017 at 11:36 AM, lothiraldan >> wrote: >>> >>> On 28/04/2017 16:51, Augie Fackler wrote: [...] >> but if adding bash to the command line also works for you that'd be my >> pre

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread lothiraldan
On 28/04/2017 17:43, Augie Fackler wrote: On Fri, Apr 28, 2017 at 11:36 AM, lothiraldan wrote: On 28/04/2017 16:51, Augie Fackler wrote: On Thu, Apr 27, 2017 at 06:49:50PM +0200, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1493131801 -7200 # Tue Apr 25 16:50:01 2017

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread Augie Fackler
On Fri, Apr 28, 2017 at 11:36 AM, lothiraldan wrote: > On 28/04/2017 16:51, Augie Fackler wrote: >> >> On Thu, Apr 27, 2017 at 06:49:50PM +0200, Boris Feld wrote: >>> >>> # HG changeset patch >>> # User Boris Feld >>> # Date 1493131801 -7200 >>> # Tue Apr 25 16:50:01 2017 +0200 >>> # Branch

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread lothiraldan
On 28/04/2017 16:51, Augie Fackler wrote: On Thu, Apr 27, 2017 at 06:49:50PM +0200, Boris Feld wrote: # HG changeset patch # User Boris Feld # Date 1493131801 -7200 # Tue Apr 25 16:50:01 2017 +0200 # Branch stable # Node ID d49b79b313989b62482da8e560fafa3373ae90b5 # Parent 52cca17ac523b49

Re: Dropping Support for Python 2.6

2017-04-28 Thread Augie Fackler
On Thu, Apr 27, 2017 at 12:23:18PM -0700, Gregory Szorc wrote: > I think the time has come to make a decision about dropping support for > Python 2.6. > > In [1], we already decided that supporting 2.6 on Windows made no sense. > While I don't think we ever wrote a patch, support for 2.6 on Windows

Re: [PATCH STABLE V2] packaging: add make target for linux wheels

2017-04-28 Thread Augie Fackler
On Thu, Apr 27, 2017 at 06:49:50PM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld > # Date 1493131801 -7200 > # Tue Apr 25 16:50:01 2017 +0200 > # Branch stable > # Node ID d49b79b313989b62482da8e560fafa3373ae90b5 > # Parent 52cca17ac523b490acdab259e794e7c2898efeda > pac

[Bug 5550] New: During merge, the message when a file was deleted on one side but changed on the other is hard to decypher

2017-04-28 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5550 Bug ID: 5550 Summary: During merge, the message when a file was deleted on one side but changed on the other is hard to decypher Product: Mercurial Version: 4.1 Hardware: Ma

Re: [PATCH] chmod: create a new file when flags are set on a hardlinked file

2017-04-28 Thread Augie Fackler
On Thu, Apr 27, 2017 at 09:32:22AM +0200, Koen Van Hoof wrote: > # HG changeset patch > # User Koen Van Hoof > # Date 1493215522 -7200 > # Wed Apr 26 16:05:22 2017 +0200 > # Branch stable > # Node ID e47e40bff9e07095076753e3e5288625951776ea > # Parent 6e0368b6e0bb2aa5210daec091c0200583553a78

Re: [PATCH STABLE] pager: use less as a fallback on Unix

2017-04-28 Thread Augie Fackler
On Fri, Apr 28, 2017 at 09:14:04PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1493380274 -32400 > # Fri Apr 28 20:51:14 2017 +0900 > # Branch stable > # Node ID a05035fe3995e4cfaa362d4976d89f5d8be3c5d9 > # Parent f9dd22b588e9f0eb475ce522a78c640d35c12

Re: [PATCH 1 of 2 STABLE] tests: demonstrate `hg show` mapping to showconfig

2017-04-28 Thread Augie Fackler
On Fri, Apr 28, 2017 at 10:04:48PM +0900, Yuya Nishihara wrote: > On Thu, 27 Apr 2017 16:11:34 -0700, Gregory Szorc wrote: > > This series is a "pick your poison" if you are a reviewer. I'm partial to > > the more complex one adding an argument to @command. But it may not be > > appropriate for sta

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

2017-04-28 Thread Yuya Nishihara
On Thu, 27 Apr 2017 10:13:21 -0400, Augie Fackler wrote: > On Wed, Apr 26, 2017 at 06:24:52PM -0700, Durham Goode wrote: > > # HG changeset patch > > # User Durham Goode > > # Date 1493255976 25200 > > # Wed Apr 26 18:19:36 2017 -0700 > > # Branch stable > > # Node ID b1964bbc387fb53b4152f19d

Re: [PATCH 1 of 2 STABLE] tests: demonstrate `hg show` mapping to showconfig

2017-04-28 Thread Yuya Nishihara
On Thu, 27 Apr 2017 16:11:34 -0700, Gregory Szorc wrote: > This series is a "pick your poison" if you are a reviewer. I'm partial to > the more complex one adding an argument to @command. But it may not be > appropriate for stable. So a hacky fallback is provided as an alternative. I don't think e

Re: [PATCH 1 of 2 STABLE] diffhelpers: add canstripcr=True to fix_newline

2017-04-28 Thread Yuya Nishihara
On Thu, 27 Apr 2017 10:04:46 -0700, Jun Wu wrote: > Excerpts from Yuya Nishihara's message of 2017-04-28 00:44:37 +0900: > > > Ah, I may have written something similar [1] yesterday. I guess your > > > patches > > > may be cleaner as I didn't improve __init__.py. > > > > > > [1]: https://bpaste.n

[PATCH STABLE] pager: use less as a fallback on Unix

2017-04-28 Thread Yuya Nishihara
# HG changeset patch # User Yuya Nishihara # Date 1493380274 -32400 # Fri Apr 28 20:51:14 2017 +0900 # Branch stable # Node ID a05035fe3995e4cfaa362d4976d89f5d8be3c5d9 # Parent f9dd22b588e9f0eb475ce522a78c640d35c12310 pager: use less as a fallback on Unix This seems reasonable choice per di