/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/testament.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/testament.py
73
73
 
74
74
from copy import copy
75
75
 
76
 
from .osutils import (
 
76
from bzrlib.osutils import (
77
77
    contains_whitespace,
78
78
    contains_linebreaks,
79
79
    sha_strings,
80
80
    )
81
 
from .tree import Tree
 
81
from bzrlib.tree import Tree
82
82
 
83
83
 
84
84
class Testament(object):
162
162
    def _escape_path(self, path):
163
163
        if contains_linebreaks(path):
164
164
            raise ValueError(path)
165
 
        return unicode(path.replace('\\', '/').replace(' ', '\\ '))
 
165
        return unicode(path.replace('\\', '/').replace(' ', '\ '))
166
166
 
167
167
    def _entry_to_line(self, path, ie):
168
168
        """Turn an inventory entry into a testament line"""
242
242
            raise ValueError(path)
243
243
        if path == '':
244
244
            path = '.'
245
 
        return unicode(path.replace('\\', '/').replace(' ', '\\ '))
 
245
        return unicode(path.replace('\\', '/').replace(' ', '\ '))