← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-14 17:47:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6368.
  • Revision ID: jelmer@samba.org-20111214174737-9stcnhid8eqhnd5e
Kill optional submit_branch argument to MergeDirective constructor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
83
83
 
84
84
    def __init__(self, revision_id, testament_sha1, time, timezone,
85
85
                 target_branch, patch=None, source_branch=None,
86
 
                 message=None, bundle=None, submit_branch=None):
 
86
                 message=None, bundle=None):
87
87
        """Constructor.
88
88
 
89
89
        :param revision_id: The revision to merge
104
104
        self.patch = patch
105
105
        self.source_branch = source_branch
106
106
        self.message = message
107
 
        self.submit_branch = None
108
107
 
109
108
    def to_lines(self):
110
109
        """Serialize as a list of lines
211
210
 
212
211
        return klass(revision_id, t.as_sha1(), time, timezone,
213
212
            target_branch, patch, patch_type, public_branch,
214
 
            message, submit_branch)
 
213
            message)
215
214
 
216
215
    def get_disk_name(self, branch):
217
216
        """Generate a suitable basename for storing this directive on disk
370
369
 
371
370
    def __init__(self, revision_id, testament_sha1, time, timezone,
372
371
                 target_branch=None, patch=None, patch_type=None,
373
 
                 source_branch=None, message=None, bundle=None,
374
 
                 submit_branch=None):
 
372
                 source_branch=None, message=None, bundle=None):
375
373
        """Constructor.
376
374
 
377
375
        :param revision_id: The revision to merge
385
383
            of patch
386
384
        :param source_branch: A public location to merge the revision from
387
385
        :param message: The message to use when committing this merge
388
 
        :param submit_branch: Branch to apply the merge to (optional)
389
386
        """
390
387
        BaseMergeDirective.__init__(self, revision_id, testament_sha1, time,
391
 
            timezone, target_branch, patch, source_branch, message,
392
 
            submit_branch)
 
388
            timezone, target_branch, patch, source_branch, message)
393
389
        if patch_type not in (None, 'diff', 'bundle'):
394
390
            raise ValueError(patch_type)
395
391
        if patch_type != 'bundle' and source_branch is None:
641
637
                entry.unlock()
642
638
        return klass(revision_id, testament_sha1, time, timezone,
643
639
            target_branch, patch, public_branch, message, bundle,
644
 
            base_revision_id, submit_branch)
 
640
            base_revision_id)
645
641
 
646
642
    def _verify_patch(self, repository):
647
643
        calculated_patch = self._generate_diff(repository, self.revision_id,