D7134: phabricator: use context manager form of progress in uploadchunks
Kwan (Ian Moody)
phabricator at mercurial-scm.org
Sat Nov 2 00:57:50 UTC 2019
Kwan added a comment.
Kwan updated this revision to Diff 17494.
Rebase onto stable
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7134?vs=17336&id=17494
BRANCH
stable
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7134/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7134
AFFECTED FILES
hgext/phabricator.py
CHANGE DETAILS
diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -609,26 +609,25 @@
"""
ui = fctx.repo().ui
chunks = callconduit(ui, b'file.querychunks', {b'filePHID': fphid})
- progress = ui.makeprogress(
+ with ui.makeprogress(
_(b'uploading file chunks'), unit=_(b'chunks'), total=len(chunks)
- )
- for chunk in chunks:
- progress.increment()
- if chunk[b'complete']:
- continue
- bstart = int(chunk[b'byteStart'])
- bend = int(chunk[b'byteEnd'])
- callconduit(
- ui,
- b'file.uploadchunk',
- {
- b'filePHID': fphid,
- b'byteStart': bstart,
- b'data': base64.b64encode(fctx.data()[bstart:bend]),
- b'dataEncoding': b'base64',
- },
- )
- progress.complete()
+ ) as progress:
+ for chunk in chunks:
+ progress.increment()
+ if chunk[b'complete']:
+ continue
+ bstart = int(chunk[b'byteStart'])
+ bend = int(chunk[b'byteEnd'])
+ callconduit(
+ ui,
+ b'file.uploadchunk',
+ {
+ b'filePHID': fphid,
+ b'byteStart': bstart,
+ b'data': base64.b64encode(fctx.data()[bstart:bend]),
+ b'dataEncoding': b'base64',
+ },
+ )
def uploadfile(fctx):
To: Kwan, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list