/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 breezy/delta.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/delta.py
20
20
    osutils,
21
21
    trace,
22
22
    )
23
 
from .tree import TreeChange
 
23
from .bzr.inventorytree import InventoryTreeChange
24
24
 
25
25
 
26
26
class TreeDelta(object):
327
327
        exe_change = False
328
328
        # files are "renamed" if they are moved or if name changes, as long
329
329
        # as it had a value
330
 
        if None not in change.name and None not in change.parent_id and\
331
 
                (change.name[0] != change.name[1] or change.parent_id[0] != change.parent_id[1]):
332
 
            if change.copied:
333
 
                copied = True
334
 
                renamed = False
335
 
            else:
336
 
                renamed = True
337
 
                copied = False
 
330
        if change.copied:
 
331
            copied = True
 
332
            renamed = False
 
333
        elif change.renamed:
 
334
            renamed = True
 
335
            copied = False
338
336
        else:
339
337
            copied = False
340
338
            renamed = False
397
395
        dec_new_path = decorate_path(item.path[1], item.kind[1], item.meta_modified())
398
396
        to_file.write(' => %s' % dec_new_path)
399
397
        if item.changed_content or item.meta_modified():
400
 
            extra_modified.append(TreeChange(
 
398
            extra_modified.append(InventoryTreeChange(
401
399
                item.file_id, (item.path[1], item.path[1]),
402
400
                item.changed_content,
403
401
                item.versioned,