[BUG][PATCH] fileid_involved fails to unescape xml characters

[John Arbash Meinel]

Martin Pool wrote:
> On 19 Jan 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> 
>>Wouldn't it work to just change the order to:
>>
>>            revs = self._revids_to_fetch(last_revision )
>>            # nothing to do
>>            if revs:
>>                self._fetch_weave_texts( revs )
>>                self._fetch_inventory_weave( revs )
>>                self._fetch_revision_texts( revs )
>>                self.count_copied += len(revs)
>>
>>It seems like that would not violate the invariant.
> 
> 
> Yes that will do it. 
> 
> And it seems like you could still use the same approach for the
> optimization.
> 
> I'm still going to leave the weave-peeking optimization out of 0.7 and
> put it in with these fixes to bzr.dev.
> 
> 
>>I'm also wondering how we missed that.
> 
> 

I would really like to commit this into at least jam-integration as a
stop-gap. Can someone give me a +1?

=== modified file 'bzrlib/fetch.py'
--- bzrlib/fetch.py
+++ bzrlib/fetch.py
@@ -111,9 +111,9 @@
             revs = self._revids_to_fetch(last_revision )
             # nothing to do
             if revs:
-                self._fetch_revision_texts( revs )
                 self._fetch_weave_texts( revs )
                 self._fetch_inventory_weave( revs )
+                self._fetch_revision_texts( revs )
                 self.count_copied += len(revs)
         finally:
             self.from_branch.unlock()

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060120/94ab6d06/attachment.pgp