Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset e5334a932a3a…

Parents 0f78bfb5c0db…

Parents 95ac1dd9c4fc…

by Adrian Buehlmann

Changes to one file · Browse files at e5334a932a3a Showing diff from parent 0f78bfb5c0db 95ac1dd9c4fc Diff from another changeset...

Change 1 of 14 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
115
116
117
118
 
119
120
121
 
235
236
237
238
 
239
240
241
 
250
251
252
253
 
254
255
256
 
285
286
287
288
 
289
290
291
 
300
301
302
303
 
304
305
306
 
319
320
321
322
 
323
324
325
 
340
341
342
343
 
344
345
346
 
588
589
590
591
 
592
593
594
 
635
636
637
638
 
639
640
641
 
651
652
653
654
 
655
656
657
 
714
715
716
717
 
718
719
720
 
811
812
813
814
 
815
816
817
 
821
822
823
824
 
825
826
827
 
833
834
835
836
 
837
838
839
 
115
116
117
 
118
119
120
121
 
235
236
237
 
238
239
240
241
 
250
251
252
 
253
254
255
256
 
285
286
287
 
288
289
290
291
 
300
301
302
 
303
304
305
306
 
319
320
321
 
322
323
324
325
 
340
341
342
 
343
344
345
346
 
588
589
590
 
591
592
593
594
 
635
636
637
 
638
639
640
641
 
651
652
653
 
654
655
656
657
 
714
715
716
 
717
718
719
720
 
811
812
813
 
814
815
816
817
 
821
822
823
 
824
825
826
827
 
833
834
835
 
836
837
838
839
@@ -115,7 +115,7 @@
  " add revert rename forget remove sep"   " log update grep sep"   " synch serve clone init thgstatus sep" - " ignore guess recover sep" + " hgignore guess recover sep"   " shellconf repoconf userconf sep"   " about"  ; @@ -235,7 +235,7 @@
  }   else   { - TDEBUG_TRACE(" InsertMenuItemWithIcon1: can't find " + iconName); + TDEBUG_TRACE(" ***** InsertMenuItemWithIcon1: can't find " + iconName);   mi.fMask = MIIM_TYPE | MIIM_ID;   }   } @@ -250,7 +250,7 @@
  }   else   { - TDEBUG_TRACE(" InsertMenuItemWithIcon1: can't find " + iconName); + TDEBUG_TRACE(" ***** InsertMenuItemWithIcon1: can't find " + iconName);   mi.fMask = MIIM_TYPE | MIIM_ID;   }   } @@ -285,7 +285,7 @@
  }   else   { - TDEBUG_TRACE(" InsertSubMenuItemWithIcon2: can't find " + iconName); + TDEBUG_TRACE(" ***** InsertSubMenuItemWithIcon2: can't find " + iconName);   mi.fMask = MIIM_TYPE | MIIM_ID;   }   } @@ -300,7 +300,7 @@
  }   else   { - TDEBUG_TRACE(" InsertSubMenuItemWithIcon2: can't find " + iconName); + TDEBUG_TRACE(" ***** InsertSubMenuItemWithIcon2: can't find " + iconName);   mi.fMask = MIIM_TYPE | MIIM_ID;   }   } @@ -319,7 +319,7 @@
  MenuDescriptionMap::iterator iter = MenuDescMap.find(name);   if (iter == MenuDescMap.end())   { - TDEBUG_TRACE("InsertMenuItemByName: can't find menu info for " << name); + TDEBUG_TRACE("***** InsertMenuItemByName: can't find menu info for " << name);   return;   }   @@ -340,7 +340,7 @@
  const int count = ::GetMenuItemCount(hMenu);   if (count == -1)   { - TDEBUG_TRACE("HasTortoiseMenu: GetMenuItemCount returned -1"); + TDEBUG_TRACE("***** HasTortoiseMenu: GetMenuItemCount returned -1");   return -1;   }   @@ -588,7 +588,7 @@
  else   {   TDEBUG_TRACE( - "CShellExtCMenu::InvokeCommand: action not found for idCmd " + "***** CShellExtCMenu::InvokeCommand: action not found for idCmd "   << idCmd   );   } @@ -635,7 +635,7 @@
  MenuIdCmdMap::iterator iter = MenuIdMap.find(static_cast<UINT>(idCmd));   if (iter == MenuIdMap.end())   { - TDEBUG_TRACE("CShellExtCMenu::GetCommandString: idCmd not found"); + TDEBUG_TRACE("***** CShellExtCMenu::GetCommandString: idCmd not found");   }   else   { @@ -651,7 +651,7 @@
  if (size >= 40)   {   TDEBUG_TRACE( - "CShellExtCMenu::GetCommandString: warning:" + "***** CShellExtCMenu::GetCommandString: warning:"   << " length of help text is " << size   << ", which is not reasonably short (<40)");   } @@ -714,7 +714,7 @@
  if (size > cchMax-1)   {   TDEBUG_TRACE( - "CShellExtCMenu::GetCommandString: string was truncated: size = " + "***** CShellExtCMenu::GetCommandString: string was truncated: size = "   << size << ", cchMax = " << cchMax);   }   @@ -811,7 +811,7 @@
  }   else   { - TDEBUG_TRACE("DoHgtk: can't get cwd"); + TDEBUG_TRACE("***** DoHgtk: can't get cwd");   return;   }   @@ -821,7 +821,7 @@
  const std::string tempfile = GetTemporaryFile();   if (tempfile.empty())   { - TDEBUG_TRACE("DoHgtk: error: GetTemporaryFile returned empty string"); + TDEBUG_TRACE("***** DoHgtk: error: GetTemporaryFile returned empty string");   return;   }   @@ -833,7 +833,7 @@
    if (tempfileHandle == INVALID_HANDLE_VALUE)   { - TDEBUG_TRACE("DoHgtk: error: failed to create file " << tempfile); + TDEBUG_TRACE("***** DoHgtk: error: failed to create file " << tempfile);   return;   }