Mercurial > hg > easyhg
changeset 282:1ec306df738e
Merge
| author | Chris Cannam |
|---|---|
| date | Fri, 18 Feb 2011 13:39:16 +0000 |
| parents | 9162f14c5ab7 (current diff) a98e76fa58f2 (diff) |
| children | bc39f2e28da8 a68801b31ceb 769ab0fa125d |
| files | mainwindow.cpp |
| diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/easyhg-extdiff.sh Fri Feb 18 13:38:31 2011 +0000 +++ b/easyhg-extdiff.sh Fri Feb 18 13:39:16 2011 +0000 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x p=`dirname $0` if [ $# -lt 2 ]; then echo Insufficient arguments: $@ @@ -13,11 +13,18 @@ found=true "$p/$d" "$1" "$2" break + elif [ -x "$(type -path $d)" ]; then + found=true + "$d" "$1" "$2" + break; fi done if [ -z "$found" ]; then od=/usr/bin/opendiff if [ -x "$od" ]; then + found=true "$od" "$1" "$2" | cat fi fi +[ -z "$found" ] +
--- a/easyhg-merge.sh Fri Feb 18 13:38:31 2011 +0000 +++ b/easyhg-merge.sh Fri Feb 18 13:39:16 2011 +0000 @@ -18,6 +18,10 @@ found=true "$p/$d" "$ancestor" "$left" "$right" -o "$out" break + elif [ -x "$(type -path $d)" ]; then + found=true + "$d" "$ancestor" "$left" "$right" -o "$out" + break; fi done if [ -z "$found" ]; then @@ -26,3 +30,4 @@ "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" fi fi +[ -z "$found" ]
--- a/mainwindow.cpp Fri Feb 18 13:38:31 2011 +0000 +++ b/mainwindow.cpp Fri Feb 18 13:39:16 2011 +0000 @@ -1695,7 +1695,7 @@ case ACT_INCOMING: // returns non-zero code and no output if the check was // successful but there are no changes pending - if (output.trimmed() == "") { + if (output.replace(QRegExp("(^|\\n)warning: [^\\n]*\\n"), "").trimmed() == "") { showIncoming(""); return; }