From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#2157: 23.0.90; bzr support: vc-diff doesn't work with prefix argument on unchanged files Date: Wed, 4 Feb 2009 07:48:10 -0800 (PST) Message-ID: <200902041548.n14FmA2I015985@rodan.ics.uci.edu> References: <20090202100449.B94A5E4057@wilson.homeunix.com> <200902022005.n12K5jIx023982@rodan.ics.uci.edu> <87fxiwa83w.fsf@physik.rwth-aachen.de> <200902022237.n12MbtsC025843@rodan.ics.uci.edu> <87eiygezvn.fsf@physik.rwth-aachen.de> <200902040743.n147hXNJ010731@rodan.ics.uci.edu> <87vdrqli2i.fsf@physik.rwth-aachen.de> Reply-To: Dan Nicolaescu , 2157@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1233763531 10220 80.91.229.12 (4 Feb 2009 16:05:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Feb 2009 16:05:31 +0000 (UTC) Cc: 2157@emacsbugs.donarmstrong.com To: Torsten Bronger Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Feb 04 17:06:44 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 1LUkGl-00076t-Mn for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Feb 2009 17:06:32 +0100 Original-Received: from localhost ([127.0.0.1]:57266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUkFS-0007Kq-VW for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Feb 2009 11:05:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUkE1-0006kE-3s for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 11:03:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUkDv-0006hF-Lx for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 11:03:39 -0500 Original-Received: from [199.232.76.173] (port=49591 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUkDv-0006gx-9Z for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 11:03:35 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:40703) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LUkDt-0004TN-UB for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 11:03:34 -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 n14G3Vnk028922; Wed, 4 Feb 2009 08:03:31 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n14Ft4lK026681; Wed, 4 Feb 2009 07:55:04 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Dan Nicolaescu Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Wed, 04 Feb 2009 15:55:04 +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.123376252525319 (code B ref 2157); Wed, 04 Feb 2009 15:55:04 +0000 Original-Received: (at 2157) by emacsbugs.donarmstrong.com; 4 Feb 2009 15:48:45 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from barrelv2.ics.uci.edu (barrelv2.ics.uci.edu [128.195.1.114]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n14Fmhev025313 for <2157@emacsbugs.donarmstrong.com>; Wed, 4 Feb 2009 07:48:44 -0800 Original-Received: from rodan.ics.uci.edu (rodan.ics.uci.edu [128.195.6.9]) by barrelv2.ics.uci.edu (8.13.8+Sun/8.13.8) with ESMTP id n14FmATD000901; Wed, 4 Feb 2009 07:48:11 -0800 (PST) Original-Received: (from dann@localhost) by rodan.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id n14FmA2I015985; Wed, 4 Feb 2009 07:48:10 -0800 (PST) In-Reply-To: <87vdrqli2i.fsf@physik.rwth-aachen.de> (Torsten Bronger's message of "Wed, 04 Feb 2009 09:31:01 +0100") Original-Lines: 44 X-ICS-MailScanner-Information: Please contact the ISP for more information X-ICS-MailScanner-ID: n14FmATD000901 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@rodan.ics.uci.edu X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Wed, 04 Feb 2009 11:03:39 -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:24938 Archived-At: Torsten Bronger writes: > Hall=C3=B6chen! >=20 > Dan Nicolaescu writes: >=20 > > Torsten Bronger writes: > > > > [...] > > > >> By the way, bug#618 is probably related to this. Formerly, I had > >> missing revno in the modeline only in lightweight checkout, now I > >> have the same problem with all branches. Maybe the branch > >> metadata format has diverged too much for vc-bzr? > > > > Is this still a problem now? If it is and you can describe how to > > get a "lightweight checkout", it might be easy to fix. >=20 > It works for branches now but not for lightweight checkouts. You > get a lightweight checkout with "bzr checkout --leightweight". LCs > don't have the file ".bzr/branch/last-revision", so unless you can > get the revno info from another file (I don't think you can), you > have to fork a Bazaar process. It looks like the lightweight checkout contains a .bzr/branch/location file that is not present in a normal one. So that could be used to differentiate between the two, like here: --- vc-bzr.el.~1.74.~ Wed Feb 4 05:54:29 2009 +++ vc-bzr.el Wed Feb 4 07:43:07 2009 @@ -327,7 +327,12 @@ (lastrev-file (expand-file-name vc-bzr-admin-lastrev rootdir))) ;; This looks at internal files to avoid forking a bzr process. ;; May break if they change their format. - (if (file-exists-p branch-format-file) + (if (and=20 + (file-exists-p branch-format-file) + (not (file-exists-p=20 + (expand-file-name + (concat vc-bzr-admin-dirname + "/branch/location") rootdir)))) (with-temp-buffer (insert-file-contents branch-format-file) (goto-char (point-min))