annotate tests/test-check-sdist.t @ 5786:c0122b98356c

divergence-resolution: [patch 1] fix a messed up test case Because of logic change in divergence resolution which causes the order change in picking the resolution parent this test case was messed up. It was supposed to test that that it hits conflict while relocating the divergent cset but because of some change in previous patches, relocation went successful and it hits conflict while merging the two divergent csets. This patch, by making some changes in files content make sure that we get conflict during relocation.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 19:47:17 +0530
parents 43a5371fa669
children fe9f9e528a42
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 #require test-repo
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 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
4
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 $ cat << EOF >> "$HGRCPATH"
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6 > [experimental]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7 > evolution = all
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
8 > EOF
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
9
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
10 $ cd "$TESTDIR"/..
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
11 $ "$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
12 */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
13 warnings.warn(msg)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
14 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
15 (?)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
16 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
17 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
18 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
19 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
20 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
21 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
22 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
23 $ cd "$TESTTMP"/dist
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
24
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
25 $ wc -c hg-evolve-*.tar.gz
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
26 8????? hg-evolve-*.tar.gz (glob)
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
27
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
28 $ 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
29 $ wc -l files
5784
43a5371fa669 divergence-resolution: add support and doc for a special case in divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5781
diff changeset
30 346 files
5772
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
31 $ fgrep debian files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
32 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
33 $ 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
34 hgext3rd/__init__.py
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
35 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
36 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
37 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
38 $ 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
39 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
40 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
41 $ fgrep README files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
42 README.rst
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
43 docs/README
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
44 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
45 hgext3rd/topic/README
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
46
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
47 $ 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
48 [1]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
49 $ 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
50 [1]
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
51 $ fgrep netlify files
da01b9062cfb tests: add test-check-sdist.t to check setup.py sdist results
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
52 [1]