comparison tests/test-grab.t @ 3526:df20ddc79064

grab: move the initialization of pctx variable outside of if-else

The pctx variable is used outside of the if-else  but it was initialized
under the conditional statements.

Added test for the case when the initialization inside the if-else broke `hg
grab --continue`.

3525:300d7d019b98

  |
  o  3:8e224524cd09 add x
  |
  o  0:1f0dee641bb7 add a
  
Testing the abort functionality of hg grab

  $ echo foo > b
  $ hg ci -Aqm "foo to b"
  $ hg glog -r .^::
  @  9:902d4f4602bb foo to b
  |
  o  8:44e155eb95c7 add c
  |
  ~

  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ hg grab --abort
  aborting grab, updating to 902d4f4602bb

  $ hg glog
  @  9:902d4f4602bb foo to b
  |
  o  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  abort: cannot grab public changesets: 7c15c05db6fa
  (see 'hg help phases' for details)
  [255]

  $ hg glog
  @  9:902d4f4602bb foo to b
  |
  o  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  (no more unresolved files)
  continue: hg grab --continue

  $ hg grab --continue
  $ hg phase -r .
  10: secret

No merge conflicts

  $ hg up d46dc301d92f
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
  $ echo foo > l
  $ hg add l
  $ hg ci -qm "added l" --secret

  $ hg phase -r .
  11: secret

  $ hg glog
  @  11:508d572e7053 added l
  |
  | o  10:cd90ed194449 add b
  | |
  | o  9:902d4f4602bb foo to b
  | |
  | o  8:44e155eb95c7 add c
  | |
  | o  7:2ccc03d1d096 foo to c
  |/

  |
  o  3:8e224524cd09 add x
  |
  o  0:1f0dee641bb7 add a
  
  $ hg up cd90ed194449
  3 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg grab -r 508d572e7053
  grabbing 11:508d572e7053 "added l"

  $ hg phase -r .
  12: secret

3526:df20ddc79064

  |
  o  3:8e224524cd09 add x
  |
  o  0:1f0dee641bb7 add a
  

When interrupted grab results in no changes to commit

  $ hg up d46dc301d92f
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo bar > c
  $ hg add c
  $ hg ci -m "foo to c"
  created new head

  $ hg up 44e155eb95c7
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg grab 4e04628911f6
  grabbing 9:4e04628911f6 "foo to c"
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]
  $ echo foobar > c
  $ hg resolve -m
  (no more unresolved files)
  continue: hg grab --continue

  $ hg grab --continue
  note: grab of 9:4e04628911f6 created no changes to commit

Testing the abort functionality of hg grab

  $ echo foo > b
  $ hg ci -Aqm "foo to b"
  $ hg glog -r .^::
  @  10:c437988de89f foo to b
  |
  o  8:44e155eb95c7 add c
  |
  ~

  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ hg grab --abort
  aborting grab, updating to c437988de89f

  $ hg glog
  @  10:c437988de89f foo to b
  |
  o  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  abort: cannot grab public changesets: 7c15c05db6fa
  (see 'hg help phases' for details)
  [255]

  $ hg glog
  @  10:c437988de89f foo to b
  |
  o  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  (no more unresolved files)
  continue: hg grab --continue

  $ hg grab --continue
  $ hg phase -r .
  11: secret

No merge conflicts

  $ hg up d46dc301d92f
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
  $ echo foo > l
  $ hg add l
  $ hg ci -qm "added l" --secret

  $ hg phase -r .
  12: secret

  $ hg glog
  @  12:508d572e7053 added l
  |
  | o  11:10427de9e26e add b
  | |
  | o  10:c437988de89f foo to b
  | |
  | o  8:44e155eb95c7 add c
  | |
  | o  7:2ccc03d1d096 foo to c
  |/

  |
  o  3:8e224524cd09 add x
  |
  o  0:1f0dee641bb7 add a
  
  $ hg up 10427de9e26e
  3 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg grab -r 508d572e7053
  grabbing 12:508d572e7053 "added l"

  $ hg phase -r .
  13: secret