equal
deleted
inserted
replaced
155 f.close() |
155 f.close() |
156 if not keeppartialbundle: |
156 if not keeppartialbundle: |
157 os.unlink(chgrpfile) |
157 os.unlink(chgrpfile) |
158 |
158 |
159 # remove undo files |
159 # remove undo files |
160 for undofile in repo.undofiles(): |
160 for undovfs, undofile in repo.undofiles(): |
161 try: |
161 try: |
162 os.unlink(undofile) |
162 undovfs.unlink(undofile) |
163 except OSError, e: |
163 except OSError, e: |
164 if e.errno != errno.ENOENT: |
164 if e.errno != errno.ENOENT: |
165 ui.warn(_('error removing %s: %s\n') % (undofile, str(e))) |
165 ui.warn(_('error removing %s: %s\n') % |
|
166 (undovfs.join(undofile), str(e))) |
166 |
167 |
167 for m in updatebm: |
168 for m in updatebm: |
168 bm[m] = repo[newbmtarget].node() |
169 bm[m] = repo[newbmtarget].node() |
169 bm.write() |
170 bm.write() |
170 except: # re-raises |
171 except: # re-raises |