Changeset 3 for trunk/SVNZero.lpr

Timestamp:

Mar 2, 2022, 1:22:13 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Restore zeroed pristine files using svn export from repository.
• Added: Automated validity tests.

File:

• trunk/SVNZero.lpr (modified) (6 diffs)

trunk/SVNZero.lpr

@@ -7 +7 @@
   cthreads,
   {$ENDIF}
-  Classes, SysUtils, CustApp, USubversion
+  Classes, SysUtils, CustApp, USubversion, UTest, USvnZero
   { you can add units after this };
 
 type
 
-  { TSvnZero }
+  { TSvnZeroApp }
 
-  TSvnZero = class(TCustomApplication)
+  TSvnZeroApp = class(TCustomApplication)
   protected
     procedure DoRun; override;
-    function CheckErrorOutput(Text: string): Boolean;
+  private
+    procedure NormalRun;
   public
-    Subversion: TSubversion;
+    SvnZero: TSvnZero;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -27 +28 @@
 { TSvnZero }
 
-procedure TSvnZero.DoRun;
-var
-  StandardOutput: string;
-  Params: array of string;
-  I: Integer;
+procedure TSvnZeroApp.DoRun;
 begin
-  StandardOutput := '';
-  SetLength(Params, ParamCount);
-  for I := 0 to ParamCount - 1 do
-    Params[I] := GetParams(I + 1);
-
-  while True do begin
-    Subversion.Execute(Params);
-    StandardOutput := StandardOutput + Subversion.StandardOutput;
-    if CheckErrorOutput(Subversion.ErrorOutput) then begin
-    end else Break;
+  if HasOption('t', 'test') then begin
+    with TTest.Create do
+    try
+      Run;
+    finally
+      Free;
+    end;
+  end else begin
+    NormalRun;
   end;
-  if StandardOutput <>'' then Write(StandardOutput);
-  if Subversion.ErrorOutput <>'' then Write(Subversion.ErrorOutput);
-  Subversion.ZeroPristine;
 
 (*  // quick check parameters
@@ -62 +55 @@
     Exit;
   end;
-
-  { add your program here }
  *)
 
@@ -70 +61 @@
 end;
 
-function TSvnZero.CheckErrorOutput(Text: string): Boolean;
+procedure TSvnZeroApp.NormalRun;
 var
-  FileName: string;
+  Params: TStringArray;
   I: Integer;
 begin
-  Result := False;
-  if Pos(': Checksum mismatch', Text) > 0 then begin
-    I := Pos('''', Text);
-    if I > 0 then begin
-      FileName := Copy(Text, I + 1, MaxInt);
-      I := Pos('''', FileName);
-      if I > 0 then
-        Delete(FileName, I, MaxInt);
+  Params := Default(TStringArray);
+  SetLength(Params, ParamCount);
+  for I := 0 to ParamCount - 1 do
+    Params[I] := GetParams(I + 1);
 
-      Subversion.Execute(['-r', '0', 'update', FileName]);
-      Subversion.Execute(['cleanup']);
-      Result := True;
-    end;
-  end;
+  SVNZero.ExecuteOutput(Params);
 end;
 
-constructor TSvnZero.Create(TheOwner: TComponent);
+constructor TSvnZeroApp.Create(TheOwner: TComponent);
 begin
   inherited;
   StopOnException := True;
-  Subversion := TSubversion.Create;
+  SvnZero := TSvnZero.Create;
 end;
 
-destructor TSvnZero.Destroy;
+destructor TSvnZeroApp.Destroy;
 begin
-  FreeAndNil(Subversion);
+  FreeAndNil(SvnZero);
   inherited;
 end;
 
-procedure TSvnZero.WriteHelp;
+procedure TSvnZeroApp.WriteHelp;
 begin
   { add your help code here }
-  writeln('Usage: ', ExeName, ' -h');
+  WriteLn('Usage: ', ExeName, ' -h');
 end;
 
@@ -116 +99 @@
 
 var
-  Application: TSvnZero;
+  Application: TSvnZeroApp;
 begin
   {$if declared(UseHeapTrace)}
@@ -123 +106 @@
   {$ENDIF}
 
-  Application := TSvnZero.Create(nil);
+  Application := TSvnZeroApp.Create(nil);
   Application.Title := 'SVN Zero';
   Application.Run;