--- a/mercurial/bundle2.py	Fri Jul 14 19:27:28 2017 +0000
+++ b/mercurial/bundle2.py	Sun Aug 13 11:05:56 2017 +0900
@@ -318,9 +318,8 @@
 
     def addhookargs(self, hookargs):
         if self.hookargs is None:
-            raise error.Abort(
-                _('attempted to add hooks to operation after transaction '
-                  'started'))
+            raise error.ProgrammingError('attempted to add hookargs to '
+                                         'operation after transaction started')
         self.hookargs.update(hookargs)
 
 class TransactionUnavailable(RuntimeError):