← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-10-02 08:21:43 UTC
  • mfrom: (2872.2.1 import-nits)
  • Revision ID: pqm@pqm.ubuntu.com-20071002082143-hkducdw42q0cel4l
(Andrew Bennetts) Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
22
22
from bzrlib.lazy_import import lazy_import
23
23
lazy_import(globals(), """
24
24
import codecs
25
 
import errno
26
25
import sys
27
 
import tempfile
28
26
import time
29
27
 
30
28
import bzrlib
31
29
from bzrlib import (
32
 
    branch,
33
30
    bugtracker,
34
31
    bundle,
35
32
    bzrdir,
43
40
    merge_directive,
44
41
    osutils,
45
42
    reconfigure,
46
 
    registry,
47
 
    repository,
48
43
    revision as _mod_revision,
49
 
    revisionspec,
50
44
    symbol_versioning,
51
45
    transport,
52
46
    tree as _mod_tree,
62
56
 
63
57
from bzrlib.commands import Command, display_command
64
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
65
 
from bzrlib.progress import DummyProgress, ProgressPhase
66
 
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
 
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
67
60
 
68
61
 
69
62
def tree_files(file_list, default_branch=u'.'):
2254
2247
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2255
2248
            unchanged=False, strict=False, local=False, fixes=None,
2256
2249
            author=None, show_diff=False):
2257
 
        from bzrlib.commit import (
2258
 
            NullCommitReporter,
2259
 
            ReportCommitToLog
2260
 
        )
2261
2250
        from bzrlib.errors import (
2262
2251
            PointlessCommit,
2263
2252
            ConflictsInTree,
2638
2627
    
2639
2628
    @display_command
2640
2629
    def run(self, branch, other):
2641
 
        from bzrlib.revision import ensure_null, MultipleRevisionSources
 
2630
        from bzrlib.revision import ensure_null
2642
2631
        
2643
2632
        branch1 = Branch.open_containing(branch)[0]
2644
2633
        branch2 = Branch.open_containing(other)[0]
2729
2718
            uncommitted=False, pull=False,
2730
2719
            directory=None,
2731
2720
            ):
2732
 
        from bzrlib.tag import _merge_tags_if_possible
2733
2721
        # This is actually a branch (or merge-directive) *location*.
2734
2722
        location = branch
2735
2723
        del branch
2790
2778
                return 0
2791
2779
            if pull:
2792
2780
                if merger.interesting_files is not None:
2793
 
                    raise BzrCommandError('Cannot pull individual files')
 
2781
                    raise errors.BzrCommandError('Cannot pull individual files')
2794
2782
                if (merger.base_rev_id == tree.last_revision()):
2795
2783
                    result = tree.pull(merger.other_branch, False,
2796
2784
                                       merger.other_rev_id)
3166
3154
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
3167
3155
            show_ids=False, verbose=False, this=False, other=False):
3168
3156
        from bzrlib.missing import find_unmerged, iter_log_revisions
3169
 
        from bzrlib.log import log_formatter
3170
3157
 
3171
3158
        if this:
3172
3159
          mine_only = this
3481
3468
            dry_run=False, verbose=False,
3482
3469
            revision=None, force=False):
3483
3470
        from bzrlib.log import log_formatter, show_log
3484
 
        import sys
3485
3471
        from bzrlib.uncommit import uncommit
3486
3472
 
3487
3473
        if location is None:
3907
3893
 
3908
3894
    def _run(self, submit_branch, revision, public_branch, remember, format,
3909
3895
             no_bundle, no_patch, output, from_, mail_to, message):
3910
 
        from bzrlib.revision import ensure_null, NULL_REVISION
 
3896
        from bzrlib.revision import NULL_REVISION
3911
3897
        if output is None:
3912
3898
            outfile = StringIO()
3913
3899
        elif output == '-':