/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 bzrlib/uncommit.py

Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
80
80
                else:
81
81
                    parents = []
82
82
                parents.extend(reversed(pending_merges))
83
 
                parent_trees = [
84
 
                    (parent, branch.repository.revision_tree(parent))
85
 
                    for parent in parents]
86
 
                tree.set_parent_trees(parent_trees)
 
83
                tree.set_parent_ids(parents)
87
84
    finally:
88
85
        for item in reversed(unlockable):
89
86
            item.unlock()