/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commands.py

  • Committer: Jelmer Vernooij
  • Date: 2009-07-18 21:31:49 UTC
  • mfrom: (635.4.1 bzr-gtk)
  • Revision ID: jelmer@samba.org-20090718213149-984ygftdwfa5gtv6
Merge removal of unnecessary import from Mario and rmeove some more unnecessary imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
17
17
from bzrlib import (
18
18
    branch,
19
19
    builtins,
20
 
    merge_directive,
21
20
    workingtree,
22
21
    )
23
22
from bzrlib.commands import (
26
25
    )
27
26
from bzrlib.errors import (
28
27
    BzrCommandError,
 
28
    NoWorkingTree,
29
29
    NotVersionedError,
30
30
    NoSuchFile,
31
31
    )
32
32
from bzrlib.option import Option
33
33
 
34
34
from bzrlib.plugins.gtk import (
 
35
    _i18n,
35
36
    open_display,
36
37
    import_pygtk,
37
38
    set_ui_factory,
269
270
    takes_options = []
270
271
 
271
272
    def run(self, filename=None):
272
 
        import os
273
273
        open_display()
274
274
        from commit import CommitDialog
275
 
        from bzrlib.errors import (BzrCommandError,
276
 
                                   NotBranchError,
277
 
                                   NoWorkingTree)
278
275
 
279
276
        wt = None
280
277
        br = None
310
307
    takes_options = ['revision']
311
308
 
312
309
    def run(self, path='.', revision=None):
313
 
        import os
314
310
        gtk = open_display()
315
311
        from bzrlib.plugins.gtk.status import StatusWindow
316
312
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
432
428
            other_branch = local_branch.get_parent()
433
429
            
434
430
            if other_branch is None:
435
 
                raise errors.BzrCommandError("No peer location known or specified.")
 
431
                raise BzrCommandError("No peer location known or specified.")
436
432
        remote_branch = Branch.open_containing(other_branch)[0]
437
433
        set_ui_factory()
438
434
        local_branch.lock_read()