/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tree.py

Merge a bunch of fixes from store-roundtrip-info.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
311
311
            oldparent = None
312
312
        else:
313
313
            oldpath = oldpath.decode("utf-8")
 
314
            assert oldmode is not None
314
315
            oldexe = mode_is_executable(oldmode)
315
316
            oldkind = mode_kind(oldmode)
316
317
            try:
328
329
            newparent = None
329
330
        else:
330
331
            newpath = newpath.decode("utf-8")
331
 
            newexe = mode_is_executable(newmode)
332
 
            newkind = mode_kind(newmode)
 
332
            assert newmode is not None
 
333
            if newmode is not None:
 
334
                newexe = mode_is_executable(newmode)
 
335
                newkind = mode_kind(newmode)
 
336
            else:
 
337
                newexe = False
 
338
                newkind = None
333
339
            try:
334
340
                newparentpath, newname = newpath.rsplit("/", 1)
335
341
            except ValueError: