Changeset 5

Timestamp:

Sep 1, 2014, 7:26:35 PM (10 years ago)

Author:

chronos

Message:

• Added: Form for console window. Working copy actions will call command line tool to perform operation.

Location:

trunk

Files:

• Forms/UFormConsole.lfm (added)
• Forms/UFormConsole.pas (added)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• Units/USubversion.pas (modified) (2 diffs)
• Units/UVCS.pas (modified) (3 diffs)
• VCSCommander.lpi (modified) (2 diffs)
• VCSCommander.lpr (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -50 +50 @@
       end
     end
+    object MenuItem11: TMenuItem
+      Caption = 'Actions'
+      object MenuItem12: TMenuItem
+        Action = Core.ACommandUpdate
+      end
+      object MenuItem13: TMenuItem
+        Action = Core.ACommandCommit
+      end
+      object MenuItem14: TMenuItem
+        Action = Core.ACommandCleanup
+      end
+      object MenuItem15: TMenuItem
+        Action = Core.ACommandCheckout
+      end
+      object MenuItem16: TMenuItem
+        Action = Core.ACommandStatus
+      end
+    end
     object MenuItem1: TMenuItem
       Caption = 'General'

trunk/Forms/UFormMain.pas

@@ -17 +17 @@
     MenuItem1: TMenuItem;
     MenuItem10: TMenuItem;
+    MenuItem11: TMenuItem;
+    MenuItem12: TMenuItem;
+    MenuItem13: TMenuItem;
+    MenuItem14: TMenuItem;
+    MenuItem15: TMenuItem;
+    MenuItem16: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;

trunk/UCore.lfm

@@ -36 +36 @@
       OnExecute = AProjectCloseExecute
     end
+    object ACommandUpdate: TAction
+      Caption = 'Update'
+      OnExecute = ACommandUpdateExecute
+    end
+    object ACommandCleanup: TAction
+      Caption = 'Cleanup'
+      OnExecute = ACommandCleanupExecute
+    end
+    object ACommandCheckout: TAction
+      Caption = 'Checkout'
+      OnExecute = ACommandCheckoutExecute
+    end
+    object ACommandCommit: TAction
+      Caption = 'Commit'
+      OnExecute = ACommandCommitExecute
+    end
+    object ACommandStatus: TAction
+      Caption = 'Status'
+    end
   end
   object ImageList1: TImageList

trunk/UCore.pas

@@ -15 +15 @@
   TCore = class(TDataModule)
     AAbout: TAction;
+    ACommandUpdate: TAction;
+    ACommandCleanup: TAction;
+    ACommandCheckout: TAction;
+    ACommandCommit: TAction;
+    ACommandStatus: TAction;
     AProjectClose: TAction;
     ActionList1: TActionList;
@@ -24 +29 @@
     ImageList1: TImageList;
     OpenDialog1: TOpenDialog;
+    procedure ACommandCheckoutExecute(Sender: TObject);
+    procedure ACommandCleanupExecute(Sender: TObject);
+    procedure ACommandCommitExecute(Sender: TObject);
+    procedure ACommandUpdateExecute(Sender: TObject);
     procedure AProjectCloseExecute(Sender: TObject);
     procedure AProjectOpenExecute(Sender: TObject);
@@ -89 +98 @@
 end;
 
+procedure TCore.ACommandUpdateExecute(Sender: TObject);
+begin
+  Project.WorkingCopy.Update;
+end;
+
+procedure TCore.ACommandCleanupExecute(Sender: TObject);
+begin
+  Project.WorkingCopy.CleanUp;
+end;
+
+procedure TCore.ACommandCheckoutExecute(Sender: TObject);
+begin
+  Project.WorkingCopy.Checkout;
+end;
+
+procedure TCore.ACommandCommitExecute(Sender: TObject);
+begin
+  Project.WorkingCopy.Commit;
+end;
+
 end.
 

trunk/Units/USubversion.pas

@@ -13 +13 @@
 
   TSubversion = class(TWorkingCopy)
+  protected
+    procedure Execute(Command: string); override;
+  public
     procedure Checkout; override;
     procedure Update; override;
@@ -25 +28 @@
 { TSubversion }
 
+procedure TSubversion.Execute(Command: string);
+begin
+  inherited Execute('svn ' + Command);
+end;
+
 procedure TSubversion.Checkout;
 begin
-
+  Execute('checkout');
 end;
 
 procedure TSubversion.Update;
 begin
-
+  Execute('update');
 end;
 
 procedure TSubversion.CleanUp;
 begin
-
+  Execute('cleanup');
 end;
 
 procedure TSubversion.Commit;
 begin
-
+  Execute('commit');
 end;
 
 procedure TSubversion.Move;
 begin
-
+  Execute('move');
 end;
 
 procedure TSubversion.Merge;
 begin
-
+  Execute('merge');
 end;
 

trunk/Units/UVCS.pas

@@ -16 +16 @@
     FPath: string;
     procedure SetPath(AValue: string);
+  protected
+    procedure Execute(Command: string); virtual;
   public
     procedure Checkout; virtual;
@@ -34 +36 @@
 implementation
 
+uses
+  UFormConsole;
 
 { TWorkingCopy }
@@ -39 +43 @@
 procedure TWorkingCopy.SetPath(AValue: string);
 begin
-  if FPath=AValue then Exit;
+  if FPath = AValue then Exit;
   FPath := AValue;
   Refresh;
+end;
+
+procedure TWorkingCopy.Execute(Command: string);
+begin
+  FormConsole.Executable := 'svn';
+  FormConsole.Parameters.Add(Command);
+  FormConsole.WorkingDir := Path;
+  FormConsole.Perform;
 end;
 

trunk/VCSCommander.lpi

@@ -72 +72 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="9">
+    <Units Count="10">
       <Unit0>
         <Filename Value="VCSCommander.lpr"/>
@@ -132 +132 @@
         <UnitName Value="UProject"/>
       </Unit8>
+      <Unit9>
+        <Filename Value="Forms/UFormConsole.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormConsole"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="UFormConsole"/>
+      </Unit9>
     </Units>
   </ProjectOptions>

trunk/VCSCommander.lpr

@@ -9 +9 @@
   Interfaces, // this includes the LCL widgetset
   Forms, UFormMain, UCore, UFormBrowse, UVCS, UFormFavorites, UFormSettings,
-  USubversion, UProject
+  UFormConsole, USubversion, UProject
   { you can add units after this };