From fd67d975fe741fbe35789a4bb5c84dbf9418bd9f Mon Sep 17 00:00:00 2001 From: vsnijders Date: Sat, 28 Jul 2007 22:00:46 +0000 Subject: [PATCH] * fixed parsing of multiline properties git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@228 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/svn/svnclasses.pas | 13 ++++++++++++- components/svn/svncommand.pas | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/svn/svnclasses.pas b/components/svn/svnclasses.pas index b0366196c..d6f8b6c59 100644 --- a/components/svn/svnclasses.pas +++ b/components/svn/svnclasses.pas @@ -477,7 +477,7 @@ begin Result := TStringList.Create; for i:= 0 to PathCount -1 do if Path[i].Action in [caModify, caAdd] then - Result.Add(BaseDir + Path[i].Path); + Result.Add(SetDirSeparators(BaseDir + Path[i].Path)); end; function TLogEntry.GetLogPathCount: integer; @@ -639,6 +639,17 @@ begin ColonPos := Pos(' : ', Line); PropName := Copy(Line, 3, ColonPos - 3); PropValue := Copy(Line, ColonPos + 3, Length(Line)-ColonPos-2); + // try for a multiline property + inc(i); + while (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; inc(i); end; diff --git a/components/svn/svncommand.pas b/components/svn/svncommand.pas index eb9dc4086..838f58a74 100644 --- a/components/svn/svncommand.pas +++ b/components/svn/svncommand.pas @@ -93,7 +93,7 @@ begin ReadOutput; Result := SvnProcess.ExitStatus; if Result<>0 then - Raise Exception.Create('Svn ' + Command + ' failed.'); + Raise Exception.Create('svn ' + Command + ' failed.'); finally SvnProcess.Free; end;