upstream/mercurial-mirror Files · tests/test-revlog-mmapindex.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Jun Wu - - Load All Authors

File last commit:

r34447:b0c97e44 default


                r38817:bb54db4a

@96 default

Download file

             test-revlog-mmapindex.t
        
                    56 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog-mmapindex.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      create verbosemmap.py

        $ cat << EOF > verbosemmap.py

        > # extension to make util.mmapread verbose

        > 

        > from __future__ import absolute_import

        > 

        > from mercurial import (

        >     extensions,

        >     pycompat,

        >     util,

        > )

        > 

        > def extsetup(ui):

        >     def mmapread(orig, fp):

        >         ui.write(b"mmapping %s\n" % pycompat.bytestr(fp.name))

        >         ui.flush()

        >         return orig(fp)

        > 

        >     extensions.wrapfunction(util, 'mmapread', mmapread)

        > EOF

      setting up base repo

        $ hg init a

        $ cd a

        $ touch a

        $ hg add a

        $ hg commit -qm base

        $ for i in `$TESTDIR/seq.py 1 100` ; do

        > echo $i > a

        > hg commit -qm $i

        > done

      set up verbosemmap extension

        $ cat << EOF >> $HGRCPATH

        > [extensions]

        > verbosemmap=$TESTTMP/verbosemmap.py

        > EOF

      mmap index which is now more than 4k long

        $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=4k

        mmapping $TESTTMP/a/.hg/store/00changelog.i

        100

        99

        98

        97

        96

      do not mmap index which is still less than 32k

        $ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=32k

        100

        99

        98

        97

        96

        $ cd ..

	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

				create verbosemmap.py
				$ cat << EOF > verbosemmap.py
				> # extension to make util.mmapread verbose
				>
				> from __future__ import absolute_import
				>
				> from mercurial import (
				> extensions,
				> pycompat,
				> util,
				> )
				>
				> def extsetup(ui):
				> def mmapread(orig, fp):
				> ui.write(b"mmapping %s\n" % pycompat.bytestr(fp.name))
				> ui.flush()
				> return orig(fp)
				>
				> extensions.wrapfunction(util, 'mmapread', mmapread)
				> EOF

				setting up base repo
				$ hg init a
				$ cd a
				$ touch a
				$ hg add a
				$ hg commit -qm base
				$ for i in `$TESTDIR/seq.py 1 100` ; do
				> echo $i > a
				> hg commit -qm $i
				> done

				set up verbosemmap extension
				$ cat << EOF >> $HGRCPATH
				> [extensions]
				> verbosemmap=$TESTTMP/verbosemmap.py
				> EOF

				mmap index which is now more than 4k long
				$ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=4k
				mmapping $TESTTMP/a/.hg/store/00changelog.i
				100
				99
				98
				97
				96

				do not mmap index which is still less than 32k
				$ hg log -l 5 -T '{rev}\n' --config experimental.mmapindexthreshold=32k
				100
				99
				98
				97
				96

				$ cd ..