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, bookmarks |
9 from mercurial import changegroup |
10 from mercurial.node import short |
10 from mercurial.node import short |
11 from mercurial.i18n import _ |
11 from mercurial.i18n import _ |
12 import os |
12 import os |
13 import errno |
13 import errno |
14 |
14 |
179 if e.errno != errno.ENOENT: |
179 if e.errno != errno.ENOENT: |
180 ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) |
180 ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) |
181 |
181 |
182 for m in updatebm: |
182 for m in updatebm: |
183 bm[m] = repo[newbmtarget].node() |
183 bm[m] = repo[newbmtarget].node() |
184 bookmarks.write(repo) |
184 bm.write() |
185 except: # re-raises |
185 except: # re-raises |
186 if backupfile: |
186 if backupfile: |
187 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
187 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
188 % backupfile) |
188 % backupfile) |
189 elif saveheads: |
189 elif saveheads: |