github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed Copy when comparing git revisions in directory

Browse source
This commit is contained in:
Mirek Fidler 2026-04-08 16:01:54 +02:00
parent c3e396263e
commit d4542d490d
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/TextDiffCtrl/DirDiff.cpp
View file

@ -346,8 +346,8 @@ void DirDiffDlg::File()
};
diff.Set(Null, Null);
String f1 = LoadFile(p1);
String f2 = LoadFile(p2);
f1 = LoadFile(p1);
f2 = LoadFile(p2);
if(split_lines) {
f1 = SplitLines(f1);
f2 = SplitLines(f2);
@ -396,10 +396,11 @@ void DirDiffDlg::Copy(bool left)
}
if(PromptYesNo("Copy [* \1" + src + "\1]&to [* \1" + dst + "\1] ?")) {
Backup(dst);
FileIn in(src);
FileOut out(dst);
CopyStream(out, in);
out.Close();
String src_data = f1;
String dst_data = f2;
if(left)
Swap(src_data, dst_data);
SaveFile(dst, src_data);
Refresh();
}
}

2
uppsrc/TextDiffCtrl/TextDiffCtrl.h
View file

@ -307,6 +307,8 @@ protected:
bool editable_left = true;
bool editable_right = true;
String f1, f2;
int lmid = 0; // for git support
int rmid = 0; // for git support