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

merge: allow smarter tool configuration...

merge: allow smarter tool configuration Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files

Matt Mackall - - Load All Authors

File last commit:

r3888:66050481 default


                r6004:5af5f0f9

default

Download file

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

        Benoit Boissinot
    
i18n first part: make '_' available for files who need it

              r1400
            
      """

      i18n.py - internationalization support for mercurial

        Vadim Gelfer
    
update copyrights.

              r2859
            
      Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

        Benoit Boissinot
    
i18n first part: make '_' available for files who need it

              r1400
            
      This software may be used and distributed according to the terms

      of the GNU General Public License, incorporated herein by reference.

      """

        Matt Mackall
    
Enable gettext translations...

              r3888
            
      import gettext

      t = gettext.translation('hg', fallback=1)

      gettext = t.gettext

      _ = gettext

	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

Benoit Boissinot i18n first part: make '_' available for files who need it	r1400	"""
		i18n.py - internationalization support for mercurial

Vadim Gelfer update copyrights.	r2859	Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
Benoit Boissinot i18n first part: make '_' available for files who need it	r1400
		This software may be used and distributed according to the terms
		of the GNU General Public License, incorporated herein by reference.
		"""

Matt Mackall Enable gettext translations...	r3888	import gettext
		t = gettext.translation('hg', fallback=1)
		gettext = t.gettext
		_ = gettext