Mercurial > hg-stable
changeset 1601:a1b25fb2e764
Error handling for unbundle, fix option line wrapping
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 27 Dec 2005 16:18:00 -0600 |
| parents | 728fd9584993 |
| children | fb4149eebdd4 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Dec 27 16:16:06 2005 -0600 +++ b/mercurial/commands.py Tue Dec 27 16:18:00 2005 -0600 @@ -2112,7 +2112,9 @@ yield zd.decompress(chunk) bzgen = bzgenerator(util.filechunkiter(f, 4096)) - repo.addchangegroup(util.chunkbuffer(bzgen)) + if repo.addchangegroup(util.chunkbuffer(bzgen)): + return 1 + if opts['update']: return update(ui, repo) else: @@ -2410,7 +2412,8 @@ "tip": (tip, [], _('hg tip')), "unbundle": (unbundle, - [('u', 'update', None, _('update the working directory to tip after unbundle'))], + [('u', 'update', None, + _('update the working directory to tip after unbundle'))], _('hg unbundle [-u] FILE')), "undo": (undo, [], _('hg undo')), "^update|up|checkout|co":