Mercurial > hg
comparison mercurial/changegroup.py @ 38373:ef692614e601
progress: hide update(None) in a new complete() method
update(None) seemed a bit cryptic.
Differential Revision: https://phab.mercurial-scm.org/D3774
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 17 Jun 2018 22:13:41 -0700 |
| parents | 83534c4ec58b |
| children | daa08d45740f |
comparison
equal
deleted
inserted
replaced
| 38372:f4f1fb1cbfb4 | 38373:ef692614e601 |
|---|---|
| 244 # no new manifest will be created and the manifest group will | 244 # no new manifest will be created and the manifest group will |
| 245 # be empty during the pull | 245 # be empty during the pull |
| 246 self.manifestheader() | 246 self.manifestheader() |
| 247 deltas = self.deltaiter() | 247 deltas = self.deltaiter() |
| 248 repo.manifestlog._revlog.addgroup(deltas, revmap, trp) | 248 repo.manifestlog._revlog.addgroup(deltas, revmap, trp) |
| 249 prog.update(None) | 249 prog.complete() |
| 250 self.callback = None | 250 self.callback = None |
| 251 | 251 |
| 252 def apply(self, repo, tr, srctype, url, targetphase=phases.draft, | 252 def apply(self, repo, tr, srctype, url, targetphase=phases.draft, |
| 253 expectedtotal=None): | 253 expectedtotal=None): |
| 254 """Add the changegroup returned by source.read() to this repo. | 254 """Add the changegroup returned by source.read() to this repo. |
| 307 if not cgnodes: | 307 if not cgnodes: |
| 308 repo.ui.develwarn('applied empty changegroup', | 308 repo.ui.develwarn('applied empty changegroup', |
| 309 config='warn-empty-changegroup') | 309 config='warn-empty-changegroup') |
| 310 clend = len(cl) | 310 clend = len(cl) |
| 311 changesets = clend - clstart | 311 changesets = clend - clstart |
| 312 progress.update(None) | 312 progress.complete() |
| 313 self.callback = None | 313 self.callback = None |
| 314 | 314 |
| 315 # pull off the manifest group | 315 # pull off the manifest group |
| 316 repo.ui.status(_("adding manifests\n")) | 316 repo.ui.status(_("adding manifests\n")) |
| 317 # We know that we'll never have more manifests than we had | 317 # We know that we'll never have more manifests than we had |