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

fpsvnsync: fixed adding file with spaces.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@295 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
vsnijders
2007-12-22 15:09:13 +00:00
parent b8d679e94e
commit cfabbe90ac
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/fpsvnsync/fpsvnsync.lpi
View File

@ -2,7 +2,7 @@
<CONFIG>
<ProjectOptions>
<PathDelim Value="\"/>
<Version Value="5"/>
<Version Value="6"/>
<General>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
@ -21,6 +21,7 @@
<local>
<FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
<WorkingDirectory Value="C:\lazarus\lazmirror"/>
</local>
</RunParams>
<RequiredPackages Count="2">

21
applications/fpsvnsync/fpsvnsync.lpr
View File

@ -74,7 +74,7 @@ var
SourceHead: integer;
Revision: integer;
XmlOutput: TMemoryStream;
SvnResult: LongInt;
//SvnResult: LongInt;
SvnLog: TSvnLog;
SubPath: string;
DestRoot: string;
@ -105,7 +105,7 @@ var
writeln(format('Updating %s to revision %s', [UpdatePath, RevisionStr]));
Command := Format('up -r%s %s', [RevisionStr, UpdatePath]);
writeln('svn ', Command);
SvnResult := ExecuteSvnCommand(Command);
writeln('Result: ', ExecuteSvnCommand(Command));
end;
procedure GetDiff;
@ -117,7 +117,7 @@ var
Command := Format('diff -c%d %s', [Revision, FSourceWC+SubPath]);
writeln('svn ', Command);
XmlOutput.Clear;
SvnResult := ExecuteSvnCommand(Command, XmlOutput);
ExecuteSvnCommand(Command, XmlOutput);
XmlOutput.Position := 0;
Diff := TStringList.Create;
Diff.LoadFromStream(XmlOutput);
@ -163,7 +163,7 @@ var
if LogPath.Action in [caModify, caAdd] then begin
SourceFile := FSourceWC + LogPath.Path;
if LogPath.CopyFromPath<>'' then begin
Command := format('copy -r%d %s%s %s',
Command := format('copy -r%d "%s%s""%s"',
[LogPath.CopyFromRevision,
DestRoot, LogPath.CopyFromPath, DestFile]);
writeln('svn '+ Command);
@ -175,8 +175,9 @@ var
else
CopyFile(SourceFile, DestFile, true);
if LogPath.Action=caAdd then begin
writeln('svn add '+ DestFile);
writeln('Result: ',ExecuteSvnCommand('add '+DestFile));
Command := format('svn add "%s"', [DestFile]);
writeln(Command);
writeln('Result: ',ExecuteSvnCommand(Command));
end;
end;
end;
@ -215,13 +216,13 @@ var
writeln(DestProp.Properties.Text);
for j:=0 to DestProp.Properties.Count-1 do begin
Command := format('propdel %s %s',
Command := format('propdel %s "%s"',
[DestProp.Properties.Names[j], DestProp.FileName]);
writeln('svn ', Command);
writeln('svn result: ', ExecuteSvnCommand(Command));
end;
for j:=0 to SourceProp.Properties.Count-1 do begin
Command := format('propset %s "%s" %s',
Command := format('propset %s "%s" "%s"',
[SourceProp.Properties.Names[j],
SourceProp.Properties.ValueFromIndex[j],
DestProp.FileName]);
@ -292,7 +293,7 @@ var
Message.SaveToFile(MessageFile);
writeln(Message.Text);
Message.Free;
Command := Format('commit -F "%s" %s', [MessageFile, FDestWC+LogEntry.CommonPath]);
Command := Format('commit -F "%s" "%s"', [MessageFile, FDestWC+LogEntry.CommonPath]);
writeln('svn ', Command);
writeln('svn commit result: ', ExecuteSvnCommand(Command));
DeleteFile(MessageFile);
@ -327,7 +328,7 @@ begin
CopyChanges;
//GetDiff;
ApplyPropChanges;
CommitChanges;
//CommitChanges;
writeln;
end;