comparison tests/test-prev-next.t @ 3781:e73a73b27f3e stable

prev: respect `commands.update.check` config option in `hg prev` (issue5808)

`commands.update.check` config option determines what level of checking should
be done when we update to another revision. When we set this config option to
`noconflict`, it updates your working directory to a specified revision only
when there will be no conflicts which is a very nice behavior.

This patch adds logic to respect the config option so that we can have that nice
behavior with `hg prev` too.
It turns out, we just needed to use hg.updatetotally() and add some cases to
check config option.

Right now, we only respect the config if value is set to `noconflict`. Otherwise
we fallback to the default behavior.

This is a part of fixing issue5808. Test changes demonstrate the fix.

3780:9da11755d615

testing for `hg prev`

  $ echo bar > wat
  $ hg prev
  abort: uncommitted changes
  (do you want --merge?)
  [255]
  $ hg diff
  diff -r ac3de1218820 wat
  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
  @@ -1,1 +1,1 @@
  -hi
  +bar

testing for `hg next`

  $ echo hi > wat
  $ hg up .^
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo bar > wat
  $ hg next
  abort: uncommitted changes
  (do you want --merge?)
  [255]
  $ hg diff

3781:e73a73b27f3e

testing for `hg prev`

  $ echo bar > wat
  $ hg prev
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  [1] added foo
  $ hg diff
  diff -r cf959ce4e1ff wat
  --- a/wat	Thu Jan 01 00:00:00 1970 +0000
  +++ b/wat	Thu Jan 01 00:00:00 1970 +0000
  @@ -1,1 +1,1 @@
  -hi
  +bar

testing for `hg next`

  $ hg next
  abort: uncommitted changes
  (do you want --merge?)
  [255]
  $ hg diff