Annotate bug ?

[Olaf Conradi]

On Wed, May 17, 2006 at 11:24:43PM +0200, Olaf Conradi wrote:
> On Wed, May 17, 2006 at 09:23:59PM +0200, Goffredo Baroncelli wrote:
> > Hi all,
> > 
> > If I do on a "bzr.dev" repository
> > 
> > $ bzr annotate -r \ 
> > 	revid:robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc \
> > 	bzrlib/branch.py
> > 
> > I get
> > 
> > bzr: ERROR: Branch <bzrlib.store.revision.knit.KnitRevisionStore object at 
> > 0x2aaaad4b92d0> has no revision 
> > john at arbash-meinel.com-20050711044256-e3d166928db591af
> 
> Congratulations, you found the ghost revisions of 2005-07-11.
> 
>  -Olaf

OK, fixed it, somehow the indentation got misaligned.

I'll put it in my ancestry branch, with a test case.
But for your convenience I already attached the patch for you to try.

 -Olaf

-------------- next part --------------
=== modified file 'bzrlib/annotate.py'
--- bzrlib/annotate.py	
+++ bzrlib/annotate.py	
@@ -71,15 +71,15 @@
                     revno_str = str(rh.index(origin) + 1)
                 else:
                     revno_str = 'merge'
-            rev = branch.repository.get_revision(origin)
-            tz = rev.timezone or 0
-            date_str = time.strftime('%Y%m%d', 
-                                     time.gmtime(rev.timestamp + tz))
-            # a lazy way to get something like the email address
-            # TODO: Get real email address
-            author = rev.committer
-            try:
-                author = extract_email_address(author)
-            except BzrError:
-                pass        # use the whole name
+                rev = branch.repository.get_revision(origin)
+                tz = rev.timezone or 0
+                date_str = time.strftime('%Y%m%d', 
+                                         time.gmtime(rev.timestamp + tz))
+                # a lazy way to get something like the email address
+                # TODO: Get real email address
+                author = rev.committer
+                try:
+                    author = extract_email_address(author)
+                except BzrError:
+                    pass        # use the whole name
         yield (revno_str, author, date_str, origin, text)