From erik.joelsson at oracle.com Tue Apr 18 17:35:04 2017 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Tue, 18 Apr 2017 19:35:04 +0200 Subject: RFR: CODETOOLS-7901950: jcheck does not work with Mercurial 4.1 Message-ID: The way a Mercurial plugin interacts with Mercurial has changed over time. The technique used in jcheck and defpath has been deprecated for a while and in 4.1, it no longer works. I have a patch that adopts the new method using decorators, introduced in Mercurial 1.9. It also contains a fallback workaround that keeps compatibility with older versions. Bug: https://bugs.openjdk.java.net/browse/CODETOOLS-7901950 Webrev: http://cr.openjdk.java.net/~erikj/CODETOOLS-7901950/jcheck-webrev.01/ I have the same changes ready for defpath which doesn't have it's own component in Jira. Webrev: http://cr.openjdk.java.net/~erikj/CODETOOLS-7901950/defpath-webrev.01/ /Erik From erik.joelsson at oracle.com Tue Apr 18 17:35:23 2017 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Tue, 18 Apr 2017 19:35:23 +0200 Subject: RFR: CODETOOLS-7901672: trees extension broken after upgrade to mercurial 3.8.1 Message-ID: <21969d4c-b650-6903-213d-1297a3e85755@oracle.com> The way a Mercurial plugin interacts with Mercurial has changed over time. The technique used in trees has been deprecated for a while and in 3.8, it no longer works. I have a patch that adopts the new method using decorators, introduced in Mercurial 1.9. It also contains a fallback workaround that keeps compatibility with older versions. For trees, there are further complications for versions between 1.9 and 3.1 which the patch also handles. I have run the automatic tests for all versions from 1.1 to latest as well as manually using it with various versions. Bug: https://bugs.openjdk.java.net/browse/CODETOOLS-7901672 Webrev: http://cr.openjdk.java.net/~erikj/CODETOOLS-7901672/webrev.01/ /Erik From erik.joelsson at oracle.com Wed Apr 19 09:33:58 2017 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Wed, 19 Apr 2017 11:33:58 +0200 Subject: RFR: CODETOOLS-7901819 hg tstatus does not work well with pager In-Reply-To: References: <3bc24d93-b3ca-b637-a64a-222a06fd5547@oracle.com> <494517750.79678.1479927110332@privateemail.com> <6d4030ad-0bbc-c549-df68-0fa34e42ef87@oracle.com> Message-ID: <6bd475c1-894d-719b-7afe-64040209a05b@oracle.com> I think the solution suggested by John Coomes looks good and would like to see it pushed. Patch repeated here for reference: diff --git a/trees.py b/trees.py --- a/trees.py +++ b/trees.py @@ -241,6 +241,7 @@ if o[1] in cmdopts: del cmdopts[o[1]] trc = cmd(ui, repo, *args, **cmdopts) + ui.flush() rc = trc != None and trc or 0 for subtree in _subtreelist(ui, repo, opts): ui.status('\n') @@ -256,6 +257,7 @@ ui.status('[%s]:\n' % repo.root) trc = cmd(ui, repo, remote, **opts) + ui.flush() rc = trc != None and trc or 0 for subtree in _subtreelist(ui, repo, opts): ui.status('\n') /Erik On 2017-03-07 14:47, Magnus Ihse Bursie wrote: > > > On 2017-01-16 14:24, Magnus Ihse Bursie wrote: >> >> On 2016-12-07 13:53, Magnus Ihse Bursie wrote: >>> On 2016-11-23 19:51, John Coomes wrote: >>>>> On November 23, 2016 at 1:16 AM Magnus Ihse Bursie >>>>> wrote: >>>>> >>>>> Any reviewers on this? >>>> Hi Magnus, >>>> >>>> I think it's better to call ui.flush() after running a command to >>>> get the right ordering. The patch below does that in both >>>> _docmd1() and _docmd2(). Feel free to push w/me as reviewer. >>> >>> I tried that but I do still not have write access to the hg repo. :-( > > Can anyone with reviewer status please push this fix? > > Also, can anyone with the correct status try to make me a reviewer so > simple patches just don't get stuck for months upon months? The > criteria for getting the proper authorization in these simple tools > project should be much lower than the jdk projects. If there's a > formal problem, can someone point it out to me so we can work on > getting that fixed? > > /Magnus From jonathan.gibbons at oracle.com Thu Apr 20 17:15:34 2017 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Thu, 20 Apr 2017 10:15:34 -0700 Subject: RFR: CODETOOLS-7901819 hg tstatus does not work well with pager In-Reply-To: <6bd475c1-894d-719b-7afe-64040209a05b@oracle.com> References: <3bc24d93-b3ca-b637-a64a-222a06fd5547@oracle.com> <494517750.79678.1479927110332@privateemail.com> <6d4030ad-0bbc-c549-df68-0fa34e42ef87@oracle.com> <6bd475c1-894d-719b-7afe-64040209a05b@oracle.com> Message-ID: <58F8ECB6.7070207@oracle.com> I will push this for you. -- Jon On 04/19/2017 02:33 AM, Erik Joelsson wrote: > I think the solution suggested by John Coomes looks good and would > like to see it pushed. > > Patch repeated here for reference: > > diff --git a/trees.py b/trees.py > --- a/trees.py > +++ b/trees.py > @@ -241,6 +241,7 @@ > if o[1] in cmdopts: > del cmdopts[o[1]] > trc = cmd(ui, repo, *args, **cmdopts) > + ui.flush() > rc = trc != None and trc or 0 > for subtree in _subtreelist(ui, repo, opts): > ui.status('\n') > @@ -256,6 +257,7 @@ > > ui.status('[%s]:\n' % repo.root) > trc = cmd(ui, repo, remote, **opts) > + ui.flush() > rc = trc != None and trc or 0 > for subtree in _subtreelist(ui, repo, opts): > ui.status('\n') > > /Erik > > > On 2017-03-07 14:47, Magnus Ihse Bursie wrote: >> >> >> On 2017-01-16 14:24, Magnus Ihse Bursie wrote: >>> >>> On 2016-12-07 13:53, Magnus Ihse Bursie wrote: >>>> On 2016-11-23 19:51, John Coomes wrote: >>>>>> On November 23, 2016 at 1:16 AM Magnus Ihse Bursie >>>>>> wrote: >>>>>> >>>>>> Any reviewers on this? >>>>> Hi Magnus, >>>>> >>>>> I think it's better to call ui.flush() after running a command to >>>>> get the right ordering. The patch below does that in both >>>>> _docmd1() and _docmd2(). Feel free to push w/me as reviewer. >>>> >>>> I tried that but I do still not have write access to the hg repo. :-( >> >> Can anyone with reviewer status please push this fix? >> >> Also, can anyone with the correct status try to make me a reviewer so >> simple patches just don't get stuck for months upon months? The >> criteria for getting the proper authorization in these simple tools >> project should be much lower than the jdk projects. If there's a >> formal problem, can someone point it out to me so we can work on >> getting that fixed? >> >> /Magnus > From jonathan.gibbons at oracle.com Fri Apr 21 21:54:14 2017 From: jonathan.gibbons at oracle.com (Jonathan Gibbons) Date: Fri, 21 Apr 2017 14:54:14 -0700 Subject: RFR: CODETOOLS-7901819 hg tstatus does not work well with pager In-Reply-To: <6bd475c1-894d-719b-7afe-64040209a05b@oracle.com> References: <3bc24d93-b3ca-b637-a64a-222a06fd5547@oracle.com> <494517750.79678.1479927110332@privateemail.com> <6d4030ad-0bbc-c549-df68-0fa34e42ef87@oracle.com> <6bd475c1-894d-719b-7afe-64040209a05b@oracle.com> Message-ID: <58FA7F86.7010909@oracle.com> Magnus, Erik, Patch pushed. -- Jon On 04/19/2017 02:33 AM, Erik Joelsson wrote: > I think the solution suggested by John Coomes looks good and would > like to see it pushed. > > Patch repeated here for reference: > > diff --git a/trees.py b/trees.py > --- a/trees.py > +++ b/trees.py > @@ -241,6 +241,7 @@ > if o[1] in cmdopts: > del cmdopts[o[1]] > trc = cmd(ui, repo, *args, **cmdopts) > + ui.flush() > rc = trc != None and trc or 0 > for subtree in _subtreelist(ui, repo, opts): > ui.status('\n') > @@ -256,6 +257,7 @@ > > ui.status('[%s]:\n' % repo.root) > trc = cmd(ui, repo, remote, **opts) > + ui.flush() > rc = trc != None and trc or 0 > for subtree in _subtreelist(ui, repo, opts): > ui.status('\n') > > /Erik > > > On 2017-03-07 14:47, Magnus Ihse Bursie wrote: >> >> >> On 2017-01-16 14:24, Magnus Ihse Bursie wrote: >>> >>> On 2016-12-07 13:53, Magnus Ihse Bursie wrote: >>>> On 2016-11-23 19:51, John Coomes wrote: >>>>>> On November 23, 2016 at 1:16 AM Magnus Ihse Bursie >>>>>> wrote: >>>>>> >>>>>> Any reviewers on this? >>>>> Hi Magnus, >>>>> >>>>> I think it's better to call ui.flush() after running a command to >>>>> get the right ordering. The patch below does that in both >>>>> _docmd1() and _docmd2(). Feel free to push w/me as reviewer. >>>> >>>> I tried that but I do still not have write access to the hg repo. :-( >> >> Can anyone with reviewer status please push this fix? >> >> Also, can anyone with the correct status try to make me a reviewer so >> simple patches just don't get stuck for months upon months? The >> criteria for getting the proper authorization in these simple tools >> project should be much lower than the jdk projects. If there's a >> formal problem, can someone point it out to me so we can work on >> getting that fixed? >> >> /Magnus >