Mercurial > hg

changeset 26368:0224d22ef5d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 25 Sep 2015 23:10:47 -0500
parents a672cc61ab1d (current diff) f31ddc9bfa5f (diff)
children 4799b5c4aaf4
files mercurial/commands.py
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Sep 14 19:25:34 2015 -0400
+++ b/mercurial/commands.py	Fri Sep 25 23:10:47 2015 -0500
@@ -6388,6 +6388,12 @@
                 try:
                     op = bundle2.processbundle(repo, gen, lambda: tr)
                     tr.close()
+                except error.UnsupportedPartError as exc:
+                    raise util.Abort(_('%s: unknown bundle feature, %s')
+                                     % (fname, exc),
+                                     hint=_("see https://mercurial.selenic.com/"
+                                            "wiki/BundleFeature for more "
+                                            "information"))
                 finally:
                     if tr:
                         tr.release()