/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 fetch.py

Cope with the fact that _type is gone in upstream dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
121
121
    # Check what revision we should store
122
122
    parent_keys = []
123
123
    for pinv in parent_invs[1:]:
124
 
        if pinv.revision_id == base_inv.revision_id:
125
 
            pie = base_ie
126
 
            if pie is None:
127
 
                continue
128
 
        else:
129
 
            try:
130
 
                pie = pinv[file_id]
131
 
            except NoSuchId:
132
 
                continue
 
124
        try:
 
125
            pie = pinv[file_id]
 
126
        except NoSuchId:
 
127
            continue
133
128
        if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
134
129
            # found a revision in one of the parents to use
135
130
            ie.revision = pie.revision