upstream/mercurial-mirror Files · tests/readlink.py

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.

Pulkit Goyal - - Load All Authors

File last commit:

r29485:6a98f940 default


                r32255:7e35d31b

default

Download file

             readlink.py
        
                    17 lines
            
             | 324 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / readlink.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Thomas Arendsen Hein
    
Use common readlink.py instead of own implementations per test script.

              r5683
            
      #!/usr/bin/env python

        Pulkit Goyal
    
py3: make files use absolute_import and print_function...

              r29485
            
      from __future__ import absolute_import, print_function

        timeless
    
readlink: use print_function

              r29175
            
        Pulkit Goyal
    
py3: make files use absolute_import and print_function...

              r29485
            
      import errno

      import os

      import sys

        Thomas Arendsen Hein
    
Use common readlink.py instead of own implementations per test script.

              r5683
            
      for f in sys.argv[1:]:

          try:

        timeless
    
readlink: use print_function

              r29175
            
              print(f, '->', os.readlink(f))

        Gregory Szorc
    
global: mass rewrite to use modern exception syntax...

              r25660
            
          except OSError as err:

        Matt Mackall
    
many, many trivial check-code fixups

              r10282
            
              if err.errno != errno.EINVAL:

                  raise

        timeless
    
readlink: use print_function

              r29175
            
              print(f, '->', f, 'not a symlink')

        Thomas Arendsen Hein
    
Use common readlink.py instead of own implementations per test script.

              r5683
            
      sys.exit(0)

	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

Thomas Arendsen Hein Use common readlink.py instead of own implementations per test script.	r5683	#!/usr/bin/env python

Pulkit Goyal py3: make files use absolute_import and print_function...	r29485	from __future__ import absolute_import, print_function
timeless readlink: use print_function	r29175
Pulkit Goyal py3: make files use absolute_import and print_function...	r29485	import errno
		import os
		import sys
Thomas Arendsen Hein Use common readlink.py instead of own implementations per test script.	r5683
		for f in sys.argv[1:]:
		try:
timeless readlink: use print_function	r29175	print(f, '->', os.readlink(f))
Gregory Szorc global: mass rewrite to use modern exception syntax...	r25660	except OSError as err:
Matt Mackall many, many trivial check-code fixups	r10282	if err.errno != errno.EINVAL:
		raise
timeless readlink: use print_function	r29175	print(f, '->', f, 'not a symlink')
Thomas Arendsen Hein Use common readlink.py instead of own implementations per test script.	r5683
		sys.exit(0)