# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1193788561 25200
# Node ID e42cbd686c423ec7e62f094be392205d2e12a0a0
# Parent  5bff70ff04315b2929c548326d259c27c5e238b9# Parent  81bef3c355c55b6ac5945c99f81fbd33ea1f61e6
Merge with crew-stable.

diff -r 81bef3c355c5 -r e42cbd686c42 hgext/gpg.py
--- a/hgext/gpg.py	Tue Oct 30 16:54:25 2007 -0700
+++ b/hgext/gpg.py	Tue Oct 30 16:56:01 2007 -0700
@@ -249,7 +249,7 @@
     message = opts['message']
     if not message:
         message = "\n".join([_("Added signature for changeset %s")
-                             % hgnode.hex(n)
+                             % hgnode.short(n)
                              for n in nodes])
     try:
         repo.commit([".hgsigs"], message, opts['user'], opts['date'])
diff -r 81bef3c355c5 -r e42cbd686c42 tests/test-execute-bit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-execute-bit	Tue Oct 30 16:56:01 2007 -0700
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+"$TESTDIR/hghave" execbit || exit 80
+
+hg init
+echo a > a
+hg ci -d'0 0' -Am'not executable'
+
+chmod +x a
+hg ci -d'1 0' -m'executable'
+hg id
+
+hg up 0
+hg id
+test -x a && echo executable -- eek || echo not executable -- whew
diff -r 81bef3c355c5 -r e42cbd686c42 tests/test-execute-bit.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-execute-bit.out	Tue Oct 30 16:56:01 2007 -0700
@@ -0,0 +1,5 @@
+adding a
+1549299e88d1 tip
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+d69afc33ff8a
+not executable -- whew