Re: [PATCH 3 of 3] filemerge: optionally strip quotes from merge marker template (BC)

2017-04-18 Thread Augie Fackler
On Sat, Apr 15, 2017 at 07:51:33PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1488018962 -32400 > # Sat Feb 25 19:36:02 2017 +0900 > # Node ID aea294cf17416c162143292b8f6594fa33bab78b > # Parent

Re: [PATCH 3 of 6] tests: add tests for poorly behaving HTTP server

2017-04-18 Thread Gregory Szorc
On Fri, Apr 14, 2017 at 12:44 AM, Gregory Szorc wrote: > # HG changeset patch > # User Gregory Szorc > # Date 1492147168 25200 > # Thu Apr 13 22:19:28 2017 -0700 > # Node ID 80bd24abcf67d5dc8b5f5bf83c796e1f71fc5bd9 > # Parent

Re: Hidden Commits in 4.3

2017-04-18 Thread Denis Laxalde
Durham Goode wrote: On 4/13/17 2:37 PM, Pierre-Yves David wrote: On 04/12/2017 04:23 PM, Ryan McElroy wrote: I think the next step is for the community to officially figure out if this is a good direction to go in, however that happens. I had productive face to face discussion with multiple

Re: [PATCH 2 of 2] progress: retry ferr.flush() and .write() on EINTR (issue5532)

2017-04-18 Thread Augie Fackler
On Sat, Apr 15, 2017 at 07:19:02PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1492090277 -32400 > # Thu Apr 13 22:31:17 2017 +0900 > # Node ID 9de8286012a70e815978f595c28f13c28d72c266 > # Parent

Re: [PATCH] dispatch: ignore further SIGPIPE while handling KeyboardInterrupt

2017-04-18 Thread Augie Fackler
On Tue, Apr 18, 2017 at 12:28:49AM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1492440799 -32400 > # Mon Apr 17 23:53:19 2017 +0900 > # Node ID f2e785be58090ea271305ade6b744f0f7ee6344f > # Parent

Re: [PATCH 6 of 5] templatefilters: fix crash by string formatting of '{x|splitlines}'

2017-04-18 Thread Kevin Bullock
> On Apr 16, 2017, at 08:27, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1492221077 -32400 > # Sat Apr 15 10:51:17 2017 +0900 > # Node ID 9301c79b46ba6424585dd4ad0ec638b9be69de1b > # Parent

Re: [PATCH 4 of 4] worker: print traceback for uncaught exception unconditionally

2017-04-18 Thread Kevin Bullock
> On Apr 15, 2017, at 05:18, Yuya Nishihara wrote: > > # HG changeset patch > # User Yuya Nishihara > # Date 1492229095 -32400 > # Sat Apr 15 13:04:55 2017 +0900 > # Node ID 7c455aa99683ec6f7f24c24e11aaadfb3fe32fe3 > # Parent

mercurial@32033: 30 new changesets

2017-04-18 Thread Mercurial Commits
30 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/bd3cb917761a changeset: 32004:bd3cb917761a user:Matt Harbison date:Fri Mar 31 23:00:41 2017 -0400 summary: hgwebdir: allow a repository to be hosted at "/"

mercurial@32043: 10 new changesets

2017-04-18 Thread Mercurial Commits
10 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/579bbcb4322b changeset: 32034:579bbcb4322b user:Yuya Nishihara date:Wed Apr 05 21:27:44 2017 +0900 summary: templatekw: eliminate unnecessary temporary variable 'names' from

mercurial@32049: 6 new changesets

2017-04-18 Thread Mercurial Commits
6 new changesets in mercurial: https://www.mercurial-scm.org/repo/hg/rev/cde72a195f32 changeset: 32044:cde72a195f32 user:Yuya Nishihara date:Mon Apr 17 23:53:19 2017 +0900 summary: dispatch: ignore further SIGPIPE while handling KeyboardInterrupt

Re: Hidden Commits in 4.3

2017-04-18 Thread Pierre-Yves David
On 04/14/2017 01:04 AM, Durham Goode wrote: On 4/13/17 2:37 PM, Pierre-Yves David wrote: On 04/12/2017 04:23 PM, Ryan McElroy wrote: […] *Practical example* (/simplified/): Situation: * Facebook has a useful: hg undo command. * Facebook cares about hg undo, preserving the hash,

[PATCH 2 of 2] show: add basic labels to work template

