From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git version of ELPA Date: Wed, 14 Aug 2013 11:30:23 -0400 Message-ID: References: <8738qs5qrg.fsf@igel.home> <87mwoz4w4f.fsf@igel.home> <877gfrrida.fsf@yandex.ru> <52087DDD.1020100@yandex.ru> <52090C0F.4020508@yandex.ru> <520B4B29.8030201@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1376494278 11453 80.91.229.3 (14 Aug 2013 15:31:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 Aug 2013 15:31:18 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 14 17:31:20 2013 Return-path: Envelope-to: ged-emacs-devel@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 1V9d2d-0001JV-NX for ged-emacs-devel@m.gmane.org; Wed, 14 Aug 2013 17:31:19 +0200 Original-Received: from localhost ([::1]:34574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9d2c-0002Gk-V0 for ged-emacs-devel@m.gmane.org; Wed, 14 Aug 2013 11:31:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9d2U-0002GC-To for emacs-devel@gnu.org; Wed, 14 Aug 2013 11:31:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9d1l-0007pD-IW for emacs-devel@gnu.org; Wed, 14 Aug 2013 11:31:10 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:47017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9d1l-0007p6-EK for emacs-devel@gnu.org; Wed, 14 Aug 2013 11:30:25 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av8EABK/CFFLd/Nq/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJBMbh3AGwS2ND4N7A5cpjVGBXoMTgVM X-IPAS-Result: Av8EABK/CFFLd/Nq/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLDiYSFBgNJBMbh3AGwS2ND4N7A5cpjVGBXoMTgVM X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="21830292" Original-Received: from 75-119-243-106.dsl.teksavvy.com (HELO ceviche.home) ([75.119.243.106]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 14 Aug 2013 11:30:16 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 2A307660C7; Wed, 14 Aug 2013 11:30:23 -0400 (EDT) In-Reply-To: <520B4B29.8030201@yandex.ru> (Dmitry Gutov's message of "Wed, 14 Aug 2013 12:17:29 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:162719 Archived-At: > 2) If packages/js2-mode and git@github.com:mooz/js2-mode.git differ in files > they contain, I imagine we'll have more errors or conflicts to deal with. Yes and no: the "push" would simply force the github version to have the same content as the elpa version. No conflict, but an undesirable outcome, so you end up having to do it somewhat by hand (you can use "git subtree split" to help, but there's still a manual intervention needed). >> In any case it's the responsibility of the package's maintainer to feed >> elpa changes back to the external branch, if any. > Maybe so. But 'git subtree' seems to make this less painful, as long as ELPA > doesn't go deliberately out of sync. Yes. The elpa-diffs email as well (a copy is sent to the maintainer). >>> 2) Can we handle having README.md (and probably other formats), >> Yes. Patches welcome (tho you might like to wait before the new Git >> repository is in place, since the code is being rewritten as we speak). > If we're okay with showing non-preprocessed Markdown, Org and similar files > as plain text, that should be easy. Markdown reads fine that way, at least. Hopefully we can do better than that, but as a first step, yes, that's definitely fine. >> Currently, you can have extra (ignored) files only for singlefile >> packages. Multifile packages will package up whatever is present. >> But it should be easy to add some way to list files that should be >> skipped. IOW, same as above "patch is welcome, tho you might like to >> wait a bit". > I'd welcome a suggestion for the exact mechanism. A simple solution is to not remove those files from the `elpa' branch. I.e. consider it as a "local change". It might lead to spurious conflicts when merging, tho. > List them in a file called .elpa-includes'? I'd rather have a list of exclusions than a list of inclusions, but other than that I guess that'd be right. So we could easily handle a list of exclusions by passing the list to "tar". Stefan