[MERGE] Re: ProgressTask UserWarning branching stacked->unstacked

Tue Jan 27 17:01:49 GMT 2009

On Mon, 2009-01-26 at 15:00 -0600, John Arbash Meinel wrote:
> This should be happening any time you push using the generic fetch code.
> 
> Martin added some code, such that if you create a nested progress bar,
> and then call ".update()" on the parent, it issues the warning you saw.
> 
> And it turns out that the generic fetching code was creating a nested
> progress bar that it never used.
> 
> The attached patch should prevent the warning.
bb:approve

Cheers,

Jelmer

> 
> Colin D Bennett wrote:
> > When I branch from a stacked standalone tree (format 1.9) to a
> > non-stacked standalone tree, I get a UserWarning:
> > 
> > 
> > bugtest1 $ mkdir branch1
> > bugtest1 $ cd branch1
> > bugtest1/branch1 $ bzr init --1.9
> > Created a standalone tree (format: 1.9)                                             
> > bugtest1/branch1 $ echo Hello > World
> > bugtest1/branch1 $ bzr add World
> > added World
> > bugtest1/branch1 $ bzr ci -m 'World added'
> > Committing to: /home/cdb/tmp/bugtest1/branch1/                                      
> > added World
> > Committed revision 1.                                                               
> > bugtest1/branch1 $ cd ..
> > bugtest1 $ bzr branch --stacked branch1 feature1
> > Created new stacked branch referring to file:///home/cdb/tmp/bugtest1/branch1/.     
> > bugtest1 $ bzr branch feature1 feature1copy
> > /home/cdb/bin/bzr.dev/bzrlib/ui/text.py:96: UserWarning: ProgressTask(1/3, msg='fetch inventory') is not the top progress task ProgressTask(None/None, msg='')
> >   (task, self._task_stack[-1]))
> > /home/cdb/bin/bzr.dev/bzrlib/ui/text.py:96: UserWarning: ProgressTask(2/3, msg='fetch inventory') is not the top progress task ProgressTask(None/None, msg='')
> >   (task, self._task_stack[-1]))
> > Branched 1 revision(s).                                                             
> > 
> > 
> > I am using bzr.dev revision: 3959
> > revid: pqm at pqm.ubuntu.com-20090126115928-bzzqlmw316iv8o3k
> > 
> > Regards,
> > Colin
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Cygwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
> 
> iEYEARECAAYFAkl+JGYACgkQJdeBCYSNAANn/ACfTpYbb03o6eL1LVEQRfjjGwMh
> hSkAn3qfJMeLpX7Wvw55C4eELTb9xWyU
> =D2m0
> -----END PGP SIGNATURE-----
> plain text document attachment (1.12-progress-warning.patch)
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: john at arbash-meinel.com-20090126205756-wh552ozttirfo2m9
> # target_branch: http://bazaar-vcs.org/bzr/bzr.dev
> # testament_sha1: 95386b7000e935bc9e6b962239cca100217fa550
> # timestamp: 2009-01-26 14:59:53 -0600
> # source_branch: lp:///~jameinel/bzr/1.12-progress-warnings
> # base_revision_id: pqm at pqm.ubuntu.com-20090126181248-yl5ctbxc3y6nu9m4
> # 
> # Begin patch
> === modified file 'bzrlib/fetch.py'
> --- bzrlib/fetch.py	2008-12-02 05:11:07 +0000
> +++ bzrlib/fetch.py	2009-01-26 20:57:56 +0000
> @@ -232,23 +232,19 @@
>      def _fetch_inventory_weave(self, revs, pb):
>          pb.update("fetch inventory", 0, 2)
>          to_weave = self.to_repository.inventories
> -        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
> -        try:
> -            # just merge, this is optimisable and its means we don't
> -            # copy unreferenced data such as not-needed inventories.
> -            pb.update("fetch inventory", 1, 3)
> -            from_weave = self.from_repository.inventories
> -            pb.update("fetch inventory", 2, 3)
> -            # we fetch only the referenced inventories because we do not
> -            # know for unselected inventories whether all their required
> -            # texts are present in the other repository - it could be
> -            # corrupt.
> -            to_weave.insert_record_stream(from_weave.get_record_stream(
> -                [(rev_id,) for rev_id in revs],
> -                self.to_repository._fetch_order,
> -                not self.to_repository._fetch_uses_deltas))
> -        finally:
> -            child_pb.finished()
> +        # just merge, this is optimisable and its means we don't
> +        # copy unreferenced data such as not-needed inventories.
> +        pb.update("fetch inventory", 1, 3)
> +        from_weave = self.from_repository.inventories
> +        pb.update("fetch inventory", 2, 3)
> +        # we fetch only the referenced inventories because we do not
> +        # know for unselected inventories whether all their required
> +        # texts are present in the other repository - it could be
> +        # corrupt.
> +        to_weave.insert_record_stream(from_weave.get_record_stream(
> +            [(rev_id,) for rev_id in revs],
> +            self.to_repository._fetch_order,
> +            not self.to_repository._fetch_uses_deltas))
>  
>      def _fetch_revision_texts(self, revs, pb):
>          # fetch signatures first and then the revision texts
> 
> # Begin bundle
> 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
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090127/9f03f629/attachment.pgp