##// END OF EJS Templates
exchange: backout changeset c26335fa4225...
exchange: backout changeset c26335fa4225 Changeset c26335fa4225 has good intends but introduce significant behavior regressions for multiple important cases. In short there are many case where push would have caught instability creation/propagation that are no longer covered. These behavior have been covered for many years and even if some related case are not currently caught, the covered one should not be regressed. The next four changesets introduce tests for some of these cases. However we could produce many more tests cases since the area is wide and they are many possible combination. (And we should cover them when getting back to this issue) Since 5.5 is one week away, the most reasonable approach seems to back this out while we devise a new way to move forward that preserve the current behavior, catch more issues and also improves the situation that c26335fa4225 target. In addition to the behavior change, c26335fa4225 also introduced output changes. These output changes does not requires a backout per-se, but are part of the same changeset. However they come with a couple of issues that also requires attention: 1) the bulk of the error message have been shoehorned into a multiple line abort message. This seems quite different from what we usually do. The abort message should be a compact and efficient message, with extra details being issued as normal error output beforehand. (with --verbose/--quiet) support. 2) the current output is unbounded, so if there is many (tens, hundreds, thousands, …) of unstable/obsolete changeset involved in the push, the output can quickly become a scary and un-usuable wall of text. So we need some limitation here (same as we have with the remote head list that says A, B , C and # others).

File last commit:

r43347:687b865b default
r45782:6063c185 stable
Show More
node.py
49 lines | 1.5 KiB | 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
Augie Fackler
node: make bin() be a wrapper instead of just an alias...
r36256 # Adapt to Python 3 API changes. If this ends up showing up in
# profiles, we can use this version only on Python 3, and forward
# binascii.unhexlify like we used to on Python 2.
def bin(s):
try:
return binascii.unhexlify(s)
except binascii.Error as e:
raise TypeError(e)
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 nullrev = -1
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is '0000000000000000000000000000000000000000'
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.
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is '2121212121212121212121212121212121212121'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 newnodeid = b'!!!!!!!!!!!!!!!!!!!!'
Yuya Nishihara
node: correct hex representation of pseudo node ids
r39231 # In hex, this is '3030303030303030303030303030306164646564'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 addednodeid = b'000000000000000added'
Yuya Nishihara
node: correct hex representation of pseudo node ids
r39231 # In hex, this is '3030303030303030303030306d6f646966696564'
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 modifiednodeid = b'000000000000modified'
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Yuya Nishihara
node: rename wdirnodes to clarify they are for manifest/filelogs...
r37466 wdirfilenodeids = {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)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 wdirrev = 0x7FFFFFFF
Kyle Lippincott
nodes: expand/comment the magic nodes so they are more easily searchable...
r39178 # In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 wdirid = b"\xff" * 20
Yuya Nishihara
revlog: add support for partial matching of wdir node id...
r32684 wdirhex = hex(wdirid)
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
mpm@selenic.com
Break apart hg.py...
r1089 def short(node):
return hex(node[:6])