Mercurial > public > mercurial-scm > hg
comparison mercurial/wireproto.py @ 23139:e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 17 Apr 2014 22:47:38 +0200 |
parents | 90f86ad3d4ff |
children | 414374cfb531 |
comparison
equal
deleted
inserted
replaced
23136:6eab50a34fed | 23139:e53f6b72a0e4 |
---|---|
825 fp.seek(0) | 825 fp.seek(0) |
826 gen = exchange.readbundle(repo.ui, fp, None) | 826 gen = exchange.readbundle(repo.ui, fp, None) |
827 r = exchange.unbundle(repo, gen, their_heads, 'serve', | 827 r = exchange.unbundle(repo, gen, their_heads, 'serve', |
828 proto._client()) | 828 proto._client()) |
829 if util.safehasattr(r, 'addpart'): | 829 if util.safehasattr(r, 'addpart'): |
830 # The return looks streameable, we are in the bundle2 case and | 830 # The return looks streamable, we are in the bundle2 case and |
831 # should return a stream. | 831 # should return a stream. |
832 return streamres(r.getchunks()) | 832 return streamres(r.getchunks()) |
833 return pushres(r) | 833 return pushres(r) |
834 | 834 |
835 finally: | 835 finally: |