view tests/test-clone-pull-corruption.t @ 17758:5863f0e4cd3a

histedit: replace various nodes lists with replacement graph (and issue3582) This changeset rewrites the change tracking logic of histedit to record every operation it does. Tracked operations record the full list of "old" node that will eventually be removed to the list of new nodes that replace it. Operations on temporary nodes are tracked too. Dropped changesets are also recorded as an "old" node replacement by nothing. This logic is similar to the obsolescence marker one and will be used for this purpose in later commit. This new logic implies a big amount of change in the histedit code base. histedit action functions now always return a tuple of (new-ctx, [list of rewriting operations]) The old `created`, `replaced` and `tmpnodes` are no longer returned and stored during histedit operation. When such information is necessary it is computed from the replacement graph. This computation is done in the `processreplacement` function. The `replacemap` is also dropped. It is computed at the end of the command from the graph. The `bootstrapcontinue` methods are altered to compute this different kind of information. This new mechanism requires much less information to be written on disk. Note: This changes allows a more accurate bookmark movement. bookmark on dropped changeset are now move of their parent (or replacement of their parent) instead of their children. This fix issue3582
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 11 Oct 2012 08:36:50 +0200
parents d2fe9aaedcaf
children b2c1ff96c1e1
line wrap: on
line source

Corrupt an hg repo with a pull started during an aborted commit
Create two repos, so that one of them can pull from the other one.

  $ hg init source
  $ cd source
  $ touch foo
  $ hg add foo
  $ hg ci -m 'add foo'
  $ hg clone . ../corrupted
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo >> foo
  $ hg ci -m 'change foo'

Add a hook to wait 5 seconds and then abort the commit

  $ cd ../corrupted
  $ echo "[hooks]" >> .hg/hgrc
  $ echo "pretxncommit = sh -c 'sleep 5; exit 1'" >> .hg/hgrc

start a commit...

  $ touch bar
  $ hg add bar
  $ hg ci -m 'add bar' &

... and start a pull while the commit is still running

  $ sleep 1
  $ hg pull ../source 2>/dev/null
  pulling from ../source
  transaction abort!
  rollback completed
  abort: pretxncommit hook exited with status 1
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 1 changes to 1 files
  (run 'hg update' to get a working copy)

see what happened

  $ wait
  $ hg verify
  checking changesets
  checking manifests
  crosschecking files in changesets and manifests
  checking files
  1 files, 2 changesets, 2 total revisions

  $ cd ..