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

menu: simplify determination if merging

Changeset 346a55135ec9…

Parent d702d0193f3a…

by Simon Heimberg

Changes to one file · Browse files at 346a55135ec9 Showing diff from parent d702d0193f3a Diff from another changeset...

Change 1 of 2 Show Entire File tortoise/​menuthg.py Stacked
 
6
7
8
9
 
10
11
12
 
289
290
291
292
 
 
293
294
295
296
297
298
 
299
300
301
 
6
7
8
 
9
10
11
12
 
289
290
291
 
292
293
294
295
296
 
 
 
297
298
299
300
@@ -6,7 +6,7 @@
 import os  import cachethg  import thgutil -from mercurial import hg, ui +from mercurial import hg, ui, node  from mercurial.i18n import _    try: @@ -289,13 +289,12 @@
  _("update working directory"),   'update', icon="menucheckout.ico")   - if len(repo.changectx(None).parents()) < 2: + 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") - - inmerge = len(repo.changectx(None).parents()) > 1 - if inmerge: + else:   menu.add_menu(_("Undo Merge"),   _("Undo merge by updating to revision"),   'merge', icon="menuunmerge.ico")