Mercurial > hg > easyhg

changeset 216:27bfdc28541e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Wed, 05 Jan 2011 15:58:58 +0000
parents 43ecb0dcc44e (diff) 4c5993d860f3 (current diff)
children 18bac9a34d58
files
diffstat 5 files changed, 21 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/easyhg-extdiff-osx.sh	Wed Jan 05 15:55:36 2011 +0000
+++ b/easyhg-extdiff-osx.sh	Wed Jan 05 15:58:58 2011 +0000
@@ -6,4 +6,4 @@
 while [ $# -gt 2 ]; do
     shift
 done
-/usr/bin/opendiff "$1" "$2"
+/usr/bin/opendiff "$1" "$2" | cat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/easyhg-merge-osx.sh	Wed Jan 05 15:58:58 2011 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+echo Args are: $@ 1>&2
+if [ "$#" -lt 3 ]; then
+	echo Insufficient arguments: $@
+	exit 2
+fi
+while [ "$#" -gt 3 ]; do
+	shift
+done
+/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge \
+	-left "$1" -merge "$1" -ancestor "$2" -right "$3"
+
Binary file easyhg.icns has changed
--- a/easyhg.pro	Wed Jan 05 15:55:36 2011 +0000
+++ b/easyhg.pro	Wed Jan 05 15:58:58 2011 +0000
@@ -1,5 +1,10 @@
 
-CONFIG += debug
+CONFIG += release
+
+macx-* {
+    QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+    CONFIG += x86 ppc
+}
 
 TEMPLATE = app
 TARGET = EasyMercurial
@@ -78,6 +83,7 @@
 macx-* {
     SOURCES += common_osx.mm
     LIBS += -framework Foundation
+    ICON = easyhg.icns
 }
 
 linux* {
--- a/filestatuswidget.cpp	Wed Jan 05 15:55:36 2011 +0000
+++ b/filestatuswidget.cpp	Wed Jan 05 15:58:58 2011 +0000
@@ -37,6 +37,7 @@
     m_dateReference(0)
 {
     QGridLayout *layout = new QGridLayout;
+    layout->setMargin(10);
     setLayout(layout);
 
     int row = 0;