From notifications-return-5527-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Wed Jul 25 21:20:05 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0DA9B180677 for ; Wed, 25 Jul 2018 21:20:04 +0200 (CEST) Received: (qmail 67171 invoked by uid 500); 25 Jul 2018 19:20:04 -0000 Mailing-List: contact notifications-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list notifications@yetus.apache.org Received: (qmail 67128 invoked by uid 99); 25 Jul 2018 19:20:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2018 19:20:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C84C5C1A63 for ; Wed, 25 Jul 2018 19:20:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -109.501 X-Spam-Level: X-Spam-Status: No, score=-109.501 tagged_above=-999 required=6.31 tests=[ENV_AND_HDR_SPF_MATCH=-0.5, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001, USER_IN_DEF_SPF_WL=-7.5, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id J051Cwb4U494 for ; Wed, 25 Jul 2018 19:20:01 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 68C915F3F0 for ; Wed, 25 Jul 2018 19:20:01 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id CC10AE259D for ; Wed, 25 Jul 2018 19:20:00 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 4348627764 for ; Wed, 25 Jul 2018 19:20:00 +0000 (UTC) Date: Wed, 25 Jul 2018 19:20:00 +0000 (UTC) From: "Allen Wittenauer (JIRA)" To: notifications@yetus.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (YETUS-645) Make leading path component optional in patch files (support IntelliJ patch files) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/YETUS-645?page=3Dcom.atlassian.= jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D16556= 153#comment-16556153 ]=20 Allen Wittenauer commented on YETUS-645: ---------------------------------------- In general, if Yetus can't apply the patch, it will complain loudly. See ht= tps://issues.apache.org/jira/browse/HADOOP-12953?focusedCommentId=3D1520721= 6&page=3Dcom.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#c= omment-15207216 as an example. However, IIRC, there is at least one edge case where patches can go haywire= : the patch only creates a new subdirectory with no other point of referenc= e. e.g., +++ newdir/foo . There's a bit of work in place to make sure it = has the correct location to apply a patch, but with no markers... it's a bi= t of a crapshoot. That said, I think something else is going wrong in the examples provided. = LUCENE-8369 almost certainly applied. I just manually added it to the buil= d queue to see what is going on there. (The logs have scrolled off...) My= hunch on LUCENE-8408 is that it probably got caught up in the several roun= ds of Jenkins downtime that happened last weekend and into early last week. Also: > Yetus probably didn't have enough time to process the first patch IYetus will make a note as to which patch it tried to process. One can loo= k at that 'JIRA Patch URL' field in the bottom of the report to see which o= ne was being used. In the case of SOLR-12561, the actual URL provides the = hints: the patch at attachment id 12932109 got processed twice. Thus confir= ming your suspicion. [I totally admit I play the "can I beat Jenkins?" gam= e too. :) ] That said this is exactly why it is highly recommended to revision patch up= loads. This makes it easier to see which report applies to which patches at= a glance. e.g., YETUS-441 provides a great example.=20 > Make leading path component optional in patch files (support IntelliJ pat= ch files) > -------------------------------------------------------------------------= --------- > > Key: YETUS-645 > URL: https://issues.apache.org/jira/browse/YETUS-645 > Project: Yetus > Issue Type: Improvement > Reporter: David Smiley > Priority: Major > > IntelliJ IDEA has a "create patch" feature that generates patch files in = a format that isn't supported by some tools like Yetus. =C2=A0In particular= , there is no leading "a/" and "b/" in the paths. =C2=A0That appears to be = the sole difference requiring these patches to be supported. > =C2=A0 > See=C2=A0[https://youtrack.jetbrains.com/issue/IDEA-92793] > =C2=A0 > To work around this, I wrote a one-liner Bash script using SED to insert = the "a/" and b/" at the right spots: > {code:java} > sed -i '' -e 's/^--- /--- a\//g' -e 's/^+++ /+++ b\//g' "$1" > {code} > In this issue I propose that Yetus detect the absence of a/ and b/ and ei= ther (a) insert them using a similar script, or (b) toggling the "-p" optio= n when the patch is applied using [git-apply|https://git-scm.com/docs/git-a= pply] or other tool. -- This message was sent by Atlassian JIRA (v7.6.3#76005)