github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-27 22:03:43 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Patch tool directory matching improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15122 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-09-23 09:30:12 +00:00
parent 6a83786020
commit 6949df0418
1 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

43
uppsrc/TextDiffCtrl/patch.cpp
View file

@ -80,8 +80,9 @@ bool Patch::Load(Stream& in, Progress& pi)
common_path.Trim(MatchLen(common_path, h[i]));
common_path.TrimEnd("/");
common_path.TrimStart("/");
for(int i = 0; i < h.GetCount(); i++)
file.SetKey(i, h[i].Mid(common_path.GetCount() + 1));
if(common_path.GetCount())
for(int i = 0; i < h.GetCount(); i++)
file.SetKey(i, h[i].Mid(common_path.GetCount() + 1));
return true;
}
@ -114,26 +115,30 @@ bool Patch::MatchFiles(const Vector<String>& dir, Progress& pi)
int best = 0;
String com_path = common_path;
com_path.Replace("\\", "/");
while(com_path.GetCount()) {
for(String d : dir) {
while(d.GetCount() > 3) {
if(pi.StepCanceled())
return false;
String dir = AppendFileName(d, com_path);
int n = MatchCount(dir);
if(n > best) {
best = n;
target_dir = dir;
if(dir.GetCount())
for(int pass = 0; pass < 2; pass++) {
while(com_path.GetCount()) {
for(String d : dir) {
while(d.GetCount() > 3) {
if(pi.StepCanceled())
return false;
String dir = AppendFileName(d, com_path);
int n = MatchCount(dir);
if(n > best) {
best = n;
target_dir = dir;
}
d = GetFileFolder(d);
}
}
d = GetFileFolder(d);
int q = com_path.Find('/');
if(q >= 0)
com_path = com_path.Mid(q + 1);
else
break;
}
com_path = GetFileFolder(dir[0]);
}
int q = com_path.Find('/');
if(q >= 0)
com_path = com_path.Mid(q + 1);
else
break;
}
return best;
}