Re: [PATCH STABLE] worker: ignore meaningless exit status indication returned by os.waitpid()

On Fri, 24 Feb 2017 06:05:29 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1487883654 -32400 > # Fri Feb 24 06:00:54 2017 +0900 > # Branch stable > # Node ID d879917b416a305a42ab92a6d3ac2121d6830560 > # Parent

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Durham Goode wrote: > > > On 2/24/17 3:25 PM, Jun Wu wrote: > >Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800: > >>On 2/23/17 2:57 PM, Jun Wu wrote: > >>>Congratulations on your first patch to the list! > >>> > >>>But I think we have better ways to achieve the same goal that

Re: [PATCH STABLE V2] worker: ignore meaningless exit status indication returned by os.waitpid()

Looks good. Thanks again for discovering the subtle issue. Excerpts from FUJIWARA Katsunori's message of 2017-02-25 01:11:11 +0900: > # HG changeset patch > # User FUJIWARA Katsunori > # Date 1487952472 -32400 > # Sat Feb 25 01:07:52 2017 +0900 > # Branch stable > #

Re: [PATCH 07 of 11] hgweb: explictly pass basectx in webutil.diffs

On Wed, 22 Feb 2017 16:10:01 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1484670348 -3600 > # Tue Jan 17 17:25:48 2017 +0100 > # Node ID b3f8ef870003ee2ca6b6db70860a065f255902b7 > # Parent

Re: [PATCH 06 of 11] patch: add filtering by line ranges in diff()

On Wed, 22 Feb 2017 16:10:00 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1484921270 -3600 > # Fri Jan 20 15:07:50 2017 +0100 > # Node ID ddf1b3d89b595aa5b376bb51a8edf458b8f1b1c8 > # Parent

Re: [PATCH 11 of 11] hgweb: add a "followlines" link to hover-box in annotate

On Wed, 22 Feb 2017 16:10:05 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1487773255 -3600 > # Wed Feb 22 15:20:55 2017 +0100 > # Node ID bc884002d0bef8aad8ef203f1722e94d49d7e940 > # Parent

mercurial@31062: 11 new changesets

11 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/0332b8fafd05 changeset: 31052:0332b8fafd05 user:FUJIWARA Katsunori date:Tue Feb 21 01:21:00 2017 +0900 summary: bookmarks: check HG_PENDING strictly

Re: [PATCH 04 of 10] localrepo: move ui loading to baselocalrepository

> On Feb 23, 2017, at 07:05, Yuya Nishihara wrote: > > On Wed, 22 Feb 2017 20:27:39 -0800, Jun Wu wrote: >> Excerpts from Kevin Bullock's message of 2017-02-22 20:31:14 -0600: >>> There's another alternative we might consider: can we move all of the >>> "side effects" out of the

Re: [PATCH 04 of 10] localrepo: move ui loading to baselocalrepository

> On Feb 23, 2017, at 11:15, Jun Wu wrote: > > Excerpts from Yuya Nishihara's message of 2017-02-23 22:05:24 +0900: >> On Wed, 22 Feb 2017 20:27:39 -0800, Jun Wu wrote: >>> Excerpts from Kevin Bullock's message of 2017-02-22 20:31:14 -0600: There's another alternative we might

Re: [PATCH 1 of 2] revset: make wdir() work with parent '^' operator(issue4905)

> > > I have some ugly hacks. Let's talk about them at the sprint if you're > interested in! > ​Yeah, sure!​ ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[PATCH STABLE V2] worker: ignore meaningless exit status indication returned by os.waitpid()

# HG changeset patch # User FUJIWARA Katsunori # Date 1487952472 -32400 # Sat Feb 25 01:07:52 2017 +0900 # Branch stable # Node ID 18fb3cf572b49ad25a0f0e62ce1f737c7cef4ec1 # Parent aa25989b0658dcefbd4c1bce7c389f006f22af30 worker: ignore meaningless exit status

Demo instance of patchwork

Hi all, Jun and I have been working on setting up a demo instance of Patchwork as a testing ground for improvements to our patch workflow. It's accessible at: For now, all we've done is installed the latest version of Patchwork. Augie and I are in

Re: [PATCH 04 of 11] hgweb: handle a "linerange" request parameter in filelog command

