comparison tests/test-largefiles-misc.t @ 24998:c8a97fa742b7

rebase: use dirstateguard instead of dirstate.invalidate

Before this patch, "rebase.concludenode()" uses "dirstate.invalidate()"
as a kind of "restore .hg/dirstate to the original status" during a failure.

But it just discards changes in memory, and doesn't actually restore
".hg/dirstate". Then, it can't work as expected, if "dirstate.write()"
is executed while processing.

This patch uses "dirstateguard" instead of "dirstate.invalidate()" to
restore ".hg/dirstate" during a failure even if "dirstate.write()" is
executed before a failure.

This patch also removes "beginparentchage()" and "endparentchange()",
because "dirstateguard" makes them useless.

This is a part of preparations to fix the issue that the recent (in
memory) dirstate isn't visible to external processes (e.g. "precommit"
hook).

After this patch, the changed dirstate becomes visible to external
"precommit" hooks during "hg rebase" in "test-largefiles-misc.t",
because "dirstateguard()" writes it out. But this content isn't yet
correct, because:

  - "normal3" should be marked as "A"(dded) at committing

    It is newly added in the changeset being rebased.

  - but it is marked as "M"(odified)

    The result of "repo.setparents()" after "dirstateguard()" isn't
    yet written out before "precommit". So, merging is still in
    progress for "hg status" in it.

    This causes marking the file newly added on "other" branch as "A".

This will be fixed by subsequent patch.

24997:12f3c7144a39

  Invoking status precommit hook
  A normal3

  $ hg -R no-largefiles -q pull --rebase
  Invoking status precommit hook
  ? normal3

(test reverting)

  $ hg init subrepo-root
  $ cat >> subrepo-root/.hg/hgrc <<EOF

24998:c8a97fa742b7

  Invoking status precommit hook
  A normal3

  $ hg -R no-largefiles -q pull --rebase
  Invoking status precommit hook
  M normal3

(test reverting)

  $ hg init subrepo-root
  $ cat >> subrepo-root/.hg/hgrc <<EOF