# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2020-12-30 10:41:24 # Node ID 5dfa837d933e97b3e8df75130fcf5f00e83ccebc # Parent 30310886d423bd8fb0f1ef61b90b1b9bb1b8ff22 engine: refactor how total dstsize is calculated Instead of increasing it with each revlog, we just get the sum of total destination changelog, manifest and filelogs sizes. Differential Revision: https://phab.mercurial-scm.org/D9665 diff --git a/mercurial/upgrade_utils/engine.py b/mercurial/upgrade_utils/engine.py --- a/mercurial/upgrade_utils/engine.py +++ b/mercurial/upgrade_utils/engine.py @@ -285,9 +285,7 @@ def _clonerevlogs( oncopiedrevision, ) info = newrl.storageinfo(storedsize=True) - datasize = info[b'storedsize'] or 0 - dstsize += datasize - fdstsize += datasize + fdstsize += info[b'storedsize'] or 0 ui.status( _( b'finished migrating %d filelog revisions across %d ' @@ -328,9 +326,7 @@ def _clonerevlogs( oncopiedrevision, ) info = newrl.storageinfo(storedsize=True) - datasize = info[b'storedsize'] or 0 - dstsize += datasize - mdstsize += datasize + mdstsize += info[b'storedsize'] or 0 ui.status( _( b'finished migrating %d manifest revisions across %d ' @@ -370,9 +366,7 @@ def _clonerevlogs( oncopiedrevision, ) info = newrl.storageinfo(storedsize=True) - datasize = info[b'storedsize'] or 0 - dstsize += datasize - cdstsize += datasize + cdstsize += info[b'storedsize'] or 0 progress.complete() ui.status( _( @@ -382,6 +376,7 @@ def _clonerevlogs( % (crevcount, util.bytecount(cdstsize - csrcsize)) ) + dstsize = fdstsize + mdstsize + cdstsize ui.status( _( b'finished migrating %d total revisions; total change in store '