upstream/mercurial-mirror Files · tests/test-issue522.t

packaging: modernize (compat PEP 517) with less distutils and setup.py calls...

packaging: modernize (compat PEP 517) with less distutils and setup.py calls - setup.py: less distutils imports and setuptools required distutils is deprecated and one should import commands from setuptools to support modern workflows depending on PEP 517 and 518. Moreover, for Python >=3.12, distutils comes from setuptools. It corresponds to old and unmaintain code that do not support PEP 517. The PEP 517 frontends (pip, build, pipx, PDM, UV, etc.) are responsible for creating a venv just for the build. The build dependencies (currently only setuptools) are specified in the pyproject.toml file. Therefore, there is no reason to support building without setuptools. Calling directly setup.py is deprecated and we have to use a PEP 517 frontend. For this commit we use pip with venv. - run-tests.py: install with pip instead of direct call of setup.py Mercurial is then built in an isolated environment. - Makefile: use venv+pip instead of setup.py

Arseniy Alekseyev - - Load All Authors

File last commit:

r50516:55c6ebd1 stable


                r53946:f5091286

tip default

Download file

             test-issue522.t
        
                    53 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue522.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/522

      In the merge below, the file "foo" has the same contents in both

      parents, but if we look at the file-level history, we'll notice that

      the version in p1 is an ancestor of the version in p2. This test makes

      sure that we'll use the version from p2 in the manifest of the merge

      revision.

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo bar >> foo

        $ hg ci -m 'change foo'

        $ hg backout -r tip -m 'backout changed foo'

        reverting foo

        changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e

        $ hg up -C 0

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ touch bar

        $ hg ci -qAm 'add bar'

        $ hg merge --debug

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee

         foo: remote is newer -> g

        getting foo

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg debugstate | grep foo

        m   0         -2 unset               foo

        $ hg st -A foo

        M foo

        $ hg ci -m 'merge'

        $ hg manifest --debug | grep foo

        c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo

        $ hg debugindex foo

           rev linkrev       nodeid    p1-nodeid    p2-nodeid

             0       0 2ed2a3912a0b 000000000000 000000000000

             1       1 6f4310b00b9a 2ed2a3912a0b 000000000000

             2       2 c6fc755d7e68 6f4310b00b9a 000000000000

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				https://bz.mercurial-scm.org/522

				In the merge below, the file "foo" has the same contents in both
				parents, but if we look at the file-level history, we'll notice that
				the version in p1 is an ancestor of the version in p2. This test makes
				sure that we'll use the version from p2 in the manifest of the merge
				revision.

				$ hg init repo
				$ cd repo

				$ echo foo > foo
				$ hg ci -qAm 'add foo'

				$ echo bar >> foo
				$ hg ci -m 'change foo'

				$ hg backout -r tip -m 'backout changed foo'
				reverting foo
				changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ touch bar
				$ hg ci -qAm 'add bar'

				$ hg merge --debug
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
				foo: remote is newer -> g
				getting foo
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg debugstate \| grep foo
				m 0 -2 unset foo

				$ hg st -A foo
				M foo

				$ hg ci -m 'merge'

				$ hg manifest --debug \| grep foo
				c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo

				$ hg debugindex foo
				rev linkrev nodeid p1-nodeid p2-nodeid
				0 0 2ed2a3912a0b 000000000000 000000000000
				1 1 6f4310b00b9a 2ed2a3912a0b 000000000000
				2 2 c6fc755d7e68 6f4310b00b9a 000000000000