On Wed, 22 Feb 2017 16:09:58 +0100, Denis Laxalde wrote: > # HG changeset patch > # User Denis Laxalde > # Date 1484844060 -3600 > # Thu Jan 19 17:41:00 2017 +0100 > # Node ID 4d83e067c9c6e0f5fb7b126a9739aa9dd8113af4 > # Parent

Re: [PATCH 2 of 2] py3: make util.posixfile compatible with py3

On Fri, 24 Feb 2017 20:17:44 +0530, Pulkit Goyal wrote: > On Thu, Feb 23, 2017 at 8:03 PM, Yuya Nishihara wrote: > > > On Thu, 23 Feb 2017 17:29:01 +0530, Pulkit Goyal wrote: > > > # HG changeset patch > > > # User Pulkit Goyal <7895pul...@gmail.com> > > > # Date 1487768580 -19800

Re: [PATCH 1 of 2] revset: make wdir() work with parent '^' operator(issue4905)

On Fri, 24 Feb 2017 20:23:44 +0530, Pulkit Goyal wrote: > > Instead, I'm thinking of adding WdirRevIsNotSupportedByUnderlyingStorage > > exception. It will be raised by revlog if wdir revision is passed, for > > example, > > and be caught where we know workingctx and fall back to slow ctx-lookup >

Re: [PATCH 3 of 6] move: move the 'label' method to the core class

On 02/23/2017 03:09 PM, Yuya Nishihara wrote: On Wed, 22 Feb 2017 17:54:34 +0100, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1487590284 -3600 # Mon Feb 20 12:31:24 2017 +0100 # Node ID

[Bug 5490] New: Debian/Ubuntu hg package version not up to date

https://bz.mercurial-scm.org/show_bug.cgi?id=5490 Bug ID: 5490 Summary: Debian/Ubuntu hg package version not up to date Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED

Re: [PATCH 1 of 2] py3: use pycompat.fsencode() to convert __file__ to bytes

> On Feb 23, 2017, at 05:59, Pulkit Goyal <7895pul...@gmail.com> wrote: > > # HG changeset patch > # User Pulkit Goyal <7895pul...@gmail.com> > # Date 1487596242 -19800 > # Mon Feb 20 18:40:42 2017 +0530 > # Node ID 80693cfda5a63dee28cf9e63cf0e8cef3f27f23a > # Parent

[PATCH 04 of 13 V2] color: move the 'colorlabel' function in the core module

# HG changeset patch # User Pierre-Yves David # Date 1487873424 -3600 # Thu Feb 23 19:10:24 2017 +0100 # Node ID 13f7594f6a7e5cfd7092bcb197039c3c38e2e32f # Parent f7e501bba8311353d25762412670cfffb306a3b1 # EXP-Topic color color: move the 'colorlabel' function

[PATCH 03 of 13 V2] color: extract the label code into its own function

# HG changeset patch # User Pierre-Yves David # Date 1487872826 -3600 # Thu Feb 23 19:00:26 2017 +0100 # Node ID f7e501bba8311353d25762412670cfffb306a3b1 # Parent f53e95ec986616a48a3a8e67e5a9674b8a684d6e # EXP-Topic color color: extract the label code into

[PATCH 11 of 13 V2] ui: extract low level part of 'write_err' in its own method

# HG changeset patch # User Pierre-Yves David # Date 1487962421 -3600 # Fri Feb 24 19:53:41 2017 +0100 # Node ID 620683bba165d6bbb9c6f163516102aaa264f980 # Parent 1a7930c207d7fd664f3d288974df36e3d8d32fd7 # EXP-Topic color ui: extract low level part of

[PATCH 08 of 13 V2] ui: extract the low level part of 'write' in a dedicated function

# HG changeset patch # User Pierre-Yves David # Date 1487960820 -3600 # Fri Feb 24 19:27:00 2017 +0100 # Node ID 9ce40e16b21c0e69d345722edf79eb2a680d33f7 # Parent d5355608d838bda4e67f5855bea85a7e1b2806c0 # EXP-Topic color ui: extract the low level part of

[PATCH 06 of 13 V2] color: clarify name of an argument of 'win32print'

# HG changeset patch # User Pierre-Yves David # Date 1487968307 -3600 # Fri Feb 24 21:31:47 2017 +0100 # Node ID a13f493b42dd655ebed3d291181510e2607b9512 # Parent fd0b7fed70ddeaf0568b02d5e0f9d982a68f1cb4 # EXP-Topic color color: clarify name of an argument of

