##// END OF EJS Templates
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

File last commit:

r7080:a6477aa8 default
r13155:f02d7a56 default
Show More
md5sum.py
42 lines | 992 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:
while 1:
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)