[thg-dev] [PATCH] update: show both parent revisions

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1253450018 -7200
# Node ID b8a2b89251691c39ab34f64309192caca9f7ce55
# Parent  310722200794b345648b3bd5ce330e7317ece754
update: show both parent revisions

diff --git a/tortoisehg/hgtk/update.py b/tortoisehg/hgtk/update.py
--- a/tortoisehg/hgtk/update.py
+++ b/tortoisehg/hgtk/update.py
@@ -87,17 +87,22 @@ class UpdateDialog(gtk.Dialog):
             combo.append_text(t)
 
         # summary of current revision
-        label = gtk.Label('<current revision>')
+        label = gtk.Label('-')
         hb = gtk.HBox()
         hb.pack_start(label, False, False)
-        addrow('Current:', hb, expand=False)
-        self.current_rev_label = label
+        addrow('Parent 1:', hb, expand=False)
+        self.current_rev_label1 = label
+        label = gtk.Label('-')
+        hb = gtk.HBox()
+        hb.pack_start(label, False, False)
+        addrow('Parent 2:', hb, expand=False)
+        self.current_rev_label2 = label
 
         # summary of new revision
-        label = gtk.Label('<new revision>')
+        label = gtk.Label('-')
         hb = gtk.HBox()
         hb.pack_start(label, False, False)
-        addrow('New:', hb, expand=False)
+        addrow('Target:', hb, expand=False)
         self.new_rev_label = label
 
         self.update_revisions()
@@ -200,8 +205,13 @@ class UpdateDialog(gtk.Dialog):
 
             t += summary
             label.set_markup(t)
-        
-        setlabel(self.current_rev_label, self.repo['.'])
+
+        ctxs = self.repo[None].parents()
+        setlabel(self.current_rev_label1, ctxs[0])
+        if len(ctxs) == 2:
+            setlabel(self.current_rev_label2, ctxs[1])
+        else:
+            self.current_rev_label2.set_text(_('<not set>'))
         newrev = self.revcombo.get_active_text()
         setlabel(self.new_rev_label, self.repo[newrev])
 

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop