# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1135721880 21600
# Node ID a1b25fb2e76478a0221589adc13f57baf2530221
# Parent  728fd95849931f1d70d5b05ec39c7529f643452f
Error handling for unbundle, fix option line wrapping



diff -r 728fd9584993 -r a1b25fb2e764 mercurial/commands.py
--- 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":