Rev 2115: Save memory, improve progress bars. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2115
revision-id: jelmer at samba.org-20081130232728-r0hhlpwq3t6747bi
parent: jelmer at samba.org-20081130231727-vzx3kcj83tkmdztd
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-12-01 00:27:28 +0100
message:
  Save memory, improve progress bars.
modified:
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'convert.py'
--- a/convert.py	2008-11-30 21:12:30 +0000
+++ b/convert.py	2008-11-30 23:27:28 +0000
@@ -220,6 +220,7 @@
         try:
             for kind, item in it:
                 if kind == "revision":
+                    pb.update("finding branches", to_revnum-item.revnum, to_revnum-from_revnum)
                     if (not item.branch_path in existing_branches and 
                         layout.is_branch(item.branch_path, project=project) and 
                         not contains_parent_path(deleted, item.branch_path)):
@@ -237,7 +238,7 @@
                   inter._supports_revmetas):
                 # TODO: Skip revisions in removed branches unless all=True
                 revmetas = revfinder.find_iter(filter_revisions(it_rev), 
-                                               mapping)
+                                                   mapping)
                 inter.fetch(needed=revmetas)
             elif all:
                 inter.fetch()

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-11-30 22:17:51 +0000
+++ b/logwalker.py	2008-11-30 23:27:28 +0000
@@ -476,7 +476,7 @@
 
             for (changed_paths, revnum, known_revprops, has_children) in iterator:
                 if pb is not None:
-                    pb.update("determining changes", from_revnum-revnum, from_revnum)
+                    pb.update("determining changes", from_revnum-revnum, from_revnum-to_revnum)
                 if revnum == 0 and changed_paths is None:
                     revpaths = changes.REV0_CHANGES
                 elif isinstance(changed_paths, dict):

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-11-30 23:17:27 +0000
+++ b/revmeta.py	2008-11-30 23:27:28 +0000
@@ -765,6 +765,7 @@
                 revmeta = process_new_rev(bp, mb, revnum, paths, revprops)
                 yield "revision", revmeta
             self._last_revnum = revnum
+            del metabranches_history[revnum]
     
         # Make sure commit 0 is processed
         if self.to_revnum == 0 and self.layout.is_branch_or_tag("", project):