##// END OF EJS Templates
merge: drop obsolete non-linear cases from docstring table...
merge: drop obsolete non-linear cases from docstring table Since 6b1fc09c699a (update: change default destination to tipmost descendant (issue4673) (BC), 2016-02-02), non-linear updates can no longer happen if the user doesn't specify a destination, so we can drop these case from the table in the docstring of merge.update().

File last commit:

r30361:1070df14 default
r31158:58f55f0b default
Show More
node.py
34 lines | 900 B | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # node.py - basic nodeid manipulation for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
Break apart hg.py...
r1089
Gregory Szorc
node: use absolute_import
r25962 from __future__ import absolute_import
Matt Mackall
Replace demandload with new demandimport
r3877 import binascii
mpm@selenic.com
Break apart hg.py...
r1089
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 # This ugly style has a noticeable effect in manifest parsing
hex = binascii.hexlify
bin = binascii.unhexlify
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 nullrev = -1
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 nullid = b"\0" * 20
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 nullhex = hex(nullid)
mpm@selenic.com
Break apart hg.py...
r1089
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360 # Phony node value to stand-in for new files in some uses of
# manifests.
newnodeid = '!' * 20
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 addednodeid = ('0' * 15) + 'added'
modifiednodeid = ('0' * 12) + 'modified'
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 wdirnodes = set((newnodeid, addednodeid, modifiednodeid))
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737 # pseudo identifiers for working directory
# (they are experimental, so don't add too many dependencies on them)
wdirrev = 0x7fffffff
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 wdirid = b"\xff" * 20
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737
mpm@selenic.com
Break apart hg.py...
r1089 def short(node):
return hex(node[:6])