← Back to branch summary

~jamesh/loggerhead/devel

« back to all changes in this revision

Viewing changes to loggerhead/history.py

  • Committer: James Henstridge
  • Date: 2007-01-25 02:43:08 UTC
  • mfrom: (97.1.13 loggerhead)
  • Revision ID: james@jamesh.id.au-20070125024308-w3gyvoo5830hcvr2
merge from robey's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/history.py
697
697
    
698
698
    @with_branch_lock
699
699
    def get_file(self, file_id, revid):
700
 
        "returns (filename, data)"
701
 
        inv_entry = self.get_inventory(revid)[file_id]
 
700
        "returns (path, filename, data)"
 
701
        inv = self.get_inventory(revid)
 
702
        inv_entry = inv[file_id]
702
703
        rev_tree = self._branch.repository.revision_tree(inv_entry.revision)
703
 
        return inv_entry.name, rev_tree.get_file_text(file_id)
 
704
        path = inv.id2path(file_id)
 
705
        if not path.startswith('/'):
 
706
            path = '/' + path
 
707
        return path, inv_entry.name, rev_tree.get_file_text(file_id)
704
708
    
705
709
    @with_branch_lock
706
710
    def parse_delta(self, delta, get_diffs=True, old_tree=None, new_tree=None):