2017-04-18 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1492539008 25200 # Tue Apr 18 11:10:08 2017 -0700 # Node ID 7f5f78179f5f6afc0f4bea52aa03f1431e03d3d9 # Parent d8d4b4acc68859f90f8759309803b116b67a9371 show: add basic labels to work template `hg show work` is much

[PATCH 1 of 2] show: rename "underway" to "work"

2017-04-18 Thread Gregory Szorc
# HG changeset patch # User Gregory Szorc # Date 1492537786 25200 # Tue Apr 18 10:49:46 2017 -0700 # Node ID d8d4b4acc68859f90f8759309803b116b67a9371 # Parent ed42e00a5c4ec7a3bebaec699ef934429cdc2ddd show: rename "underway" to "work" Durham and I both like this

[PATCH remotenames] remotenames: fix parameter ordering

2017-04-18 Thread Wez Furlong
# HG changeset patch # User Wez Furlong # Date 1492546015 25200 # Tue Apr 18 13:06:55 2017 -0700 # Node ID 87fa8cb8721726dcbe2c6a313b70ac770e0fc5ae # Parent b55f98398522d9c7cf81ab191ddd322926699b0a remotenames: fix parameter ordering Summary: templater function signature

Re: Hidden Commits in 4.3

2017-04-18 Thread Durham Goode
I respond below, but I believe Jun has sent you a innovative proposal that may solve both of our needs and render this discussion irrelevant. So take a look at his proposal at your earliest convenience, since it may let us put this behind us. On 4/18/17 11:03 AM, Pierre-Yves David wrote: On

[PATCH remotenames-ext] remotenames: be compatible with upstream change about scmutil.vfs

2017-04-18 Thread Kostia Balytskyi
# HG changeset patch # User Kostia Balytskyi # Date 1492508238 25200 # Tue Apr 18 02:37:18 2017 -0700 # Node ID b55f98398522d9c7cf81ab191ddd322926699b0a # Parent 4f17d4ae821e7654b3c134002537155b28f7e146 remotenames: be compatible with upstream change about scmutil.vfs

Re: [PATCH 3 of 3] color: also enable by default on windowso

2017-04-18 Thread Yuya Nishihara
On Mon, 17 Apr 2017 22:19:37 -0400, Josef 'Jeff' Sipek wrote: > On Sun, Apr 16, 2017 at 02:55:27 +0200, Pierre-Yves David wrote: > > # HG changeset patch > > # User Pierre-Yves David > > # Date 1492302848 -7200 > > # Sun Apr 16 02:34:08 2017 +0200 > > # Node

Re: [PATCH V4] hgwebdir: allow a repository to be hosted at "/"

2017-04-18 Thread Yuya Nishihara
On Mon, 17 Apr 2017 20:34:16 -0400, Matt Harbison wrote: > On Mon, 17 Apr 2017 18:40:22 -0400, Sean Farley wrote: > > > Kevin Bullock writes: > > > >>> On Apr 15, 2017, at 14:34, Matt Harbison wrote: > >>> > >>> # HG

Re: [PATCH 2 of 3] color: turn on by default (but for windows)

2017-04-18 Thread Yuya Nishihara
On Mon, 17 Apr 2017 20:44:16 +0200, Pierre-Yves David wrote: > > hgext/color.py can also be removed > > and marked as a builtin, but that isn't important. > > I wanted to mimize the possible churn on stable if we have to backout > the change in default during the freeze. My plan is to clan this

Re: [PATCH] color: update the help with the new default

2017-04-18 Thread Yuya Nishihara
On Mon, 17 Apr 2017 20:40:56 +0200, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David > # Date 1492453320 -7200 > # Mon Apr 17 20:22:00 2017 +0200 > # Node ID dea9816832a37b9e310051841b307fba0138e45d > # Parent

Re: [PATCH 3 of 6] tests: add tests for poorly behaving HTTP server

2017-04-18 Thread Danek Duvall
Gregory Szorc wrote: > +Failure to accept() socket should result in connection related error message > + > + $ hg --config badserver.closebeforeaccept=true serve -p $HGPORT -d > --pid-file=hg.pid > + $ cat hg.pid > $DAEMON_PIDS > + > + $ hg clone http://localhost:$HGPORT/ clone > + abort:

[Bug 5540] New: Stripping a working directory parent may switch named branches

2017-04-18 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=5540 Bug ID: 5540 Summary: Stripping a working directory parent may switch named branches Product: Mercurial Version: default branch Hardware: PC OS: Windows