From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS Date: Sun, 16 Oct 2022 22:22:42 +0000 Message-ID: <87a65v2ytp.fsf@posteo.net> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <20220214140020.04438C00891@vcs2.savannah.gnu.org> <87bkqmqpvb.fsf@posteo.net> <87edv96q4j.fsf@posteo.net> <83tu455a5s.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33099"; mail-complaints-to="usenet@ciao.gmane.io" Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 17 00:26:35 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 1okC5a-0008SJ-Uf for ged-emacs-devel@m.gmane-mx.org; Mon, 17 Oct 2022 00:26:35 +0200 Original-Received: from localhost ([::1]:34762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okC5Z-0007hI-OC for ged-emacs-devel@m.gmane-mx.org; Sun, 16 Oct 2022 18:26:33 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okC1v-0004Ip-Jh for emacs-devel@gnu.org; Sun, 16 Oct 2022 18:22:47 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:48503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okC1t-0000pd-NT for emacs-devel@gnu.org; Sun, 16 Oct 2022 18:22:47 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4FCD5240103 for ; Mon, 17 Oct 2022 00:22:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1665958964; bh=Dhw4UBIt4qMKQTTV0EaaCT/Q6HA/P5JcVn0f4TjnfJM=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=ARyZ5ZMta/2bgLpla6sewav2rCZmUdT1TvukberFB+8+AvxG1Tos+7fnTFtvAW1rz PFWJrVbyjTsemiFfE53jx9RNNG0W+D3qC5gKwMNdCDlOErF5c6Oc69mx2B8wcOc/bD hEHLzx1yNrIlMEOY6cF5bcMrmn/TdjBlIE/5qht1d/BF167V9AP7/fvuYM+fkYkTkA hjELoM2DlSJLlWKJYUIe7G16CrkwtUdrVr/peeUy4psT9rLUlvrr9TDorIvOT/p/b8 Jcnbej07+kitDQjrBi7F7KwQaMu/mTKq7tTnAg90KCvASNX2gF6C4CeYE+Kb+YYcNE QpEW9Oh27H4+A== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MrF4M2lBTz6trN; Mon, 17 Oct 2022 00:22:43 +0200 (CEST) In-Reply-To: <83tu455a5s.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Oct 2022 19:22:39 +0300") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:297888 Archived-At: Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: emacs-devel@gnu.org >> Date: Sat, 15 Oct 2022 15:52:28 +0000 >> >> Philip Kaludercic writes: >> >> > - The ability to update a package using `package-upgrade'[0] >> >> [...] >> >> > [0] This feature is currently broken because it tries to use `vc-pull' >> > which refuses to work if any changes have been made. This is an >> > issue as package-vc-fetch tries to modify the list of ignored files >> > in a repository (think of .gitignore). It will either be necessary >> > to change how vc-pull works or try to do something with >> > vc-log-incoming + vc-merge. >> >> Does anyone know if it is possible to do this? > > Where is the code which fails vc-pull if there are changes in the > working tree? is it specific to some backend, perhaps? The doc > string says: > > On a non-distributed version control system, update the current > fileset to the tip revisions. For each unchanged and unlocked > file, this simply replaces the work file with the latest revision > on its branch. If the file contains changes, any changes in the > tip revision are merged into the working file. > > Note that last sentence. So this ought to work, and if it doesn't, > it's a bug, I guess? I have re-tested it and I was mistaken, the issue was with Git. Sadly I cannot reproduce it right now, but I will try to re-trigger it. > From the shell prompt, "git pull" will fail if the changes are in the > same file as one of those whose changes are brought in by the pull, > but either using --rebase or maybe the stash/pull/unstash dance should > take care of that, I guess? Right, I believe it was something along these lines but this is something that is difficult to automate. > Or am I missing something?