Attempt to fix CIA trigger on recent bk versions.

BKrev: 40b63de0GFFIGjG-Yf0cB6jF69Gkiw

2 files changed, 16 insertions, 10 deletions

diff --git a/BitKeeper/triggers/post-outgoing.ciabot b/BitKeeper/triggers/post-outgoing.ciabot
index 8a7132789f..3fead58232 100644
--- a/BitKeeper/triggers/post-outgoing.ciabot
+++ b/BitKeeper/triggers/post-outgoing.ciabot
@@ -42,16 +42,22 @@ check_sanity () {
 # Check sanity - do we need to send anything?
 check_sanity || exit 0
 
-# Convert numbers from the cset list into something useful
-nums=
-for s in `cat $BK_CSETLIST`; do
-    # translate cset serial to cset #
-    n=`bk prs -h -d"\\$if(:DS: -eq $s){:REV:}" ChangeSet`
-    # dont send notifications about empty ChangeSets
-    if test -z `bk prs -h -r"$n" -d'$if(:LI: -eq 0){$if(:LD: -eq 0){:REV:}}' ChangeSet`; then
-    	nums="$n $nums"
-    fi
-done
+if (grep -q ':ChangeSet:' $BK_CSETLIST); then
+    # new, correct csets-out format
+    nums = `bk changes -d:REV: - < $BK_CSETLIST`
+else
+
+    # Convert numbers from the cset list into something useful
+    nums=
+    for s in `cat $BK_CSETLIST`; do
+        # translate cset serial to cset #
+        n=`bk prs -h -d"\\$if(:DS: -eq $s){:REV:}" ChangeSet`
+        # dont send notifications about empty ChangeSets
+        if test -z `bk prs -h -r"$n" -d'$if(:LI: -eq 0){$if(:LD: -eq 0){:REV:}}' ChangeSet`; then
+        	nums="$n $nums"
+        fi
+    done
+fi
 
 # Send notifications to CIA
 if test -n "$nums"; then
diff --git a/test b/test
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test
+++ /dev/null