[PATCH 02 of 13 V2] color: inline the 'showlabel' method

# HG changeset patch # User Pierre-Yves David # Date 1487589203 -3600 # Mon Feb 20 12:13:23 2017 +0100 # Node ID f53e95ec986616a48a3a8e67e5a9674b8a684d6e # Parent d32d64e7e9f084bf01cbac178ad2c2e74e130f9d # EXP-Topic color color: inline the 'showlabel' method

[PATCH 12 of 13 V2] color: move 'write-err' logic to the core ui class

# HG changeset patch # User Pierre-Yves David # Date 1487590943 -3600 # Mon Feb 20 12:42:23 2017 +0100 # Node ID 419d5f42cc7b764f5304b2518146824329c32f91 # Parent 620683bba165d6bbb9c6f163516102aaa264f980 # EXP-Topic color color: move 'write-err' logic to the

[PATCH 09 of 13 V2] color: move 'write' logic to the core ui class

# HG changeset patch # User Pierre-Yves David # Date 1487590299 -3600 # Mon Feb 20 12:31:39 2017 +0100 # Node ID 85598b639dafeb7c64a8e2219f4095b2197729e1 # Parent 9ce40e16b21c0e69d345722edf79eb2a680d33f7 # EXP-Topic color color: move 'write' logic to the core

[PATCH 07 of 13 V2] color: add multiple messages input support to 'win32print'

# HG changeset patch # User Pierre-Yves David # Date 1487968447 -3600 # Fri Feb 24 21:34:07 2017 +0100 # Node ID d5355608d838bda4e67f5855bea85a7e1b2806c0 # Parent a13f493b42dd655ebed3d291181510e2607b9512 # EXP-Topic color color: add multiple messages input

[PATCH 05 of 13 V2] color: move the 'colorlabel' call to the core 'ui' class

# HG changeset patch # User Pierre-Yves David # Date 1487875532 -3600 # Thu Feb 23 19:45:32 2017 +0100 # Node ID fd0b7fed70ddeaf0568b02d5e0f9d982a68f1cb4 # Parent 13f7594f6a7e5cfd7092bcb197039c3c38e2e32f # EXP-Topic color color: move the 'colorlabel' call to

[PATCH 01 of 13 V2] color: move '_colormode' to the core 'ui' class

# HG changeset patch # User Pierre-Yves David # Date 1487589128 -3600 # Mon Feb 20 12:12:08 2017 +0100 # Node ID d32d64e7e9f084bf01cbac178ad2c2e74e130f9d # Parent 80f04ba7f4d1f439d726068f02172f9a52b981fe # EXP-Topic color color: move '_colormode' to the core

[PATCH 10 of 13 V2] ui: extract buffer write from protect and timed 'write_err' output

# HG changeset patch # User Pierre-Yves David # Date 1487960925 -3600 # Fri Feb 24 19:28:45 2017 +0100 # Node ID 1a7930c207d7fd664f3d288974df36e3d8d32fd7 # Parent 85598b639dafeb7c64a8e2219f4095b2197729e1 # EXP-Topic color ui: extract buffer write from protect

Re: [PATCH 2 of 2] py3: make util.posixfile compatible with py3

On Thu, Feb 23, 2017 at 8:03 PM, Yuya Nishihara wrote: > On Thu, 23 Feb 2017 17:29:01 +0530, Pulkit Goyal wrote: > > # HG changeset patch > > # User Pulkit Goyal <7895pul...@gmail.com> > > # Date 1487768580 -19800 > > # Wed Feb 22 18:33:00 2017 +0530 > > # Node ID

Re: [PATCH STABLE] worker: ignore meaningless exit status indication returned by os.waitpid()

At Fri, 24 Feb 2017 22:40:14 +0900, Yuya Nishihara wrote: > > On Fri, 24 Feb 2017 06:05:29 +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori > > # Date 1487883654 -32400 > > # Fri Feb 24 06:00:54 2017 +0900 > > # Branch stable > >

Re: [PATCH 1 of 2] revset: make wdir() work with parent '^' operator(issue4905)

> > > IMHO, we shouldn't add this kind of branch to every place where wdir() > could > be passed. That would be error-prone and could hurt performance of > non-wdir() > cases. > ​​ ​I agree.​ > Instead, I'm thinking of adding WdirRevIsNotSupportedByUnderlyingStorage > exception. It will be

