equal
deleted
inserted
replaced
129 try: |
129 try: |
130 for i in xrange(offset, len(tr.entries)): |
130 for i in xrange(offset, len(tr.entries)): |
131 file, troffset, ignore = tr.entries[i] |
131 file, troffset, ignore = tr.entries[i] |
132 repo.sopener(file, 'a').truncate(troffset) |
132 repo.sopener(file, 'a').truncate(troffset) |
133 tr.close() |
133 tr.close() |
134 except: |
134 except: # re-raises |
135 tr.abort() |
135 tr.abort() |
136 raise |
136 raise |
137 |
137 |
138 if saveheads or savebases: |
138 if saveheads or savebases: |
139 ui.note(_("adding branch\n")) |
139 ui.note(_("adding branch\n")) |
158 ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) |
158 ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) |
159 |
159 |
160 for m in updatebm: |
160 for m in updatebm: |
161 bm[m] = repo['.'].node() |
161 bm[m] = repo['.'].node() |
162 bookmarks.write(repo) |
162 bookmarks.write(repo) |
163 except: |
163 except: # re-raises |
164 if backupfile: |
164 if backupfile: |
165 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
165 ui.warn(_("strip failed, full bundle stored in '%s'\n") |
166 % backupfile) |
166 % backupfile) |
167 elif saveheads: |
167 elif saveheads: |
168 ui.warn(_("strip failed, partial bundle stored in '%s'\n") |
168 ui.warn(_("strip failed, partial bundle stored in '%s'\n") |