← Back to branch summary

~doxxx/qbzr/qconflicts-cmdline-splitting

« back to all changes in this revision

Viewing changes to lib/loggraphprovider.py

  • Committer: Gary van der Merwe
  • Date: 2010-06-24 09:39:24 UTC
  • mfrom: (1190.1.48 bug585280)
  • Revision ID: garyvdm@gmail.com-20100624093924-0943kzq1astxzvef
https://launchpad.net/bugs/585280
qlog: Lock tree when looking for directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/loggraphprovider.py
857
857
            if tree is None:
858
858
                tree = bi.branch.basis_tree()
859
859
            
860
 
            self.has_dir = False
861
 
            for fileid in self.fileids:
862
 
                if tree.kind(fileid) in ('directory', 'tree-reference'):
863
 
                    self.has_dir = True
864
 
                    break
 
860
            tree.lock_read()
 
861
            try:
 
862
                self.has_dir = False
 
863
                for fileid in self.fileids:
 
864
                    if tree.kind(fileid) in ('directory', 'tree-reference'):
 
865
                        self.has_dir = True
 
866
                        break
 
867
            finally:
 
868
                tree.unlock()
865
869
            
866
870
            self.filter_file_id = [False for i in 
867
871
                         xrange(len(self.revisions))]