[PATCH 1 of 2 STABLE] worker: add basic test to ensure child processes are managed well

# HG changeset patch # User Yuya Nishihara # Date 1487993617 -32400 # Sat Feb 25 12:33:37 2017 +0900 # Branch stable # Node ID 21b8ba399a3ba480f66b53d97842ff61d5ec0f28 # Parent 18fb3cf572b49ad25a0f0e62ce1f737c7cef4ec1 worker: add basic test to ensure child processes are

[PATCH 2 of 2 STABLE] worker: flush messages written by child processes before exit

# HG changeset patch # User Yuya Nishihara # Date 1487994530 -32400 # Sat Feb 25 12:48:50 2017 +0900 # Branch stable # Node ID 0a98fef7c72482b78ad384d74d25f78b4147b151 # Parent 21b8ba399a3ba480f66b53d97842ff61d5ec0f28 worker: flush messages written by child processes before

[Bugzilla] Your account mercurial-devel@mercurial-scm.org is being impersonated

Kevin Bullock has used the 'sudo' feature to access Bugzilla using your account. Kevin Bullock provided the following reason for doing this: kbullock+mercur...@ringworld.org If you feel that this action was

Re: [Bugzilla] Your account mercurial-devel@mercurial-scm.org is being impersonated

> On Feb 24, 2017, at 22:53, mercurial-b...@mercurial-scm.org wrote: > >Kevin Bullock has used the 'sudo' > feature to access > Bugzilla using your account. > >Kevin Bullock provided the following > reason for doing

Re: [PATCH 13 of 13 V2] color: drop the 'colorui' class

On Fri, 24 Feb 2017 15:08:35 -0800, Durham Goode wrote: > On 2/24/17 2:09 PM, Pierre-Yves David wrote: > > # HG changeset patch > > # User Pierre-Yves David > > # Date 1487590955 -3600 > > # Mon Feb 20 12:42:35 2017 +0100 > > # Node ID

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Hi Jun, Interesting, thanks. So if I understand correctly, if --tool accepted a Python function, to replicate the functionality described here, the user could write a simple script that wrote out the four* versions to some location on disk and printed their paths as JSON (as you noted, they could

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Excerpts from Phil Cohen's message of 2017-02-24 14:54:00 -0800: > Hi Jun, > > Interesting, thanks. So if I understand correctly, if --tool accepted > a Python function, to replicate the functionality described here, the > user could write a simple script that wrote out the four* versions to

Re: [PATCH 05 of 13 V2] color: move the 'colorlabel' call to the core 'ui' class

Minor grammar nit. Series through here looks good to me though. On 2/24/17 2:09 PM, Pierre-Yves David wrote: # HG changeset patch # User Pierre-Yves David # Date 1487875532 -3600 # Thu Feb 23 19:45:32 2017 +0100 # Node ID

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

On 2/24/17 3:25 PM, Jun Wu wrote: Excerpts from Durham Goode's message of 2017-02-24 15:18:40 -0800: On 2/23/17 2:57 PM, Jun Wu wrote: Congratulations on your first patch to the list! But I think we have better ways to achieve the same goal that we may prefer them to this patch. 1) Better

[PATCH 1 of 2] manifest: allow specifying the revlog filename

# HG changeset patch # User Durham Goode # Date 1487973639 28800 # Fri Feb 24 14:00:39 2017 -0800 # Node ID ed987b24e755a4c61c006f7d98a4ff370229faad # Parent f01df5d2fe493376a67569756a9bc2ddffa5cd81 manifest: allow specifying the revlog filename Previously we had hardcoded

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

On 2/23/17 2:57 PM, Jun Wu wrote: Congratulations on your first patch to the list! But I think we have better ways to achieve the same goal that we may prefer them to this patch. 1) Better way to provide conflicted file contents - in-python merge tools From a high-level, the patch tries to

Re: [PATCH] merge: add resolve --prep, which outputs conflicted comparison files

Excerpts from Durham Goode's message of 2017-02-24 15:42:34 -0800: > Maybe I don't understand your proposal. The current merge-tools are > invoked once per file. Would this python merge-tool be invoked in some > other way where it's given the full conflict state at the beginning then > it can