From martinrb at google.com Wed Jul 11 15:09:15 2018 From: martinrb at google.com (Martin Buchholz) Date: Wed, 11 Jul 2018 08:09:15 -0700 Subject: RFR: Make trees work with hg 4.6 In-Reply-To: References: <635f1675-54c5-8f4b-8ab8-7ce0fba3ae0b@oracle.com> Message-ID: Can we get the pending changes to hg tools committed please? Would it help if I reviewed them? Would it help if code tools had more reviewers? Perhaps deputize regular openjdk reviewers? On Fri, Jun 8, 2018 at 11:46 AM, Erik Joelsson wrote: > Hello, > On 2018-06-07 11:59, Martin Buchholz wrote: > > > > On Thu, Jun 7, 2018 at 11:46 AM, Erik Joelsson > wrote: > >> This is because the last two release candidate tags in the official hg >> repo are "4.6rc1" and "4.6rc2". They changed the pattern. I don't see "rc" >> anywhere else in tags that shouldn't be matched. This plugin is only used >> internally in trees testing. >> >> - tags = filter(lambda t: not t.endswith('-rc') and t != "tip", tags) >> + tags = filter(lambda t: 'rc' not in t and t != "tip", tags) >> >> The other changes look good to me but I'm not a python or trees developer. >> >> > Ohh.... verlist is being used to get tags for the upstream mercurial repo > for mercurial itself? If so, maybe document that? > > I think the comment at the top basically says this. > > Looking for the substring "rc" seems particularly brittle because it > happens to match "mercurial". > > Well, we can only really make this code good enough to match the current > tags in the official mercurial repo. If they change format again, we will > need to adapt. I've changed the rc and tip strings to all use single quote > on that line. > > /Erik > From erik.joelsson at oracle.com Wed Jul 11 16:36:10 2018 From: erik.joelsson at oracle.com (Erik Joelsson) Date: Wed, 11 Jul 2018 09:36:10 -0700 Subject: RFR: Make trees work with hg 4.6 In-Reply-To: References: <635f1675-54c5-8f4b-8ab8-7ce0fba3ae0b@oracle.com> Message-ID: Sorry, I will get to it today since I'm now a committer here. I also stumbled over an issue in defpath with hg 4.6. May take a look at that if time permits. /Erik On 2018-07-11 08:09, Martin Buchholz wrote: > Can we get the pending changes to hg tools committed please? > > Would it help if I reviewed them? > > Would it help if code tools had more reviewers?? Perhaps deputize > regular openjdk reviewers? > > On Fri, Jun 8, 2018 at 11:46 AM, Erik Joelsson > > wrote: > > Hello, > > On 2018-06-07 11:59, Martin Buchholz wrote: >> >> >> On Thu, Jun 7, 2018 at 11:46 AM, Erik Joelsson >> > wrote: >> >> This is because the last two release candidate tags in the >> official hg repo are "4.6rc1" and "4.6rc2". They changed the >> pattern. I don't see "rc" anywhere else in tags that >> shouldn't be matched. This plugin is only used internally in >> trees testing. >> >>> -? ? tags = filter(lambda t: not t.endswith('-rc') and t != >>> "tip", tags) >>> +? ? tags = filter(lambda t: 'rc' not in t and t != "tip", tags) >>> >>> The other changes look good to me but I'm not a python or >>> trees developer. >> >> >> Ohh.... verlist is being used to get tags for the upstream >> mercurial repo for mercurial itself?? If so, maybe document that? >> > I think the comment at the top basically says this. >> Looking for the substring "rc" seems particularly brittle because >> it happens to match "mercurial". > Well, we can only really make this code good enough to match the > current tags in the official mercurial repo. If they change format > again, we will need to adapt. I've changed the rc and tip strings > to all use single quote on that line. > > /Erik > > From erik.joelsson at oracle.com Wed Jul 11 16:46:19 2018 From: erik.joelsson at oracle.com (erik.joelsson at oracle.com) Date: Wed, 11 Jul 2018 16:46:19 +0000 Subject: hg: code-tools/trees: Make trees work with hg 4.6 Message-ID: <201807111646.w6BGkJ5D004297@aojmv0008.oracle.com> Changeset: 592eba45b774 Author: erikj Date: 2018-07-11 09:31 -0700 URL: http://hg.openjdk.java.net/code-tools/trees/rev/592eba45b774 Make trees work with hg 4.6 ! tests/verlist.py ! trees.py From martinrb at google.com Tue Jul 17 18:51:18 2018 From: martinrb at google.com (Martin Buchholz) Date: Tue, 17 Jul 2018 11:51:18 -0700 Subject: RFR: Make trees work with hg 4.6 In-Reply-To: References: <635f1675-54c5-8f4b-8ab8-7ce0fba3ae0b@oracle.com> Message-ID: never ending breakage? My hg got updated and now I see: $ hg --version *** failed to import extension jcheck from ~/ws/code-tools/jcheck/jcheck.py: missing attributes: norepo, optionalrepo, inferrepo *** (use @command decorator to register 'jcheck') *** failed to import extension defpath from ~/ws/code-tools/defpath/defpath.py: missing attributes: norepo, optionalrepo, inferrepo *** (use @command decorator to register 'fdefpath') Mercurial Distributed SCM (version 4.6.2+674-f83600efa1ca) On Wed, Jul 11, 2018 at 9:36 AM, Erik Joelsson wrote: > Sorry, I will get to it today since I'm now a committer here. > > I also stumbled over an issue in defpath with hg 4.6. May take a look at > that if time permits. > > /Erik > > On 2018-07-11 08:09, Martin Buchholz wrote: > > Can we get the pending changes to hg tools committed please? > > Would it help if I reviewed them? > > Would it help if code tools had more reviewers? Perhaps deputize regular > openjdk reviewers? > > On Fri, Jun 8, 2018 at 11:46 AM, Erik Joelsson > wrote: > >> Hello, >> On 2018-06-07 11:59, Martin Buchholz wrote: >> >> >> >> On Thu, Jun 7, 2018 at 11:46 AM, Erik Joelsson >> wrote: >> >>> This is because the last two release candidate tags in the official hg >>> repo are "4.6rc1" and "4.6rc2". They changed the pattern. I don't see "rc" >>> anywhere else in tags that shouldn't be matched. This plugin is only used >>> internally in trees testing. >>> >>> - tags = filter(lambda t: not t.endswith('-rc') and t != "tip", tags) >>> + tags = filter(lambda t: 'rc' not in t and t != "tip", tags) >>> >>> The other changes look good to me but I'm not a python or trees >>> developer. >>> >>> >> Ohh.... verlist is being used to get tags for the upstream mercurial repo >> for mercurial itself? If so, maybe document that? >> >> I think the comment at the top basically says this. >> >> Looking for the substring "rc" seems particularly brittle because it >> happens to match "mercurial". >> >> Well, we can only really make this code good enough to match the current >> tags in the official mercurial repo. If they change format again, we will >> need to adapt. I've changed the rc and tip strings to all use single quote >> on that line. >> >> /Erik >> > > >