/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: Jelmer Vernooij
  • Date: 2006-09-04 23:46:31 UTC
  • mto: (0.8.83 merge)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060904234631-278821e3426bb4d4
Remove more unused functions, imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
157
157
    
158
158
    # find the relative path to the given file (needed for proper delta)
159
159
    wtpath = tree1.basedir
160
 
    #print "DEBUG: wtpath =", wtpath
161
160
    fullpath = filename
162
 
    #print "DEBUG: fullpath =", fullpath
163
161
    i = 0
164
162
    wtsplit = wtpath.split('/')
165
163
    fpsplit = fullpath.split('/')
170
168
                del fpcopy[0]
171
169
            i = i + 1
172
170
    rel = '/'.join(fpcopy)
173
 
    #print "DEBUG: rel =", rel
174
171
    
175
 
    if bzrlib.version_info[1] < 9:
176
 
        delta = compare_trees(old_tree=tree2,
177
 
                              new_tree=tree1,
178
 
                              want_unchanged=True,
179
 
                              specific_files=[rel])
180
 
    else:
181
 
        delta = tree1.changes_from(tree2,
 
172
    delta = tree1.changes_from(tree2,
182
173
                                   want_unchanged=True,
183
174
                                   specific_files=[rel])
184
175
    
185
 
    """ Debug information (could be usable in the future, so didn't cut out)
186
 
    print "DEBUG: delta.renamed:"
187
 
    for path, id, kind, text_modified, meta_modified in delta.renamed:
188
 
        print path
189
 
    print
190
 
    print "DEBUG: delta.added:"
191
 
    for path, id, kind in delta.added:
192
 
        print path
193
 
    print
194
 
    print "DEBUG: delta.removed:"
195
 
    for path, id, kind, text_modified, meta_modified in delta.removed:
196
 
        print path
197
 
    print
198
 
    print "DEBUG: delta.modified:"
199
 
    for path, id, kind, text_modified, meta_modified in delta.modified:
200
 
        print path
201
 
    print
202
 
    print "DEBUG: delta.unchanged:"
203
 
    for path, id, kind in delta.unchanged:
204
 
        print path
205
 
    """
206
 
    
207
176
    if len(delta.renamed):
208
177
        return 'renamed'
209
178
    elif len(delta.added):