~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-09 02:53:42 UTC
  • mfrom: (4873.2.3 2.1.0b4-win32-test-imports)
  • Revision ID: pqm@pqm.ubuntu.com-20091209025342-sidvxfcqdgxmuz59
(jam) Get the test suite running again on Windows, (bug #492561)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2006 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
and for applying a changeset.
21
21
"""
22
22
 
 
23
import sys
23
24
from cStringIO import StringIO
24
25
 
25
26
from bzrlib.lazy_import import lazy_import
35
36
""")
36
37
 
37
38
from bzrlib.commands import Command
 
39
from bzrlib.option import Option
 
40
from bzrlib.trace import note
38
41
 
39
42
 
40
43
class cmd_bundle_info(Command):
41
 
    __doc__ = """Output interesting stats about a bundle"""
 
44
    """Output interesting stats about a bundle"""
42
45
 
43
46
    hidden = True
44
47
    takes_args = ['location']
51
54
        from bzrlib import osutils
52
55
        term_encoding = osutils.get_terminal_encoding()
53
56
        bundle_info = read_mergeable_from_url(location)
54
 
        if isinstance(bundle_info, merge_directive.BaseMergeDirective):
 
57
        if isinstance(bundle_info, merge_directive._BaseMergeDirective):
55
58
            bundle_file = StringIO(bundle_info.get_raw_bundle())
56
59
            bundle_info = read_bundle(bundle_file)
57
60
        else: