Merge lp:~maxb/bzr-svn/fetch-svn-rev-info-progress-bar into lp:bzr-svn/1.0

[Max Bowsher]

Fix the 'fetching svn revision info' progress display to give the accurate count of revisions that bzr-svn has planned to fetch, instead of just displaying the number of revisions in the remote svn repository, some of which bzr-svn may have already fetched info for previously.

[lp:~maxb/bzr-svn/fetch-svn-rev-info-progress-bar]

3326. By Max Bowsher on 2010-07-21

Fix off-by-one in progress bar calculation, and explain why.

3327. By Max Bowsher on 2010-07-30

Merge trunk.

=== modified file 'logwalker.py'
--- logwalker.py	2010-07-30 20:07:38 +0000
+++ logwalker.py	2010-07-30 22:52:43 +0000
@@ -280,9 +280,16 @@
         else:
             todo_revprops = ["svn:author", "svn:log", "svn:date"]
 
+        # Define this variable in this scope, it will be filled in below
+        total_revs_to_fetch = None
+
+        # Container list allows mutability from the inner scope
+        number_of_fetched_revs = [0]
+
         def rcvr(orig_paths, revision, revprops, has_children=None):
+            number_of_fetched_revs[0] += 1
             nested_pb.update('fetching svn revision info',
-                             to_revnum - revision, to_revnum)
+                             number_of_fetched_revs[0], total_revs_to_fetch)
             self.cache.insert_paths(revision, orig_paths)
             self.cache.insert_revprops(revision, revprops,
                                        todo_revprops is None)
@@ -297,18 +304,25 @@
         else:
             nested_pb = pb
 
+        if self.saved_minrevnum is None:
+            self.saved_minrevnum = 0
+
         try:
-            nested_pb.update('fetching svn revision info', 0, to_revnum)
             try:
+                # The get_log bounds are inclusive at both ends, so the total
+                # number of revisions requested is A - B + 1:
+                total_revs_to_fetch = to_revnum - self.saved_revnum + 1
                 # Try to keep the cache consistent by closing any holes early
                 # in the history
-                if self.saved_minrevnum is None:
-                    self.saved_minrevnum = 0
-                elif self.saved_minrevnum != 0:
+                if self.saved_minrevnum != 0:
+                    total_revs_to_fetch += self.saved_minrevnum + 1
+                    nested_pb.update('fetching svn revision info', 0, total_revs_to_fetch)
                     self.mutter("get_log %d->%d", self.saved_minrevnum, 0)
                     self.actual._transport.get_log(rcvr, [""],
                         self.saved_minrevnum, 0, 0, True, True, False,
                         todo_revprops)
+                else:
+                    nested_pb.update('fetching svn revision info', 0, total_revs_to_fetch)
                 self.mutter("get_log %d->%d", to_revnum, self.saved_revnum)
                 self.actual._transport.get_log(rcvr, [""], to_revnum,
                     self.saved_revnum, 0, True, True, False, todo_revprops)