Rev 30: Comply to verbose. in http://code.launchpad.net/%7Ebzr-upload-devs/bzr-upload/trunk

[Vincent Ladeuil]

At http://code.launchpad.net/%7Ebzr-upload-devs/bzr-upload/trunk

------------------------------------------------------------
revno: 30
revision-id: v.ladeuil+lp at free.fr-20080425203909-14dle6clfs7pgqzw
parent: v.ladeuil+lp at free.fr-20080425182934-mepc2hfjxvd7yr9n
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: upload
timestamp: Fri 2008-04-25 22:39:09 +0200
message:
  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.
modified:
  __init__.py                    __init__.py-20080307145942-xx1xgifrreovahgz-1
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-04-25 18:29:34 +0000
+++ b/__init__.py	2008-04-25 20:39:09 +0000
@@ -95,7 +95,7 @@
         if len(wt.conflicts()) > 0:
             raise errors.ConflictsInTree
 
-        self.branch = branch.Branch.open_containing(directory)[0]
+        self.branch = wt.branch
 
         if location is None:
             stored_loc = self.get_upload_location()
@@ -148,7 +148,8 @@
         return self.to_transport.get_bytes(self.bzr_upload_revid_file_name)
 
     def upload_file(self, relpath, id):
-        self.outf.write('Uploaded ' + relpath + "\n")
+        if self.verbose:
+            self.outf.write('Uploadind %s\n' % relpath)
         self.to_transport.put_bytes(relpath, self.tree.get_file_text(id))
 
     def make_remote_dir(self, relpath):
@@ -156,11 +157,13 @@
         self.to_transport.mkdir(relpath)
 
     def delete_remote_file(self, relpath):
-        self.outf.write('Deleting: ' + relpath + "\n")
+        if self.verbose:
+            self.outf.write('Deleting %s\n' % relpath)
         self.to_transport.delete(relpath)
 
     def delete_remote_dir(self, relpath):
-        self.outf.write('Deleting: ' + relpath + "\n")
+        if self.verbose:
+            self.outf.write('Deleting %s\n' % relpath)
         self.to_transport.rmdir(relpath)
 
     def delete_remote_dir_maybe(self, relpath):
@@ -199,7 +202,8 @@
         stamp = '.tmp.%.9f.%d.%d' % (time.time(),
                                      os.getpid(),
                                      random.randint(0,0x7FFFFFFF))
-        self.outf.write('Renaming ' + old_relpath + ' to ' + new_relpath + "\n")
+        if self.verbose:
+            self.outf.write('Renaming %s to %s\n' % (old_relpath, new_relpath))
         self.to_transport.rename(old_relpath, stamp)
         self._pending_renames.append((stamp, new_relpath))