Author: philip
Date: Fri Jul 2 15:46:38 2010
New Revision: 960036
URL: http://svn.apache.org/viewvc?rev=960036&view=rev
Log:
Make commit store SHA1 instead of MD5.
* subversion/libsvn_wc/adm_ops.c
(svn_wc__process_committed_internal): Pass SHA1 checksum.
* subversion/tests/cmdline/wc.py
(text_base_path): Only accept SHA1 checksums.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/tests/cmdline/svntest/wc.py
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=960036&r1=960035&r2=960036&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Jul 2 15:46:38 2010
@@ -250,7 +250,7 @@ svn_wc__process_committed_internal(svn_w
new_revnum, new_date, rev_author,
new_dav_cache,
no_unlock, keep_changelist,
- md5_checksum, /* ### not yet: sha1_checksum,
*/
+ sha1_checksum,
scratch_pool));
if (recurse && kind == svn_wc__db_kind_dir)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=960036&r1=960035&r2=960036&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Fri Jul 2 15:46:38
2010
@@ -837,11 +837,7 @@ def text_base_path(file_path):
c.execute("""select checksum from base_node
where local_relpath = '""" + file_name + """'""")
checksum = c.fetchone()[0]
- if checksum is not None and checksum[0:6] == "$md5 $":
- c.execute("""select checksum from pristine
- where md5_checksum = '""" + checksum + """'""")
- checksum = c.fetchone()[0]
- if checksum is None:
+ if checksum is None or checksum[0:6] != "$sha1$":
raise svntest.Failure("No SHA1 checksum for " + file_path)
db.close()
return os.path.join(parent_path, dot_svn, 'pristine', checksum[6:])
