← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-16 01:25:46 UTC
  • mfrom: (2071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016012546-d01a0740671b4d73
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/commands.py
22
22
 
23
23
import sys
24
24
 
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.commands import Command, register_command
27
 
import bzrlib.errors as errors
 
25
from bzrlib.lazy_import import lazy_import
 
26
lazy_import(globals(), """
 
27
from bzrlib import (
 
28
    branch,
 
29
    errors,
 
30
    urlutils,
 
31
    )
 
32
from bzrlib.revision import common_ancestor
 
33
""")
 
34
 
 
35
from bzrlib.commands import Command
28
36
from bzrlib.option import Option
29
 
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
30
 
                             NULL_REVISION)
31
37
from bzrlib.trace import note
32
 
from bzrlib import urlutils
33
38
 
34
39
 
35
40
class cmd_send_changeset(Command):
57
62
                raise BzrCommandError('We do not support rollup-changesets yet.')
58
63
            revision = revision[0]
59
64
 
60
 
        b = Branch.open_containing('.')
 
65
        b = branch.Branch.open_containing('.')
61
66
 
62
67
        if not to:
63
68
            try:
98
103
        from bzrlib import user_encoding
99
104
        from bzrlib.bundle.serializer import write_bundle
100
105
 
101
 
        target_branch = Branch.open_containing(u'.')[0]
 
106
        target_branch = branch.Branch.open_containing(u'.')[0]
102
107
 
103
108
        if base is None:
104
109
            base_specified = False
132
137
                # we must format with 'ascii' to be safe
133
138
                note('Using saved location: %s',
134
139
                     urlutils.unescape_for_display(base, 'ascii'))
135
 
            base_branch = Branch.open(base)
 
140
            base_branch = branch.Branch.open(base)
136
141
 
137
142
            # We don't want to lock the same branch across
138
143
            # 2 different branches
173
178
        from read_changeset import read_changeset
174
179
        #from bzrlib.xml import serializer_v4
175
180
 
176
 
        b, relpath = Branch.open_containing('.')
 
181
        b, relpath = branch.Branch.open_containing('.')
177
182
 
178
183
        if filename is None or filename == '-':
179
184
            f = sys.stdin