Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

cmenu: update default promoted items, Python menu list

Changeset e04a5c974d53…

Parent 09a9e2798934…

by Steve Borho

Changes to 2 files · Browse files at e04a5c974d53 Showing diff from parent 09a9e2798934 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​util/​menuthg.py Stacked
 
28
29
30
31
32
33
34
35
36
 
46
47
48
49
 
50
51
52
 
53
54
55
 
61
62
63
64
65
66
67
68
69
 
79
80
81
82
83
84
85
86
87
 
298
299
300
301
302
303
304
305
 
318
319
320
321
322
323
324
325
326
327
328
 
329
330
331
332
333
334
335
336
337
338
 
28
29
30
 
 
 
31
32
33
 
43
44
45
 
46
47
48
 
49
50
51
52
 
58
59
60
 
 
 
61
62
63
 
73
74
75
 
 
 
76
77
78
 
289
290
291
 
 
292
293
294
 
307
308
309
 
 
 
 
310
311
312
 
313
314
315
316
317
318
319
 
320
321
322
@@ -28,9 +28,6 @@
  'status': { 'label': _('File Status'),   'help': _('Repository status & changes'),   'icon': 'menushowchanged.ico'}, - 'shelve': { 'label': _('Shelve Changes'), - 'help': _('Shelve or unshelve file changes'), - 'icon': 'shelve.ico'},   'add': { 'label': _('Add Files...'),   'help': _('Add files to version control'),   'icon': 'menuadd.ico'}, @@ -46,10 +43,10 @@
  'rename': { 'label': _('Rename File'),   'help': _('Rename file or directory'),   'icon': 'general.ico'}, - 'log': { 'label': _('Repository Explorer'), + 'workbench': { 'label': _('Workbench'),   'help': _('View change history in repository'),   'icon': 'menulog.ico'}, - 'history': { 'label': _('File History'), + 'log': { 'label': _('File History'),   'help': _('View change history of selected files'),   'icon': 'menulog.ico'},   'synch': { 'label': _('Synchronize'), @@ -61,9 +58,6 @@
  'update': { 'label': _('Update...'),   'help': _('Update working directory'),   'icon': 'menucheckout.ico'}, - 'recover': { 'label': _('Recovery...'), - 'help': _('Repair and recovery of repository'), - 'icon': 'general.ico'},   'thgstatus': { 'label': _('Update Icons'),   'help': _('Update icons for this repository'),   'icon': 'refresh_overlays.ico'}, @@ -79,9 +73,6 @@
  'about': { 'label': _('About TortoiseHg'),   'help': _('Show About Dialog'),   'icon': 'menuabout.ico'}, - 'datamine': { 'label': _('Annotate Files'), - 'help': _('Changeset information per file line'), - 'icon': 'menublame.ico'},   'vdiff': { 'label': _('Visual Diff'),   'help': _('View changes using GUI diff tool'),   'icon': 'TortoiseMerge.ico'}, @@ -298,8 +289,6 @@
  menu.add_menu('hgignore')   if changed or cachethg.UNKNOWN in states:   menu.add_menu('status') - if modified: - menu.add_menu('shelve')     # Visual Diff (any extdiff command)   has_vdiff = repo.ui.config('tortoisehg', 'vdiff', 'vdiff') != '' @@ -318,21 +307,16 @@
  if files and changed:   menu.add_menu('revert')   - # we can only annotate file but not directories - if onlyfiles and tracked: - menu.add_menu('datamine') -   menu.add_sep()     if tracked: - menu.add_menu(files and 'history' or 'log') + menu.add_menu(files and 'log' or 'workbench')     if len(files) == 0:   menu.add_sep()   menu.add_menu('grep')   menu.add_sep()   menu.add_menu('synch') - menu.add_menu('recover')   menu.add_menu('serve')   menu.add_sep()   menu.add_menu('clone')
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
429
430
431
432
 
433
434
435
 
429
430
431
 
432
433
434
435
@@ -429,7 +429,7 @@
  typedef std::vector<std::string> entriesT;   typedef entriesT::const_iterator entriesIter;   - std::string promoted_string = "commit,log"; // default value if key not found + std::string promoted_string = "commit,workbench"; // default value if key not found   GetRegistryConfig("PromotedItems", promoted_string);     entriesT promoted;