From notifications-return-5520-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Wed Jul 25 18:56:28 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 E192E18062C for ; Wed, 25 Jul 2018 18:56:27 +0200 (CEST) Received: (qmail 19700 invoked by uid 500); 25 Jul 2018 16:56:27 -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 19691 invoked by uid 99); 25 Jul 2018 16:56:27 -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 16:56:27 +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 7FF1FC1ABA for ; Wed, 25 Jul 2018 16:56:26 +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 P2YM22lJz1Z4 for ; Wed, 25 Jul 2018 16:56:25 +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 A2CB25F4E4 for ; Wed, 25 Jul 2018 16:56:00 +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 3D936E0110 for ; Wed, 25 Jul 2018 16:56: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 095432775D for ; Wed, 25 Jul 2018 16:56:00 +0000 (UTC) Date: Wed, 25 Jul 2018 16:56:00 +0000 (UTC) From: "Allen Wittenauer (JIRA)" To: notifications@yetus.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Comment Edited] (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=3D16555= 971#comment-16555971 ]=20 Allen Wittenauer edited comment on YETUS-645 at 7/25/18 4:55 PM: ----------------------------------------------------------------- Hmm. Weird. Yetus actually tries to do -p0 which should support patches wi= thout a leading path. Any chance you could share or link to a patch that b= reaks? Thanks! (p.s., from the link,it looks like there is more going on than just the lea= ding a/b so want to take a look at one that Yetus failed to used.) was (Author: aw): Hmm. Weird. Yetus actually tries to do -p0 which should support patches wi= thout a leading path. Any chance you could share or link to a patch that b= reaks? Thanks! > 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)