tests/test-narrow-debugcommands.t

rebase: also include commit of collapsed commits in single transaction

When rebase.singletransaction is set, we still used to create a second
transaction when committing with --collapse. It's simpler to create a
single transaction.

Note that in the affected .t file, the test that uses --collapse still
appears to create two transactions (it prints "rebase status stored"
twice). However, only a single transaction is actually created and the
second printout comes from cmdutil.commitforceeditor() that explicitly
calls tr.writepending().

Also note the that we now roll back any commits if the user closes the
commit message editor with an error code (or leaves the message
empty). That might be unfortunate, but it's consistent with how we
behave in the --no-collapse case (if the user passed --edit). If we
want to change that, I think it should be done consistently in a
separate patch.

Differential Revision: https://phab.mercurial-scm.org/D2728

  $ . "$TESTDIR/narrow-library.sh"
  $ hg init repo
  $ cd repo
  $ cat << EOF > .hg/narrowspec
  > [includes]
  > path:foo
  > [excludes]
  > EOF
  $ echo treemanifest >> .hg/requires
  $ echo narrowhg-experimental >> .hg/requires
  $ mkdir -p foo/bar
  $ echo b > foo/f
  $ echo c > foo/bar/f
  $ hg commit -Am hi
  adding foo/bar/f
  adding foo/f
  $ hg debugindex -m
     rev    offset  length  delta linkrev nodeid       p1           p2
       0         0      47     -1       0 14a5d056d75a 000000000000 000000000000
  $ hg debugindex --dir foo
     rev    offset  length  delta linkrev nodeid       p1           p2
       0         0      77     -1       0 e635c7857aef 000000000000 000000000000
  $ hg debugindex --dir foo/
     rev    offset  length  delta linkrev nodeid       p1           p2
       0         0      77     -1       0 e635c7857aef 000000000000 000000000000
  $ hg debugindex --dir foo/bar
     rev    offset  length  delta linkrev nodeid       p1           p2
       0         0      44     -1       0 e091d4224761 000000000000 000000000000
  $ hg debugindex --dir foo/bar/
     rev    offset  length  delta linkrev nodeid       p1           p2
       0         0      44     -1       0 e091d4224761 000000000000 000000000000
  $ hg debugdata -m 0
  foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc)
  $ hg debugdata --dir foo 0
  bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
  f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
  $ hg debugdata --dir foo/ 0
  bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc)
  f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc)
  $ hg debugdata --dir foo/bar 0
  f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)
  $ hg debugdata --dir foo/bar/ 0
  f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)