Changeset 11 for trunk

Timestamp:

May 19, 2015, 11:33:02 PM (9 years ago)

Author:

chronos

Message:

• Added: Log form to show history of object. Implemented for Subversion partialy.

Location:

trunk

Files:

• Backends/Subversion/USubversion.pas (modified) (2 diffs)
• Forms/UFormBrowse.lfm (modified) (4 diffs)
• Forms/UFormBrowse.pas (modified) (8 diffs)
• Forms/UFormLog.lfm (added)
• Forms/UFormLog.pas (added)
• UCore.lfm (modified) (1 diff)
• Units/UVCS.pas (modified) (6 diffs)
• VCSCommander.lpi (modified) (2 diffs)
• VCSCommander.lpr (modified) (2 diffs)

trunk/Backends/Subversion/USubversion.pas

@@ -31 +31 @@
     procedure Merge; override;
     procedure Add(FileName: string); override;
+    procedure GetLog(FileName: string; Log: TLogList); override;
   end;
 
@@ -91 +92 @@
 end;
 
+procedure TSubversion.GetLog(FileName: string; Log: TLogList);
+var
+  NewItem: TLogItem;
+  I: Integer;
+  Line: string;
+  ChangedFiles: Boolean;
+  Action: string;
+begin
+  NewItem := nil;
+  Log.Clear;
+  Execute(['log', FileName, '-v']);
+  for I := 0 to ExecutionOutput.Count - 1 do begin
+    Line := Trim(ExecutionOutput[I]);
+    if Line = '------------------------------------------------------------------------' then begin
+      if Assigned(NewItem) then Log.Add(NewItem);
+      NewItem := TLogItem.Create;
+    end else
+    if Pos('|', Line) > 0 then begin
+      NewItem.Revision := Trim(GetNext(Line, '|'));
+      NewItem.Author := Trim(GetNext(Line, '|'));
+      GetNext(Line, '|');
+      //NewItem.Time := StrToDateTime(Trim(GetNext(Line, '|')));
+    end else
+    if Line = 'Changed paths:' then begin
+      ChangedFiles := True;
+    end else
+    if ChangedFiles then begin
+      if (Line <> '') and (Copy(ExecutionOutput[I], 1, 3) = '   ') then begin
+        Action := GetNext(Line, ' ');
+        NewItem.Actions := NewItem.Actions + Action;
+        NewItem.ChangedFiles.Add(Line);
+      end else
+      if Line = '' then begin
+        ChangedFiles := False;
+      end;
+    end else
+      NewItem.Messages.Add(Line);
+  end;
+  if Assigned(NewItem) then Log.Add(NewItem);
+end;
+
 end.
 

trunk/Forms/UFormBrowse.lfm

@@ -9 +9 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnShow = FormShow
   LCLVersion = '1.5'
   object TreeView1: TTreeView
@@ -61 +62 @@
     OnData = ListView1Data
     OnDblClick = AOpenExecute
+    OnSelectItem = ListView1SelectItem
   end
   object PopupMenu1: TPopupMenu
@@ -83 +85 @@
     object MenuItem6: TMenuItem
       Action = AOpen
+    end
+    object MenuItem7: TMenuItem
+      Action = ALogShow
     end
   end
@@ -111 +116 @@
       OnExecute = AOpenExecute
     end
+    object ALogShow: TAction
+      Caption = 'Show log'
+      OnExecute = ALogShowExecute
+    end
   end
 end

trunk/Forms/UFormBrowse.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, Menus, ActnList, UFindFile;
+  ExtCtrls, Menus, ActnList, UFindFile, UVCS;
 
 type
@@ -15 +15 @@
   TFormBrowse = class(TForm)
     AAdd: TAction;
+    ALogShow: TAction;
     AOpen: TAction;
     AProperties: TAction;
@@ -28 +29 @@
     MenuItem5: TMenuItem;
     MenuItem6: TMenuItem;
+    MenuItem7: TMenuItem;
     PopupMenu1: TPopupMenu;
     Splitter1: TSplitter;
@@ -33 +35 @@
     procedure AAddExecute(Sender: TObject);
     procedure ADeleteExecute(Sender: TObject);
+    procedure ALogShowExecute(Sender: TObject);
     procedure AOpenExecute(Sender: TObject);
     procedure ARenameExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
     procedure ListView1DblClick(Sender: TObject);
+    procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
   private
     FileList: TStringList;
@@ -53 +59 @@
 
 uses
-  UCore;
+  UCore, UFormLog;
 
 {$R *.lfm}
@@ -71 +77 @@
 end;
 
+procedure TFormBrowse.ListView1SelectItem(Sender: TObject; Item: TListItem;
+  Selected: Boolean);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormBrowse.ADeleteExecute(Sender: TObject);
 begin
 
