upstream/mercurial-mirror Files · mercurial/__init__.py

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

Gregory Szorc - - Load All Authors

File last commit:

r43376:d783f945 default


                r47570:c52c3c4c

default

Download file

             __init__.py
        
                    13 lines
            
             | 416 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
mercurial: implement import hook for handling C/Python modules...

              r27220
            
      # __init__.py - Startup and module loading logic for Mercurial.

      #

      # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

        Siddharth Agarwal
    
demandimport: move to separate package...

              r32420
            
      # Allow 'from mercurial import demandimport' to keep working.

      import hgdemandimport

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Siddharth Agarwal
    
demandimport: move to separate package...

              r32420
            
      demandimport = hgdemandimport

	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

Gregory Szorc mercurial: implement import hook for handling C/Python modules...	r27220	# __init__.py - Startup and module loading logic for Mercurial.
		#
		# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.

		from __future__ import absolute_import

Siddharth Agarwal demandimport: move to separate package...	r32420	# Allow 'from mercurial import demandimport' to keep working.
		import hgdemandimport
Augie Fackler formatting: blacken the codebase...	r43346
Siddharth Agarwal demandimport: move to separate package...	r32420	demandimport = hgdemandimport