svn commit: r221978 - in user/des/svnsup: bin/distill include/svnsup lib/libsvnsup

[Dag-Erling Smorgrav]

Author: des
Date: Sun May 15 23:54:45 2011
New Revision: 221978
URL: http://svn.freebsd.org/changeset/base/221978

Log:
  Include the revision number in the delta.

Modified:
  user/des/svnsup/bin/distill/distill.c
  user/des/svnsup/include/svnsup/delta.h
  user/des/svnsup/lib/libsvnsup/svnsup_delta.c

Modified: user/des/svnsup/bin/distill/distill.c
==============================================================================
--- user/des/svnsup/bin/distill/distill.c	Sun May 15 23:10:13 2011	(r221977)
+++ user/des/svnsup/bin/distill/distill.c	Sun May 15 23:54:45 2011	(r221978)
@@ -102,6 +102,8 @@ distill(const char *url, unsigned long r
 	SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_uuid()");
 	err = svnsup_delta_path(sd, subdir);
 	SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_path()");
+	err = svnsup_delta_revision(sd, revision);
+	SVNSUP_SVNSUP_ERROR(err, "svnsup_delta_revision()");
 
 	/* get revision metadata */
 	error = svn_ra_get_log2(ra_session, NULL, revision, revision, 0,

Modified: user/des/svnsup/include/svnsup/delta.h
==============================================================================
--- user/des/svnsup/include/svnsup/delta.h	Sun May 15 23:10:13 2011	(r221977)
+++ user/des/svnsup/include/svnsup/delta.h	Sun May 15 23:54:45 2011	(r221978)
@@ -39,6 +39,7 @@ int svnsup_close_delta(svnsup_delta_t);
 int svnsup_delta_root(svnsup_delta_t, const char *);
 int svnsup_delta_uuid(svnsup_delta_t, const char *);
 int svnsup_delta_path(svnsup_delta_t, const char *);
+int svnsup_delta_revision(svnsup_delta_t, unsigned long);
 int svnsup_delta_comment(svnsup_delta_t, const char *, ...);
 int svnsup_delta_meta(svnsup_delta_t, const char *, const char *, ...);
 int svnsup_delta_create_directory(svnsup_delta_t, const char *);

Modified: user/des/svnsup/lib/libsvnsup/svnsup_delta.c
==============================================================================
--- user/des/svnsup/lib/libsvnsup/svnsup_delta.c	Sun May 15 23:10:13 2011	(r221977)
+++ user/des/svnsup/lib/libsvnsup/svnsup_delta.c	Sun May 15 23:54:45 2011	(r221978)
@@ -50,6 +50,7 @@ struct svnsup_delta {
 	const char *root;
 	const char *uuid;
 	const char *path;
+	unsigned long revision;
 	struct svnsup_delta_file *sdf;
 	unsigned int ntxt;
 };
@@ -242,6 +243,20 @@ svnsup_delta_path(svnsup_delta_t sd, con
 }
 
 /*
+ * Revision
+ */
+int
+svnsup_delta_revision(svnsup_delta_t sd, unsigned long revision)
+{
+
+	assert(sd->revision == 0);
+	sd->revision = revision;
+	fprintf(sd->f, "@revision %lu\n", sd->revision);
+	return (SVNSUP_ERR_NONE);
+}
+
+
+/*
  * Create a directory
  */
 int