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