Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

menuthg: remove update and merge from shell context menu

Changeset 45d27a2e8eb7…

Parent 4cfaab49b8ac…

by Steve Borho

Changes to one file · Browse files at 45d27a2e8eb7 Showing diff from parent 4cfaab49b8ac Diff from another changeset...

Change 1 of 1 Show Entire File tortoise/​menuthg.py Stacked
 
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
 
285
286
287
 
 
 
 
 
 
 
 
 
 
 
 
 
 
288
289
290
@@ -285,20 +285,6 @@
    if len(files) == 0:   menu.add_sep() - menu.add_menu(_("Update To Revision"), - _("update working directory"), - 'update', icon="menucheckout.ico") - - inmerge = repo.dirstate.parents()[1] != node.nullid - if not inmerge: - menu.add_menu(_("Merge Revisions"), - _("merge working directory with another revision"), - 'merge', icon="menumerge.ico") - else: - menu.add_menu(_("Undo Merge"), - _("Undo merge by updating to revision"), - 'merge', icon="menuunmerge.ico") -   menu.add_menu(_("Search History"),   _("Search revisions of files for a text pattern"),   'datamine', icon="menurepobrowse.ico")