+end;
+
+procedure TFormBrowse.ALogShowExecute(Sender: TObject);
+begin
+  FormLog.FileName := Directory + DirectorySeparator + ListView1.Selected.Caption;
+  FormLog.ShowModal;
 end;
 
@@ -114 +132 @@
 end;
 
+procedure TFormBrowse.FormShow(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormBrowse.ReloadList;
 var
@@ -145 +168 @@
   ARename.Enabled := Assigned(ListView1.Selected);
   AProperties.Enabled := Assigned(ListView1.Selected);
+  AOpen.Enabled := Assigned(ListView1.Selected);
+  ALogShow.Enabled := Assigned(ListView1.Selected);
 end;
 

trunk/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 435
-  HorizontalOffset = 539
-  VerticalOffset = 195
+  HorizontalOffset = 695
+  VerticalOffset = 306
   Width = 693
   object ActionList1: TActionList

trunk/Units/UVCS.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil;
+  Classes, SysUtils, FileUtil, Contnrs;
 
 type
+
+  { TLogItem }
+
+  TLogItem = class
+    Author: string;
+    Actions: string;
+    Time: TDateTime;
+    Revision: string;
+    Messages: TStringList;
+    ChangedFiles: TStringList;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  TLogList = class(TObjectList)
+
+  end;
 
   { TWorkingCopy }
@@ -20 +37 @@
   protected
     procedure ExecuteProcess(Command: string; Parameters: array of string); virtual;
+    function GetNext(var Text: string; Separator: string): string;
   public
+    ExecutionOutput: TStringList;
     procedure Checkout; virtual;
     procedure Update; virtual;
@@ -29 +48 @@
     procedure Refresh; virtual;
     procedure Add(FileName: string); virtual;
+    procedure GetLog(FileName: string; Log: TLogList); virtual;
+    constructor Create;
+    destructor Destroy; override;
     property RepositoryURL: string read FRepositoryURL write SetRepositoryURL;
     property Path: string read FPath write SetPath;
@@ -43 +65 @@
 uses
   UFormConsole;
+
+{ TLogItem }
+
+constructor TLogItem.Create;
+begin
+  Messages := TStringList.Create;
+  ChangedFiles := TStringList.Create;
+end;
+
+destructor TLogItem.Destroy;
+begin
+  Messages.Free;
+  ChangedFiles.Free;
+  inherited Destroy;
+end;
 
 { TWorkingCopy }
@@ -67 +104 @@
     else FormConsole.WorkingDir := '';
   FormConsole.ShowModal;
+  ExecutionOutput.Assign(FormConsole.Log);
+end;
+
+function TWorkingCopy.GetNext(var Text: string; Separator: string): string;
+begin
+  if Pos(Separator, Text) > 0 then begin
+    Result := Copy(Text, 1, Pos(Separator, Text) - 1);
+    Delete(Text, 1, Pos(Separator, Text) + Length(Separator));
+  end else begin
+    Result := Text;
+    Text := '';
+  end;
 end;
 
@@ -109 +158 @@
 end;
 
+procedure TWorkingCopy.GetLog(FileName: string; Log: TLogList);
+begin
+  Log.Clear;
+end;
+
+constructor TWorkingCopy.Create;
+begin
+  ExecutionOutput := TStringList.Create;
+  FPath := '';
+  FRepositoryURL := '';
+end;
+
+destructor TWorkingCopy.Destroy;
+begin
+  FreeAndNil(ExecutionOutput);
+  inherited Destroy;
+end;
+
 end.
 

trunk/VCSCommander.lpi

@@ -84 +84 @@
       </Item4>
     </RequiredPackages>
-    <Units Count="15">
+    <Units Count="16">
       <Unit0>
         <Filename Value="VCSCommander.lpr"/>
@@ -169 +169 @@
         <IsPartOfProject Value="True"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="Forms/UFormLog.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormLog"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+      </Unit15>
     </Units>
   </ProjectOptions>

trunk/VCSCommander.lpr

@@ -10 +10 @@
   Forms, UFormMain, UCore, Common, TemplateGenerics, UFormBrowse, UVCS,
   UFormFavorites, UFormSettings, UFormConsole, USubversion, UProject, SysUtils,
-  UFormCommit, UFormCheckout, UBazaar, UBackend
+  UFormCommit, UFormCheckout, UBazaar, UBackend, UFormLog
   { you can add units after this };
 
@@ -38 +38 @@
   Application.CreateForm(TFormCommit, FormCommit);
   Application.CreateForm(TFormCheckout, FormCheckout);
+  Application.CreateForm(TFormLog, FormLog);
   Application.Run;
 end.