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: Wed, 04 Feb 2009 18:09:30 +0100 Organization: Phoenix Foundation Message-ID: <87r62egmd1.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> <87eiygezvn.fsf@physik.rwth-aachen.de> <200902040743.n147hXNJ010731@rodan.ics.uci.edu> <87vdrqli2i.fsf@physik.rwth-aachen.de> <200902041548.n14FmA2I015985@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 1233768318 28548 80.91.229.12 (4 Feb 2009 17:25:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Feb 2009 17:25:18 +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 Wed Feb 04 18:26:32 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 1LUlW2-00007i-75 for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Feb 2009 18:26:22 +0100 Original-Received: from localhost ([127.0.0.1]:58982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUlUj-00069d-0F for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 Feb 2009 12:25:01 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LUlTM-0005DP-Jq for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 12:23:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LUlTK-0005Bb-QS for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 12:23:35 -0500 Original-Received: from [199.232.76.173] (port=59182 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LUlTK-0005BX-GD for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 12:23:34 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:51174) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LUlTK-0000dz-0a for bug-gnu-emacs@gnu.org; Wed, 04 Feb 2009 12:23: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 n14HNVHZ017253; Wed, 4 Feb 2009 09:23:32 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n14HF3Tc014996; Wed, 4 Feb 2009 09:15:03 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Torsten Bronger Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Wed, 04 Feb 2009 17:15:03 +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.123376737613662 (code B ref 2157); Wed, 04 Feb 2009 17:15:03 +0000 Original-Received: (at 2157) by emacsbugs.donarmstrong.com; 4 Feb 2009 17:09:36 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mta-2.ms.rz.rwth-aachen.de (mta-2.ms.rz.RWTH-Aachen.DE [134.130.7.73]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n14H9WLr013650 for <2157@emacsbugs.donarmstrong.com>; Wed, 4 Feb 2009 09:09:33 -0800 Original-Received: from ironport-out-1.rz.rwth-aachen.de ([134.130.5.40]) by mta-2.ms.rz.RWTH-Aachen.de (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008)) with ESMTP id <0KEJ00DFIWZVM380@mta-2.ms.rz.RWTH-Aachen.de> for 2157@emacsbugs.donarmstrong.com; Wed, 04 Feb 2009 18:09:31 +0100 (CET) X-IronPort-AV: E=Sophos;i="4.37,380,1231110000"; d="scan'208";a="415759" Original-Received: from relay-2.ms.rz.rwth-aachen.de (HELO relay.rwth-aachen.de) ([134.130.7.75]) by ironport-in-1.rz.rwth-aachen.de with ESMTP; Wed, 04 Feb 2009 18:09:32 +0100 Original-Received: from wilson (xdsl-87-79-134-254.netcologne.de [87.79.134.254]) by relay.rwth-aachen.de (8.13.8+Sun/8.13.8/1) with ESMTP id n14H9Vr8010996; Wed, 04 Feb 2009 18:09:31 +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= User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Wed, 04 Feb 2009 12:23:35 -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:24944 Archived-At: Hall=F6chen! Dan Nicolaescu writes: > [...] > > 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)) This probably works, however, even better is to check whether the "location" starts with "file://" and then look there. Maybe one can just call the function recursively just with another "file" parameter (must "file" exist actually?). If "location" doesn't start with "file://", do the fallback. The Bazaar documentation explicitly says that lightweight checkouts should be done only locally. For example, you can use them to switch efficiently between locally stored branches. Therefore, one can expect "file://" in most cases indeed. I use to have many files open (40+), and when I start Emacs, I can see a significant CPU usage of bzr processes now, thus my concern. Tsch=F6, Torsten. --=20 Torsten Bronger, aquisgrana, europa vetus Jabber ID: torsten.bronger@jabber.rwth-aachen.de