t/t1300-uncommit.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Catalin Marinas
   4 #
   5
   6 test_description='Test the uncommit command.
   7
   8 '
   9
  10 . ./test-lib.sh
  11
  12 test_expect_success \
  13         'Initialize the StGIT repository' \
  14         'stg init
  15 '
  16
  17 test_expect_success \
  18         'Create the first patch' \
  19         '
  20         stg new foo -m "Foo Patch" &&
  21         echo foo > test &&
  22         stg add test &&
  23         stg refresh
  24         '
  25
  26 test_expect_success \
  27         'Create the second patch' \
  28         '
  29         stg new bar -m "Bar Patch" &&
  30         echo bar > test &&
  31         stg add test &&
  32         stg refresh
  33         '
  34
  35 test_expect_success \
  36         'Commit the patches' \
  37         '
  38         stg commit --all
  39         '
  40
  41 test_expect_success \
  42   'Invalid --to and --number arguments' \
  43   '
  44   command_error stg uncommit --to HEAD^ --number 1 2>&1 |
  45   grep -e "cannot give both --to and --number"
  46   '
  47
  48 test_expect_success \
  49   'Invalid --to with patch args' \
  50   '
  51   command_error stg uncommit --to HEAD^ p0 2>&1 |
  52   grep -e "cannot specify patch name with --to"
  53   '
  54
  55 test_expect_success \
  56   'Invalid --number' \
  57   '
  58   command_error stg uncommit --number -1 2>&1 |
  59   grep -e "invalid value passed to --number"
  60   '
  61
  62 test_expect_success \
  63   'Too many patch names with --number' \
  64   '
  65   command_error stg uncommit --number 2 p0 p1 2>&1 |
  66   grep -e "when using --number, specify at most one patch name"
  67   '
  68
  69 test_expect_success \
  70         'Uncommit the patches using names' \
  71         '
  72         stg uncommit bar foo &&
  73         [ "$(stg id foo)" = "$(stg id bar^)" ] &&
  74         stg commit --all
  75         '
  76
  77 test_expect_success \
  78         'Uncommit the patches using prefix' \
  79         '
  80         stg uncommit --number=2 foobar &&
  81         [ "$(stg id foobar1)" = "$(stg id foobar2^)" ] &&
  82         stg commit --all
  83         '
  84
  85 test_expect_success \
  86         'Uncommit the patches using auto names' \
  87         '
  88         stg uncommit --number=2 &&
  89         [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] &&
  90         stg commit --all
  91         '
  92
  93 test_expect_success \
  94         'Uncommit the patches one by one' \
  95         '
  96         stg uncommit &&
  97         stg uncommit &&
  98         [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] &&
  99         stg commit --all
 100         '
 101
 102 test_expect_success \
 103     'Uncommit the patches with --to' '
 104     stg uncommit --to HEAD^ &&
 105     [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] &&
 106     stg commit --all
 107 '
 108
 109 test_expect_success \
 110   'Use --exclusive' \
 111   '
 112   stg uncommit --to HEAD^ --exclusive &&
 113   [ "$(echo $(stg series --applied --noprefix))" = "bar-patch" ] &&
 114   stg commit --all
 115   '
 116
 117 test_expect_success 'Attempt to reuse patch name' '
 118   stg uncommit &&
 119   [ "$(echo $(stg series --applied --noprefix))" = "bar-patch" ] &&
 120   command_error stg uncommit bar-patch 2>&1 |
 121   grep -e "Patch name \"bar-patch\" already taken" &&
 122   stg commit --all
 123 '
 124
 125 test_expect_success 'Uncommit a commit with not precisely one parent' '
 126     command_error stg uncommit -n 5  &&
 127     [ "$(echo $(stg series))" = "" ]
 128 '
 129
 130 # stg uncommit should work even when top != head, and should not touch
 131 # the head.
 132 test_expect_success 'Uncommit when top != head' '
 133     stg new -m foo &&
 134     git reset --hard HEAD^ &&
 135     h=$(git rev-parse HEAD)
 136     stg uncommit bar &&
 137     test "$(git rev-parse HEAD)" = "$h" &&
 138     test "$(echo $(stg series))" = "+ bar > foo"
 139 '
 140
 141 test_done