From unknown Fri Aug 15 02:03:02 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#1384 <1384@debbugs.gnu.org> To: bug#1384 <1384@debbugs.gnu.org> Subject: Status: vc-diff-switches inconsistencies Reply-To: bug#1384 <1384@debbugs.gnu.org> Date: Fri, 15 Aug 2025 09:03:02 +0000 retitle 1384 vc-diff-switches inconsistencies reassign 1384 emacs submitter 1384 Glenn Morris severity 1384 normal thanks From pot@gnu.org Tue Sep 23 07:58:05 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-5.6 required=4.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at submit) by emacsbugs.donarmstrong.com; 23 Sep 2008 14:58:05 +0000 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8NEvwve008456 for ; Tue, 23 Sep 2008 07:58:00 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ki9Kw-0000By-BK for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 10:57:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ki9Ku-0000Aj-DD for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 10:57:57 -0400 Received: from [199.232.76.173] (port=37227 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ki9Ku-0000Ae-72 for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 10:57:56 -0400 Received: from mx4.isti.cnr.it ([194.119.192.6]:63201 helo=ITANIUM.ISTI.CNR.IT) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ki9Kt-0006F9-Pr for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 10:57:56 -0400 Received: from conversionlocal.isti.cnr.it by mx.isti.cnr.it (PMDF V6.4-beta #31598) id <01MZWPGJ8N5C9S4ISQ@mx.isti.cnr.it> for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 16:57:25 +0200 Received: from tucano.isti.cnr.it (tucano.isti.cnr.it [146.48.81.102]) by mx.isti.cnr.it (PMDF V6.4-beta #31599) with ESMTPSA id <01MZWPGIVM629QUZA3@mx.isti.cnr.it> for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 16:57:24 +0200 Received: from pot by tucano.isti.cnr.it with local (Exim 4.69) (envelope-from ) id 1Ki9KO-0007wu-G8 for bug-gnu-emacs@gnu.org; Tue, 23 Sep 2008 16:57:24 +0200 Date: Tue, 23 Sep 2008 16:57:24 +0200 From: Francesco Potorti` Subject: vc-diff for the hg backend ignore diff switches variables To: GNU emacs bug list Message-id: Organization: X-INSM-ip-source: 146.48.81.102 Auth Done X-fingerprint: 4B02 6187 5C03 D6B1 2E31 7666 09DF 2DC9 BE21 6115 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Three related problems: 1) Apparently the hg backend of vc ignores both diff-switches and vc-diff-switches. 2) The vc-hg-diff-switches variables is not defined. 3) The hg backend is special with respect to the vc-diff-switches variable. Its doc says: A string or list of strings specifying switches for diff under VC. When running diff under a given BACKEND, VC concatenates the values of `diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to get the switches for that command. Thus, `vc-diff-switches' should contain switches that are specific to version control, but not specific to any particular backend. This behaviour assumes that the diff switches can be accumulated. however, it does not allow for removing them for a particular backend. For example, I have (setq diff-switches "-pu" vc-diff-switches "-b") which works for the cvs and rcs backends. However, it would not work for the hg backend, as 'hg diff' does not tolerate the -u option. This problem would require a different way of combining the diff switches. From rgm@gnu.org Sat Sep 27 19:01:38 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-12.1 required=4.0 tests=AWL,BAYES_00, FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1017) by emacsbugs.donarmstrong.com; 28 Sep 2008 02:01:38 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m8S21ZZI016373 for <1017@emacsbugs.donarmstrong.com>; Sat, 27 Sep 2008 19:01:36 -0700 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1KjlZE-0007cE-RI; Sat, 27 Sep 2008 21:59:24 -0400 From: Glenn Morris To: Francesco Potorti` Cc: 1017@debbugs.gnu.org Subject: Re: bug#1017: vc-diff for the hg backend ignore diff switches variables References: X-Spook: Serbian FTS2000 Telex Iran Saddam Hussein offensive X-Ran: Q\:1K(S-D(2b?JWHSl>t,{bjLlhU`pWA>w,FiuMSUXoF0iOq:KV]6m6]b)F%e=x%wYBpj; X-Hue: red X-Debbugs-No-Ack: yes X-Attribution: GM Date: Sat, 27 Sep 2008 21:59:24 -0400 In-Reply-To: (Francesco Potorti`'s message of "Tue, 23 Sep 2008 16:57:24 +0200") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Francesco Potorti` wrote: > 1) > Apparently the hg backend of vc ignores both diff-switches and > vc-diff-switches. > > 2) > The vc-hg-diff-switches variables is not defined. > > 3) > The hg backend is special with respect to the vc-diff-switches > variable. I don't use hg, but try the included patch, based on vc-svn. [vc-diff-switches] > A string or list of strings specifying switches for diff under VC. > When running diff under a given BACKEND, VC concatenates the values of > `diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to > get the switches for that command. Thus, `vc-diff-switches' should > contain switches that are specific to version control, but not > specific to any particular backend. The above does not appear to be true. The `vc-switches' command uses either vc-BACKEND-diff-switches, or vc-diff-switches, or diff-switches. It does not append any of these. Most vc-BACKEND-diff commands seem to use the above behaviour. vc-cvs-diff appends diff-switches and vc-diff-switches, but only if it does not have to call cvs to get a diff. If it does, it uses the vc-switches method. vc-mtn-diff and vc-git-diff don't use any switches. It is all rather confusing... *** vc-hg.el.~1.85.~ 2008-07-05 12:09:45.000000000 -0700 --- vc-hg.el 2008-09-27 18:29:00.000000000 -0700 *************** *** 123,128 **** --- 123,142 ---- :version "22.2" :group 'vc) + (defcustom vc-hg-diff-switches + t ; Hg doesn't support common args like -u + "String or list of strings specifying extra switches for Hg diff under VC. + If nil, use the value of `vc-diff-switches'. + If you want to force an empty list of arguments, use t." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" + :value ("") + string)) + :version "23.1" + :group 'vc) + ;;; Properties of the backend *************** *** 248,254 **** (defun vc-hg-diff (files &optional oldvers newvers buffer) "Get a difference report using hg between two revisions of FILES." (let* ((firstfile (car files)) ! (working (and firstfile (vc-working-revision firstfile)))) (when (and (equal oldvers working) (not newvers)) (setq oldvers nil)) (when (and (not oldvers) newvers) --- 262,270 ---- (defun vc-hg-diff (files &optional oldvers newvers buffer) "Get a difference report using hg between two revisions of FILES." (let* ((firstfile (car files)) ! (working (and firstfile (vc-working-revision firstfile))) ! (switches ! (vc-switches (if vc-hg-diff-switches 'HG) 'diff))) (when (and (equal oldvers working) (not newvers)) (setq oldvers nil)) (when (and (not oldvers) newvers) *************** *** 259,264 **** --- 275,281 ---- (expand-file-name default-directory)) "diff" (append + switches (when oldvers (if newvers (list "-r" oldvers "-r" newvers) From rgm@gnu.org Thu Oct 2 14:20:06 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-9.6 required=4.0 tests=AWL,BAYES_00,MISSING_SUBJECT, MURPHY_DRUGS_REL8,NOSUBJECT,RCVD_IN_DNSWL_MED,VALID_BTS_CONTROL, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at control) by emacsbugs.donarmstrong.com; 2 Oct 2008 21:20:06 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m92LK3OM007936 for ; Thu, 2 Oct 2008 14:20:04 -0700 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1KlVYR-00039a-5Q; Thu, 02 Oct 2008 17:17:47 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18661.14971.116177.674668@fencepost.gnu.org> Date: Thu, 2 Oct 2008 17:17:47 -0400 From: Glenn Morris To: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: magenta X-Ran: ksbR-Gfj07dj>lXr>M+*e0o7q2qu+!1(ZOT{+f'yLO)O*tCgRdo@lt&kzoa6o%)3$aWo*9 X-Debbugs-No-Ack: yes tags 1046 patch tags 1017 patch moreinfo tags 1059 unreproducible tags 1053 notabug wontfix From rgm@gnu.org Sat Oct 4 13:33:26 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-12.2 required=4.0 tests=AWL,BAYES_00,HAS_BUG_NUMBER, MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1017) by emacsbugs.donarmstrong.com; 4 Oct 2008 20:33:26 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m94KXNw3000629 for <1017@emacsbugs.donarmstrong.com>; Sat, 4 Oct 2008 13:33:24 -0700 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1KmDmK-0007y5-Kt; Sat, 04 Oct 2008 16:31:04 -0400 From: Glenn Morris To: 1017@debbugs.gnu.org Cc: Francesco Potorti` Subject: Re: bug#1017: vc-diff for the hg backend ignore diff switches variables References: X-Spook: UMTS MD2 Israel DES infowar Project Monarch Maple Abbas X-Ran: }C6M^JA%t)>@ZFs$`j.g~B3Gmbcm`RjHzCKu=j^WaX>e[Tmr0rA%"/#-",-?+0na9Y?9N" X-Hue: red X-Debbugs-No-Ack: yes X-Attribution: GM Date: Sat, 04 Oct 2008 16:31:04 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Since I do not use Mercurial, I need someone who does to check that patch works. From rgm@gnu.org Wed Nov 19 14:02:46 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-8.8 required=4.0 tests=AWL,BAYES_00,MISSING_SUBJECT, NOSUBJECT,RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at control) by emacsbugs.donarmstrong.com; 19 Nov 2008 22:02:46 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAJM2iR5004846 for ; Wed, 19 Nov 2008 14:02:45 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L2v86-0006zL-Di; Wed, 19 Nov 2008 17:02:34 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18724.36090.346659.635901@fencepost.gnu.org> Date: Wed, 19 Nov 2008 17:02:34 -0500 From: Glenn Morris To: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: magenta X-Ran: Z"Skj%XEw(YP?~^r1Yd:hz[Tf!Of&IJopy^`lg||w&N6R9{XSCfXa{]Dx|6{qe X-Debbugs-No-Ack: yes clone 1017 -1 retitle -1 vc-diff-switches inconsistencies submitter -1 Glenn Morris From rgm@gnu.org Wed Nov 19 14:13:15 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-9.8 required=4.0 tests=AWL,BAYES_00,MISSING_SUBJECT, MURPHY_DRUGS_REL8,NOSUBJECT,RCVD_IN_DNSWL_MED,VALID_BTS_CONTROL, X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at control) by emacsbugs.donarmstrong.com; 19 Nov 2008 22:13:15 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAJMD9Pk008073 for ; Wed, 19 Nov 2008 14:13:10 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L2vIA-0007Kw-V3; Wed, 19 Nov 2008 17:12:59 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18724.36714.920594.92159@fencepost.gnu.org> Date: Wed, 19 Nov 2008 17:12:58 -0500 From: Glenn Morris To: control X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: green X-Ran: v?%yUByj\(C|!rH|7hT/}^7eUob8F`/HqS"+QbE7ZOlQU|#qL|_%$Fc41h X-Debbugs-No-Ack: yes tags 1384 - moreinfo patch From rgm@gnu.org Tue Nov 25 19:04:23 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-8.4 required=4.0 tests=AWL,BAYES_00,FAKE_REPLY_C, ONEWORD,RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1384-quiet) by emacsbugs.donarmstrong.com; 26 Nov 2008 03:04:23 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAQ34LvX030593 for <1384-quiet@emacsbugs.donarmstrong.com>; Tue, 25 Nov 2008 19:04:22 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L5Ah9-0001px-8L; Tue, 25 Nov 2008 22:04:03 -0500 From: Glenn Morris To: 1384-quiet@debbugs.gnu.org Subject: Re: bug#1384 X-Spook: Kosovo quarter Project Monarch insurgency anthrax X-Ran: z~N1;D~n>e65>\2FFyh#;Yevrh\2?}R]jmcW79X"lUgEUXf#n&`Rlszr_31Pyn@4act9#* X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 25 Nov 2008 22:04:03 -0500 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii I think the only remaining issues are: i) vc-arch does not apply any diff switches (arch's diff does not seem to accept many). ii) vc-cvs uses the switches in different ways depending on whether it needs to call cvs or not. iii) many backends don't append the various diff switches, as previously described in the behavior of vc-switches. From rgm@gnu.org Wed Dec 3 00:00:05 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-7.8 required=4.0 tests=AWL,BAYES_00,ONEWORD, RCVD_IN_DNSWL_MED,UNRESOLVED_TEMPLATE,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1384-done) by emacsbugs.donarmstrong.com; 3 Dec 2008 08:00:05 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mB3802Bv004521 for <1384-done@emacsbugs.donarmstrong.com>; Wed, 3 Dec 2008 00:00:03 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L7mdz-0005O3-0Y; Wed, 03 Dec 2008 02:59:35 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <18742.15462.814713.128649@fencepost.gnu.org> Date: Wed, 3 Dec 2008 02:59:34 -0500 From: Glenn Morris To: 1384-done@debbugs.gnu.org Subject: Re: Bug#1384 X-Attribution: GM X-Mailer: VM (www.wonderworks.com/vm), GNU Emacs (www.gnu.org/software/emacs) X-Hue: black X-Ran: _zsI;tyVKJ@{V(&.B),)TyjGGf(I3B]{Z7V-<[W=ugg[b3O@5ouv%:U\ZIU>%X_]P_LX+. X-Debbugs-No-Ack: yes I believe this is tidied up now. From unknown Fri Aug 15 02:03:02 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: $requester Subject: Internal Control Message-Id: bug archived. Date: Wed, 31 Dec 2008 15:24:04 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A log time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator