org.handhelds.familiar/packages/wiggle/wiggle-0.6/005Pchanges

   1 Status: ok
   2
   3 diff ./p~current~ ./p
   4
   5  ----------- Diffstat output ------------
   6  ./p |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
   7  1 files changed, 62 insertions(+), 4 deletions(-)
   8
   9 diff ./p~current~ ./p
  10 --- ./p~current~        2004-02-03 13:18:55.000000000 +1100
  11 +++ ./p 2004-02-03 13:19:20.000000000 +1100
  12 @@ -146,7 +146,7 @@ all_files()
  13
  14  diff_one()
  15  {
  16 -       if cmp -s "$1~current~" "$1"
  17 +       if cmp -s "$1~current~" "$1" || [ ! -f "$1" -a ! -f "$1~current~" ]
  18         then :
  19         else
  20                 echo
  21 @@ -168,10 +168,12 @@ diff_one_orig()
  22
  23  commit_one()
  24  {
  25 -       rm -f "$1~current~"
  26 +    rm -f "$1~current~"
  27 +    if [  -f "$1" ] ; then
  28         mv "$1" "$1~current~"
  29         cp -p "$1~current~" $1
  30         chmod u+w $1
  31 +    fi
  32  }
  33
  34  discard_one()
  35 @@ -623,6 +625,33 @@ case $cmd in
  36         while [ -s "$pfile" ]  &&
  37              p apply last && p commit ; do : ; done
  38         ;;
  39 +  decommit )
  40 +       make_diff
  41 +       get_meta
  42 +       if [ -s .patches/patch ]
  43 +       then
  44 +           echo >&2 Patch $name already open - please commit ; exit 1;
  45 +       fi
  46 +       if [ $# -eq 0 ]
  47 +       then
  48 +           echo "Applied patches are:"
  49 +           ls .patches/applied
  50 +           exit 0
  51 +       fi
  52 +       if [ $# -ne 1 ]
  53 +       then echo >&2 "Usage: p decommit patchname"; exit 1
  54 +       fi
  55 +       case $1 in
  56 +           last ) pfile=`ls -d .patches/applied/[0-9]* | tail -1` ; echo last is "$pfile";;
  57 +           */* ) pfile=$1 ;;
  58 +           * ) pfile=`echo .patches/applied/*$1*`
  59 +       esac
  60 +       if [ ! -f "$pfile" ]
  61 +       then echo >&2 "Cannot find unique patch '$1' - found: $pfile"; exit 1
  62 +       fi
  63 +       while [ -s "$pfile" ]  &&
  64 +            p open last && p discard ; do : ; done
  65 +       ;;
  66    snapshot )
  67         all_files snap_one
  68         ;;
  69 @@ -653,6 +682,12 @@ case $cmd in
  70          cd .patches/SOURCE && bk pull
  71         ;;
  72    update )
  73 +       make_diff
  74 +       get_meta
  75 +       if [ -s .patches/patch ]
  76 +       then
  77 +               echo >&2 Patch $name already open - please commit; exit 1;
  78 +       fi
  79          p openall && p clean &&
  80           (cd .patches/SOURCE ; bk export -tpatch -rLATEST, ) > .patches/imported-patch &&
  81           patch --dry-run -f -p1 < .patches/imported-patch &&
  82 @@ -678,9 +713,32 @@ case $cmd in
  83             echo "Your address and other headers must be in .patches/owner"
  84             exit 1;
  85         fi
  86 +       messid="<`date +'%Y%m%d%H%M%S'`.$$.patches@`uname -n`>"
  87         cnt=$(ls .patches/applied/???${1}* | wc -l)
  88         cnt=$(echo $cnt)  # discard spaces
  89         this=1
  90 +       {
  91 +           cat .patches/owner
  92 +           echo "To: `cat .patches/maintainer`"
  93 +           if [ -s .patches/cc ] ; then
  94 +               while read word prefix addr
  95 +                 do if [ " $word" = " $1" ] ; then
  96 +                       echo "Cc: $addr"
  97 +                       sprefix="$prefix - "
  98 +                   fi
  99 +                 done < .patches/cc
 100 +           fi
 101 +           if [ $cnt = 1 ]
 102 +                 then
 103 +                 echo "Subject: [PATCH] $sprefix Intro"
 104 +                 else
 105 +                 echo "Subject: [PATCH] ${sprefix}0 of $cnt - Introduction"
 106 +           fi
 107 +           echo "Message-ID: $messid"
 108 +           echo
 109 +           echo PUT COMMENTS HERE
 110 +       } > .patches/mail/000Intro
 111 +
 112         for patch in .patches/applied/???${1}*
 113         do
 114           {
 115 @@ -702,9 +760,9 @@ case $cmd in
 116                   else
 117                   echo "Subject: [PATCH] $sprefix$this of $cnt - $head"
 118               fi
 119 +             echo "References: $messid"
 120               echo
 121 -             echo '### Comments for ChangeSet'
 122 -             sed -e '1,/^[^S]/d' $patch
 123 +             sed -e '1,3d' $patch
 124           } > .patches/mail/${patch#.patches/applied/}
 125           this=$(expr $this + 1)
 126         done