org.handhelds.familiar/packages/wiggle/wiggle-0.6/003Recommit

   1 Status: ok
   2
   3 New p command 'recommit'
   4
   5 p recommit patchname
   6 will apply and commit a series of removed patches.
   7
   8  ----------- Diffstat output ------------
   9  ./p      |   27 +++++++++++++++++++++++++++
  10  ./p.help |    8 ++++++++
  11  2 files changed, 35 insertions(+)
  12
  13 diff ./p~current~ ./p
  14 --- ./p~current~        2004-02-03 13:01:18.000000000 +1100
  15 +++ ./p 2004-02-03 13:18:44.000000000 +1100
  16 @@ -596,6 +596,33 @@ case $cmd in
  17    openall )
  18          while p open last && p discard ; do : ; done
  19         ;;
  20 +  recommit )
  21 +       make_diff
  22 +       get_meta
  23 +       if [ -s .patches/patch ]
  24 +       then
  25 +           echo >&2 Patch $name already open - please commit ; exit 1;
  26 +       fi
  27 +       if [ $# -eq 0 ]
  28 +       then
  29 +           echo "Unapplied patches are:"
  30 +           ls .patches/removed
  31 +           exit 0
  32 +       fi
  33 +       if [ $# -ne 1 ]
  34 +       then echo >&2 "Usage: p recommit patchname"; exit 1
  35 +       fi
  36 +       case $1 in
  37 +           last ) pfile=`ls -d .patches/removed/[0-9]* | tail -1` ; echo last is "$pfile";;
  38 +           */* ) pfile=$1 ;;
  39 +           * ) pfile=`echo .patches/removed/*$1*`
  40 +       esac
  41 +       if [ ! -f "$pfile" ]
  42 +       then echo >&2 "Cannot find unique patch '$1' - found: $pfile"; exit 1
  43 +       fi
  44 +       while [ -s "$pfile" ]  &&
  45 +            p apply last && p commit ; do : ; done
  46 +       ;;
  47    snapshot )
  48         all_files snap_one
  49         ;;
  50
  51 diff ./p.help~current~ ./p.help
  52 --- ./p.help~current~   2004-02-03 13:01:18.000000000 +1100
  53 +++ ./p.help    2004-02-03 13:18:44.000000000 +1100
  54 @@ -248,6 +248,14 @@ openall
  55   discarded.  This is part of the preparation for incorporating
  56   upstream changes.
  57
  58 +recommit
  59 + Usage: p recommit patchname
  60 +
  61 + This command will re-apply and re-commit removed patches
  62 + that successfully apply until the names patch has been applied.
  63 + Patches are applied in reverse order, which is consistant with
  64 + the order in which they were removed.
  65 +
  66  snapshot
  67   Usage: p snapshot
  68