Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r53 - branches/SOPTIM/src/tsvnWizard.pas

delphiaddinfortortoisesvn
Discussion topic

Back to topic list

svn commit: r53 - branches/SOPTIM/src/tsvnWizard.pas

Author otto_noll
Full name Otto Noll
Date 2009-01-09 07:03:31 PST
Message Author: otto_noll
Date: 2009-01-09 07:03:30-0800
New Revision: 53

Modified:
   branches/SOPTIM/src/​tsvnWizard.pas

Log:
Add "Resolve" to context menu

Modified: branches/SOPTIM/src/​tsvnWizard.pas
Url: http://delphiaddinfo​rtortoisesvn.tigris.​org/source/browse/de​lphiaddinfortortoise​svn/branches/SOPTIM/​src/tsvnWizard.pas?v​iew=diff&pathrev​=53&r1=52&r2​=53
====================​====================​====================​==================
--- branches/SOPTIM/src/​tsvnWizard.pas (original)
+++ branches/SOPTIM/src/​tsvnWizard.pas 2009-01-09 07:03:30-0800
@@ -29,7 +29,8 @@
         SVN_LOG,
         SVN_MERGE,
         SVN_PROPERTIES,
- SVN_DELETE
+ SVN_DELETE,
+ SVN_RESOLVE
     );
 type TTortoiseSVN = class(TNotifierObject, IOTANotifier, IOTAWizard)
 private
@@ -236,7 +237,7 @@
           MItem.Visible := True;
           PMenu.Items.Add(MItem);
           //Creating Submenu of the Popupmenu
- for J:= SVN_Add to SVN_DELETE do begin
+ for J:= SVN_Add to SVN_RESOLVE do begin
             bmp:= TBitmap.create;
             try
               bmp.LoadFromResourceName( HInstance, getBitmapName(J) );
@@ -280,6 +281,7 @@
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_MERGE​))) as TMenuItem).Enabled := false;
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_PROPE​RTIES))) as TMenuItem).Enabled := false;
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_DELET​E))) as TMenuItem).Enabled := false;
+ (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_RESOL​VE))) as TMenuItem).Enabled := false;
     GetCurrentModuleFile​List(files);
     if files.Count > 0 then
     begin
@@ -294,6 +296,7 @@
       (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_LOG))​) as TMenuItem).Enabled := true;
       (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_MERGE​))) as TMenuItem).Enabled := true;
       (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_DELET​E))) as TMenuItem).Enabled := true;
+ (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_RESOL​VE))) as TMenuItem).Enabled := true;
     end;
 end;
 
@@ -352,6 +355,8 @@
             Result:= 'delete';
         SVN_PROPERTIES:
             Result:= 'properties';
+ SVN_RESOLVE:
+ Result:= 'resolve';
     end;
 end;
 
@@ -402,6 +407,8 @@
             Result:= 'Delete...';
         SVN_PROPERTIES:
             Result:= 'Properties...';
+ SVN_RESOLVE:
+ Result:= 'Resolve...';
     end;
 end;
 
@@ -445,6 +452,8 @@
             ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
         SVN_DELETE:
             ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
+ SVN_RESOLVE:
+ ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
         SVN_UPDATE_TO_SANDBOX:
             if GetCurrentProject <> nil then
                 Result:= vsEnabled;
@@ -555,6 +564,14 @@
               else if GetCurrentModuleFile​List(TStringList.cre​ate).Count = 1 then
                   TSVNExec( '/command:copy /notempfile /path:' + AnsiQuotedStr(GetCur​rentModuleFileList(T​StringList.create)[0​], '"' ) );
             end;
+ SVN_RESOLVE:
+ if project <> nil then
+ begin
+ if GetCurrentModuleFile​List(TStringList.cre​ate).Count > 1 then
+ TSVNExec( '/command:resolve /notempfile /path:' + AnsiQuotedStr( ExtractFileName(GetC​urrentModuleFileList​(TStringList.create)​[0] ), '"' ) )
+ else if GetCurrentModuleFile​List(TStringList.cre​ate).Count = 1 then
+ TSVNExec( '/command:resolve /notempfile /path:' + AnsiQuotedStr(GetCur​rentModuleFileList(T​StringList.create)[0​], '"' ) );
+ end;
         SVN_GRAPH:
             if project <> nil then
             begin

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r53 - branches/SOPTIM/src/tsvnWizard.pas otto_noll Otto Noll 2009-01-09 07:03:31 PST
Messages per page: