Changed private variable FRepoPath to property RepositoryPath

git-svn-id: trunk@17169 -
This commit is contained in:
darius 2008-11-01 11:39:24 +00:00
parent 97f2b268a1
commit aa20e38629
11 changed files with 120 additions and 125 deletions

View File

@ -72,10 +72,6 @@ const
type
TSortDirection = (sdAscending, sdDescending);
//TColumnSortInfo = record
//Index: integer;
//SortOrder: TSortOrder;
//end;
{ TSVNSettings }
@ -127,7 +123,7 @@ type
TSVNStatus = class(TObject)
private
FRepository: string;
FRepositoryPath: string;
FSortDirection: TSortDirection;
FSortItem: TStatusItemName;
public
@ -136,7 +132,7 @@ type
constructor Create(const ARepoPath: string);
destructor Destroy; override;
property Repository: string read FRepository write FRepository;
property RepositoryPath: string read FRepositoryPath write FrepositoryPath;
procedure Sort(ASortItem: TStatusItemName; ADirection: TSortDirection);
procedure ReverseSort(ASortItem: TStatusItemName);
property SortDirection: TSortDirection read FSortDirection write FSortDirection;
@ -476,13 +472,13 @@ var
NodeValue: string;
begin
List := TFPList.Create;
Repository := ARepoPath;
RepositoryPath := ARepoPath;
M := TMemoryStream.Create;
BytesRead := 0;
AProcess := TProcess.Create(nil);
AProcess.CommandLine := SVNExecutable + ' stat --verbose --xml ' + Repository + ' --non-interactive';
AProcess.CommandLine := SVNExecutable + ' stat --verbose --xml ' + RepositoryPath + ' --non-interactive';
debugln('TSVNStatus.Create CommandLine ' + AProcess.CommandLine);
AProcess.Options := AProcess.Options + [poUsePipes, poStdErrToOutput];
AProcess.ShowWindow := swoHIDE;

View File

@ -39,12 +39,13 @@ type
procedure FormShow(Sender: TObject);
procedure SaveButtonClick(Sender: TObject);
private
FRepositoryPath: string;
{ private declarations }
FSwitches: string;
FRepoPath: string;
public
{ public declarations }
procedure Execute(Data: PtrInt);
property RepositoryPath: string read FRepositoryPath write FrepositoryPath;
end;
procedure ShowSVNDiffFrm(ASwitches, ARepoPath: string);
@ -60,7 +61,7 @@ var
begin
SVNDiffFrm := TSVNDiffFrm.Create(nil);
SVNDiffFrm.FRepoPath:=ARepoPath;
SVNDiffFrm.RepositoryPath:=ARepoPath;
SVNDiffFrm.FSwitches:=ASwitches;
SVNDiffFrm.ShowModal;
@ -71,7 +72,7 @@ end;
procedure TSVNDiffFrm.FormShow(Sender: TObject);
begin
Caption := Format(rsLazarusSVNDiff, [FRepoPath]);
Caption := Format(rsLazarusSVNDiff, [RepositoryPath]);
Application.QueueAsyncCall(@Execute, 0);
end;
@ -94,7 +95,7 @@ var
M: TMemoryStream;
begin
AProcess := TProcess.Create(nil);
AProcess.CommandLine := SVNExecutable + ' diff ' + FSwitches + ' ' + FRepoPath + ' --non-interactive';
AProcess.CommandLine := SVNExecutable + ' diff ' + FSwitches + ' ' + RepositoryPath + ' --non-interactive';
debugln('TSVNDiffFrm.Execute commandline=', AProcess.CommandLine);
AProcess.Options := AProcess.Options + [poUsePipes, poStdErrToOutput];
AProcess.ShowWindow := swoHIDE;

View File

