Mercurial > hg
changeset 23890:7817059917d0
pullbundle2: extract addchangegroup result combining into its own function
This will also be used for 'hg unbundle'
| author | Eric Sumner <ericsumner@fb.com> |
|---|---|
| date | Fri, 16 Jan 2015 12:53:45 -0800 |
| parents | 3831e9b3750a |
| children | 5827ad0b849e |
| files | mercurial/changegroup.py mercurial/exchange.py |
| diffstat | 2 files changed, 21 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/changegroup.py Fri Jan 16 15:31:45 2015 -0500 +++ b/mercurial/changegroup.py Fri Jan 16 12:53:45 2015 -0800 @@ -42,6 +42,25 @@ """return a changegroup chunk header (string) for a zero-length chunk""" return struct.pack(">l", 0) +def combineresults(results): + """logic to combine 0 or more addchangegroup results into one""" + changedheads = 0 + result = 1 + for ret in results: + # If any changegroup result is 0, return 0 + if ret == 0: + result = 0 + break + if ret < -1: + changedheads += ret + 1 + elif ret > 1: + changedheads += ret - 1 + if changedheads > 0: + result = 1 + changedheads + elif changedheads < 0: + result = -1 + changedheads + return result + class nocompress(object): def compress(self, x): return x
--- a/mercurial/exchange.py Fri Jan 16 15:31:45 2015 -0500 +++ b/mercurial/exchange.py Fri Jan 16 12:53:45 2015 -0800 @@ -992,22 +992,8 @@ raise util.Abort('missing support for %s' % exc) if pullop.fetch: - changedheads = 0 - pullop.cgresult = 1 - for cg in op.records['changegroup']: - ret = cg['return'] - # If any changegroup result is 0, return 0 - if ret == 0: - pullop.cgresult = 0 - break - if ret < -1: - changedheads += ret + 1 - elif ret > 1: - changedheads += ret - 1 - if changedheads > 0: - pullop.cgresult = 1 + changedheads - elif changedheads < 0: - pullop.cgresult = -1 + changedheads + results = [cg['return'] for cg in op.records['changegroup']] + pullop.cgresult = changegroup.combineresults(results) # processing phases change for namespace, value in op.records['listkeys']: