Mercurial > public > mercurial-scm > hg

comparison mercurial/wireproto.py @ 12042:210049a8d16e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: unify/refactor unbundle/readbundle
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Aug 2010 15:33:06 -0500
parents 4e804302d30c
children 516b000fbb7e
comparison
equal deleted inserted replaced
12041:270fb4d39153 12042:210049a8d16e
292 # were transferring data 292 # were transferring data
293 return 'unsynced changes' 293 return 'unsynced changes'
294 294
295 # push can proceed 295 # push can proceed
296 fp.seek(0) 296 fp.seek(0)
297 header = fp.read(6) 297 gen = changegroupmod.readbundle(fp, None)
298 if header.startswith('HG'):
299 if not header.startswith('HG10'):
300 raise ValueError('unknown bundle version')
301 elif header not in changegroupmod.bundletypes:
302 raise ValueError('unknown bundle compression type')
303 gen = changegroupmod.unbundle(header, fp)
304 298
305 try: 299 try:
306 r = repo.addchangegroup(gen, 'serve', proto._client(), 300 r = repo.addchangegroup(gen, 'serve', proto._client(),
307 lock=lock) 301 lock=lock)
308 except util.Abort, inst: 302 except util.Abort, inst: