cola.controllers.merge – Merge operations
This controller handles the merge dialog.
-
class cola.controllers.merge.MergeController(model, view)
Provide control to the merge dialog
-
merge_revision()
- Merge the selected revision/branch
-
radio_callback()
- Update the revision list whenever a radio button is clicked
-
revision_selected(*args)
- Update the revision field when a list item is selected
-
revisions()
- Retrieve candidate items to merge
-
viz_revision()
- Launch a gitk-like viewer on the selection revision
-
cola.controllers.merge.abort_merge()
- Prompts before aborting a merge in progress
-
cola.controllers.merge.local_merge()
- Provides a dialog for merging branches