lp.code.model.diff.Diff : API documentation

Method	text	Undocumented
Method	oversized	Undocumented
Class Method	mergePreviewFromBranches	Generate a merge preview diff from the supplied branches.
Class Method	fromTrees	Create a Diff from two Bazaar trees.
Class Method	fromFileAtEnd	Make a Diff from a file object that is currently at its end.
Class Method	fromFile	Create a Diff from a textual diff.
Static Method	generateDiffstat	Generate statistics about the provided diff.
Class Method	generateIncrementalDiff	Return a Diff whose contents are an incremental diff.
Method	_get_diffstat	Undocumented
Method	_set_diffstat	Undocumented
Class Method	_getMergedTree	Return a tree that is the result of a merge.
Static Method	_getLCA	Return the unique LCA of two branches.

Inherited from SQLBase:

Method	__init__	Extended version of the SQLObjectBase constructor.
Method	__repr__	Undocumented
Method	destroySelf	Undocumented
Method	__eq__	Equality operator.
Method	__ne__	Inverse of __eq__.
Method	__storm_invalidated__	Flush cached properties.
Class Method	_get_store	Undocumented

@classmethod
def mergePreviewFromBranches(cls, source_branch, source_revision, target_branch, prerequisite_branch=None):

Generate a merge preview diff from the supplied branches.

Parameters	source_branch	The branch that will be merged.
	source_revision	The revision_id of the revision that will be merged.
	target_branch	The branch that the source will merge into.
	prerequisite_branch	The branch that should be merged before merging the source.
Returns	A tuple of (`Diff`, `ConflictList`) for a merge preview.

@classmethod
def _getMergedTree(cls, source_branch, source_revision, target_branch, merge_target, cleanups):

Return a tree that is the result of a merge.

Parameters	source_branch	The branch to merge.
	source_revision	The revision_id of the revision to merge.
	target_branch	The branch to merge into.
	merge_target	The tree to merge into.
	cleanups	A list of cleanup operations to run when all operations are complete. This will be appended to.
Returns	a tuple of a tree and the resulting conflicts.

@staticmethod
def _getLCA(source_branch, source_revision, target_branch):

Return the unique LCA of two branches.

Parameters	source_branch	The branch to merge.
	source_revision	The revision of the source branch.
	target_branch	The branch to merge into.

@classmethod
def fromFile(cls, diff_content, size, filename=None, strip_prefix_segments=0):

Create a Diff from a textual diff.

Unknown Field: diff_content	The diff text
Unknown Field: size	The number of bytes in the diff text.
Unknown Field: filename	The filename to store the content with. Randomly generated if not supplied.

@staticmethod
def generateDiffstat(diff_bytes, strip_prefix_segments=0):

Generate statistics about the provided diff.

Parameters	diff_bytes	A unified diff, as bytes.
	strip_prefix_segments	Strip the smallest prefix containing this many leading slashes from each file name found in the patch file, as with "patch -p".
Returns	A map of {filename: (added_line_count, removed_line_count)}

@classmethod
def generateIncrementalDiff(cls, old_revision, new_revision, source_branch, ignore_branches):

Return a Diff whose contents are an incremental diff.

The Diff's contents will show the changes made between old_revision and new_revision, except those changes introduced by the ignore_branches.

Parameters	old_revision	The `Revision` to show changes from.
	new_revision	The `Revision` to show changes to.
	source_branch	The bzr branch containing these revisions.
	ignore_brances	A collection of branches to ignore merges from.
Returns	a `Diff`.

Unknown Field: from_tree	The old tree in the diff.
Unknown Field: to_tree	The new tree in the diff.

l.c.m.d.Diff(SQLBase) : class documentation