/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 breezy/delta.py

merge Parth's work into Breezy

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/delta.py
18
18
 
19
19
from breezy import (
20
20
    osutils,
 
21
    trace,
21
22
    )
22
23
from .sixish import (
23
24
    StringIO,
24
25
    )
25
 
from .trace import is_quiet
26
26
 
27
27
 
28
28
class TreeDelta(object):
140
140
            if fully_present[1] is True:
141
141
                delta.added.append((path[1], file_id, kind[1]))
142
142
            else:
143
 
                delta.removed.append((path[0], file_id, kind[0]))
 
143
                if kind[0] == 'symlink' and not osutils.has_symlinks():
 
144
                    trace.warning('bzr: warning: Ignoring "%s" as symlinks '
 
145
                        'are not supported on this platform.' % (path[0],))
 
146
                else:
 
147
                    delta.removed.append((path[0], file_id, kind[0]))
144
148
        elif fully_present[0] is False:
145
149
            delta.missing.append((path[1], file_id, kind[1]))
146
150
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
250
254
        :param kind: A pair of file kinds, as generated by Tree.iter_changes.
251
255
            None indicates no file present.
252
256
        """
253
 
        if is_quiet():
 
257
        if trace.is_quiet():
254
258
            return
255
259
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
256
260
            return