← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shell.py

Merge from ab-baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell.py
77
77
        cmd.Cmd.__init__(self)
78
78
        self.prompt = "bzr> "
79
79
        try:
80
 
            self.branch = Branch.open_containing('.')[0]
 
80
            self.tree = WorkingTree.open_containing('.')[0]
81
81
        except:
82
 
            self.branch = None
 
82
            self.tree = None
83
83
        self.set_title()
84
84
        self.set_prompt()
85
85
        self.identchars += '-'
109
109
        self.set_prompt()
110
110
 
111
111
    def set_prompt(self):
112
 
        if self.branch is not None:
 
112
        if self.tree is not None:
113
113
            try:
114
 
                prompt_data = (self.branch.nick, self.branch.revno(), 
115
 
                               self.branch.working_tree().relpath('.'))
 
114
                prompt_data = (self.tree.branch.nick, self.tree.branch.revno(), 
 
115
                               self.tree.branch.relpath('.'))
116
116
                prompt = " %s:%d/%s" % prompt_data
117
117
            except:
118
118
                prompt = ""
145
145
        except Exception, e:
146
146
            print e
147
147
        try:
148
 
            self.branch = Branch.open_containing(".")[0]
 
148
            self.tree = WorkingTree.open_containing(".")[0]
149
149
        except:
150
 
            self.branch = None
 
150
            self.tree = None
151
151
 
152
152
    def do_help(self, line):
153
153
        self.default("help "+line)