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

  • Committer: Robert Collins
  • Date: 2005-10-13 01:44:05 UTC
  • Revision ID: robertc@lifelesslap.robertcollins.net-20051013014405-1f230a49790d25fb
make MergeTree clearer

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
217
217
            base_tree = branch.revision_tree(revision)
218
218
    temp_path = os.path.join(temp_root, label)
219
219
    os.mkdir(temp_path)
220
 
    return MergeTree(base_tree, temp_path)
 
220
    return MergeAdapterTree(base_tree, temp_path)
221
221
 
222
222
 
223
223
def file_exists(tree, file_id):
224
224
    return tree.has_filename(tree.id2path(file_id))
225
225
    
226
226
 
227
 
class MergeTree(object):
 
227
class MergeAdapterTree(object):
 
228
    """MergeAdapterTree adapts a normal tree for merge_inner to use.
 
229
 
 
230
    The interface the merge_inner needs is nearly but not quite
 
231
    the same as that of bzrlib.tree with the exception of readonly_path.
 
232
    """
 
233
    
228
234
    def __init__(self, tree, tempdir):
229
235
        object.__init__(self)
230
236
        if hasattr(tree, "basedir"):