← Back to branch summary

~ubuntu-branches/ubuntu/utopic/bzrtools/utopic

« back to all changes in this revision

Viewing changes to command_classes.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2011-11-09 15:27:29 UTC
  • Revision ID: package-import@ubuntu.com-20111109152729-5sm7p0elrkbionkg
* Merge from Debian. Remaining changes:
 + Disable use of subunit, which is not in main.

Show diffs side-by-side

added added

removed removed

Lines of Context:
command_classes.py
1
 
# Copyright (C) 2005, 2006, 2007 Aaron Bentley <aaron@aaronbentley.com>
 
1
# Copyright (C) 2005, 2006, 2007, 2011 Aaron Bentley <aaron@aaronbentley.com>
2
2
# Copyright (C) 2005, 2006, 2011 Canonical Limited.
3
3
# Copyright (C) 2006 Michael Ellerman.
4
4
#
16
16
#    along with this program; if not, write to the Free Software
17
17
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
19
 
import errno
20
 
 
21
19
import bzrlib
22
20
 
23
21
from bzrlib.lazy_import import lazy_import
26
24
import shelf
27
25
""")
28
26
 
 
27
from bzrlib.plugins import bzrtools
29
28
from command import BzrToolsCommand
30
29
from errors import CommandError
31
30
from patchsource import BzrPatchSource
32
 
import sys
33
 
import os.path
34
31
 
35
 
import bzrlib.builtins
36
32
import bzrlib.commands
37
33
from bzrlib.branch import Branch
38
 
from bzrlib.bzrdir import BzrDir
39
34
from bzrlib.commands import get_cmd_object
40
35
from bzrlib.errors import BzrCommandError
41
 
import bzrlib.ignores
42
 
from bzrlib.trace import note
43
36
from bzrlib.option import Option, RegistryOption
44
 
from bzrlib.workingtree import WorkingTree
45
 
 
46
 
from command import BzrToolsCommand
47
37
 
48
38
 
49
39
class cmd_graph_ancestry(BzrToolsCommand):
448
438
                       hardlink=hardlink)
449
439
 
450
440
 
451
 
class cmd_branches(BzrToolsCommand):
 
441
class cmd_list_branches(BzrToolsCommand):
452
442
    """Scan a location for branches"""
 
443
    @property
 
444
    def aliases(self):
 
445
        from bzrlib import commands
 
446
        return commands.plugin_cmds.get_info('list-branches').aliases
 
447
 
453
448
    takes_args = ["location?"]
454
449
    def run(self, location=None):
455
450
        from branches import branches