--- a/hgext/shelve.py Mon Apr 14 14:46:32 2014 -0400
+++ b/hgext/shelve.py Mon Apr 14 15:33:50 2014 -0400
@@ -25,7 +25,7 @@
from mercurial.node import nullid, nullrev, bin, hex
from mercurial import changegroup, cmdutil, scmutil, phases, commands
from mercurial import error, hg, mdiff, merge, patch, repair, util
-from mercurial import templatefilters, changegroup
+from mercurial import templatefilters, changegroup, exchange
from mercurial import lock as lockmod
from hgext import rebase
import errno
@@ -71,7 +71,7 @@
def applybundle(self):
fp = self.opener()
try:
- gen = changegroup.readbundle(fp, self.fname, self.vfs)
+ gen = exchange.readbundle(fp, self.fname, self.vfs)
changegroup.addchangegroup(self.repo, gen, 'unshelve',
'bundle:' + self.vfs.join(self.fname))
finally: