annotate tests/test-check-sdist.t @ 6224:17ffdea0edbb stable

evolve: look for split successors of the correct ancestor (issue6648) Consider two changesets, 1 and 2. 1 is split into two new changesets and 2 is pruned. If we stand on 2 and call hg evolve, _singlesuccessor() will traverse ancestors of wdp in search of a changeset with successors to update to (it will be 1, which was split). In case of a split, select_split_successor() gets control. The issue is this function didn't traverse ancestors, and instead tried to look up successors of the original changeset (i.e. 2 in our case, which was pruned). We can make select_split_successor() aware of _singlesuccessor() logic by using the changeset that actually has successors without traversing ancestors again. It's done by storing that changeset in MultipleSuccessorsError exception.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 21 Apr 2022 22:19:27 +0400
parents 74665d83fb3b
children 318b81560f8c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5772
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
1 Enable obsolescence to avoid the warning issue when obsmarkers are found
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
2
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
3 $ cat << EOF >> "$HGRCPATH"
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
4 > [experimental]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 > evolution = all
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6 > EOF
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
8 $ cd "$TESTDIR"/..
5799
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
9
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
10 Archiving to a separate location to avoid hardlink mess when the repo is shared
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
11
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
12 #if test-repo
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
13
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
14 $ hg archive "$TESTTMP"/hg-evolve
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
15 $ cd "$TESTTMP"/hg-evolve
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
16
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
17 #endif
fe9f9e528a42 tests: make test-check-sdist.t less flaky by first archiving the repo
Anton Shestakov <av6@dwimlabs.net>
parents: 5784
diff changeset
18
5772
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
19 $ "$PYTHON" setup.py sdist --dist-dir "$TESTTMP"/dist > /dev/null
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
20 */dist.py:*: UserWarning: Unknown distribution option: 'python_requires' (glob)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
21 warnings.warn(msg)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
22 warning: sdist: standard file not found: should have one of README, README.txt (?)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
23 (?)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
24 warning: no previously-included files found matching 'docs/tutorial/.netlify'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
25 warning: no previously-included files found matching '.gitlab-ci.yml'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
26 warning: no previously-included files found matching '.hg-format-source'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
27 warning: no previously-included files found matching 'Makefile'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
28 no previously-included directories found matching 'contrib'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
29 no previously-included directories found matching 'debian'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
30 no previously-included directories found matching '.gitlab'
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
31 $ cd "$TESTTMP"/dist
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
32
5956
8e78e0f316b3 tests: improve tarball size check in test-check-sdist.t
Anton Shestakov <av6@dwimlabs.net>
parents: 5918
diff changeset
33 $ find hg-evolve-*.tar.gz -size +800000c
8e78e0f316b3 tests: improve tarball size check in test-check-sdist.t
Anton Shestakov <av6@dwimlabs.net>
parents: 5918
diff changeset
34 hg-evolve-*.tar.gz (glob)
5772
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
35
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
36 $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
37 $ wc -l files
6224
17ffdea0edbb evolve: look for split successors of the correct ancestor (issue6648)
Anton Shestakov <av6@dwimlabs.net>
parents: 6146
diff changeset
38 357 files
5772
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
39 $ fgrep debian files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
40 tests/test-check-debian.t
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
41 $ fgrep __init__.py files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
42 hgext3rd/__init__.py
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
43 hgext3rd/evolve/__init__.py
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
44 hgext3rd/evolve/thirdparty/__init__.py
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
45 hgext3rd/topic/__init__.py
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
46 $ fgrep common.sh files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
47 docs/tutorial/testlib/common.sh
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
48 tests/testlib/common.sh
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
49 $ fgrep README files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
50 README.rst
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
51 docs/README
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
52 docs/tutorial/README.rst
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
53 hgext3rd/topic/README
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
54
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
55 $ egrep '(gitlab|contrib|hack|format-source)' files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
56 [1]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
57 $ fgrep legacy.py files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
58 [1]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
59 $ fgrep netlify files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
60 [1]