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

merge: introduce mergeresult.addfile() and use it...

merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820

Gregory Szorc - - Load All Authors

File last commit:

r43376:d783f945 default


                r45839:b442920a

default

Download file

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

      # __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

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

      import hgdemandimport

      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

				# __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

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

				demandimport = hgdemandimport