@@ -130,12 +130,11 @@ class MultiPartUpload(object):

         if extra_label:

             extra_label = u' ' + extra_label

         labels = {

-            'source' : filename,

-            'destination' : self.dst_uri.uri(),

+            'source': filename,

+            'destination': self.dst_uri.uri(),

         }

         seq = 1

-

         if self.src_size:

             size_left = self.src_size

             nr_parts = self.src_size // self.chunk_size \

@@ -274,7 +273,10 @@ class MultiPartUpload(object):

         request = self.s3.create_request("OBJECT_PUT", uri=self.dst_uri,

                                          headers=headers,

                                          uri_params=query_string_params)

-        response = self.s3.send_request(request)

+

+        labels[u'action'] = u'remote copy'

+        response = self.s3.send_request_with_progress(request, labels,

+                                                      chunk_size)

         # NOTE: Amazon sends whitespace while upload progresses, which

         # accumulates in response body and seems to confuse XML parser.

@@ -811,7 +811,8 @@ class S3(object):

                 del headers[h.lower()]

         return headers

-    def object_copy(self, src_uri, dst_uri, extra_headers = None):

+    def object_copy(self, src_uri, dst_uri, extra_headers=None,

+                    extra_label=""):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

         if dst_uri.type != "s3":

@@ -853,7 +854,7 @@ class S3(object):

             if size > self.config.multipart_copy_chunk_size_mb * 1024 * 1024:

                 # Multipart requests are quite different... drop here

                 return self.copy_file_multipart(src_uri, dst_uri, size,

-                                                headers)

+                                                headers, extra_label)

         ## Not multipart...

         headers['x-amz-copy-source'] = "/%s/%s" % (

@@ -882,7 +883,8 @@ class S3(object):

                     raise exc

         return response

-    def object_modify(self, src_uri, dst_uri, extra_headers = None):

+    def object_modify(self, src_uri, dst_uri, extra_headers=None,

+                      extra_label=""):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

@@ -932,7 +934,7 @@ class S3(object):

             error("Server error during the MODIFY operation. Overwrite response status to 500")

             raise S3Error(response)

-        if acl != None:

+        if acl is not None:

             try:

                 self.set_acl(src_uri, acl)

             except S3Error as exc:

@@ -943,7 +945,8 @@ class S3(object):

         return response

-    def object_move(self, src_uri, dst_uri, extra_headers = None):

+    def object_move(self, src_uri, dst_uri, extra_headers=None,

+                    extra_label=""):

         response_copy = self.object_copy(src_uri, dst_uri, extra_headers)

         debug("Object %s copied to %s" % (src_uri, dst_uri))

         if not response_copy["data"] or getRootTagName(response_copy["data"]) == "CopyObjectResult":

@@ -1385,6 +1388,30 @@ class S3(object):

         return response

+    def send_request_with_progress(self, request, labels, operation_size=0):

+        """Wrapper around send_request for slow requests.

+

+        To be able to show progression for small requests

+        """

+        if not self.config.progress_meter:

+            info("Sending slow request '%s', please wait..." % filename)

+            return self.send_request(request)

+

+        if 'action' not in labels:

+            labels[u'action'] = u'request'

+        progress = self.config.progress_class(labels, operation_size)

+

+        try:

+            response = self.send_request(request)

+        except Exception as exc:

+            progress.done("failed")

+            raise

+

+        progress.update(current_position=operation_size)

+        progress.done("done")

+

+        return response

+

     def send_file(self, request, stream, labels, buffer = '', throttle = 0,

                   retries = _max_retries, offset = 0, chunk_size = -1,

                   use_expect_continue = None):

@@ -889,8 +889,10 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

         extra_headers = copy(cfg.extra_headers)

         try:

-            response = process_fce(src_uri, dst_uri, extra_headers)

-            output(message % { "src" : src_uri, "dst" : dst_uri })

+            response = process_fce(src_uri, dst_uri, extra_headers,

+                                   extra_label=seq_label)

+            output(message % {"src": src_uri, "dst": dst_uri,

+                              "extra": seq_label})

             if Config().acl_public:

                 info(u"Public URL is: %s" % dst_uri.public_url())

             scoreboard.success()

@@ -905,15 +907,16 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

 def cmd_cp(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_copy, "copy", u"remote copy: '%(src)s' -> '%(dst)s'")

+    return subcmd_cp_mv(args, s3.object_copy, "copy", u"remote copy: '%(src)s' -> '%(dst)s'  %(extra)s")

 def cmd_modify(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_modify, "modify", u"modify: '%(src)s'")

+    return subcmd_cp_mv(args, s3.object_modify, "modify",

+                        u"modify: '%(src)s'  %(extra)s")

 def cmd_mv(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_move, "move", u"move: '%(src)s' -> '%(dst)s'")

+    return subcmd_cp_mv(args, s3.object_move, "move", u"move: '%(src)s' -> '%(dst)s'  %(extra)s")

 def cmd_info(args):

     cfg = Config()

@@ -1112,8 +1115,10 @@ def cmd_sync_remote2remote(args):

             seq_label = "[%d of %d]" % (seq, src_count)

             extra_headers = copy(cfg.extra_headers)

             try:

-                response = s3.object_copy(src_uri, dst_uri, extra_headers)

-                output(u"remote copy: '%s' -> '%s'" % (src_uri, dst_uri))

+                response = s3.object_copy(src_uri, dst_uri, extra_headers,

+                                          extra_label=seq_label)

+                output(u"remote copy: '%s' -> '%s'  %s" %

+                       (src_uri, dst_uri, seq_label))

                 total_nb_files += 1

                 total_size += item.get(u'size', 0)

             except S3Error as exc:

@@ -1549,15 +1554,20 @@ def remote_copy(s3, copy_pairs, destination_base, uploaded_objects_list=None):

     cfg = Config()

     saved_bytes = 0

     failed_copy_list = FileDict()

+    seq = 0

+    src_count = len(copy_pairs)

     for (src_obj, dst1, dst2) in copy_pairs:

+        seq += 1

         debug(u"Remote Copying from %s to %s" % (dst1, dst2))

         dst1_uri = S3Uri(destination_base + dst1)

         dst2_uri = S3Uri(destination_base + dst2)

+        seq_label = "[%d of %d]" % (seq, src_count)

         extra_headers = copy(cfg.extra_headers)

         try:

-            s3.object_copy(dst1_uri, dst2_uri, extra_headers)

+            s3.object_copy(dst1_uri, dst2_uri, extra_headers,

+                           extra_label=seq_label)

+            output(u"remote copy: '%s' -> '%s'  %s" % (dst1, dst2, seq_label))

             saved_bytes += src_obj.get(u'size', 0)

-            output(u"remote copy: '%s' -> '%s'" % (dst1, dst2))

             if uploaded_objects_list is not None:

                 uploaded_objects_list.append(dst2)

         except Exception: