diff options
Diffstat (limited to 'mailimport')
| -rwxr-xr-x | mailimport | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/mailimport b/mailimport index 8ed624179..2ff60d1d8 100755 --- a/mailimport +++ b/mailimport @@ -120,7 +120,7 @@ apply_patch () { patch -s -t -p1 -l -N -d $pdir -i $next if [ "$?" != "0" ]; then echo "*** ERROR at: patch -s -t -p1 -l -N -d $pdir -i $next" - exit + exit -1 fi make cardlist make whitespace @@ -130,28 +130,36 @@ apply_patch () { hg addremove `diffstat -p1 -l $next` if [ "$?" != "0" ]; then echo "*** ERROR at hg addremove" - exit + echo hg addremove `diffstat -p1 -l $next` + patch -s -t -p1 -l -R -d $pdir -i $next + exit -1 fi # Commit the changed files CARDLIST="`hg status -n -m|grep CARDLIST.`" FILES="" + for i in $CARDLIST; do + FILES="$FILES $cur/$i" + done for i in `diffstat -p1 -l $next`; do FILES="$FILES `pwd`/$i" done if [ "$FILES" == "" ]; then echo "*** ERROR nothing to commit" + patch -s -t -p1 -l -R -d $pdir -i $next cd $cur - exit + exit -1 fi - hg commit -d "$date" -u "$committer" -m "`cat $TMP2|grep -v "^#"`" $CARDLIST $FILES + hg commit -d "$date" -u "$committer" -m "`cat $TMP2|grep -v "^#"`" $FILES if [ "$?" != "0" ]; then echo "*** ERROR at hg commit" + echo hg commit -d \"$date\" -u \"$committer\" -m "<msg>" $FILES + patch -s -t -p1 -l -R -d $pdir -i $next cd $cur - exit + exit -1 fi cd $cur fi @@ -178,7 +186,7 @@ proccess_patch () exit fi - cat $i| git-mailinfo $DIR/msg $DIR/patch >$DIR/author + cat $i| git mailinfo $DIR/msg $DIR/patch >$DIR/author cat $DIR/msg|grep -vi ^CC: >$DIR/msg2 cat $DIR/author|perl -ne "if (m/Author[:]\\s*(.*)\\n/) { \$auth=\$1; } else \ @@ -250,7 +258,7 @@ DIR="$TMPDIR/mailimport$$" mkdir $DIR if [ "$?" != "0" ]; then echo "*** Error at mkdir $DIR" - exit; + exit -1; fi trap "rm -rf $DIR" EXIT @@ -284,9 +292,9 @@ else ^Content-Transfer-Encoding: 8bit EOF - echo git-mailsplit -b $DIR/tmpbox $DIR + echo git mailsplit -b $DIR/tmpbox $DIR echo -n "Number of patches at file: " - git-mailsplit -b $DIR/tmpbox $DIR + git mailsplit -b $DIR/tmpbox $DIR echo for i in $DIR/0*; do |