##// END OF EJS Templates
graft: fix collision detection with origin revisions that are missing...
graft: fix collision detection with origin revisions that are missing When grafting something with a matching origin, it would normally be skipped: skipping already grafted revision 123 (23 also has origin 12) But after stripping a graft origin, graft could fail with a reference to the origin that no longer exists: abort: unknown revision '5c095ad7e90f871700f02dd1fa5012cb4498a2d4'! Instead, detect that the origin is unknown and skip it anyway, like: skipping already grafted revision 8 (2 also has unknown origin 5c095ad7e90f871700f02dd1fa5012cb4498a2d4)

File last commit:

r14494:1ffeeb91 default
r22302:9472284d stable
Show More
md5sum.py
42 lines | 995 B | text/x-python | PythonLexer
Thomas Arendsen Hein
Unified #! paths for python scripts and removed them for test modules.
r4122 #!/usr/bin/env python
Peter van Dijk
clarify license on md5sum.py
r1928 #
# Based on python's Tools/scripts/md5sum.py
#
# This software may be used and distributed according to the terms
# of the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2, which is
# GPL-compatible.
Patrick Mezard
tests: Windows compatibility fixes...
r7080 import sys, os
Dirkjan Ochtman
python 2.6 compatibility: compatibility wrappers for hash functions
r6470
try:
from hashlib import md5
except ImportError:
from md5 import md5
Peter van Dijk
add md5sum.py required by fix in previous changeset
r1924
Patrick Mezard
tests: Windows compatibility fixes...
r7080 try:
import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
except ImportError:
pass
Peter van Dijk
add md5sum.py required by fix in previous changeset
r1924 for filename in sys.argv[1:]:
try:
fp = open(filename, 'rb')
except IOError, msg:
sys.stderr.write('%s: Can\'t open: %s\n' % (filename, msg))
sys.exit(1)
Thomas Arendsen Hein
Whitespace/Tab cleanup
r3223
Dirkjan Ochtman
python 2.6 compatibility: compatibility wrappers for hash functions
r6470 m = md5()
Peter van Dijk
add md5sum.py required by fix in previous changeset
r1924 try:
Martin Geisler
check-code: flag 0/1 used as constant Boolean expression
r14494 while True:
Peter van Dijk
add md5sum.py required by fix in previous changeset
r1924 data = fp.read(8192)
if not data:
break
m.update(data)
except IOError, msg:
sys.stderr.write('%s: I/O error: %s\n' % (filename, msg))
sys.exit(1)
sys.stdout.write('%s %s\n' % (m.hexdigest(), filename))
sys.exit(0)