From d16c8781e9c3bc3a0c98eaf27fc6e35d71104fe4 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Tue, 15 Apr 2008 02:37:47 -0700
Subject: [PATCH] merge: add a commit checkbox to allow merging w/out commit

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 ugit/controllers/merge.py |  3 ++-
 ui/merge.ui               | 38 ++++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/ugit/controllers/merge.py b/ugit/controllers/merge.py
index f190a687..a49c038c 100644
--- a/ugit/controllers/merge.py
+++ b/ugit/controllers/merge.py
@@ -69,6 +69,7 @@ class MergeController(QObserver):
 				"You must specify a revision to merge")
 			return
 
+		no_commit = not(self.view.checkbox_commit.isChecked())
 		squash = self.view.checkbox_squash.isChecked()
 		msg = self.model.get_merge_message()
 		qtutils.log(
@@ -76,7 +77,7 @@ class MergeController(QObserver):
 				'-m'+msg,
 				revision,
 				strategy='recursive',
-				no_commit=squash,
+				no_commit=no_commit,
 				squash=squash
 				),
 			quiet=False,
diff --git a/ui/merge.ui b/ui/merge.ui
index 246f3845..3f80399b 100644
--- a/ui/merge.ui
+++ b/ui/merge.ui
@@ -89,45 +89,55 @@
     </widget>
    </item>
    <item>
-    <layout class="QGridLayout" >
-     <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
+     <item>
       <widget class="QPushButton" name="button_viz" >
        <property name="text" >
         <string>Visualize</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
+     <item>
       <spacer>
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" >
         <size>
-         <width>211</width>
-         <height>20</height>
+         <width>231</width>
+         <height>24</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="0" column="2" >
-      <widget class="QPushButton" name="button_cancel" >
+     <item>
+      <widget class="QCheckBox" name="checkbox_squash" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>Squash</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="3" >
-      <widget class="QPushButton" name="button_merge" >
+     <item>
+      <widget class="QCheckBox" name="checkbox_commit" >
        <property name="text" >
-        <string>Merge</string>
+        <string>Commit</string>
+       </property>
+       <property name="checked" >
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="0" column="4" >
-      <widget class="QCheckBox" name="checkbox_squash" >
+     <item>
+      <widget class="QPushButton" name="button_cancel" >
        <property name="text" >
-        <string>Squash</string>
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_merge" >
+       <property name="text" >
+        <string>Merge</string>
        </property>
       </widget>
      </item>
-- 
2.11.4.GIT