[Armagetronad-commits] SF.net SVN: armagetronad: [7843] tools/bzr/trunk

[<baz...@us...>]

Revision: 7843
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7843&view=rev
Author:   bazaarmagetron
Date:     2008-02-10 07:39:12 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
Better merge messages, they now contain the complete log.

Modified Paths:
--------------
    tools/bzr/trunk/synctools/bzr-merge.sh
    tools/bzr/trunk/synctools/sync.sh

Added Paths:
-----------
    tools/bzr/trunk/synctools/bzr-autocommit.sh

Property Changed:
----------------
    tools/bzr/trunk/


Property changes on: tools/bzr/trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-02-10 15:24:02.447000027 +0100
committer: Manuel Moos <z-...@us...>
properties: 
	branch-nick: tools-bzr-trunk-work

   + timestamp: 2008-02-10 16:30:17.400000095 +0100
committer: Manuel Moos <z-...@us...>
properties: 
	branch-nick: tools-bzr-trunk-work

Name: bzr:file-ids
   - 
   + synctools/bzr-autocommit.sh	bzrautocommit.sh-20080210153001-xuwi8ok3ivxd2sle-1

Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
   - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz
12 z-...@us...-20080207162744-4riit8379zi13ekd
13 z-...@us...-20080207220145-74cas2qumuyn2vcn
14 z-...@us...-20080207221008-zhs110iw1vtreysm
15 z-...@us...-20080207221223-4b0wgl86lxox3uwj
16 z-...@us...-20080208001947-ff25qitcr900qsvy
17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn
18 z-...@us...-20080208021135-93i43tke8qfcb3u4
19 z-...@us...-20080208120320-6dxkcn46tdv109jb
20 z-...@us...-20080208120416-c3711pdfebb9m8ba
21 z-...@us...-20080208120611-jzqvstdirza22aa0
22 z-...@us...-20080210142402-67q9uws5tgw4anze

   + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz
12 z-...@us...-20080207162744-4riit8379zi13ekd
13 z-...@us...-20080207220145-74cas2qumuyn2vcn
14 z-...@us...-20080207221008-zhs110iw1vtreysm
15 z-...@us...-20080207221223-4b0wgl86lxox3uwj
16 z-...@us...-20080208001947-ff25qitcr900qsvy
17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn
18 z-...@us...-20080208021135-93i43tke8qfcb3u4
19 z-...@us...-20080208120320-6dxkcn46tdv109jb
20 z-...@us...-20080208120416-c3711pdfebb9m8ba
21 z-...@us...-20080208120611-jzqvstdirza22aa0
22 z-...@us...-20080210142402-67q9uws5tgw4anze
23 z-...@us...-20080210153017-32tq0mbladuewpl7


Added: tools/bzr/trunk/synctools/bzr-autocommit.sh
===================================================================
--- tools/bzr/trunk/synctools/bzr-autocommit.sh	                        (rev 0)
+++ tools/bzr/trunk/synctools/bzr-autocommit.sh	2008-02-10 15:39:12 UTC (rev 7843)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# commits merges with a meaningful message.
+
+if test -z "$(bzr diff)"; then
+  bzr commit -m "Empty merge to keep the peace between svn and bzr."
+else
+  tmp=$(tempfile)
+  msg="MERGING${tmp}":
+
+  # commit once to get a good log
+  bzr commit -m "${msg}"
+  msg="^ *${msg}"
+  echo "Automatic merging of commits that would change history order:" > ${tmp}
+  bzr log -r revno:-1 | grep "${msg}" -A 2000000 | grep -v "${msg}" | sed -e "s,^ ,," >> ${tmp}
+
+  # undo the commit
+  bzr uncommit --force > /dev/null
+
+  # and repeat it with the log message
+  bzr commit -F ${tmp}
+  rm ${tmp}
+fi
+


Property changes on: tools/bzr/trunk/synctools/bzr-autocommit.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: tools/bzr/trunk/synctools/bzr-merge.sh
===================================================================
--- tools/bzr/trunk/synctools/bzr-merge.sh	2008-02-10 14:53:47 UTC (rev 7842)
+++ tools/bzr/trunk/synctools/bzr-merge.sh	2008-02-10 15:39:12 UTC (rev 7843)
@@ -7,4 +7,4 @@
 bzr merge "$@" || exit 1
 
 # commit directly if there are no conflicts
-$(dirname $0)/bzr-commit.sh
+$(dirname $0)/bzr-autocommit.sh

Modified: tools/bzr/trunk/synctools/sync.sh
===================================================================
--- tools/bzr/trunk/synctools/sync.sh	2008-02-10 14:53:47 UTC (rev 7842)
+++ tools/bzr/trunk/synctools/sync.sh	2008-02-10 15:39:12 UTC (rev 7843)
@@ -47,7 +47,7 @@
 
 echo pulling changes from remote bzr work branch...
 pushd "${bzrbranch_local}-work" > /dev/null
-EDITOR="echo" ${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1
+${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1
 popd > /dev/null
 cat bzrlog
 
@@ -70,7 +70,7 @@
   set -x
   pushd "${bzrbranch_local}-sync" > /dev/null
   bzr merge "${workdir}/${bzrbranch_local}-work" || exit 1
-  EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1
+  ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1
   echo pushing changes from sync to work branch...
   bzr push "${workdir}/${bzrbranch_local}-work" || exit 1
   popd
@@ -97,7 +97,7 @@
   echo merging changes from remote bzr work branch...
   pushd "${bzrbranch_local}-work" > /dev/null
   bzr merge "${bzrbranch_full}" || exit 1
-  EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1
+  ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1
   popd > /dev/null
   echo retrying the push...
   bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit -1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.