equal
deleted
inserted
replaced
199 else: |
199 else: |
200 tobackup = [f for f in newfiles if f in modified or f in \ |
200 tobackup = [f for f in newfiles if f in modified or f in \ |
201 newlyaddedandmodifiedfiles] |
201 newlyaddedandmodifiedfiles] |
202 backups = {} |
202 backups = {} |
203 if tobackup: |
203 if tobackup: |
204 backupdir = repo.join('record-backups') |
204 backupdir = repo.vfs.join('record-backups') |
205 try: |
205 try: |
206 os.mkdir(backupdir) |
206 os.mkdir(backupdir) |
207 except OSError as err: |
207 except OSError as err: |
208 if err.errno != errno.EEXIST: |
208 if err.errno != errno.EEXIST: |
209 raise |
209 raise |
3410 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3410 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3411 if not clearable and repo.vfs.exists(f): |
3411 if not clearable and repo.vfs.exists(f): |
3412 raise error.Abort(msg, hint=hint) |
3412 raise error.Abort(msg, hint=hint) |
3413 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3413 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3414 if clearable and repo.vfs.exists(f): |
3414 if clearable and repo.vfs.exists(f): |
3415 util.unlink(repo.join(f)) |
3415 util.unlink(repo.vfs.join(f)) |
3416 |
3416 |
3417 afterresolvedstates = [ |
3417 afterresolvedstates = [ |
3418 ('graftstate', |
3418 ('graftstate', |
3419 _('hg graft --continue')), |
3419 _('hg graft --continue')), |
3420 ] |
3420 ] |