Mercurial > public > mercurial-scm > hg
diff mercurial/exchange.py @ 33037:d765ad56081f
bundle: make combinechangegroupresults() take a bundleoperation
Both callers have a bundleoperation. Passing it in lets us share a bit
more code.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 22 Jun 2017 14:04:13 -0700 |
| parents | 52c7060b707a |
| children | b82615afde65 |
line wrap: on
line diff
--- a/mercurial/exchange.py Thu Jun 22 13:58:20 2017 -0700 +++ b/mercurial/exchange.py Thu Jun 22 14:04:13 2017 -0700 @@ -1397,8 +1397,7 @@ raise error.Abort(_('missing support for %s') % exc) if pullop.fetch: - results = [cg['return'] for cg in op.records['changegroup']] - pullop.cgresult = bundle2.combinechangegroupresults(results) + pullop.cgresult = bundle2.combinechangegroupresults(op) # processing phases change for namespace, value in op.records['listkeys']: