comparison tests/test-treemanifest.t @ 49267:4141951dacff

debugindex: rename the parent column to mention nodeid

We will add new columns with the "revnum" version of the parent. It will be
useful in case we need to inspect a corrupted revlog index.

49266:ccd76e292be5

  $ cat dir1/a
  5
  $ cat dir1/b
  6
  $ hg debugindex --dir dir1
     rev linkrev       nodeid           p1           p2
       0       1 8b3ffd73f901 000000000000 000000000000
       1       2 68e9d057c5a8 8b3ffd73f901 000000000000
       2       4 4698198d2624 68e9d057c5a8 000000000000
       3       5 44844058ccce 68e9d057c5a8 000000000000
       4       6 bf3d9b744927 68e9d057c5a8 000000000000

  $ hg diff -r 3

Parent of tree root manifest should be flat manifest, and two for merge

  $ hg debugindex -m
     rev linkrev       nodeid           p1           p2
       0       0 40536115ed9e 000000000000 000000000000
       1       1 f3376063c255 40536115ed9e 000000000000
       2       2 5d9b9da231a2 40536115ed9e 000000000000
       3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255
       4       4 51e32a8c60ee f3376063c255 000000000000

Turning off treemanifest config has no effect

  $ hg debugindex --dir dir1
     rev linkrev       nodeid           p1           p2
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
  $ echo 2 > dir1/a
  $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
  $ hg debugindex --dir dir1
     rev linkrev       nodeid           p1           p2
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
       2       6 5b16163a30c6 25ecb8cb8618 000000000000

Stripping and recovering changes should work

  M dir1/a
  $ hg --config extensions.strip= strip tip
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
  $ hg debugindex --dir dir1
     rev linkrev       nodeid           p1           p2
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000

#if repobundlerepo
  $ hg incoming .hg/strip-backup/*

  (run 'hg update' to get a working copy)
  $ hg --config extensions.strip= strip tip
  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
  $ hg unbundle -q .hg/strip-backup/*
  $ hg debugindex --dir dir1
     rev linkrev       nodeid           p1           p2
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
       2       6 5b16163a30c6 25ecb8cb8618 000000000000
  $ hg st --change tip
  M dir1/a

49267:4141951dacff

  $ cat dir1/a
  5
  $ cat dir1/b
  6
  $ hg debugindex --dir dir1
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       1 8b3ffd73f901 000000000000 000000000000
       1       2 68e9d057c5a8 8b3ffd73f901 000000000000
       2       4 4698198d2624 68e9d057c5a8 000000000000
       3       5 44844058ccce 68e9d057c5a8 000000000000
       4       6 bf3d9b744927 68e9d057c5a8 000000000000

  $ hg diff -r 3

Parent of tree root manifest should be flat manifest, and two for merge

  $ hg debugindex -m
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       0 40536115ed9e 000000000000 000000000000
       1       1 f3376063c255 40536115ed9e 000000000000
       2       2 5d9b9da231a2 40536115ed9e 000000000000
       3       3 d17d663cbd8a 5d9b9da231a2 f3376063c255
       4       4 51e32a8c60ee f3376063c255 000000000000

Turning off treemanifest config has no effect

  $ hg debugindex --dir dir1
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
  $ echo 2 > dir1/a
  $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a'
  $ hg debugindex --dir dir1
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
       2       6 5b16163a30c6 25ecb8cb8618 000000000000

Stripping and recovering changes should work

  M dir1/a
  $ hg --config extensions.strip= strip tip
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg
  $ hg debugindex --dir dir1
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000

#if repobundlerepo
  $ hg incoming .hg/strip-backup/*

  (run 'hg update' to get a working copy)
  $ hg --config extensions.strip= strip tip
  saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob)
  $ hg unbundle -q .hg/strip-backup/*
  $ hg debugindex --dir dir1
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
       0       4 064927a0648a 000000000000 000000000000
       1       5 25ecb8cb8618 000000000000 000000000000
       2       6 5b16163a30c6 25ecb8cb8618 000000000000
  $ hg st --change tip
  M dir1/a