← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: INADA Naoki
  • Date: 2011-05-05 09:15:34 UTC
  • mto: (5830.3.3 i18n-msgfmt)
  • mto: This revision was merged to the branch mainline in revision 5873.
  • Revision ID: songofacandy@gmail.com-20110505091534-7sv835xpofwrmpt4
Add update-pot command to Makefile and tools/bzrgettext script that
extracts help text from bzr commands.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
641
641
                'Malformed patch for %s, %r' % (file_id, file_patch))
642
642
        return patched_file(file_patch, patch_original)
643
643
 
644
 
    def get_symlink_target(self, file_id, path=None):
645
 
        if path is None:
646
 
            path = self.id2path(file_id)
 
644
    def get_symlink_target(self, file_id):
 
645
        new_path = self.id2path(file_id)
647
646
        try:
648
 
            return self._targets[path]
 
647
            return self._targets[new_path]
649
648
        except KeyError:
650
649
            return self.base_tree.get_symlink_target(file_id)
651
650
 
716
715
                ie.executable = self.is_executable(file_id)
717
716
            elif kind == 'symlink':
718
717
                ie = InventoryLink(file_id, name, parent_id)
719
 
                ie.symlink_target = self.get_symlink_target(file_id, path)
 
718
                ie.symlink_target = self.get_symlink_target(file_id)
720
719
            ie.revision = revision_id
721
720
 
722
721
            if kind == 'file':
764
763
        paths = []
765
764
        for result in self._new_id.iteritems():
766
765
            paths.append(result)
767
 
        for id in self.base_tree.all_file_ids():
 
766
        for id in self.base_tree:
768
767
            path = self.id2path(id)
769
768
            if path is None:
770
769
                continue