Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.6, 0.7, and 0.7.1

cmenu: keep unmerge menu visible but disable it accordingly

Changeset d5641072bec2…

Parent fa13d038ba7a…

by TK Soh

Changes to one file · Browse files at d5641072bec2 Showing diff from parent fa13d038ba7a Diff from another changeset...

Change 1 of 1 Show Entire File tortoise/​contextmenu.py Stacked
 
368
369
370
371
372
373
374
375
 
 
 
 
 
376
377
378
 
368
369
370
 
 
 
 
 
371
372
373
374
375
376
377
378
@@ -368,11 +368,11 @@
  self._merge, icon="menumerge.ico",   state=can_merge))   - # show un-merge menu per merge status of working directory - if len(repo.changectx(None).parents()) > 1: - result.append(TortoiseMenu(_("Undo Merge"), - _("Undo merge by updating to revision"), - self._merge, icon="menuunmerge.ico")) + in_merge = len(repo.changectx(None).parents()) > 1 + result.append(TortoiseMenu(_("Undo Merge"), + _("Undo merge by updating to revision"), + self._merge, icon="menuunmerge.ico", + state=in_merge))     result.append(TortoiseMenuSep())