From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS Date: Sun, 30 Oct 2022 10:00:40 -0400 Message-ID: References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <87pmer0xtz.fsf@posteo.net> <83wn8z2aze.fsf@gnu.org> <878rle1i0k.fsf@posteo.net> <87ilkelc10.fsf@posteo.net> <878rl6syg8.fsf@posteo.net> <87zgdjqcu0.fsf@posteo.net> <87zgdivc3f.fsf@posteo.net> <874jvqv2u3.fsf@posteo.net> <875yg6qtbl.fsf@posteo.net> <87ilk33lqk.fsf@posteo.net> <87mt9epqlk.fsf@posteo.net> <87ilk1bgvd.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7862"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Richard Stallman , emacs-devel@gnu.org To: Philip Kaludercic Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Oct 30 15:01:41 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1op8se-0001tY-O2 for ged-emacs-devel@m.gmane-mx.org; Sun, 30 Oct 2022 15:01:40 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1op8rw-0006CE-8l; Sun, 30 Oct 2022 10:00:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1op8rs-0006C3-3m for emacs-devel@gnu.org; Sun, 30 Oct 2022 10:00:52 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1op8rq-00013a-AI; Sun, 30 Oct 2022 10:00:51 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 4B7BA440A71; Sun, 30 Oct 2022 10:00:48 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 9739F440A47; Sun, 30 Oct 2022 10:00:42 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1667138442; bh=MGmJm5Tk72bk6ZZg3jxv1vvfPk25uhG2pFoEd639t2Y=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=n0dIlkThj5Kz0+9Qee1bsoCQkDm+lkb7+tm18qUYuUfwytxBdgK1kAXc/K4K2rHXV mGnJyAQa6q7nWacu53w3Fagq6tIF6YQfKzBp1Mzn7LK53tqKRuLK5i60RzlwkwY1cP VDoJXsJ2OqeXWYxx6H6vhFtciIqHP43znooIH4jUX/M8gfq8YK29x76ecP3KooLrv9 3M+9JXe7E+LMEqNyu65ZBCzBmex5b0trZMuiL2TWSM0NufnOZahN0r5IxlLqjwRzAy WgDrtD+iSaIqES0A7H8p8N7MVe6O0+McnW++KWREYAhAXSf8iyRHHxDJqHb7oDHLck wigNJs88xXk5Q== Original-Received: from pastel (65-110-220-202.cpe.pppoe.ca [65.110.220.202]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 64C4E120E7A; Sun, 30 Oct 2022 10:00:42 -0400 (EDT) In-Reply-To: <87ilk1bgvd.fsf@posteo.net> (Philip Kaludercic's message of "Sun, 30 Oct 2022 13:06:30 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298814 Archived-At: > I guess so. Here is a possible patch that should behave close enough to > elpa-admin.el using "blame" Why do you use `blame` rather than `log` like `elpa-admin.el`? > (an obvious exception is the missing handler for the new :merge > property, but I have been wondering if it might also be fair to always > add "--first-parent" for Git). We considered using `--first-parent` but it tends to point to more recent merge commits than to the actual commit that bumped the `Version:`. If you add to that the fact that order of parents in Git is somewhat arbitrary and rarely taken into consideration, I'd rather not go there. For `:merge` we didn't really have a choice, and (to make up for that) we get to control how the merge is done and thus which one is the first parent. > The default handler just wraps vc-annotate, so it is a bit more fragile. Hmm... the code I see in your patch uses `vc-region-history` (which is only supported for Git and Hg, currently, and is fairly difficult to support in a generic way) rather than `vc-annotate`. Am I missing something? > Invoking `package-vc-install' with a prefix argument will now check out > the specific commit that bumps the version tag. At least for git, the > slight problem here is that this means the head is in a detached state, > not connected to any specific branch. I don't know if there is any > elegant solution to this problem, or if it should even be "solved". I suspect a better option is to use something like `git reset` instead of `git checkout`, so we end up at the right revision but still on the main branch. But yes, it's kind of ugly if you want to try and preserve local changes. I think doing it right requires distinguishing whether we're moving forward or backward (moving forward can be done with `git merge`, which is well-behaved, whereas moving backward is poorly supported, AFAICT). You might want to take a look at `elpaa--select-revision` where I try to solve this problem (for a slightly more restricted case, admittedly, but it's already unsatisfactory). Maybe there's a better way to do that? Stefan