/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/backend/fileops.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-01 16:16:31 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060801161631-ca1ac79e3726e307
Visual feedback when Olive is busy; follow bzr API changes; commit dialog update

2006-08-01  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive/frontend/gtk/push.py: now the number of pushed revisions gets
      displayed (Fixed: #54698)
    * olive/backend/info.py: added is_checkout()
    * olive/frontend/gtk/commit.py: local commit checkbox shows up only if the
      current directory is a checkout
    * olive/backend/fileops.py: upgraded to new API (compare_trees deprecated)
    * many files: the cursor changes to a watch when performing time consuming
      operations (Fixed: #54015)

Show diffs side-by-side

added added

removed removed

Lines of Context:
135
135
    
136
136
    :return: renamed | added | removed | modified | unchanged | unknown
137
137
    """
 
138
    import bzrlib
138
139
    from bzrlib.delta import compare_trees
139
140
    from bzrlib.workingtree import WorkingTree
140
141
    
163
164
    rel = '/'.join(fpcopy)
164
165
    #print "DEBUG: rel =", rel
165
166
    
166
 
    delta = compare_trees(old_tree=tree2,
167
 
                          new_tree=tree1,
168
 
                          want_unchanged=True,
169
 
                          specific_files=[rel])
 
167
    if bzrlib.version_info[1] < 9:
 
168
        delta = compare_trees(old_tree=tree2,
 
169
                              new_tree=tree1,
 
170
                              want_unchanged=True,
 
171
                              specific_files=[rel])
 
172
    else:
 
173
        delta = tree1.changes_from(tree2,
 
174
                                   want_unchanged=True,
 
175
                                   specific_files=[rel])
170
176
    
171
177
    """ Debug information (could be usable in the future, so didn't cut out)
172
178
    print "DEBUG: delta.renamed:"