From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Mike Mattie Newsgroups: gmane.emacs.devel Subject: Re: vc-bzr sha1sum dependency patch #2 Date: Wed, 13 May 2009 22:25:41 -0700 Message-ID: <20090514052539.GA6203@reforged.homenet> References: <20090423193557.GA6117@reforged> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="UugvWAfsgieZRqgk" X-Trace: ger.gmane.org 1242278955 6116 80.91.229.12 (14 May 2009 05:29:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 14 May 2009 05:29:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 14 07:29:07 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1M4TVC-0000Vh-3t for ged-emacs-devel@m.gmane.org; Thu, 14 May 2009 07:29:06 +0200 Original-Received: from localhost ([127.0.0.1]:47559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M4TVB-0002N9-GM for ged-emacs-devel@m.gmane.org; Thu, 14 May 2009 01:29:05 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M4TS4-0001Nr-Ur for emacs-devel@gnu.org; Thu, 14 May 2009 01:25:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M4TRz-0001LM-Ke for emacs-devel@gnu.org; Thu, 14 May 2009 01:25:51 -0400 Original-Received: from [199.232.76.173] (port=35397 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M4TRz-0001LB-4g for emacs-devel@gnu.org; Thu, 14 May 2009 01:25:47 -0400 Original-Received: from wa-out-1112.google.com ([209.85.146.181]:32178) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M4TRy-0006pt-Mv for emacs-devel@gnu.org; Thu, 14 May 2009 01:25:46 -0400 Original-Received: by wa-out-1112.google.com with SMTP id m34so351255wag.26 for ; Wed, 13 May 2009 22:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=xMe2PtJxjla3hpYE5kaQ1bMr6XQLHVcQL8DBoasN1Ho=; b=GOOoO9wX6nr9sZ1BRx+gHx29lgmwaoxEUuXEk1TbSrc3ffzE0/8KN2a6ph8Pirdpf2 dnIBZ8BXjEuFOUyDb/JQUUJM345unQf3wKKl6tZJJxbOrp48VyRnSD4xTJkBXb5Ryuda OIRT1J/0VDm68UhUh5hbgfl4Dp10fxHrrklJQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=ip+ZHLDRbd4O73IcwnJpYHra2dwQnN1uq8eSgcWKqDx/VSRXxJmxQn+g3o2s+FF4iS NjiUaJVOq/bcKJV2xEJ+ilBXFpoY3R3Wb4VmmW8D5Ox4pll/rbYD96OVBxaMaOhvTfoa bvlDC4oHJPXDzfNsMxaWJ4/OgO3FvjnWrqMsI= Original-Received: by 10.115.92.2 with SMTP id u2mr1596020wal.137.1242278745588; Wed, 13 May 2009 22:25:45 -0700 (PDT) Original-Received: from reforged.homenet ([66.235.1.45]) by mx.google.com with ESMTPS id m34sm599221waf.60.2009.05.13.22.25.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 May 2009 22:25:44 -0700 (PDT) Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-09) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:110866 Archived-At: --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I tested your patch and it worked fine. Your patch is a far better solution than mine in all respects. My thumb's up for applying it. On Wed, May 06, 2009 at 11:20:01PM -0400, Stefan Monnier wrote: > > Here is a corrected version of the patch I sent in the message vc-bzr s= ha1sum dependency >=20 > Can you test the patch below instead? >=20 >=20 > Stefan >=20 >=20 > --- vc-bzr.el.~1.77.~ 2009-04-08 20:09:55.000000000 -0400 > +++ vc-bzr.el 2009-05-06 23:19:06.000000000 -0400 > @@ -143,7 +143,7 @@ > =20 > (defun vc-bzr-state-heuristic (file) > "Like `vc-bzr-state' but hopefully without running Bzr." > - ;; `bzr status' is excrutiatingly slow with large histories and > + ;; `bzr status' was excrutiatingly slow with large histories and > ;; pending merges, so try to avoid using it until they fix their > ;; performance problems. > ;; This function tries first to parse Bzr internal file > @@ -158,8 +158,7 @@ > ;; This looks at internal files. May break if they change > ;; their format. > (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate ro= ot))) > - (if (not (file-readable-p dirstate)) > - (vc-bzr-state file) ; Expensive. > + (condition-case nil > (with-temp-buffer > (insert-file-contents dirstate) > (goto-char (point-min)) > @@ -201,7 +200,13 @@ > (vc-bzr-sha1 file))) > 'up-to-date) > (t 'edited)) > - 'unregistered))))))))) > + 'unregistered)))) > + ;; Either the dirstate file can't be read, or the sha1 > + ;; executable is missing, or ... > + ;; In either case, recent versions of Bzr aren't that slow > + ;; any more. > + (error (vc-bzr-state file))))))) > + > =20 > (defun vc-bzr-registered (file) > "Return non-nil if FILE is registered with bzr." --=20 GnuPG Key: B9012279 is available from HKP server pgp.mit.edu --UugvWAfsgieZRqgk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEABECAAYFAkoLq1MACgkQdfRchrkBInkOAQCfa/mtGd13JQLUFOCq7y2wH2yd WaQAoIx42tWhXl4fCjze0uu/PPEpW0x9 =ckHV -----END PGP SIGNATURE----- --UugvWAfsgieZRqgk--