equal
deleted
inserted
replaced
752 outpath = localpath |
752 outpath = localpath |
753 localoutputpath = backup.path() |
753 localoutputpath = backup.path() |
754 # Remove the .orig to make syntax-highlighting more likely. |
754 # Remove the .orig to make syntax-highlighting more likely. |
755 if localoutputpath.endswith(b'.orig'): |
755 if localoutputpath.endswith(b'.orig'): |
756 localoutputpath, ext = os.path.splitext(localoutputpath) |
756 localoutputpath, ext = os.path.splitext(localoutputpath) |
757 localdata = util.readfile(localpath) |
757 files.append((b"local", localoutputpath, backup.data())) |
758 files.append((b"local", localoutputpath, localdata)) |
|
759 |
758 |
760 with _maketempfiles(files) as temppaths: |
759 with _maketempfiles(files) as temppaths: |
761 basepath, otherpath = temppaths[:2] |
760 basepath, otherpath = temppaths[:2] |
762 if len(temppaths) == 3: |
761 if len(temppaths) == 3: |
763 localpath = temppaths[2] |
762 localpath = temppaths[2] |