Part of bzrlib.merge_directive View In Hierarchy
Method | __init__ | Constructor. |
Method | clear_payload | Undocumented |
Method | get_raw_bundle | Return the bundle for this merge directive. |
Method | to_lines | Serialize as a list of lines |
Class Method | from_objects | Generate a merge directive from various objects |
Method | get_merge_request | Provide data for performing a merge |
Method | _patch_type | Undocumented |
Class Method | _from_lines | Undocumented |
Method | _verify_patch | Undocumented |
Method | _maybe_verify | Undocumented |
Inherited from BaseMergeDirective:
Method | to_files | Serialize as a set of files. |
Method | write_to_directory | Write this merge directive to a series of files in a directory. |
Method | get_disk_name | Generate a suitable basename for storing this directive on disk |
Method | to_signed | Serialize as a signed string. |
Method | to_email | Serialize as an email message. |
Method | install_revisions | Install revisions and return the target revision |
Method | compose_merge_request | Compose a request to merge this directive. |
Method | _to_lines | Serialize as a list of lines |
Static Method | _generate_diff | Undocumented |
Static Method | _generate_bundle | Undocumented |
Parameters | revision_id | The revision to merge |
testament_sha1 | The sha1 of the testament of the revision to merge. | |
time | The current POSIX timestamp time | |
timezone | The timezone offset | |
target_branch | The branch to apply the merge to | |
patch | The text of a diff or bundle | |
source_branch | A public location to merge the revision from | |
message | The message to use when committing this merge |
Returns | bundle text or None if there is no bundle |
The public branch is always used if supplied. If no bundle is included, the public branch must be supplied, and will be verified.
If the message is not supplied, the message from revision_id will be used for the commit.
Parameters | repository | The repository containing the revision |
revision_id | The revision to merge | |
time | The POSIX timestamp of the date the request was issued. | |
timezone | The timezone of the request | |
target_branch | The url of the branch to merge into | |
include_patch | If true, include a preview patch | |
include_bundle | If true, include a bundle | |
local_target_branch | a local copy of the target branch | |
public_branch | location of a public branch containing the target revision. | |
message | Message to use when committing the merge | |
Returns | The merge directive |