From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Torsten Bronger Newsgroups: gmane.emacs.bugs Subject: bug#2157: 23.0.90; bzr support: vc-diff doesn't work with prefix argument on unchanged files Date: Tue, 03 Feb 2009 08:48:30 +0100 Organization: Phoenix Foundation Message-ID: <87eiygq7u9.fsf@physik.rwth-aachen.de> References: <20090202100449.B94A5E4057@wilson.homeunix.com> <200902022005.n12K5jIx023982@rodan.ics.uci.edu> <87fxiwa83w.fsf@physik.rwth-aachen.de> <200902022237.n12MbtsC025843@rodan.ics.uci.edu> Reply-To: Torsten Bronger , 2157@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1233648447 13645 80.91.229.12 (3 Feb 2009 08:07:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Feb 2009 08:07:27 +0000 (UTC) Cc: 2157@emacsbugs.donarmstrong.com To: Dan Nicolaescu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 03 09:08:41 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LUGKl-0006sg-NZ for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Feb 2009 09:08:40 +0100 Original-Received: from localhost ([127.0.0.1]:42320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUGJS-0000i4-Sl for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Feb 2009 03:07:18 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUGJO-0000hz-U5 for bug-gnu-emacs@gnu.org; Tue, 03 Feb 2009 03:07:14 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUGJM-0000hn-6C for bug-gnu-emacs@gnu.org; Tue, 03 Feb 2009 03:07:13 -0500 Original-Received: from [199.232.76.173] (port=36106 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUGJM-0000hk-1k for bug-gnu-emacs@gnu.org; Tue, 03 Feb 2009 03:07:12 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:20546) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LUGJL-0006K4-7U for bug-gnu-emacs@gnu.org; Tue, 03 Feb 2009 03:07:11 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LUGJK-0002jo-Gr for bug-gnu-emacs@gnu.org; Tue, 03 Feb 2009 03:07:10 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n1383VpX031402; Tue, 3 Feb 2009 00:03:31 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n137t5TL029264; Mon, 2 Feb 2009 23:55:05 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Torsten Bronger Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Tue, 03 Feb 2009 07:55:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 2157 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 2157-submit@emacsbugs.donarmstrong.com id=B2157.123364732027820 (code B ref 2157); Tue, 03 Feb 2009 07:55:05 +0000 Original-Received: (at 2157) by emacsbugs.donarmstrong.com; 3 Feb 2009 07:48:40 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mta-1.ms.rz.rwth-aachen.de (mta-1.ms.rz.RWTH-Aachen.DE [134.130.7.72]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n137mXal027809 for <2157@emacsbugs.donarmstrong.com>; Mon, 2 Feb 2009 23:48:34 -0800 Original-Received: from ironport-out-1.rz.rwth-aachen.de ([134.130.5.40]) by mta-1.ms.rz.RWTH-Aachen.de (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008)) with ESMTP id <0KEH00IOTCCW9Z00@mta-1.ms.rz.RWTH-Aachen.de> for 2157@emacsbugs.donarmstrong.com; Tue, 03 Feb 2009 08:48:32 +0100 (CET) X-IronPort-AV: E=Sophos;i="4.37,371,1231110000"; d="scan'208";a="193339" Original-Received: from relay-1.ms.rz.rwth-aachen.de (HELO relay.rwth-aachen.de) ([134.130.7.74]) by ironport-in-1.rz.rwth-aachen.de with ESMTP; Tue, 03 Feb 2009 08:48:33 +0100 Original-Received: from wilson (xdsl-87-78-66-145.netcologne.de [87.78.66.145]) by relay.rwth-aachen.de (8.13.8+Sun/8.13.8/1) with ESMTP id n137mWgU007482; Tue, 03 Feb 2009 08:48:32 +0100 (CET) X-PGP-Fingerprint: C5C8 D6E2 79D2 EFE9 8C0F 6D77 D5E3 CEFC 9F51 6B77 X-PGP-Affinity: will accept encrypted message for GPG X-Home-Page: http://www.wikipedia.org/wiki/User:Bronger X-Binford: 6100 (more power) X-Accept-Language: de, en Jabber-ID: torsten.bronger@jabber.rwth-aachen.de Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAHlBMVEWVTEMoFxP8/Pnw4Nn8 tqbbi3ju7eqxc2XlqJjz8u/LYySDAAACVElEQVR4nF2UMW/bMBCFqUEluokIUGf21i1xArTd ilZBM6pICGpMa0C2NiYuQXdrDBNlt0IGDOvf9h1JKUJv0MBPd+/ueEfW9mSPYrTZYk7GwvlK TOw8gradOjD67CLA+SmdkmVCnI2hLoUoGOOWDD6zAJoQqWA4k2QKLovkcUQUbo2svfdS6ihC HpBgOJeeTCohnpLHShQccfy+LL13iPU6gb8ACFTCbgM4S+ABkaTcl5FMwFrwAK6JEHiVwEkw Q+DqKoFB45BA+fk6gqeU7jH7T2M3Vl5wWSeArIpuaOIzgE8ABc6GJr4PoBxANna3yhizdcwK zcqKTQQHzTJ0fUv/o+3mkeUD0Bl6DXKT4bK41rwL4gCMfPKywg0ao60l0LQHC8AKm5fKMMtl xe33AJZGc5Ybacq6/u2MrIyKHq3VdNk197WTpnaVMqHyplUahXvHHe5wj9JtAs0XTfUpHvvl FB/AOyTvXRXBrbRym8AJoJY6d/KeSrdqkzTeKmp7ZaARJOynBLoTg3q1dTK03d7NU6i2R3yv f9yQhgvJRo++/wVQ5dJSUnYzHz2OAFJxW1Mo+3MCPoZJN94jKb17Af1FGPbaY6zVBDTHFdpr 7/e3tAZT0KwZtd7SzCu2eAHtEqFoo1CjnYKm0Rwu+N8pzf50E3DBQyzsE8veYHBGsEZTJDws bv+877shq+ah4FuPrYESRrfr5l30aJ8x8J6KKCztOYJFsBQFbZvUGa+w8+28Sxp4SzBYXEOJ Xo/iwyD+jd4LehyMDI8HSASXBKhA+TW9Tf4fSktOMtuPmUoAAAAASUVORK5CYII= In-reply-to: <200902022237.n12MbtsC025843@rodan.ics.uci.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (gnu/linux) X-detected-kernel: by mx20.gnu.org: Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Resent-Date: Tue, 03 Feb 2009 03:07:13 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:24887 Archived-At: Hall=F6chen! Dan Nicolaescu writes: > [...] > > This shows that (vc-working-revision > "/home/bronger/src/chantal/current/chantal/samples/remote_client/la2chant= al.py") > > returns nil. So probably for some reason > (vc-bzr-working-revision > "/home/bronger/src/chantal/current/chantal/samples/remote_client/la2chant= al.py") > > returns nil. Can you try to debug why that happens? I removed the interpretation of the meta data and fork a bzr process always by pruning the routine to: (defun vc-bzr-working-revision (file) ;; Together with the code in vc-state-heuristic, this makes it possible ;; to get the initial VC state of a Bzr file even if Bzr is not installed. (lexical-let* ((rootdir (vc-bzr-root file)) (branch-format-file (expand-file-name vc-bzr-admin-branch-format-file rootdir)) (revhistory-file (expand-file-name vc-bzr-admin-revhistory rootdir)) (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir))) (lexical-let* ((result (vc-bzr-command-discarding-stderr vc-bzr-program "revno" (file-relative-name file))) (exitcode (car result)) (output (cdr result))) (cond ((eq exitcode 0) (substring output 0 -1)) (t nil))))) This works perfectly, i.e. I see revision numbers always (even for lightweight checkouts) and it solves this bug. However, it is a lazy and provisional solution because it's much less efficient. Tsch=F6, Torsten. --=20 Torsten Bronger, aquisgrana, europa vetus Jabber ID: torsten.bronger@jabber.rwth-aachen.de