b.m.Merger(object) : class documentation

Part of bzrlib.merge View In Hierarchy

Known subclasses: bzrlib.merge.MergeIntoMerger

No class docstring
Method __init__ Undocumented
Method cache_trees_with_revision_ids Cache any tree in trees if it has a revision_id.
Method revision_graph Undocumented
Static Method from_uncommitted Return a Merger for uncommitted changes in other_tree.
Class Method from_mergeable Return a Merger for a bundle or merge directive.
Static Method from_revision_ids Return a Merger for revision-ids.
Method revision_tree Undocumented
Method ensure_revision_trees Undocumented
Method file_revisions Undocumented
Method check_basis Undocumented
Method compare_basis Undocumented
Method set_interesting_files Undocumented
Method set_pending Undocumented
Method set_other Set the revision and tree to merge from.
Method set_other_revision Set 'other' based on a branch and revision id
Method set_base_revision Set 'base' based on a branch and revision id
Method find_base Undocumented
Method set_base Set the base revision to use for the merge.
Method make_merger Undocumented
Method do_merge Undocumented
Method _set_base_is_ancestor Undocumented
Method _get_base_is_ancestor Undocumented
Method _set_base_is_other_ancestor Undocumented
Method _get_base_is_other_ancestor Undocumented
Method _get_tree Undocumented
Method _add_parent Undocumented
Method _maybe_fetch Undocumented
Method _do_merge_to Undocumented
def __init__(self, this_branch, other_tree=None, base_tree=None, this_tree=None, pb=None, change_reporter=None, recurse='down', revision_graph=None):
Undocumented
def cache_trees_with_revision_ids(self, trees):
Cache any tree in trees if it has a revision_id.
@property
def revision_graph(self):
Undocumented
def _set_base_is_ancestor(self, value):
Undocumented
def _get_base_is_ancestor(self):
Undocumented
def _set_base_is_other_ancestor(self, value):
Undocumented
def _get_base_is_other_ancestor(self):
Undocumented
@staticmethod
def from_uncommitted(tree, other_tree, pb=None, base_tree=None):
Return a Merger for uncommitted changes in other_tree.
ParameterstreeThe tree to merge into
other_treeThe tree to get uncommitted changes from
pbA progress indicator
base_treeThe basis to use for the merge. If unspecified, other_tree.basis_tree() will be used.
@classmethod
def from_mergeable(klass, tree, mergeable, pb):
Return a Merger for a bundle or merge directive.
ParameterstreeThe tree to merge changes into
mergeableA merge directive or bundle
pbA progress indicator
@staticmethod
def from_revision_ids(pb, tree, other, base=None, other_branch=None, base_branch=None, revision_graph=None, tree_branch=None):
Return a Merger for revision-ids.
ParameterspbA progress indicator
treeThe tree to merge changes into
otherThe revision-id to use as OTHER
baseThe revision-id to use as BASE. If not specified, will be auto-selected.
other_branchA branch containing the other revision-id. If not supplied, tree.branch is used.
base_branchA branch containing the base revision-id. If not supplied, other_branch or tree.branch will be used.
revision_graphIf you have a revision_graph precomputed, pass it in, otherwise it will be created for you.
tree_branchThe branch associated with tree. If not supplied, tree.branch will be used.
def revision_tree(self, revision_id, branch=None):
Undocumented
def _get_tree(self, treespec, possible_transports=None):
Undocumented
@deprecated_method(deprecated_in((2, 1, 0)))
def ensure_revision_trees(self):
Undocumented
@deprecated_method(deprecated_in((2, 1, 0)))
def file_revisions(self, file_id):
Undocumented
@deprecated_method(deprecated_in((2, 1, 0)))
def check_basis(self, check_clean, require_commits=True):
Undocumented
@deprecated_method(deprecated_in((2, 1, 0)))
def compare_basis(self):
Undocumented
def set_interesting_files(self, file_list):
Undocumented
def set_pending(self):
Undocumented
def _add_parent(self):
Undocumented
def set_other(self, other_revision, possible_transports=None):
Set the revision and tree to merge from.

This sets the other_tree, other_rev_id, other_basis attributes.

Parametersother_revisionThe [path, revision] list to merge from.
def set_other_revision(self, revision_id, other_branch):
Set 'other' based on a branch and revision id
Parametersrevision_idThe revision to use for a tree
other_branchThe branch containing this tree
def set_base_revision(self, revision_id, branch):
Set 'base' based on a branch and revision id
Parametersrevision_idThe revision to use for a tree
branchThe branch containing this tree
def _maybe_fetch(self, source, target, revision_id):
Undocumented
def find_base(self):
Undocumented
def set_base(self, base_revision):
Set the base revision to use for the merge.
Parametersbase_revisionA 2-list containing a path and revision number.
def make_merger(self):
Undocumented
def _do_merge_to(self):
Undocumented
def do_merge(self):
Undocumented
API Documentation for Bazaar, generated by pydoctor at 2019-10-19 00:33:24.