← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Lukáš Lalinský
  • Date: 2007-12-01 11:43:56 UTC
  • mto: This revision was merged to the branch mainline in revision 3084.
  • Revision ID: lalinsky@gmail.com-20071201114356-v65hafsuxuzsmd1e
https://launchpad.net/bugs/133782
Fix UnboundLocalError in cmd_cat.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2114
2114
    def run(self, filename, revision=None, name_from_revision=False):
2115
2115
        if revision is not None and len(revision) != 1:
2116
2116
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
2117
 
                                        " one number")
2118
 
        tree = None
2119
 
        try:
2120
 
            tree, b, relpath = \
2121
 
                    bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2122
 
        except errors.NotBranchError:
2123
 
            pass
2124
 
 
2125
 
        if revision is not None and revision[0].get_branch() is not None:
2126
 
            b = Branch.open(revision[0].get_branch())
2127
 
        b.lock_read()
2128
 
        try:
2129
 
            return self._run(tree, b, relpath, filename, revision,
2130
 
                name_from_revision)
 
2117
                                         " one revision specifier")
 
2118
        tree, branch, relpath = \
 
2119
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
2120
        branch.lock_read()
 
2121
        try:
 
2122
            return self._run(tree, branch, relpath, filename, revision,
 
2123
                             name_from_revision)
2131
2124
        finally:
2132
 
            b.unlock()
 
2125
            branch.unlock()
2133
2126
 
2134
2127
    def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2135
2128
        if tree is None: