tests/test-obsolete-check-push.t
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Fri, 26 Apr 2024 19:10:35 +0100
changeset 51626 865efc020c33
parent 45227 559ebfb5a58e
permissions -rw-r--r--
dirstate: remove the python-side whitelist of allowed matchers This whitelist is too permissive because it allows matchers that contain disallowed ones deep inside, for example through `intersectionmatcher`. It is also too restrictive because it doesn't pass through some of the matchers we support, such as `patternmatcher`. It's also unnecessary because unsupported matchers raise `FallbackError` and we fall back anyway. Making this change makes more of the tests use rust code path, and therefore subtly change behavior. For example, rust status in largefiles repos seems to have strange behavior.

=======================================================
Test check for obsolescence and instability during push
=======================================================

  $ . $TESTDIR/testlib/obsmarker-common.sh

  $ cat >> $HGRCPATH << EOF
  > [phases]
  > publish=false
  > [experimental]
  > evolution = all
  > EOF


Tests that pushing orphaness to the server is detected
======================================================

initial setup

  $ mkdir base
  $ cd base
  $ hg init server
  $ cd server
  $ mkcommit root
  $ hg phase --public .
  $ mkcommit commit_A0_
  $ mkcommit commit_B0_
  $ cd ..
  $ hg init client
  $ cd client
  $ echo '[paths]' >> .hg/hgrc
  $ echo 'default=../server' >> .hg/hgrc
  $ hg pull
  pulling from $TESTTMP/base/server
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 3 changesets with 3 changes to 3 files
  new changesets 1e4be0697311:c09d8ab29fda (2 drafts)
  (run 'hg update' to get a working copy)
  $ hg up 'desc("root")'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(having some unrelated change affects discovery result, we should ideally test both case)
  $ hg branch unrelated --quiet
  $ mkcommit unrelated
  $ hg up null
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ hg log -G
  o  changeset:   3:16affbe0f986
  |  branch:      unrelated
  |  tag:         tip
  |  parent:      0:1e4be0697311
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     unrelated
  |
  | o  changeset:   2:c09d8ab29fda
  | |  user:        test
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
  | |  summary:     commit_B0_
  | |
  | o  changeset:   1:37624bf21024
  |/   user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    summary:     commit_A0_
  |
  o  changeset:   0:1e4be0697311
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     root
  
  $ cd ..
  $ cd ..


Orphan from pruning
-------------------

Setup

  $ cp -R base check-pruned
  $ cd check-pruned/client
  $ hg debugobsolete --record-parents `getid 'desc("commit_A0_")'`
  1 new obsolescence markers
  obsoleted 1 changesets
  1 new orphan changesets
  $ hg log -G
  o  changeset:   3:16affbe0f986
  |  branch:      unrelated
  |  tag:         tip
  |  parent:      0:1e4be0697311
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     unrelated
  |
  | *  changeset:   2:c09d8ab29fda
  | |  user:        test
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
  | |  instability: orphan
  | |  summary:     commit_B0_
  | |
  | x  changeset:   1:37624bf21024
  |/   user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    obsolete:    pruned
  |    summary:     commit_A0_
  |
  o  changeset:   0:1e4be0697311
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     root
  

Pushing the result is prevented with a message

  $ hg push --new-branch
  pushing to $TESTTMP/check-pruned/server
  searching for changes
  abort: push includes orphan changeset: c09d8ab29fda!
  [255]

  $ cd ../..


Orphan from superseding
-----------------------

Setup

  $ cp -R base check-superseded
  $ cd check-superseded/client
  $ hg up 'desc("commit_A0_")'
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg branch other
  marked working directory as branch other
  $ hg commit --amend -m commit_A1_
  1 new orphan changesets
  $ hg log -G
  @  changeset:   4:df9b82a99e21
  |  branch:      other
  |  tag:         tip
  |  parent:      0:1e4be0697311
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     commit_A1_
  |
  | o  changeset:   3:16affbe0f986
  |/   branch:      unrelated
  |    parent:      0:1e4be0697311
  |    user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    summary:     unrelated
  |
  | *  changeset:   2:c09d8ab29fda
  | |  user:        test
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
  | |  instability: orphan
  | |  summary:     commit_B0_
  | |
  | x  changeset:   1:37624bf21024
  |/   user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    obsolete:    rewritten using amend as 4:df9b82a99e21
  |    summary:     commit_A0_
  |
  o  changeset:   0:1e4be0697311
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     root
  

Pushing the result is prevented with a message

  $ hg push --new-branch
  pushing to $TESTTMP/check-superseded/server
  searching for changes
  abort: push includes orphan changeset: c09d8ab29fda!
  [255]

  $ cd ../..

Tests that user get warned if it is about to publish obsolete/unstable content
------------------------------------------------------------------------------

Orphan from pruning
-------------------

Make sure the only difference is phase:

  $ cd check-pruned/client
  $ hg push --force --rev 'not desc("unrelated")'
  pushing to $TESTTMP/check-pruned/server
  searching for changes
  no changes found
  1 new obsolescence markers
  obsoleted 1 changesets
  1 new orphan changesets
  [1]

Check something prevents a silent publication of the obsolete changeset

  $ hg push --publish --new-branch
  pushing to $TESTTMP/check-pruned/server
  searching for changes
  abort: push includes orphan changeset: c09d8ab29fda!
  [255]

  $ cd ../..

Orphan from superseding
-----------------------

Make sure the only difference is phase:

  $ cd check-superseded/client
  $ hg push --force --rev 'not desc("unrelated")'
  pushing to $TESTTMP/check-superseded/server
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 0 changes to 0 files (+1 heads)
  1 new obsolescence markers
  obsoleted 1 changesets
  1 new orphan changesets

Check something prevents a silent publication of the obsolete changeset

  $ hg push --publish --new-branch
  pushing to $TESTTMP/check-superseded/server
  searching for changes
  abort: push includes orphan changeset: c09d8ab29fda!
  [255]

  $ cd ../..