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

Clarified message when nothing to merge is seen....

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.

Vadim Gelfer - - Load All Authors

File last commit:

r2470:fe168927 default


                r2548:0229ff95

default

Download file

             node.py
        
                    22 lines
            
             | 474 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """

      node.py - basic nodeid manipulation for mercurial

      Copyright 2005 Matt Mackall <mpm@selenic.com>

      This software may be used and distributed according to the terms

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

      """

      from demandload import demandload

      demandload(globals(), "binascii")

      nullid = "\0" * 20

      def hex(node):

          return binascii.hexlify(node)

      def bin(node):

          return binascii.unhexlify(node)

      def short(node):

          return hex(node[:6])

	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

				"""
				node.py - basic nodeid manipulation for mercurial

				Copyright 2005 Matt Mackall <mpm@selenic.com>

				This software may be used and distributed according to the terms
				of the GNU General Public License, incorporated herein by reference.
				"""

				from demandload import demandload
				demandload(globals(), "binascii")

				nullid = "\0" * 20

				def hex(node):
				return binascii.hexlify(node)

				def bin(node):
				return binascii.unhexlify(node)

				def short(node):
				return hex(node[:6])