From owner-svn-src-user@FreeBSD.ORG Sun May 15 23:54:46 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27FC4106564A; Sun, 15 May 2011 23:54:46 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F14AF8FC08; Sun, 15 May 2011 23:54:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4FNsj23057848; Sun, 15 May 2011 23:54:45 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4FNsjL7057843; Sun, 15 May 2011 23:54:45 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201105152354.p4FNsjL7057843@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sun, 15 May 2011 23:54:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221978 - in user/des/svnsup: bin/distill include/svnsup lib/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2011 23:54:46 -0000 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