Re: 23 branch - can't push - lock

[David Reitter]

On Jun 16, 2011, at 4:09 PM, Eli Zaretskii wrote:
>> 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:

Core i7, 2.6GHz, 4GB RAM. 

> And anyway, 3.5 sec is hardly significantly different from 0.8, for
> producing something that a human needs to _read_.

Actually, I disagree.  A modern interface should not make the user wait that 
long - I would estimate anything beyond 30ms is discernible, and anything 
beyond 1s may be seen as interrupting someone's workflow.
At some point, people (perhaps including you) did an awesome job making Emacs 
start up fast.   I have had many complaints from Aquamacs users because it 
didn't start up as fast (loading a few more libraries, etc) - and we're talking 
3-4 seconds here.

Just getting the first pages of a log should happen instantly - this is an 
operation one does all the time.  I'd find the timing you get acceptable, but 
mine is just sluggish.
(And I agree, vc-annotate should also be reasonably fast, even though I'd 
accept a few seconds delay 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.)

I started out with the wrong command, "bzr merge -c 104024", because I thought 
that the revision ID is unique (sorry, Git thinking).  It took 65 seconds to 
give me an error message!
And the wording of the error message wasn't even very user-level:

InvalidRevisionSpec: Requested revision: u'104024' does not exist in branch: 
BzrBranch7('file:///Users/dr/Projects/emacs/emacs-23/')

Then I did the right thing, and it took 112 seconds (see below).

> Thu 2011-06-16 11:07:41 -0400
> 0.070  bazaar version: 2.1.0
> 0.070  bzr arguments: [u'merge', u'-c', u'104024', u'../trunk']
> 0.084  looking for plugins in /Users/dr/.bazaar/plugins
> 0.138  looking for plugins in /Library/Python/2.6/site-packages/bzrlib/plugins
> 0.282  Returning RevisionSpec RevisionSpec_before for before:104024
> 0.283  encoding stdout as sys.stdout encoding 'us-ascii'
> 0.396  opening working tree '/Users/dr/Projects/emacs/emacs-23'
> [64363] 2011-06-16 11:09:25.819 INFO:  M  src/ChangeLog
> [64363] 2011-06-16 11:09:25.885 INFO:  M  src/nsmenu.m
> [64363] 2011-06-16 11:09:25.885 WARNING: Text conflict in src/ChangeLog
> [64363] 2011-06-16 11:09:25.885 WARNING: Text conflict in src/nsmenu.m
> [64363] 2011-06-16 11:09:31.749 INFO: 2 conflicts encountered.
> 112.112  Transferred: 0KiB (0.0K/s r:0K w:0K)
> 112.112  return code 1

I updated Bazaar after that to 2.3.1, and did the same merge a second time 
(this one may be much easier for Bzr now - I don't know).
It still took 20 seconds.    That's sluggish in my book.  
Is there a way to reset a branch to a previous commit, i.e., the equivalent of 
"git reset --hard"?  Then I could test this better.

With --no-plugins, the time is cut in half.  Better, but still sluggish.  I'll 
see if I can eliminate some plugins if they hurt performance so much.  Thanks 
for this hint.