@ -40,9 +40,9 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = SVNLogLimit
Left = 6
Height = 14
Top = 497
Width = 97
Height = 18
Top = 489
Width = 134
HelpContext = 0
Align = alNone
Alignment = taLeftJustify
@ -153,7 +153,7 @@ object SVNLogFrm: TSVNLogFrm
object SVNActionsListView: TListView
AnchorSideBottom.Control = RefreshButton
Left = 6
Height = 163
Height = 155
Top = 326
Width = 714
HelpContext = 0
@ -204,8 +204,8 @@ object SVNLogFrm: TSVNLogFrm
end
object ButtonPanel: TButtonPanel
Left = 6
Height = 40
Top = 526
Height = 48
Top = 518
Width = 714
HelpContext = 0
Align = alBottom
@ -255,9 +255,9 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideLeft.Control = Label1
AnchorSideLeft.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel
Left = 109
Left = 146
Height = 23
Top = 497
Top = 489
Width = 94
HelpContext = 0
Align = alNone
@ -289,7 +289,7 @@ object SVNLogFrm: TSVNLogFrm
AnchorSideBottom.Control = ButtonPanel
Left = 645
Height = 25
Top = 495
Top = 487
Width = 75
HelpContext = 0
Align = alNone

View File

@ -15,17 +15,17 @@ LazarusResources.Add('TSVNLogFrm','FORMDATA',[
+'de'#9#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#13'ShowInTaskBar'#7
+#9'stDefault'#14'UseDockManager'#8#10'LCLVersion'#6#6'0.9.27'#11'WindowState'
+#7#8'wsNormal'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+'AnchorSideTop.Control'#7#11'SVNLogLimit'#4'Left'#2#6#6'Height'#2#14#3'Top'#3
+#241#1#5'Width'#2'a'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#9'Alignment'#7
+#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+'.Top'#2#0#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#0#20'Borde'
+'rSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bo'
+'rderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#19'Show last X com'
+'mits'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#6'L'
+'ayout'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9#14
+'ParentShowHint'#9#13'ShowAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'Word'
+'Wrap'#8#11'OptimalFill'#8#0#0#9'TListView'#11'LogListView'#4'Left'#2#6#6'He'
+'ight'#3#159#0#3'Top'#2#6#5'Width'#3#202#2#11'HelpContext'#2#0#5'Align'#7#5
+'AnchorSideTop.Control'#7#11'SVNLogLimit'#4'Left'#2#6#6'Height'#2#18#3'Top'#3
+#233#1#5'Width'#3#134#0#11'HelpContext'#2#0#5'Align'#7#6'alNone'#9'Alignment'
+#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+'ng.Top'#2#0#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#0#20'Bor'
+'derSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
+'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#19'Show last X c'
+'ommits'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#6
+'Layout'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9
+#14'ParentShowHint'#9#13'ShowAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'W'
+'ordWrap'#8#11'OptimalFill'#8#0#0#9'TListView'#11'LogListView'#4'Left'#2#6#6
+'Height'#3#159#0#3'Top'#2#6#5'Width'#3#202#2#11'HelpContext'#2#0#5'Align'#7#5
+'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacin'
+'g.Right'#2#6#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!Bor'
+'derSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVert'
@ -46,7 +46,7 @@ LazarusResources.Add('TSVNLogFrm','FORMDATA',[
+#0#9'MaxLength'#2#255#14'ParentBidiMode'#9#10'ParentFont'#8#8'ReadOnly'#8#10
+'ScrollBars'#7#6'ssNone'#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'#9#11'WantRe'
+'turns'#9#8'WantTabs'#8#0#0#9'TListView'#18'SVNActionsListView'#24'AnchorSid'
+'eBottom.Control'#7#13'RefreshButton'#4'Left'#2#6#6'Height'#3#163#0#3'Top'#3
+'eBottom.Control'#7#13'RefreshButton'#4'Left'#2#6#6'Height'#3#155#0#3'Top'#3
+'F'#1#5'Width'#3#202#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#7'Anchors'#11
+#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'B'
+'orderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2
@ -59,12 +59,12 @@ LazarusResources.Add('TSVNLogFrm','FORMDATA',[
+'ReadOnly'#8#9'RowSelect'#9#10'ScrollBars'#7#6'ssBoth'#17'ShowColumnHeaders'
+#9#10'SortColumn'#2#0#8'SortType'#7#6'stNone'#7'TabStop'#9#8'TabOrder'#2#2#8
+'ToolTips'#9#7'Visible'#9#9'ViewStyle'#7#8'vsReport'#0#0#12'TButtonPanel'#11
+'ButtonPanel'#4'Left'#2#6#6'Height'#2'('#3'Top'#3#14#2#5'Width'#3#202#2#11'H'
+'elpContext'#2#0#5'Align'#7#8'alBottom'#8'AutoSize'#9#11'ButtonOrder'#7#9'bo'
+'Default'#8'TabOrder'#2#3#13'DefaultButton'#7#4'pbOK'#11'ShowButtons'#11#4'p'
+'bOK'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'#7'pbClose'#6'pbHelp'#0#7'Visib'
+'le'#9#0#0#9'TSplitter'#9'Splitter1'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'H'
+'eight'#2#5#3'Top'#3#165#0#5'Width'#3#214#2#11'HelpContext'#2#0#5'Align'#7#5
+'ButtonPanel'#4'Left'#2#6#6'Height'#2'0'#3'Top'#3#6#2#5'Width'#3#202#2#11'He'
+'lpContext'#2#0#5'Align'#7#8'alBottom'#8'AutoSize'#9#11'ButtonOrder'#7#9'boD'
+'efault'#8'TabOrder'#2#3#13'DefaultButton'#7#4'pbOK'#11'ShowButtons'#11#4'pb'
+'OK'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'#7'pbClose'#6'pbHelp'#0#7'Visibl'
+'e'#9#0#0#9'TSplitter'#9'Splitter1'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'He'
+'ight'#2#5#3'Top'#3#165#0#5'Width'#3#214#2#11'HelpContext'#2#0#5'Align'#7#5
,'alTop'#8'AutoSnap'#9#7'Beveled'#8#7'MinSize'#2#30#11'ParentColor'#9#14'Pare'
+'ntShowHint'#9#12'ResizeAnchor'#7#5'akTop'#11'ResizeStyle'#7#8'rsUpdate'#7'V'
+'isible'#9#0#0#9'TSplitter'#9'Splitter2'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0
@ -73,25 +73,25 @@ LazarusResources.Add('TSVNLogFrm','FORMDATA',[
+'rentShowHint'#9#12'ResizeAnchor'#7#5'akTop'#11'ResizeStyle'#7#8'rsUpdate'#7
+'Visible'#9#0#0#9'TSpinEdit'#11'SVNLogLimit'#22'AnchorSideLeft.Control'#7#6
+'Label1'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
+#7#11'ButtonPanel'#4'Left'#2'm'#6'Height'#2#23#3'Top'#3#241#1#5'Width'#2'^'
+#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'akBottom'
+#0#10'AutoSelect'#8#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacin'
+'g.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bord'
+'erSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'B'
+'orderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Enabled'#9#9'Increment'#2#1#8
+'MaxValue'#4#160#134#1#0#8'MinValue'#2#0#10'ParentFont'#9#14'ParentShowHint'
+#9#8'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2#6#5'Value'#2'd'#7'Visible'#9#0#0
+#7'TButton'#13'RefreshButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anch'
+'orSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'ButtonPa'
+'nel'#4'Left'#3#133#2#6'Height'#2#25#3'Top'#3#239#1#5'Width'#2'K'#11'HelpCon'
+'text'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
+'oSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpac'
+'ing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!B'
+'orderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVe'
+'rtical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#7'Refresh'#7'Default'#8#10'Dr'
+'agCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiM'
+'ode'#9#11'ModalResult'#2#0#7'OnClick'#7#18'RefreshButtonClick'#10'ParentFon'
+'t'#9#14'ParentShowHint'#9#8'TabOrder'#2#7#7'TabStop'#9#7'Visible'#9#0#0#10
+#7#11'ButtonPanel'#4'Left'#3#146#0#6'Height'#2#23#3'Top'#3#233#1#5'Width'#2
+'^'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLeft'#8'akBot'
+'tom'#0#10'AutoSelect'#8#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderS'
+'pacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20
+'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'
+#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Enabled'#9#9'Increment'#2
+#1#8'MaxValue'#4#160#134#1#0#8'MinValue'#2#0#10'ParentFont'#9#14'ParentShowH'
+'int'#9#8'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2#6#5'Value'#2'd'#7'Visible'#9
+#0#0#7'TButton'#13'RefreshButton'#23'AnchorSideRight.Control'#7#5'Owner'#20
+'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'Butt'
+'onPanel'#4'Left'#3#133#2#6'Height'#2#25#3'Top'#3#231#1#5'Width'#2'K'#11'Hel'
+'pContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8
+'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderS'
+'pacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6
+'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlign'
+'Vertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#7'Refresh'#7'Default'#8#10
+'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBid'
+'iMode'#9#11'ModalResult'#2#0#7'OnClick'#7#18'RefreshButtonClick'#10'ParentF'
+'ont'#9#14'ParentShowHint'#9#8'TabOrder'#2#7#7'TabStop'#9#7'Visible'#9#0#0#10
+'TPopupMenu'#19'SVNActionsPopupMenu'#4'left'#2'%'#3'top'#3'q'#1#0#9'TMenuIte'
+'m'#11'mnuShowDiff'#7'Caption'#6#9'New Item1'#12'RightJustify'#8#19'ShowAlwa'
+'ysCheckable'#8#7'OnClick'#7#16'mnuShowDiffClick'#0#0#0#0

View File

@ -83,13 +83,15 @@ type
procedure LogListViewSelectItem(Sender: TObject; Item: TListItem;
Selected: Boolean);
private
FRepositoryPath: string;
{ private declarations }
FRepoPath: string;
LogList: TFPList;
procedure UpdateLogListView;
public
{ public declarations }
procedure Execute(Data: PtrInt);
property RepositoryPath: string read FRepositoryPath write FrepositoryPath;
end;
procedure ShowSVNLogFrm(ARepoPath: string);
@ -105,7 +107,7 @@ var
begin
SVNLogFrm := TSVNLogFrm.Create(nil);
SVNLogFrm.FRepoPath:=ARepoPath;
SVNLogFrm.RepositoryPath:=ARepoPath;
SVNLogFrm.ShowModal;
SVNLogFrm.Free;
@ -181,7 +183,7 @@ end;
procedure TSVNLogFrm.FormShow(Sender: TObject);
begin
Caption := Format(rsLazarusSVNLog, [FRepoPath]);
Caption := Format(rsLazarusSVNLog, [RepositoryPath]);
Application.QueueAsyncCall(@Execute, 0);
end;
@ -258,7 +260,7 @@ begin
path := SVNActionsListView.Selected.SubItems[0];
Delete(path, 1, 1);
i := pos('/', path);
ShowSVNDiffFrm('-r PREV', FRepoPath + Copy(path, i, length(path) - i + 1));
ShowSVNDiffFrm('-r PREV', RepositoryPath + Copy(path, i, length(path) - i + 1));
end;
end;
@ -308,10 +310,10 @@ var
end;
end;
begin
debugln('TSVNLogFrm.Execute FRepoPath=' ,FRepoPath);
debugln('TSVNLogFrm.Execute RepositoryPath=' ,RepositoryPath);
AProcess := TProcess.Create(nil);
AProcess.CommandLine := SVNExecutable + ' log --xml --verbose --limit ' + IntToStr(SVNLogLimit.Value) + ' ' + FRepoPath + ' --non-interactive';
AProcess.CommandLine := SVNExecutable + ' log --xml --verbose --limit ' + IntToStr(SVNLogLimit.Value) + ' ' + RepositoryPath + ' --non-interactive';
debugln('TSVNLogFrm.Execute CommandLine ' + AProcess.CommandLine);
AProcess.Options := AProcess.Options + [poUsePipes, poStdErrToOutput];
AProcess.ShowWindow := swoHIDE;

View File

@ -1,7 +1,7 @@
object SVNStatusFrm: TSVNStatusFrm
Left = 150
Left = 310
Height = 408
Top = 200
Top = 174
Width = 738
HelpContext = 0
ActiveControl = SVNFileListView
@ -37,7 +37,7 @@ object SVNStatusFrm: TSVNStatusFrm
WindowState = wsNormal
object SVNFileListView: TListView
Left = 6
Height = 274
Height = 266
Top = 88
Width = 726
HelpContext = 0
@ -106,7 +106,7 @@ object SVNStatusFrm: TSVNStatusFrm
object SVNCommitMsgMemo: TMemo
Left = 6
Height = 77
Top = 6
Top = 11
Width = 726
HelpContext = 0
Align = alTop
@ -121,12 +121,7 @@ object SVNStatusFrm: TSVNStatusFrm
DragCursor = crDrag
DragMode = dmManual
Enabled = True
Font.CharSet = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -13
Font.Name = 'Courier'
Font.Pitch = fpFixed
Font.Quality = fqDraft
Font.Height = 0
Font.Style = []
MaxLength = -1
ParentBidiMode = True
@ -141,8 +136,8 @@ object SVNStatusFrm: TSVNStatusFrm
end
object ButtonPanel: TButtonPanel
Left = 6
Height = 40
Top = 368
Height = 48
Top = 360
Width = 726
HelpContext = 0
Align = alBottom
@ -158,7 +153,7 @@ object SVNStatusFrm: TSVNStatusFrm
Cursor = crVSplit
Left = 0
Height = 5
Top = 83
Top = 0
Width = 738
HelpContext = 0
Align = alTop

View File

@ -1,8 +1,8 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TSVNStatusFrm','FORMDATA',[
'TPF0'#13'TSVNStatusFrm'#12'SVNStatusFrm'#4'Left'#3#150#0#6'Height'#3#152#1#3
+'Top'#3#200#0#5'Width'#3#226#2#11'HelpContext'#2#0#13'ActiveControl'#7#15'SV'
'TPF0'#13'TSVNStatusFrm'#12'SVNStatusFrm'#4'Left'#3'6'#1#6'Height'#3#152#1#3
+'Top'#3#174#0#5'Width'#3#226#2#11'HelpContext'#2#0#13'ActiveControl'#7#15'SV'
+'NFileListView'#5'Align'#7#6'alNone'#14'AllowDropFiles'#8#10'AutoScroll'#9#8
+'AutoSize'#8#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#10'biMaximiz'
+'e'#0#11'BorderStyle'#7#10'bsSizeable'#7'Caption'#6#12'SVNStatusFrm'#28'Chil'
@ -14,7 +14,7 @@ LazarusResources.Add('TSVNStatusFrm','FORMDATA',[
+'te'#7#10'FormCreate'#6'OnShow'#7#8'FormShow'#14'ParentBiDiMode'#9#10'Parent'
+'Font'#8#8'Position'#7#14'poScreenCenter'#13'ShowInTaskBar'#7#9'stDefault'#14
+'UseDockManager'#8#10'LCLVersion'#6#6'0.9.27'#11'WindowState'#7#8'wsNormal'#0
+#9'TListView'#15'SVNFileListView'#4'Left'#2#6#6'Height'#3#18#1#3'Top'#2'X'#5
+#9'TListView'#15'SVNFileListView'#4'Left'#2#6#6'Height'#3#10#1#3'Top'#2'X'#5
+'Width'#3#214#2#11'HelpContext'#2#0#5'Align'#7#8'alClient'#18'BorderSpacing.'
+'Left'#2#6#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#6#20'BorderSp'
+'acing.Bottom'#2#6#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHori'
@ -29,26 +29,24 @@ LazarusResources.Add('TSVNStatusFrm','FORMDATA',[
+'stText'#7'TabStop'#9#8'TabOrder'#2#0#8'ToolTips'#9#7'Visible'#9#9'ViewStyle'
+#7#8'vsReport'#13'OnColumnClick'#7#26'SVNFileListViewColumnClick'#12'OnSelec'
+'tItem'#7#25'SVNFileListViewSelectItem'#0#0#5'TMemo'#16'SVNCommitMsgMemo'#4
+'Left'#2#6#6'Height'#2'M'#3'Top'#2#6#5'Width'#3#214#2#11'HelpContext'#2#0#5
+'Left'#2#6#6'Height'#2'M'#3'Top'#2#11#5'Width'#3#214#2#11'HelpContext'#2#0#5
+'Align'#7#5'alTop'#9'Alignment'#7#13'taLeftJustify'#18'BorderSpacing.Left'#2
+#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bo'
+'ttom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7
+#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#10'DragCursor'#7
+#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#12'Font.CharSet'#7#12'ANSI'
+'_CHARSET'#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#243#9'Font.Name'#6#7
+'Courier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#7'fqDraft'#10'Font.'
+'Style'#11#0#9'MaxLength'#2#255#14'ParentBidiMode'#9#10'ParentFont'#8#8'Read'
+'Only'#8#10'ScrollBars'#7#6'ssNone'#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'#9
+#11'WantReturns'#9#8'WantTabs'#8#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'
+#2#6#6'Height'#2'('#3'Top'#3'p'#1#5'Width'#3#214#2#11'HelpContext'#2#0#5'Ali'
+'gn'#7#8'alBottom'#8'AutoSize'#9#11'ButtonOrder'#7#9'boDefault'#8'TabOrder'#2
+#2#13'DefaultButton'#7#4'pbOK'#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#10'S'
+'howGlyphs'#11#4'pbOK'#8'pbCancel'#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0#0#9
+'TSplitter'#8'Splitter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#5#3
+'Top'#2'S'#5'Width'#3#226#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#8'AutoSn'
+'ap'#9#7'Beveled'#8#7'MinSize'#2#30#11'ParentColor'#9#14'ParentShowHint'#9#12
+'ResizeAnchor'#7#5'akTop'#11'ResizeStyle'#7#8'rsUpdate'#7'Visible'#9#0#0#10
+'TPopupMenu'#10'PopupMenu1'#4'left'#2'5'#3'top'#3#213#0#0#9'TMenuItem'#11'mn'
+'uShowDiff'#7'Caption'#6#9'New Item1'#12'RightJustify'#8#19'ShowAlwaysChecka'
+'ble'#8#7'OnClick'#7#16'mnuShowDiffClick'#0#0#0#0
+#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#11'Font.Height'#2#0#10'Fon'
+'t.Style'#11#0#9'MaxLength'#2#255#14'ParentBidiMode'#9#10'ParentFont'#8#8'Re'
+'adOnly'#8#10'ScrollBars'#7#6'ssNone'#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'
+#9#11'WantReturns'#9#8'WantTabs'#8#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Le'
+'ft'#2#6#6'Height'#2'0'#3'Top'#3'h'#1#5'Width'#3#214#2#11'HelpContext'#2#0#5
+'Align'#7#8'alBottom'#8'AutoSize'#9#11'ButtonOrder'#7#9'boDefault'#8'TabOrde'
+'r'#2#2#13'DefaultButton'#7#4'pbOK'#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0
+#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0
+#0#9'TSplitter'#8'Splitter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#5
+#3'Top'#2#0#5'Width'#3#226#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#8'AutoS'
+'nap'#9#7'Beveled'#8#7'MinSize'#2#30#11'ParentColor'#9#14'ParentShowHint'#9
+#12'ResizeAnchor'#7#5'akTop'#11'ResizeStyle'#7#8'rsUpdate'#7'Visible'#9#0#0
+#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'5'#3'top'#3#213#0#0#9'TMenuItem'#11
+'mnuShowDiff'#7'Caption'#6#9'New Item1'#12'RightJustify'#8#19'ShowAlwaysChec'
+'kable'#8#7'OnClick'#7#16'mnuShowDiffClick'#0#0#0#0
]);

View File

@ -46,12 +46,13 @@ type
procedure SVNFileListViewSelectItem(Sender: TObject; Item: TListItem;
Selected: Boolean);
private
FRepositoryPath: string;
{ private declarations }
FRepoPath: string;
SVNStatus: TSVNStatus;
procedure UpdateFilesListView(Data: PtrInt);
public
{ public declarations }
property RepositoryPath: string read FRepositoryPath write FrepositoryPath;
end;
procedure ShowSVNStatusFrm(ARepoPath: string);
@ -67,7 +68,7 @@ var
begin
SVNStatusFrm := TSVNStatusFrm.Create(nil);
SVNStatusFrm.FRepoPath:=ARepoPath;
SVNStatusFrm.RepositoryPath:=ARepoPath;
SVNStatusFrm.ShowModal;
SVNStatusFrm.Free;
@ -77,10 +78,10 @@ end;
procedure TSVNStatusFrm.FormShow(Sender: TObject);
begin
SVNStatus := TSVNStatus.Create(FRepoPath);
SVNStatus := TSVNStatus.Create(RepositoryPath);
SVNStatus.Sort(siChecked, sdAscending);
Caption := Format('%s - %s...', [FRepoPath, rsLazarusSVNCommit]);
Caption := Format('%s - %s...', [RepositoryPath, rsLazarusSVNCommit]);
Application.QueueAsyncCall(@UpdateFilesListView, 0);
end;
@ -91,10 +92,10 @@ begin
begin
debugln('TSVNStatusFrm.mnuShowDiffClick Path=' ,SVNFileListView.Selected.SubItems[0]);
if pos(FRepoPath,SVNFileListView.Selected.SubItems[0]) <> 0 then
if pos(RepositoryPath,SVNFileListView.Selected.SubItems[0]) <> 0 then
ShowSVNDiffFrm('-r HEAD', SVNFileListView.Selected.SubItems[0])
else
ShowSVNDiffFrm('-r HEAD', AppendPathDelim(FRepoPath) + SVNFileListView.Selected.SubItems[0]);
ShowSVNDiffFrm('-r HEAD', AppendPathDelim(RepositoryPath) + SVNFileListView.Selected.SubItems[0]);
end;
end;
@ -112,8 +113,8 @@ begin
StatusItem := PSVNStatusItem(SVNStatus.List.Items[i]);
if StatusItem^.Checked then
if pos(FRepoPath,StatusItem^.Path) = 0 then
CmdLine := CmdLine + ' ' + AppendPathDelim(FRepoPath) + StatusItem^.Path
if pos(RepositoryPath,StatusItem^.Path) = 0 then
CmdLine := CmdLine + ' ' + AppendPathDelim(RepositoryPath) + StatusItem^.Path
else
CmdLine := CmdLine + ' ' + StatusItem^.Path;
end;

View File

@ -36,7 +36,7 @@ object SVNUpdateFrm: TSVNUpdateFrm
WindowState = wsNormal
object SVNUpdateListView: TListView
Left = 6
Height = 248
Height = 240
Top = 6
Width = 628
HelpContext = 0
@ -81,8 +81,8 @@ object SVNUpdateFrm: TSVNUpdateFrm
end
object ButtonPanel: TButtonPanel
Left = 6
Height = 40
Top = 260
Height = 48
Top = 252
Width = 628
HelpContext = 0
Align = alBottom
@ -95,9 +95,9 @@ object SVNUpdateFrm: TSVNUpdateFrm
Visible = True
object ShowLogButton: TBitBtn
Left = 78
Height = 26
Height = 34
Top = 8
Width = 120
Width = 131
HelpContext = 0
Align = alLeft
AutoSize = True

View File

@ -14,7 +14,7 @@ LazarusResources.Add('TSVNUpdateFrm','FORMDATA',[
+'how'#14'ParentBiDiMode'#9#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'
+#13'ShowInTaskBar'#7#9'stDefault'#14'UseDockManager'#8#10'LCLVersion'#6#6'0.'
+'9.27'#11'WindowState'#7#8'wsNormal'#0#9'TListView'#17'SVNUpdateListView'#4
+'Left'#2#6#6'Height'#3#248#0#3'Top'#2#6#5'Width'#3't'#2#11'HelpContext'#2#0#5
+'Left'#2#6#6'Height'#3#240#0#3'Top'#2#6#5'Width'#3't'#2#11'HelpContext'#2#0#5
+'Align'#7#8'alClient'#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19
+'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Arou'
+'nd'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.C'
@ -25,13 +25,13 @@ LazarusResources.Add('TSVNUpdateFrm','FORMDATA',[
+'Menu'#7#15'UpdatePopupMenu'#8'ReadOnly'#8#9'RowSelect'#9#10'ScrollBars'#7#10
+'ssAutoBoth'#17'ShowColumnHeaders'#9#10'SortColumn'#2#0#8'SortType'#7#6'stNo'
+'ne'#7'TabStop'#9#8'TabOrder'#2#0#8'ToolTips'#9#7'Visible'#9#9'ViewStyle'#7#8
+'vsReport'#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6#6'Height'#2'('#3
+'Top'#3#4#1#5'Width'#3't'#2#11'HelpContext'#2#0#5'Align'#7#8'alBottom'#8'Aut'
+'oSize'#9#11'ButtonOrder'#7#9'boDefault'#8'TabOrder'#2#1#13'DefaultButton'#7
+#4'pbOK'#11'ShowButtons'#11#4'pbOK'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'#7
+'pbClose'#6'pbHelp'#0#7'Visible'#9#0#7'TBitBtn'#13'ShowLogButton'#4'Left'#2
+'N'#6'Height'#2#26#3'Top'#2#8#5'Width'#2'x'#11'HelpContext'#2#0#5'Align'#7#6
+'alLeft'#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+'vsReport'#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6#6'Height'#2'0'#3
+'Top'#3#252#0#5'Width'#3't'#2#11'HelpContext'#2#0#5'Align'#7#8'alBottom'#8'A'
+'utoSize'#9#11'ButtonOrder'#7#9'boDefault'#8'TabOrder'#2#1#13'DefaultButton'
+#7#4'pbOK'#11'ShowButtons'#11#4'pbOK'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'
+#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0#7'TBitBtn'#13'ShowLogButton'#4'Left'#2
+'N'#6'Height'#2'"'#3'Top'#2#8#5'Width'#3#131#0#11'HelpContext'#2#0#5'Align'#7
+#6'alLeft'#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+'round'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+'g.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#13'ShowLogButton'

View File

@ -42,13 +42,15 @@ type
procedure OKButtonClick(Sender: TObject);
procedure ShowLogButtonClick(Sender: TObject);
private
FRepositoryPath: string;
{ private declarations }
FRepoPath: string;
procedure ProcessSVNUpdateOutput(var MemStream: TMemoryStream; var BytesRead: LongInt);
public
{ public declarations }
procedure Execute(Data: PtrInt);
end;
property RepositoryPath: string read FRepositoryPath write FrepositoryPath;
end;
procedure ShowSVNUpdateFrm(ARepoPath: string);
@ -65,7 +67,7 @@ var
begin
SVNUpdateFrm := TSVNUpdateFrm.Create(nil);
SVNUpdateFrm.FRepoPath:=ARepoPath;
SVNUpdateFrm.RepositoryPath:=ARepoPath;
SVNUpdateFrm.ShowModal;
SVNUpdateFrm.Free;
@ -84,7 +86,7 @@ end;
procedure TSVNUpdateFrm.FormShow(Sender: TObject);
begin
Caption := Format(rsLazarusSVNUpdate, [FRepoPath]);
Caption := Format(rsLazarusSVNUpdate, [RepositoryPath]);
Application.QueueAsyncCall(@Execute, 0);
end;
@ -112,7 +114,7 @@ end;
procedure TSVNUpdateFrm.ShowLogButtonClick(Sender: TObject);
begin
ShowSVNLogFrm(FRepoPath);
ShowSVNLogFrm(RepositoryPath);
end;
procedure TSVNUpdateFrm.ProcessSVNUpdateOutput(var MemStream: TMemoryStream; var BytesRead: LongInt);
@ -165,7 +167,7 @@ begin
BytesRead := 0;
AProcess := TProcess.Create(nil);
AProcess.CommandLine := SVNExecutable + ' update ' + FRepoPath + ' --non-interactive';
AProcess.CommandLine := SVNExecutable + ' update ' + RepositoryPath + ' --non-interactive';
debugln('TSVNUpdateFrm.Execute CommandLine ' + AProcess.CommandLine);
AProcess.Options := [poUsePipes, poStdErrToOutput];
AProcess.ShowWindow := swoHIDE;