Login | Register
My pages Projects Community openCollabNet

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

delphiaddinfortortoisesvn
Discussion topic

Back to topic list

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

Author otto_noll
Full name Otto Noll
Date 2009-01-09 04:31:12 PST
Message Author: otto_noll
Date: 2009-01-09 04:31:11-0800
New Revision: 48

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

Log:
Add "Merge" 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​=48&r1=47&r2​=48
====================​====================​====================​==================
--- branches/SOPTIM/src/​tsvnWizard.pas (original)
+++ branches/SOPTIM/src/​tsvnWizard.pas 2009-01-09 04:31:11-0800
@@ -26,7 +26,8 @@
         SVN_EXPLORE,
         SVN_GRAPH,
         SVN_LOCK,
- SVN_LOG
+ SVN_LOG,
+ SVN_MERGE
     );
 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_LOG do begin
+ for J:= SVN_Add to SVN_MERGE do begin
             bmp:= TBitmap.create;
             try
               bmp.LoadFromResourceName( HInstance, getBitmapName(J) );
@@ -277,6 +278,7 @@
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_GRAPH​))) as TMenuItem).Enabled := false;
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_LOCK)​)) as TMenuItem).Enabled := false;
     (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_LOG))​) as TMenuItem).Enabled := false;
+ (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_MERGE​))) as TMenuItem).Enabled := false;
     GetCurrentModuleFile​List(files);
     if files.Count > 0 then
     begin
@@ -289,6 +291,7 @@
       (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_GRAPH​))) as TMenuItem).Enabled := true;
       (submenu.FindCompone​nt('ESVNFeature_'+in​ttostr(ord(SVN_LOCK)​)) as TMenuItem).Enabled := true;
       (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;
     end;
 end;
 
@@ -343,6 +346,8 @@
             Result:= 'lock';
         SVN_LOG:
             Result:= 'log';
+ SVN_MERGE:
+ Result:= 'merge';
     end;
 end;
 
@@ -387,6 +392,8 @@
             Result:= 'Lock...';
         SVN_LOG:
             Result:= 'Log...';
+ SVN_MERGE:
+ Result:= 'Merge...';
     end;
 end;
 
@@ -424,6 +431,8 @@
             ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
         SVN_LOG:
             ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
+ SVN_MERGE:
+ ;// this verb state is updated by TTortoiseSVN.CheckOn_Popup
         SVN_UPDATE_TO_SANDBOX:
             if GetCurrentProject <> nil then
                 Result:= vsEnabled;
@@ -552,6 +561,14 @@
               else if GetCurrentModuleFile​List(TStringList.cre​ate).Count = 1 then
                   TSVNExec( '/command:log /notempfile /path:' + AnsiQuotedStr(GetCur​rentModuleFileList(T​StringList.create)[0​], '"' ) );
             end;
+ SVN_MERGE:
+ if project <> nil then
+ begin
+ if GetCurrentModuleFile​List(TStringList.cre​ate).Count > 1 then
+ TSVNExec( '/command:merge /notempfile /path:' + AnsiQuotedStr( ExtractFileName(GetC​urrentModuleFileList​(TStringList.create)​[0] ), '"' ) )
+ else if GetCurrentModuleFile​List(TStringList.cre​ate).Count = 1 then
+ TSVNExec( '/command:merge /notempfile /path:' + AnsiQuotedStr(GetCur​rentModuleFileList(T​StringList.create)[0​], '"' ) );
+ end;
         SVN_EXPLORE:
             if project <> nil then
             begin

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

Messages

Show all messages in topic

svn commit: r48 - branches/SOPTIM/src/tsvnWizard.pas otto_noll Otto Noll 2009-01-09 04:31:12 PST
Messages per page: