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

Comply to verbose.

* __init__.py:
(cmd_upload.run): We have a working tree, let's use it.
(cmd_upload.upload_file, cmd_upload.delete_remote_file,
cmd_upload.delete_remote_dir, cmd_upload.rename_remote):
Be verbose when verbose is True.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
95
95
        if len(wt.conflicts()) > 0:
96
96
            raise errors.ConflictsInTree
97
97
 
98
 
        self.branch = branch.Branch.open_containing(directory)[0]
 
98
        self.branch = wt.branch
99
99
 
100
100
        if location is None:
101
101
            stored_loc = self.get_upload_location()
148
148
        return self.to_transport.get_bytes(self.bzr_upload_revid_file_name)
149
149
 
150
150
    def upload_file(self, relpath, id):
151
 
        self.outf.write('Uploaded ' + relpath + "\n")
 
151
        if self.verbose:
 
152
            self.outf.write('Uploadind %s\n' % relpath)
152
153
        self.to_transport.put_bytes(relpath, self.tree.get_file_text(id))
153
154
 
154
155
    def make_remote_dir(self, relpath):
156
157
        self.to_transport.mkdir(relpath)
157
158
 
158
159
    def delete_remote_file(self, relpath):
159
 
        self.outf.write('Deleting: ' + relpath + "\n")
 
160
        if self.verbose:
 
161
            self.outf.write('Deleting %s\n' % relpath)
160
162
        self.to_transport.delete(relpath)
161
163
 
162
164
    def delete_remote_dir(self, relpath):
163
 
        self.outf.write('Deleting: ' + relpath + "\n")
 
165
        if self.verbose:
 
166
            self.outf.write('Deleting %s\n' % relpath)
164
167
        self.to_transport.rmdir(relpath)
165
168
 
166
169
    def delete_remote_dir_maybe(self, relpath):
199
202
        stamp = '.tmp.%.9f.%d.%d' % (time.time(),
200
203
                                     os.getpid(),
201
204
                                     random.randint(0,0x7FFFFFFF))
202
 
        self.outf.write('Renaming ' + old_relpath + ' to ' + new_relpath + "\n")
 
205
        if self.verbose:
 
206
            self.outf.write('Renaming %s to %s\n' % (old_relpath, new_relpath))
203
207
        self.to_transport.rename(old_relpath, stamp)
204
208
        self._pending_renames.append((stamp, new_relpath))
205
209