Rev 9: Do some more locking. in file:///data/jelmer/bzr-global-log/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-global-log/trunk/

------------------------------------------------------------
revno: 9
revision-id:jelmer at samba.org-20071120175826-hyfpisxns5w595kh
parent: jelmer at samba.org-20071105042458-8n8cy01vujomehzr
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2007-11-20 18:58:26 +0100
message:
  Do some more locking.
modified:
  IDEAS                          ideas-20071103220320-a6g5upkxb8l0nyqt-1
  __init__.py                    __init__.py-20071029004222-avdgq0mc7n1q6q8f-1
=== modified file 'IDEAS'
--- a/IDEAS	2007-11-05 01:48:51 +0000
+++ b/IDEAS	2007-11-20 17:58:26 +0000
@@ -1,4 +1,4 @@
-- use bzr-stats plugin to group different authors
-- support log-author command
 - support recursively specifying branches on the command-line
 - eliminate revisions that have the "rebase-of" revision property set
+- easier way to specify branch list
+- aliases list

=== modified file '__init__.py'
--- a/__init__.py	2007-11-05 04:24:58 +0000
+++ b/__init__.py	2007-11-20 17:58:26 +0000
@@ -37,8 +37,12 @@
                       location_list.index(location),
                       len(location_list))
             branch = Branch.open(location)
-            repos.add(branch.repository)
-            revids.update(branch.repository.get_ancestry(branch.last_revision()))
+            branch.lock_read()
+            try:
+                repos.add(branch.repository)
+                revids.update(branch.repository.get_ancestry(branch.last_revision()))
+            finally:
+                branch.unlock()
     finally:
         pb.finished()
 
@@ -65,6 +69,8 @@
         else:
             repository = SimpleStackingRepository()
 
+        repository.lock_read()
+
         revids, repos = gather_revids(location_list)
 
         for repo in repos:
@@ -73,7 +79,9 @@
         from bzrlib.plugins.stats import (sort_by_committer, collapse_by_author,
                                           display_info)
 
+        repository.lock_read()
         info = collapse_by_author(sort_by_committer(repository, revids))
+        repository.unlock()
         display_info(info, self.outf)
 
 
@@ -107,6 +115,7 @@
 
         revs = set()
         pb = ui.ui_factory.nested_progress_bar()
+        repository.lock_read()
         try:
             count = 0
             for rev in repository.get_revisions(revids):
@@ -115,6 +124,7 @@
                 count += 1
         finally:
             pb.finished()
+            repository.unlock()
 
         if log_format is None:
             log_format = LineLogFormatter