/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-30 13:04:15 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930130415-aba4100709e11f0a
Loads of fixes. Pyflakes cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
521
521
            if not self.notbranch:
522
522
                filename = self.wt.relpath(self.path + os.sep + item)
523
523
                
524
 
                for rpath, id, kind, text_modified, meta_modified in delta.renamed:
525
 
                    if rpath == filename:
 
524
                for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
 
525
                    if rpathnew == filename:
526
526
                        status = 'renamed'
527
527
                for rpath, id, kind in delta.added:
528
528
                    if rpath == filename:
707
707
            if not notbranch:
708
708
                filename = tree1.relpath(path + os.sep + item)
709
709
                
710
 
                for rpath, id, kind, text_modified, meta_modified in delta.renamed:
711
 
                    if rpath == filename:
 
710
                for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
 
711
                    if rpathnew == filename:
712
712
                        status = 'renamed'
713
713
                for rpath, id, kind in delta.added:
714
714
                    if rpath == filename:
715
 
                        status = 'added'
 
715
                        status = 'added'                
716
716
                for rpath, id, kind, text_modified, meta_modified in delta.removed:
717
717
                    if rpath == filename:
718
718
                        status = 'removed'