From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#26028: 26.0.50; epatch for multifile patches Date: Wed, 24 May 2017 09:46:59 +0900 (JST) Message-ID: References: <87varjfzhr.fsf@yandex.ru> <838tofh93b.fsf@gnu.org> <87y3wfv3iy.fsf@yandex.ru> <871srfbyps.fsf@calancha-pc> <87efvfkx9l.fsf@drachen> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: blaine.gmane.org 1495586901 24286 195.159.176.226 (24 May 2017 00:48:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 24 May 2017 00:48:21 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: 26028@debbugs.gnu.org, Tino Calancha , Arseny Sher , Kaushal Modi To: Michael Heerdegen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 24 02:48:13 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDKTF-000698-J8 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 May 2017 02:48:13 +0200 Original-Received: from localhost ([::1]:52084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDKTL-0003bS-1A for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 May 2017 20:48:19 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDKT7-0003bJ-UM for bug-gnu-emacs@gnu.org; Tue, 23 May 2017 20:48:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDKT4-0001Sn-SM for bug-gnu-emacs@gnu.org; Tue, 23 May 2017 20:48:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60824) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDKT4-0001Sf-Ob for bug-gnu-emacs@gnu.org; Tue, 23 May 2017 20:48:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dDKT4-0004Tm-CB for bug-gnu-emacs@gnu.org; Tue, 23 May 2017 20:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 May 2017 00:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26028 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 26028-submit@debbugs.gnu.org id=B26028.149558683317148 (code B ref 26028); Wed, 24 May 2017 00:48:02 +0000 Original-Received: (at 26028) by debbugs.gnu.org; 24 May 2017 00:47:13 +0000 Original-Received: from localhost ([127.0.0.1]:35268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDKSE-0004ST-RI for submit@debbugs.gnu.org; Tue, 23 May 2017 20:47:11 -0400 Original-Received: from mail-pf0-f194.google.com ([209.85.192.194]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDKSD-0004SE-05 for 26028@debbugs.gnu.org; Tue, 23 May 2017 20:47:09 -0400 Original-Received: by mail-pf0-f194.google.com with SMTP id u26so30842836pfd.2 for <26028@debbugs.gnu.org>; Tue, 23 May 2017 17:47:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=ZAqbG0B5nFeEBSidHU7TqG0jRwFTAnOdJF+Jg5Sp8v4=; b=q9geL97eKOD0AFwEHErnj2zZ3LHlQErnfq3FP1fTi/17CeTsg9jhNjoDqTkvlQYHjP xBYqMZ0g15R9LmJjR9TBr2LVT5QEVUdwdE2JmTmh2QSWEyU/t4xV1UfzifSTw4oW5eMQ g8ZolGkItBr/zI3Qoa24lM4ry3U5BmrennaTOCY+t2QS/KytJf5bP6zba/1X8MbA+zFg F7/hM9iJqP31F9/3JASSN5IUvzyZBmo7kiElSgkAHATF3anzdGGrFnSY+xwVWMTWBHqP EXS1IRHu0giCCVf1/eUZ9Z/k0JT9JyW7C2M6+TNGfo/eOPMQhSXuAvu6rVB8v2VWNxU7 bHKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=ZAqbG0B5nFeEBSidHU7TqG0jRwFTAnOdJF+Jg5Sp8v4=; b=OnPQ11KjrBakwc6iAyRnB/1UVGv2ZDaP7MG39gI6LgnRoBc1Ssm/Az8I8E2WIRZ7Nd Ei0VkgXxbE0Wh5jrryP6CNH67h6UpOpdJSSJ24VZJwkVDyyU42xA5ND+mUZEeIslHzl4 TuM0wNrCTnipucRL14pEWG0w3cyRWy7gFRBRTxJiXSzz9ZSXioQs0xjO6oi0dJykmA0s AB1TjKbYBp7KTjGiQLRrp9xKhnhkJwn3zTNCRYbguTISo07l1TNBVVDZ+OulSqXRpC+L RTaH91CBL/MGZSMc1aVzdcDRzqdnt8SWXt54pn9S/DbGdD6EsedbC4oprVZftjxJVH8x Xn/Q== X-Gm-Message-State: AODbwcC3qErR1+ceLvxz6KJMnm3juG4rKuz2iUN/A99DpyD4D7MFXKB+ GqZ3UKyBies3Gw== X-Received: by 10.98.102.208 with SMTP id s77mr34536398pfj.22.1495586823082; Tue, 23 May 2017 17:47:03 -0700 (PDT) Original-Received: from calancha-pc (222.139.137.133.dy.bbexcite.jp. [133.137.139.222]) by smtp.gmail.com with ESMTPSA id t66sm3578243pfe.134.2017.05.23.17.47.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 17:47:02 -0700 (PDT) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc In-Reply-To: <87efvfkx9l.fsf@drachen> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:132775 Archived-At: On Wed, 24 May 2017, Michael Heerdegen wrote: > Tino Calancha writes: > >> Recently i am not using `epatch', but maybe following patch >> is of interest for someone: > > FWIW, do you think you understood all of the code you changed (I ask > because I gave up after a while)? I think so. I you exclude from the patch the added tests in test/lisp/vc/ediff-ptch-tests.el then this patch just touch: 2 files changed, 42 insertions(+), 18 deletions(-) The only it does: * tweak the original heuristic part for guessing the file names * change the suggested defaults in the prompts asking for the patch and dirs to patch. > If you did, do you think we should > install your fix, or are there open questions? I have tested with plain diffs and with Git diffs. I didn't test it with other VC than Git. I don't think solves all the problems, but at least it makes `epatch' usable for the most common multipatch situations. I) You know, `epatch' has never parsed multipatches with files in different dirs, as: foo/file1 bar/file2 II) The only multipatches `epatch' worked before is when all the files belong to the same dir, as: foo/file1 foo/file2 This patch makes possible to handle I) as well.