/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2007-03-17 23:58:03 UTC
  • mfrom: (170.1.5 bzr-gtk-meld)
  • Revision ID: jelmer@samba.org-20070317235803-fyaw65t8ika939s1
Merge upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
638
638
            if not self.notbranch:
639
639
                filename = self.wt.relpath(self.path + os.sep + item)
640
640
                
641
 
                for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
642
 
                    if rpathnew == filename:
643
 
                        status = 'renamed'
644
 
                for rpath, id, kind in delta.added:
645
 
                    if rpath == filename:
646
 
                        status = 'added'
647
 
                for rpath, id, kind in delta.removed:
648
 
                    if rpath == filename:
649
 
                        status = 'removed'
650
 
                for rpath, id, kind, text_modified, meta_modified in delta.modified:
651
 
                    if rpath == filename:
652
 
                        status = 'modified'
653
 
                for rpath, id, kind in delta.unchanged:
654
 
                    if rpath == filename:
655
 
                        status = 'unchanged'
656
 
                for rpath, file_class, kind, id, entry in self.wt.list_files():
657
 
                    if rpath == filename and file_class == 'I':
658
 
                        status = 'ignored'
 
641
                try:
 
642
                    self.wt.lock_read()
 
643
                    
 
644
                    for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
 
645
                        if rpathnew == filename:
 
646
                            status = 'renamed'
 
647
                    for rpath, id, kind in delta.added:
 
648
                        if rpath == filename:
 
649
                            status = 'added'
 
650
                    for rpath, id, kind in delta.removed:
 
651
                        if rpath == filename:
 
652
                            status = 'removed'
 
653
                    for rpath, id, kind, text_modified, meta_modified in delta.modified:
 
654
                        if rpath == filename:
 
655
                            status = 'modified'
 
656
                    for rpath, id, kind in delta.unchanged:
 
657
                        if rpath == filename:
 
658
                            status = 'unchanged'
 
659
                    for rpath, file_class, kind, id, entry in self.wt.list_files():
 
660
                        if rpath == filename and file_class == 'I':
 
661
                            status = 'ignored'
 
662
                finally:
 
663
                    self.wt.unlock()
659
664
            
660
665
            #try:
661
666
            #    status = fileops.status(path + os.sep + item)
834
839
            if not notbranch:
835
840
                filename = tree1.relpath(path + os.sep + item)
836
841
                
837
 
                for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
838
 
                    if rpathnew == filename:
839
 
                        status = 'renamed'
840
 
                for rpath, id, kind in delta.added:
841
 
                    if rpath == filename:
842
 
                        status = 'added'                
843
 
                for rpath, id, kind in delta.removed:
844
 
                    if rpath == filename:
845
 
                        status = 'removed'
846
 
                for rpath, id, kind, text_modified, meta_modified in delta.modified:
847
 
                    if rpath == filename:
848
 
                        status = 'modified'
849
 
                for rpath, id, kind in delta.unchanged:
850
 
                    if rpath == filename:
851
 
                        status = 'unchanged'
852
 
                for rpath, file_class, kind, id, entry in self.wt.list_files():
853
 
                    if rpath == filename and file_class == 'I':
854
 
                        status = 'ignored'
 
842
                try:
 
843
                    self.wt.lock_read()
 
844
                    
 
845
                    for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
 
846
                        if rpathnew == filename:
 
847
                            status = 'renamed'
 
848
                    for rpath, id, kind in delta.added:
 
849
                        if rpath == filename:
 
850
                            status = 'added'                
 
851
                    for rpath, id, kind in delta.removed:
 
852
                        if rpath == filename:
 
853
                            status = 'removed'
 
854
                    for rpath, id, kind, text_modified, meta_modified in delta.modified:
 
855
                        if rpath == filename:
 
856
                            status = 'modified'
 
857
                    for rpath, id, kind in delta.unchanged:
 
858
                        if rpath == filename:
 
859
                            status = 'unchanged'
 
860
                    for rpath, file_class, kind, id, entry in self.wt.list_files():
 
861
                        if rpath == filename and file_class == 'I':
 
862
                            status = 'ignored'
 
863
                finally:
 
864
                    self.wt.unlock()
855
865
            
856
866
            #try:
857
867
            #    status = fileops.status(path + os.sep + item)