← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    errors,
23
 
    merge_directive,
24
23
    osutils,
25
24
    registry,
26
25
    trace,
115
114
                    ).get_user_option_as_bool('send_strict')
116
115
            if strict is None: strict = True # default value
117
116
            if strict and tree is not None:
118
 
                if (tree.has_changes(tree.basis_tree())
119
 
                    or len(tree.get_parent_ids()) > 1):
 
117
                if (tree.has_changes()):
120
118
                    raise errors.UncommittedChanges(
121
119
                        tree, more='Use --no-strict to force the send.')
122
120
                if tree.last_revision() != tree.branch.last_revision():
123
121
                    # The tree has lost sync with its branch, there is little
124
122
                    # chance that the user is aware of it but he can still force
125
 
                    # the push with --no-strict
 
123
                    # the send with --no-strict
126
124
                    raise errors.OutOfDateTree(
127
125
                        tree, more='Use --no-strict to force the send.')
128
126
            revision_id = branch.last_revision()
151
149
 
152
150
def _send_4(branch, revision_id, submit_branch, public_branch,
153
151
            no_patch, no_bundle, message, base_revision_id):
 
152
    from bzrlib import merge_directive
154
153
    return merge_directive.MergeDirective2.from_objects(
155
154
        branch.repository, revision_id, time.time(),
156
155
        osutils.local_time_offset(), submit_branch,
172
171
            patch_type = 'diff'
173
172
        else:
174
173
            patch_type = None
 
174
    from bzrlib import merge_directive
175
175
    return merge_directive.MergeDirective.from_objects(
176
176
        branch.repository, revision_id, time.time(),
177
177
        osutils.local_time_offset(), submit_branch,