/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

merge bzr.dev r3564

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1838
1838
            raise
1839
1839
        return result
1840
1840
 
1841
 
    def _inv_entry_to_details(self, inv_entry):
 
1841
    @staticmethod
 
1842
    def _inv_entry_to_details(inv_entry):
1842
1843
        """Convert an inventory entry (from a revision tree) to state details.
1843
1844
 
1844
1845
        :param inv_entry: An inventory entry whose sha1 and link targets can be
1854
1855
            size = 0
1855
1856
            executable = False
1856
1857
        elif kind == 'symlink':
1857
 
            fingerprint = inv_entry.symlink_target or ''
 
1858
            # We don't support non-ascii targets for symlinks yet.
 
1859
            fingerprint = str(inv_entry.symlink_target or '')
1858
1860
            size = 0
1859
1861
            executable = False
1860
1862
        elif kind == 'file':