Mercurial > hg > gitweb
comparison hgeditor @ 754:3e73bf876f17
Fixes and cleanups to hgeditor:
- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 22 Jul 2005 07:30:52 +0100 |
| parents | 4ccf3de52989 |
| children | 0c033ef053ab |
comparison
equal
deleted
inserted
replaced
| 753:8760d0c83b9b | 754:3e73bf876f17 |
|---|---|
| 21 gvim|vim) | 21 gvim|vim) |
| 22 EDITOR="$EDITOR -f -o" | 22 EDITOR="$EDITOR -f -o" |
| 23 ;; | 23 ;; |
| 24 esac | 24 esac |
| 25 | 25 |
| 26 if grep -q "^HG: merge resolve" "$1" ; then | 26 # Remove temporary files even if we get interrupted |
| 27 # we don't sign merges | 27 trap "cleanup_exit 255" TERM KILL INT QUIT ABRT |
| 28 exec $EDITOR "$1" | 28 T1=`mktemp`; T2=`mktemp` |
| 29 ( | |
| 30 cd "`hg root`" | |
| 31 grep '^HG: changed' "$1" | cut -b 13- | while read changed; do | |
| 32 hg diff "$changed" >> "$T2" | |
| 33 done | |
| 34 ) | |
| 35 | |
| 36 echo > "$T1" | |
| 37 if [ "$SIGN" == "1" ]; then | |
| 38 MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-` | |
| 39 echo -e "\nmanifest hash: $MANIFEST" >> "$T1" | |
| 40 fi | |
| 41 grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1" | |
| 42 | |
| 43 CHECKSUM=`md5sum "$T1"` | |
| 44 $EDITOR "$T1" "$T2" || cleanup_exit $? | |
| 45 echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13 | |
| 46 | |
| 47 if [ "$SIGN" == "1" ]; then | |
| 48 { | |
| 49 head -n 1 "$T1" | |
| 50 echo | |
| 51 grep -v "^HG:" "$T1" | gpg -t -a -u "${HGUSER}" --clearsign | |
| 52 } > "$T2" && mv "$T2" "$1" | |
| 29 else | 53 else |
| 30 # Remove temporary files even if we get interrupted | 54 mv "$T1" "$1" |
| 31 trap "cleanup_exit 255" TERM KILL INT QUIT ABRT | |
| 32 T1=`mktemp`; T2=`mktemp` | |
| 33 MANIFEST=`grep '^HG: manifest hash' "$1" | cut -b 19-` | |
| 34 | |
| 35 echo -e "\n\nmanifest hash: $MANIFEST" >> "$T1" | |
| 36 grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$T1" | |
| 37 ( | |
| 38 cd "`hg root`" | |
| 39 grep '^HG: changed' "$1" | cut -b 13- | while read changed; do | |
| 40 hg diff "$changed" >> "$T2" | |
| 41 done | |
| 42 ) | |
| 43 | |
| 44 CHECKSUM=`md5sum "$T1"` | |
| 45 $EDITOR "$T1" "$T2" || cleanup_exit $? | |
| 46 | |
| 47 if [ "$SIGN" == "1" ] ; then | |
| 48 echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 13 | |
| 49 { | |
| 50 head -n 1 "$T1" | |
| 51 echo | |
| 52 grep -v "^HG:" "$T1" | gpg -t -a -u "${HGUSER}" --clearsign | |
| 53 } > "$T2" && mv "$T2" "$1" | |
| 54 else | |
| 55 mv "$T1" "$1" | |
| 56 fi | |
| 57 cleanup_exit $? | |
| 58 fi | 55 fi |
| 59 | 56 |
| 57 cleanup_exit $? |