← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/trace.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/trace.py
37
37
 
38
38
    def __init__(self, url, _decorated=None, _from_transport=None):
39
39
        """Set the 'base' path where files will be stored.
40
 
        
 
40
 
41
41
        _decorated is a private parameter for cloning.
42
42
        """
43
43
        TransportDecorator.__init__(self, url, _decorated)
98
98
    def put_file(self, relpath, f, mode=None):
99
99
        """See Transport.put_file()."""
100
100
        return self._decorated.put_file(relpath, f, mode)
101
 
    
 
101
 
102
102
    def put_bytes(self, relpath, bytes, mode=None):
103
103
        """See Transport.put_bytes()."""
104
104
        self._trace(('put_bytes', relpath, len(bytes), mode))
111
111
    def iter_files_recursive(self):
112
112
        """See Transport.iter_files_recursive()."""
113
113
        return self._decorated.iter_files_recursive()
114
 
    
 
114
 
115
115
    def list_dir(self, relpath):
116
116
        """See Transport.list_dir()."""
117
117
        return self._decorated.list_dir(relpath)
131
131
    def rename(self, rel_from, rel_to):
132
132
        self._activity.append(('rename', rel_from, rel_to))
133
133
        return self._decorated.rename(rel_from, rel_to)
134
 
    
 
134
 
135
135
    def rmdir(self, relpath):
136
136
        """See Transport.rmdir."""
137
137
        return self._decorated.rmdir(relpath)