From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#15310: 24.3.50; [ELPA] Better commit notifications for upstream authors Date: Wed, 11 Sep 2013 13:09:22 -0400 Message-ID: References: <871u4znfjb.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1378919416 5025 80.91.229.3 (11 Sep 2013 17:10:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 11 Sep 2013 17:10:16 +0000 (UTC) Cc: 15310@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 11 19:10:19 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VJnvm-0002hB-A2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 11 Sep 2013 19:10:18 +0200 Original-Received: from localhost ([::1]:37203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJnvl-0004CV-Pf for geb-bug-gnu-emacs@m.gmane.org; Wed, 11 Sep 2013 13:10:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJnvd-0004C4-GJ for bug-gnu-emacs@gnu.org; Wed, 11 Sep 2013 13:10:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJnvY-0004Xg-0I for bug-gnu-emacs@gnu.org; Wed, 11 Sep 2013 13:10:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJnvX-0004WY-T6 for bug-gnu-emacs@gnu.org; Wed, 11 Sep 2013 13:10:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1VJnvW-0007kZ-98 for bug-gnu-emacs@gnu.org; Wed, 11 Sep 2013 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 11 Sep 2013 17:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 15310 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 15310-submit@debbugs.gnu.org id=B15310.137891936629733 (code B ref 15310); Wed, 11 Sep 2013 17:10:02 +0000 Original-Received: (at 15310) by debbugs.gnu.org; 11 Sep 2013 17:09:26 +0000 Original-Received: from localhost ([127.0.0.1]:56049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJnuv-0007jU-Ke for submit@debbugs.gnu.org; Wed, 11 Sep 2013 13:09:25 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:60181) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1VJnut-0007jM-OB for 15310@debbugs.gnu.org; Wed, 11 Sep 2013 13:09:24 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id r8BH9Mkl001654; Wed, 11 Sep 2013 13:09:22 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 7B9E9B40D3; Wed, 11 Sep 2013 13:09:22 -0400 (EDT) In-Reply-To: <871u4znfjb.fsf@yandex.ru> (Dmitry Gutov's message of "Mon, 09 Sep 2013 00:56:40 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4698=0 X-NAI-Spam-Version: 2.3.0.9362 : core <4698> : inlines <81> : streams <1035606> : uri <1533816> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:78239 Archived-At: > The commits are all sent together (one notification email per push, > AFAICS), as a plain-text email without attachments. Indeed. That's basically what Savannah's email notification gives us (we can somewhat tweak it, the current config can be seen in http://git.savannah.gnu.org/r/emacs/elpa.git/config, although we do not have direct write access to it). > Is there a better way to work with these emails? "patch -p2" will strip off the "a/packages/" prefix. > If no, it would be better if, for example, the script preparing these > emails identified commits not synced from upstream (maybe by file paths > inside the diffs?), fixed the paths, and attached these commits in patch > format that's accepted by 'git am' and already contains the commit > message and author information. There's a copy of the script I use in elpa/admin/forward-diffs.py. Improvements are welcome. This said, I try to "push" the syncs separately from local changes, so that an email should either contain a "sync" that you can completely disregard, or only local changes. This should be even more true once I get a new cron job that does the syncs semi-automatically (i.e. automatically when there's no conflict). In that case you should be able to pass the whole email to "patch -p2". Stefan