/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/foreign.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/foreign.py
19
19
from __future__ import absolute_import
20
20
 
21
21
 
22
 
from .branch import (
 
22
from bzrlib.branch import (
23
23
    Branch,
24
24
    )
25
 
from .commands import Command, Option
26
 
from .repository import Repository
27
 
from .revision import Revision
28
 
from .sixish import (
29
 
    text_type,
30
 
    )
31
 
from .lazy_import import lazy_import
 
25
from bzrlib.commands import Command, Option
 
26
from bzrlib.repository import Repository
 
27
from bzrlib.revision import Revision
 
28
from bzrlib.lazy_import import lazy_import
32
29
lazy_import(globals(), """
33
 
from breezy import (
 
30
from bzrlib import (
34
31
    errors,
35
32
    registry,
36
33
    transform,
37
34
    )
38
 
from breezy.i18n import gettext
 
35
from bzrlib.i18n import gettext
39
36
""")
40
37
 
41
38
class VcsMapping(object):
275
272
               help='Branch to push from, '
276
273
               'rather than the one containing the working directory.',
277
274
               short_name='d',
278
 
               type=text_type,
 
275
               type=unicode,
279
276
               ),
280
277
        Option('no-rebase', help="Do not rebase after push."),
281
278
        Option('strict',
285
282
 
286
283
    def run(self, location=None, remember=False, directory=None,
287
284
            no_rebase=False, strict=None):
288
 
        from breezy import urlutils
289
 
        from breezy.controldir import ControlDir
290
 
        from breezy.errors import BzrCommandError, NoWorkingTree
291
 
        from breezy.workingtree import WorkingTree
 
285
        from bzrlib import urlutils
 
286
        from bzrlib.controldir import ControlDir
 
287
        from bzrlib.errors import BzrCommandError, NoWorkingTree
 
288
        from bzrlib.workingtree import WorkingTree
292
289
 
293
290
        if directory is None:
294
291
            directory = "."