[thg-dev] [PATCH] update: do not show "Parent 2" if there is none, reorder labels

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adr...@cadifra.com>
# Date 1253450925 -7200
# Node ID 84df13e80c5eee238356361fd99985f3786d3e1c
# Parent  b8a2b89251691c39ab34f64309192caca9f7ce55
update: do not show "Parent 2" if there is none, reorder labels

remove the label "Target:" and write the summary of the target
revision right below the combobox.

diff --git a/tortoisehg/hgtk/update.py b/tortoisehg/hgtk/update.py
--- a/tortoisehg/hgtk/update.py
+++ b/tortoisehg/hgtk/update.py
@@ -86,24 +86,30 @@ class UpdateDialog(gtk.Dialog):
         for t in tags:
             combo.append_text(t)
 
+        # summary of new revision
+        label = gtk.Label('-')
+        hb = gtk.HBox()
+        hb.pack_start(label, False, False)
+        addrow('', hb, expand=False)
+        self.new_rev_label = label
+
         # summary of current revision
         label = gtk.Label('-')
         hb = gtk.HBox()
         hb.pack_start(label, False, False)
-        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('-')
-        hb = gtk.HBox()
-        hb.pack_start(label, False, False)
-        addrow('Target:', hb, expand=False)
-        self.new_rev_label = label
+        self.ctxs = self.repo[None].parents()
+        if len(self.ctxs) == 2:
+            addrow(_('Parent 1:'), hb, expand=False)
+            label = gtk.Label('-')
+            hb = gtk.HBox()
+            hb.pack_start(label, False, False)
+            addrow('Parent 2:', hb, expand=False)
+            self.current_rev_label2 = label
+        else:
+            addrow(_('Current:'), hb, expand=False)
+            self.current_rev_label2 = None
 
         self.update_revisions()
 
@@ -206,12 +212,10 @@ class UpdateDialog(gtk.Dialog):
             t += summary
             label.set_markup(t)
 
-        ctxs = self.repo[None].parents()
+        ctxs = self.ctxs
         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