upstream/mercurial-mirror Files · tests/test-pathconflicts-basic.t

revset: use phasecache.getrevset to calculate public()...

revset: use phasecache.getrevset to calculate public() Other revsets like secret(), draft(), _nonpublic() are using phasescache.getrevset already. The latter is more efficient after D1606. So let's migrate the public() revset function too. Tested using: $ hg debugshell --hidden --cwd hg-committed` In [1]: %timeit len(repo.revs('public()')) * Before D1606: 10 loops, best of 3: 22.5 ms per loop * Before this change, after D1606: 10 loops, best of 3: 28.6 ms per loop * After this change: 10 loops, best of 3: 20.2 ms per loop Therefore `public()` revset becomes even slightly faster after the data structure change by D1606. A similar performance win could also be observed on a large repo. A side effect is `phasecache.getrevset` needs to take a `subset` parameter. That was added with a default value so it won't cause BC issues. Differential Revision: https://phab.mercurial-scm.org/D1620

Siddharth Agarwal - - Load All Authors

File last commit:

r34943:2a774cae stable


                r35331:0c1aff6d

default

Download file

             test-pathconflicts-basic.t
        
                    106 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pathconflicts-basic.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Path conflict checking is currently disabled by default because of issue5716.

      Turn it on for this test.

        $ cat >> $HGRCPATH << EOF

        > [experimental]

        > merge.checkpathconflicts=True

        > EOF

        $ hg init repo

        $ cd repo

        $ echo base > base

        $ hg add base

        $ hg commit -m "base"

        $ hg bookmark -i base

        $ echo 1 > a

        $ hg add a

        $ hg commit -m "file"

        $ hg bookmark -i file

        $ echo 2 > a

        $ hg commit -m "file2"

        $ hg bookmark -i file2

        $ hg up -q 0

        $ mkdir a

        $ echo 2 > a/b

        $ hg add a/b

        $ hg commit -m "dir"

        created new head

        $ hg bookmark -i dir

      Basic merge - local file conflicts with remote directory

        $ hg up -q file

        $ hg bookmark -i

        $ hg merge --verbose dir

        resolving manifests

        a: path conflict - a file or link has the same name as a directory

        the local file has been renamed to a~853701544ac3

        resolve manually then use 'hg resolve --mark a'

        moving a to a~853701544ac3

        getting a/b

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ hg update --clean .

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

        $ rm a~853701544ac3

      Basic update - local directory conflicts with remote file

        $ hg up -q 0

        $ mkdir a

        $ echo 3 > a/b

        $ hg up file

        a: untracked directory conflicts with file

        abort: untracked files in working directory differ from files in requested revision

        [255]

        $ hg up --clean file

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

        (activating bookmark file)

      Repo state is ok

        $ hg sum

        parent: 1:853701544ac3 

         file

        branch: default

        bookmarks: *file

        commit: (clean)

        update: 2 new changesets (update)

        phases: 4 draft

      Basic update - untracked file conflicts with remote directory

        $ hg up -q 0

        $ echo untracked > a

        $ hg up --config merge.checkunknown=warn dir

        a: replacing untracked file

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

        (activating bookmark dir)

        $ cat a.orig

        untracked

        $ rm -f a.orig

      Basic clean update - local directory conflicts with changed remote file

        $ hg up -q file

        $ rm a

        $ mkdir a

        $ echo 4 > a/b

        $ hg up file2

        abort: *: '$TESTTMP/repo/a' (glob)

        [255]

        $ hg up --clean file2

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

        (activating bookmark file2)

      Repo state is ok

        $ hg sum

        parent: 2:f64e09fac717 

         file2

        branch: default

        bookmarks: *file2

        commit: (clean)

        update: 1 new changesets, 2 branch heads (merge)

        phases: 4 draft

	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

				Path conflict checking is currently disabled by default because of issue5716.
				Turn it on for this test.

				$ cat >> $HGRCPATH << EOF
				> [experimental]
				> merge.checkpathconflicts=True
				> EOF

				$ hg init repo
				$ cd repo
				$ echo base > base
				$ hg add base
				$ hg commit -m "base"
				$ hg bookmark -i base
				$ echo 1 > a
				$ hg add a
				$ hg commit -m "file"
				$ hg bookmark -i file
				$ echo 2 > a
				$ hg commit -m "file2"
				$ hg bookmark -i file2
				$ hg up -q 0
				$ mkdir a
				$ echo 2 > a/b
				$ hg add a/b
				$ hg commit -m "dir"
				created new head
				$ hg bookmark -i dir

				Basic merge - local file conflicts with remote directory

				$ hg up -q file
				$ hg bookmark -i
				$ hg merge --verbose dir
				resolving manifests
				a: path conflict - a file or link has the same name as a directory
				the local file has been renamed to a~853701544ac3
				resolve manually then use 'hg resolve --mark a'
				moving a to a~853701544ac3
				getting a/b
				1 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]
				$ hg update --clean .
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ rm a~853701544ac3

				Basic update - local directory conflicts with remote file

				$ hg up -q 0
				$ mkdir a
				$ echo 3 > a/b
				$ hg up file
				a: untracked directory conflicts with file
				abort: untracked files in working directory differ from files in requested revision
				[255]
				$ hg up --clean file
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark file)

				Repo state is ok

				$ hg sum
				parent: 1:853701544ac3
				file
				branch: default
				bookmarks: *file
				commit: (clean)
				update: 2 new changesets (update)
				phases: 4 draft

				Basic update - untracked file conflicts with remote directory

				$ hg up -q 0
				$ echo untracked > a
				$ hg up --config merge.checkunknown=warn dir
				a: replacing untracked file
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark dir)
				$ cat a.orig
				untracked
				$ rm -f a.orig

				Basic clean update - local directory conflicts with changed remote file

				$ hg up -q file
				$ rm a
				$ mkdir a
				$ echo 4 > a/b
				$ hg up file2
				abort: *: '$TESTTMP/repo/a' (glob)
				[255]
				$ hg up --clean file2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(activating bookmark file2)

				Repo state is ok

				$ hg sum
				parent: 2:f64e09fac717
				file2
				branch: default
				bookmarks: *file2
				commit: (clean)
				update: 1 new changesets, 2 branch heads (merge)
				phases: 4 draft