From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: 23 branch - can't push - lock Date: Thu, 16 Jun 2011 23:09:39 +0300 Message-ID: <83aadhy1vg.fsf@gnu.org> References: <1C745F22-51D9-4FE6-A8EF-5D621109E656@gmail.com> <83boxxy9de.fsf@gnu.org> <65EAEB6A-294A-4B8F-8BCA-F37C5914E5D6@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1308259635 18605 80.91.229.12 (16 Jun 2011 21:27:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 16 Jun 2011 21:27:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Reitter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 16 23:27:11 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QXK5m-00081C-OE for ged-emacs-devel@m.gmane.org; Thu, 16 Jun 2011 23:27:10 +0200 Original-Received: from localhost ([::1]:38290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXK5l-0004Rw-TQ for ged-emacs-devel@m.gmane.org; Thu, 16 Jun 2011 17:27:10 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXIv1-0005NS-H2 for emacs-devel@gnu.org; Thu, 16 Jun 2011 16:12:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QXIuz-0004bx-SY for emacs-devel@gnu.org; Thu, 16 Jun 2011 16:11:59 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:37141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QXIuz-0004bj-Dm for emacs-devel@gnu.org; Thu, 16 Jun 2011 16:11:57 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0LMW00200FQTGC00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Thu, 16 Jun 2011 23:11:42 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.126.164.125]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LMW0023CG3EA290@a-mtaout21.012.net.il>; Thu, 16 Jun 2011 23:11:39 +0300 (IDT) In-reply-to: <65EAEB6A-294A-4B8F-8BCA-F37C5914E5D6@gmail.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:140573 Archived-At: > From: David Reitter > Date: Thu, 16 Jun 2011 13:44:46 -0400 > Cc: emacs-devel@gnu.org > > How do I tell it's a local lock? I don't have /srv/bzr. Then I was mistaken, and it's not local. I assume that when you said "there's a lock", you had evidence there indeed was a lock. > I thought that was on the server. No, I didn't do C-c. I have since pushed to bzr+ssh, so perhaps the problem was one of authentication, and really just permissions on the server. Maybe. I always use bzr+ssh. > dr@elin:~/Projects/emacs/emacs-23 $ time bzr log >/dev/null > real 0m33.780s Why in the world would you need the log of all the 104K revisions? Btw, I suggest to set up a bzr alias so that "log" is actually "log --line", it's much more concise and faster, too. > First page only: > real 0m3.594s [faster when repeated,i.e., in cache] What kind of machine is that? On my 6-year-old Windows box with a single 3 GHz core, I get this: D:\gnu\bzr\emacs\trunk>timep bzr --no-plugins log -l40 > nul real 00h00m00.437s user 00h00m00.343s sys 00h00m00.078s D:\gnu\bzr\emacs\trunk>timep bzr log -l40 > nul real 00h00m00.812s user 00h00m00.500s sys 00h00m00.281s And anyway, 3.5 sec is hardly significantly different from 0.8, for producing something that a human needs to _read_. > dr@elin:~/em23 emacs23$ time git log >/dev/null > real 0m5.427s Irrelevant. But OTOH, this is _very_ relevant for my work on the display engine: D:\gnu\bzr\emacs\trunk>timep bzr annotate src/xdisp.c > nul real 00h01m23.421s user 00h01m18.734s sys 00h00m03.046s eliz@fencepost:~/git/emacs$ time git annotate src/xdisp.c > /dev/null real 8m28.865s user 7m45.490s sys 0m6.090s (The second timing is from fencepost.gnu.org, a multicore x86_64 server that is much faster than what I have here.) > The merge of a single revision (-c) also took a long time. How long is "long" in this case? (You can look it up in your ~/.bzr.log file, it logs the time and network throughput/speed of each command, something I've searched high and low in git and couldn't find.)