equal
deleted
inserted
replaced
4 # Copyright 2007 Matt Mackall |
4 # Copyright 2007 Matt Mackall |
5 # |
5 # |
6 # This software may be used and distributed according to the terms of the |
6 # This software may be used and distributed according to the terms of the |
7 # GNU General Public License version 2 or any later version. |
7 # GNU General Public License version 2 or any later version. |
8 |
8 |
9 from mercurial import changegroup |
9 from mercurial import changegroup, exchange |
10 from mercurial.node import short |
10 from mercurial.node import short |
11 from mercurial.i18n import _ |
11 from mercurial.i18n import _ |
12 import errno |
12 import errno |
13 |
13 |
14 def _bundle(repo, bases, heads, node, suffix, compress=True): |
14 def _bundle(repo, bases, heads, node, suffix, compress=True): |
145 raise |
145 raise |
146 |
146 |
147 if saveheads or savebases: |
147 if saveheads or savebases: |
148 ui.note(_("adding branch\n")) |
148 ui.note(_("adding branch\n")) |
149 f = vfs.open(chgrpfile, "rb") |
149 f = vfs.open(chgrpfile, "rb") |
150 gen = changegroup.readbundle(f, chgrpfile, vfs) |
150 gen = exchange.readbundle(f, chgrpfile, vfs) |
151 if not repo.ui.verbose: |
151 if not repo.ui.verbose: |
152 # silence internal shuffling chatter |
152 # silence internal shuffling chatter |
153 repo.ui.pushbuffer() |
153 repo.ui.pushbuffer() |
154 changegroup.addchangegroup(repo, gen, 'strip', |
154 changegroup.addchangegroup(repo, gen, 'strip', |
155 'bundle:' + vfs.join(chgrpfile), True) |
155 'bundle:' + vfs.join(chgrpfile), True) |