Re: [PATCH] hgweb: fix the MRO in Python 3

2016-10-26 Thread timeless
> Is there a checkcode test for this? Martijn Pieters wrote: > No, but tests simply fail when you make this mistake. > In this *specific case* that was only visible in the Python 3 tests because > the base classes used in Python 2 were old-style classes, so in *Python 2* > the base class order

Re: [PATCH] templates: update links to the book

2016-10-26 Thread Kevin Bullock
> On Oct 26, 2016, at 14:58, Mathias De Maré wrote: > > # HG changeset patch > # User Mathias De Maré > # Date 1477511250 -7200 > # Wed Oct 26 21:47:30 2016 +0200 > # Node ID 53e90a523b43efa8b34a9868eb692294edd75a22 > # Parent

Re: [PATCH v5] copy: distinguish "file exists" cases and add a hint (BC)

2016-10-26 Thread Kevin Bullock
> On Oct 26, 2016, at 15:05, Augie Fackler wrote: > >> On Oct 26, 2016, at 15:03, timeless wrote: >> >> Augie Fackler wrote: >>> +hint = _('(hg rename %s to replace the file by ' >>> + 'recording a

Re: [PATCH 15 of 16] copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)

2016-10-26 Thread timeless
> + note: possible conflict - f3b was renamed multiple times to: > + f3e > + f3d >merging f4e and f4a to f4e >warning: can't find ancestor for 'f3d' copied from 'f3b'! I know this isn't where the message was introduced, but I'm having a hard time understanding "renamed multiple

Re: [PATCH] templates: update links to the book

2016-10-26 Thread Mathias De Maré
On Wed, Oct 26, 2016 at 9:58 PM, Mathias De Maré wrote: > # HG changeset patch > # User Mathias De Maré > # Date 1477511250 -7200 > # Wed Oct 26 21:47:30 2016 +0200 > # Node ID 53e90a523b43efa8b34a9868eb692294edd75a22 > # Parent

Re: [PATCH 07 of 16] copies: detect graft-like merges

2016-10-26 Thread timeless
Gábor Stefanik wrote: > +# overridden We still need to know a real common ancestor in this case We You're missing periods before `We` twice in this line... ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org

Re: [PATCH RFC] perf: add asv benchmarks

2016-10-26 Thread timeless
On Wed, Oct 12, 2016 at 4:35 AM, Philippe Pepiot wrote: > +"show_commit_url": "https://www.selenic.com/hg/rev/;, Not a review, but I believe this should be: https://www.mercurial-scm.org/repo/hg/ ___ Mercurial-devel

Re: Main and stable migrated

2016-10-26 Thread Kevin Bullock
> On Oct 26, 2016, at 13:34, Gábor STEFANIK wrote: > > -Original Message- >> From: Mercurial-devel [mailto:mercurial-devel-boun...@mercurial-scm.org] >> On Behalf Of Kevin Bullock >> Sent: Wednesday, October 26, 2016 7:26 PM >> To: mercurial-devel

RE: Main and stable migrated

2016-10-26 Thread Gábor STEFANIK
> -- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy.

mercurial@30226: 3 new changesets (3 on stable)

2016-10-26 Thread Mercurial Commits
3 new changesets (3 on stable) in mercurial: http://selenic.com/repo/hg//rev/ad56071b37d4 changeset: 30224:ad56071b37d4 branch: stable user:Mads Kiilerich date:Tue Oct 18 16:52:35 2016 +0200 summary: dirstate: fix debug.dirstate.delaywrite to use

Re: [PATCH STABLE] tests: run "cwd was removed" test only if cwd can actually be removed

2016-10-26 Thread Danek Duvall
Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1477489806 -32400 > # Wed Oct 26 22:50:06 2016 +0900 > # Branch stable > # Node ID d389b88b942adb330819437ef46d1b9acb4392d7 > # Parent b9f7b0c10027764cee77f9c6d61877fcffea837f > tests: run "cwd was

