← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to obsolete/annotate.py

  • Committer: Aaron Bentley
  • Date: 2006-03-07 15:23:15 UTC
  • mfrom: (321.1.2 bzrtools)
  • mto: (147.4.31 trunk)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20060307152315-42337454a0ad956b
Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
obsolete/annotate.py
67
67
    def run(self, filename):
68
68
        if not os.path.exists(filename):
69
69
            raise BzrCommandError("The file %s does not exist." % filename)
70
 
        branch = (Branch.open_containing(filename))
71
 
        file_id = branch.working_tree().path2id(branch.relpath(filename))
 
70
        branch,relpath = (Branch.open_containing(filename))
 
71
        file_id = branch.working_tree().path2id(relpath)
72
72
        if file_id is None:
73
73
            raise BzrCommandError("The file %s is not versioned." % filename)
74
74
        lines = branch.basis_tree().get_file(file_id)