mercurial/transaction.py

50305:972f3e5c94b8

                filepath = vfs.join(f)
                backuppath = vfs.join(b)
                checkambig = checkambigfiles and (f, l) in checkambigfiles
                try:
                    util.copyfile(backuppath, filepath, checkambig=checkambig)
                    backupfiles.append(b)
                except IOError as exc:
                    e_msg = stringutil.forcebytestr(exc)
                    report(_(b"failed to recover %s (%s)\n") % (f, e_msg))
            else:
                target = f or b

    backuppath = b"%s.backupfiles" % journal
    if opener.exists(backuppath):
        opener.unlink(backuppath)
    opener.unlink(journal)
    try:
        for f in backupfiles:
            if opener.exists(f):
                opener.unlink(f)
    except (IOError, OSError, error.Abort):
        # only pure backup file remains, it is sage to ignore any error
        pass

50306:90276164333a

                filepath = vfs.join(f)
                backuppath = vfs.join(b)
                checkambig = checkambigfiles and (f, l) in checkambigfiles
                try:
                    util.copyfile(backuppath, filepath, checkambig=checkambig)
                    backupfiles.append((vfs, b))
                except IOError as exc:
                    e_msg = stringutil.forcebytestr(exc)
                    report(_(b"failed to recover %s (%s)\n") % (f, e_msg))
            else:
                target = f or b

    backuppath = b"%s.backupfiles" % journal
    if opener.exists(backuppath):
        opener.unlink(backuppath)
    opener.unlink(journal)
    try:
        for vfs, f in backupfiles:
            if vfs.exists(f):
                vfs.unlink(f)
    except (IOError, OSError, error.Abort):
        # only pure backup file remains, it is sage to ignore any error
        pass