upstream/mercurial-mirror Files · tests/test-filecache.py.out

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r29995:57830bd0 default


                r32255:7e35d31b

default

Download file

             test-filecache.py.out
        
                    63 lines
            
             | 1.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-filecache.py.out

History | Source | Raw |Copy content |Copy permalink

Idan Kamara scmutil: introduce filecache...	r14928	basic:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file still exists
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* empty file x created
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed size
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* nothing changed with either file
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed inode
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* empty file y created
		creating
		* file y changed size
		creating
		* file y changed inode
		creating
		* both files changed inode
		creating
Idan Kamara scmutil: introduce filecache...	r14928
		fakeuncacheable:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file still exists
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* empty file x created
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed size
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* nothing changed with either file
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x changed inode
Idan Kamara scmutil: introduce filecache...	r14928	creating
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* empty file y created
		creating
		* file y changed size
		creating
		* file y changed inode
		creating
		* both files changed inode
		creating
Idan Kamara destroyed: keep the filecache in sync with __dict__ (issue3335) (issue3693) (issue3743)...	r18313	repository tip rolled back to revision -1 (undo commit)
		working directory now based on revision -1
		repository tip rolled back to revision -1 (undo commit)
		working directory now based on revision -1
Idan Kamara filecache: create an entry in _filecache when __set__ is called for a missing one...	r18316
		setbeforeget:

Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* neither file exists
Siddharth Agarwal test-filecache.py: make setbeforeget test clearer...	r20040	string set externally
Siddharth Agarwal test-filecache.py: add markers to the output for each event...	r20041	* file x created
Idan Kamara filecache: create an entry in _filecache when __set__ is called for a missing one...	r18316	creating
Siddharth Agarwal test-filecache.py: make setbeforeget test clearer...	r20040	string from function
Siddharth Agarwal scmutil.filecache: support watching over multiple files	r20045	* string set externally again
		string 2 set externally
		* file y created
		creating
		string from function
FUJIWARA Katsunori scmutil: add file object wrapper class to check ambiguity at closing...	r29995
		antiambiguity:

	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