Re: [PATCH 3 of 3 STABLE V2] changectx: do not include hidden revisions on short node lookup (issue4964)

2016-10-26 Thread Yuya Nishihara
On Tue, 25 Oct 2016 23:17:14 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1477199774 -32400 > # Sun Oct 23 14:16:14 2016 +0900 > # Branch stable > # Node ID 242b7a856495179795ee5662f298029c4b492563 > # Parent

Re: [PATCH stable] revset: don't cache abstractsmartset min/max invocations infinitely

2016-10-26 Thread Mads Kiilerich
On 10/26/2016 02:31 PM, Yuya Nishihara wrote: On Wed, 26 Oct 2016 14:09:17 +0200, Mads Kiilerich wrote: Instead, I would perhaps prefer to introduce a 'gettercache' that works on methods that only have self as parameter (and thus can set a simple instance method as I do here) ... or a

Re: [PATCH STABLE v2] sslutil: guard against broken certifi installations (issue5406)

2016-10-26 Thread Yuya Nishihara
On Mon, 24 Oct 2016 05:19:14 -0500, Gábor Stefanik wrote: > # HG changeset patch > # User Gábor Stefanik > # Date 1476893174 -7200 > # Wed Oct 19 18:06:14 2016 +0200 > # Branch stable > # Node ID c3fe0e56546a44a7961354d4840cdcb82cbecefc > # Parent

Re: [PATCH 3 of 4 STABLE] manifest: make manifestctx store the repo

2016-10-26 Thread Yuya Nishihara
On Tue, 25 Oct 2016 12:46:58 -0700, Durham Goode wrote: > On 10/22/16 1:59 AM, Yuya Nishihara wrote: > > On Tue, 18 Oct 2016 17:50:16 -0700, Durham Goode wrote: > >> # HG changeset patch > >> # User Durham Goode > >> # Date 1476837866 25200 > >> # Tue Oct 18 17:44:26 2016

Re: [PATCH stable] revset: don't cache abstractsmartset min/max invocations infinitely

2016-10-26 Thread Yuya Nishihara
On Wed, 26 Oct 2016 14:09:17 +0200, Mads Kiilerich wrote: > On 10/26/2016 01:21 PM, Yuya Nishihara wrote: > > On Tue, 25 Oct 2016 18:57:26 +0200, Mads Kiilerich wrote: > >> # HG changeset patch > >> # User Mads Kiilerich > >> # Date 1477414587 -7200 > >> # Tue Oct 25

Re: [PATCH stable] revset: don't cache abstractsmartset min/max invocations infinitely

2016-10-26 Thread Mads Kiilerich
On 10/26/2016 01:21 PM, Yuya Nishihara wrote: On Tue, 25 Oct 2016 18:57:26 +0200, Mads Kiilerich wrote: # HG changeset patch # User Mads Kiilerich # Date 1477414587 -7200 # Tue Oct 25 18:56:27 2016 +0200 # Branch stable # Node ID

Re: [PATCH 2 of 3 STABLE V2] templater: use unfiltered changelog to calculate shortest() at O(log(N))

2016-10-26 Thread Yuya Nishihara
On Tue, 25 Oct 2016 23:17:13 +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1477399770 -32400 > # Tue Oct 25 21:49:30 2016 +0900 > # Branch stable > # Node ID ecbce2fe4dea116c925a2fecd1b7b50df0a62589 > # Parent

RE: [PATCH STABLE] merge: avoid superfluous filemerges when grafting through renames (issue5407)

2016-10-26 Thread Gábor STEFANIK
> -- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy.

Re: [PATCH stable] revset: don't cache abstractsmartset min/max invocations infinitely

2016-10-26 Thread Yuya Nishihara
On Tue, 25 Oct 2016 18:57:26 +0200, Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich > # Date 1477414587 -7200 > # Tue Oct 25 18:56:27 2016 +0200 > # Branch stable > # Node ID c2fe58cd4235fc6c8cabea882794303d620bec3a > # Parent