##// END OF EJS Templates
lfs: use ui.note() and ui.debug() instead of ui.write() and their flags...
Matt Harbison -
r35494:5a73a044 default
parent child Browse files
Show More
@@ -290,9 +290,9 b' class _gitlfsremote(object):'
290 290 sizes[obj.get('oid')] = obj.get('size', 0)
291 291 topic = {'upload': _('lfs uploading'),
292 292 'download': _('lfs downloading')}[action]
293 if self.ui.verbose and len(objects) > 1:
294 self.ui.write(_('lfs: need to transfer %d objects (%s)\n')
295 % (len(objects), util.bytecount(total)))
293 if len(objects) > 1:
294 self.ui.note(_('lfs: need to transfer %d objects (%s)\n')
295 % (len(objects), util.bytecount(total)))
296 296 self.ui.progress(topic, 0, total=total)
297 297 def transfer(chunk):
298 298 for obj in chunk:
@@ -302,8 +302,8 b' class _gitlfsremote(object):'
302 302 msg = _('lfs: downloading %s (%s)\n')
303 303 elif action == 'upload':
304 304 msg = _('lfs: uploading %s (%s)\n')
305 self.ui.write(msg % (obj.get('oid'),
306 util.bytecount(objsize)))
305 self.ui.note(msg % (obj.get('oid'),
306 util.bytecount(objsize)))
307 307 retry = self.retry
308 308 while True:
309 309 try:
@@ -312,10 +312,9 b' class _gitlfsremote(object):'
312 312 break
313 313 except socket.error as ex:
314 314 if retry > 0:
315 if self.ui.verbose:
316 self.ui.write(
317 _('lfs: failed: %r (remaining retry %d)\n')
318 % (ex, retry))
315 self.ui.note(
316 _('lfs: failed: %r (remaining retry %d)\n')
317 % (ex, retry))
319 318 retry -= 1
320 319 continue
321 320 raise
@@ -326,8 +325,7 b' class _gitlfsremote(object):'
326 325 for _one, oid in oids:
327 326 processed += sizes[oid]
328 327 self.ui.progress(topic, processed, total=total)
329 if self.ui.verbose:
330 self.ui.write(_('lfs: processed: %s\n') % oid)
328 self.ui.note(_('lfs: processed: %s\n') % oid)
331 329 self.ui.progress(topic, pos=None, total=total)
332 330
333 331 def __del__(self):
@@ -273,9 +273,7 b' def writenewbundle(orig, ui, repo, sourc'
273 273
274 274 def extractpointers(repo, revs):
275 275 """return a list of lfs pointers added by given revs"""
276 ui = repo.ui
277 if ui.debugflag:
278 ui.write(_('lfs: computing set of blobs to upload\n'))
276 repo.ui.debug('lfs: computing set of blobs to upload\n')
279 277 pointers = {}
280 278 for r in revs:
281 279 ctx = repo[r]
General Comments 0
You need to be logged in to leave comments. Login now