diff -r 0e330d7d9f53 -r ae53ecc47414 mercurial/commands.py
--- a/mercurial/commands.py	Mon Mar 28 17:16:00 2016 -0500
+++ b/mercurial/commands.py	Mon Mar 28 14:41:29 2016 -0700
@@ -1434,8 +1434,7 @@
         assert cgversion == '02'
         bversion = 'HG20'
 
-
-    changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
+    bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression)
 
 @command('cat',
     [('o', 'output', '',
@@ -2482,9 +2481,9 @@
               'gzip': 'HG10GZ',
               'bundle2': 'HG20'}
     bundletype = btypes.get(bundletype)
-    if bundletype not in changegroup.bundletypes:
+    if bundletype not in bundle2.bundletypes:
         raise error.Abort(_('unknown bundle type specified with --type'))
-    changegroup.writebundle(ui, bundle, bundlepath, bundletype)
+    bundle2.writebundle(ui, bundle, bundlepath, bundletype)
 
 @command('debugignore', [], '[FILE]')
 def debugignore(ui, repo, *files, **opts):