pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* fixed parsing of multiline properties

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@228 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
vsnijders
2007-07-28 22:00:46 +00:00
parent c8296c17b9
commit fd67d975fe
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/svn/svnclasses.pas
View File

@ -477,7 +477,7 @@ begin
Result := TStringList.Create; Result := TStringList.Create;
for i:= 0 to PathCount -1 do for i:= 0 to PathCount -1 do
if Path[i].Action in [caModify, caAdd] then if Path[i].Action in [caModify, caAdd] then
Result.Add(BaseDir + Path[i].Path); Result.Add(SetDirSeparators(BaseDir + Path[i].Path));
end; end;
function TLogEntry.GetLogPathCount: integer; function TLogEntry.GetLogPathCount: integer;
@ -639,6 +639,17 @@ begin
ColonPos := Pos(' : ', Line); ColonPos := Pos(' : ', Line);
PropName := Copy(Line, 3, ColonPos - 3); PropName := Copy(Line, 3, ColonPos - 3);
PropValue := Copy(Line, ColonPos + 3, Length(Line)-ColonPos-2); PropValue := Copy(Line, ColonPos + 3, Length(Line)-ColonPos-2);
// try for a multiline property
inc(i);
while (i<Lines.Count) do begin
if (length(Lines[i])>=2) and (copy(Lines[i],1,2)=' ') then begin
// new property, unget line
dec(i);
break;
end;
PropValue := PropValue + LineEnding + Lines[i];
inc(i);
end;
FileProp.Properties.Values[PropName] := PropValue; FileProp.Properties.Values[PropName] := PropValue;
inc(i); inc(i);
end; end;

2
components/svn/svncommand.pas
View File

@ -93,7 +93,7 @@ begin
ReadOutput; ReadOutput;
Result := SvnProcess.ExitStatus; Result := SvnProcess.ExitStatus;
if Result<>0 then if Result<>0 then
Raise Exception.Create('Svn ' + Command + ' failed.'); Raise Exception.Create('svn ' + Command + ' failed.');
finally finally
SvnProcess.Free; SvnProcess.Free;
end; end;