Hello community, here is the log from the commit of package cvsps for openSUSE:Factory checked in at 2013-03-08 09:08:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cvsps (Old) and /work/SRC/openSUSE:Factory/.cvsps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cvsps", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cvsps/cvsps.changes 2013-01-17 09:37:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cvsps.new/cvsps.changes 2013-03-08 09:09:25.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Jan 29 08:12:23 UTC 2013 - [email protected] + +- update to 3.10 + * Make the behavior of a second -d option match the documentation. + +------------------------------------------------------------------- +Mon Jan 21 11:40:20 UTC 2013 - [email protected] + +- update to 3.9 + * Added -i option for generating incremental fast exports. + +------------------------------------------------------------------- Old: ---- cvsps-3.8.tar.gz New: ---- cvsps-3.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cvsps.spec ++++++ --- /var/tmp/diff_new_pack.Y7oJ9z/_old 2013-03-08 09:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.Y7oJ9z/_new 2013-03-08 09:09:26.000000000 +0100 @@ -20,7 +20,7 @@ Summary: A Program for Generating Patch Set Information from a CVS Repository License: GPL-2.0+ Group: Development/Tools/Version Control -Version: 3.8 +Version: 3.10 Release: 0 Source0: http://www.catb.org/~esr/cvsps/%{name}-%{version}.tar.gz Url: http://www.catb.org/~esr/cvsps/ ++++++ cvsps-3.8.tar.gz -> cvsps-3.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cvsps-3.8/Makefile new/cvsps-3.10/Makefile --- old/cvsps-3.8/Makefile 2013-01-14 12:07:17.000000000 +0100 +++ new/cvsps-3.10/Makefile 2013-01-21 14:20:15.000000000 +0100 @@ -1,4 +1,4 @@ -VERSION=3.8 +VERSION=3.10 CC?=gcc CFLAGS?=-g -O2 -Wall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cvsps-3.8/NEWS new/cvsps-3.10/NEWS --- old/cvsps-3.8/NEWS 2013-01-14 12:07:04.000000000 +0100 +++ new/cvsps-3.10/NEWS 2013-01-21 14:20:02.000000000 +0100 @@ -1,5 +1,11 @@ CVSps project news +3.10 @ 2013-01-20 + Make the behavior of a second -d option match the documentation. + +3.9 @ 2013-01-20 + Added -i option for generating incremental fast exports. + 3.8 @ 2013-01-13 Fix buggy generation of the revision-map file (thanks to Chris Rorvick). Don't convert .cvsignores by default, we have field reports of collisions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cvsps-3.8/cvsclient.c new/cvsps-3.10/cvsclient.c --- old/cvsps-3.8/cvsclient.c 2013-01-09 16:48:13.000000000 +0100 +++ new/cvsps-3.10/cvsclient.c 2013-01-14 19:55:10.000000000 +0100 @@ -799,12 +799,15 @@ void cvs_update(CvsServerCtx * ctx, const char * rep, const char * file, const char * rev, bool kk, FILE *fp) { - if (kk) - send_string(ctx, "Argument -kk\n"); - send_string(ctx, "Argument -r\n"); - send_string(ctx, "Argument %s\n", rev); - send_string(ctx, "Argument %s/%s\n", rep, file); - send_string(ctx, "co\n"); + send_string(ctx, + "%s" + "Argument -r\n" + "Argument %s\n" + "Argument %s/%s\n" + "co\n", + kk ? "Argument -kk\n" : "", + rev, + rep, file); ctx_to_fp(ctx, fp); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cvsps-3.8/cvsps.asc new/cvsps-3.10/cvsps.asc --- old/cvsps-3.8/cvsps.asc 2013-01-14 12:04:41.000000000 +0100 +++ new/cvsps-3.10/cvsps.asc 2013-01-20 23:40:02.000000000 +0100 @@ -12,7 +12,7 @@ [-v] [-t] [--summary-first] [--diff-opts 'option string'] [--debuglvl 'bitmask'] [-Z 'compression'] [--root 'cvsroot'] [-q] [--fast-export] [--convert-ignores] [--reposurgeon] - [-k] [-T] [-V] ['module-path'] + [-i] [-k] [-T] [-V] ['module-path'] == DESCRIPTION == cvsps tries to group the per-file commits and tags in a CVS project @@ -130,6 +130,12 @@ --root 'cvsroot':: Override the setting of CVSROOT (overrides working directory and environment). +-i:: +Incremental export. Each commit with no ancestor gets a from pointer +with the value of refs/heads/${BRANCH}^0 where $BRANCH is its branch +name. When importing to an existing repository, this will attach each +such commit as a child of the last commit on $BRANCH in the existing +repository. -k:: Kill keywords: will extract files with '-kk' from the CVS archive to avoid noisy changesets. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cvsps-3.8/cvsps.c new/cvsps-3.10/cvsps.c --- old/cvsps-3.8/cvsps.c 2013-01-14 12:03:30.000000000 +0100 +++ new/cvsps-3.10/cvsps.c 2013-01-21 14:13:24.000000000 +0100 @@ -111,6 +111,7 @@ static bool keyword_suppression = false; static bool reposurgeon = false; static bool convert_ignores = false; +static bool incremental = false; static int parse_args(int, char *[]); static int parse_rc(); @@ -602,7 +603,7 @@ debug(DEBUG_USAGE, " [-p <directory>] [-A 'authormap'] [-v] [-t] [--summary-first]"); debug(DEBUG_USAGE, " [--diff-opts <option string>] [--convert-ignores]"); debug(DEBUG_USAGE, " [--debuglvl <bitmask>] [-Z <compression>] [--root <cvsroot>]"); - debug(DEBUG_USAGE, " [-k] [-T] [-V] [<repository>]"); + debug(DEBUG_USAGE, " [-i] [-k] [-T] [-V] [<repository>]"); debug(DEBUG_USAGE, " "); debug(DEBUG_USAGE, "Where:"); debug(DEBUG_USAGE, " -h display this informative message"); @@ -628,6 +629,7 @@ debug(DEBUG_USAGE, " --debuglvl <bitmask> enable various debug channels."); debug(DEBUG_USAGE, " -Z <compression> A value 1-9 which specifies amount of compression"); debug(DEBUG_USAGE, " --root <cvsroot> specify cvsroot. overrides env. and working directory"); + debug(DEBUG_USAGE, " -i generate ^0 branch starts for incremental export"); debug(DEBUG_USAGE, " -k suppress CVS keyword expansion"); debug(DEBUG_USAGE, " -T <date> set base date for regression testing"); debug(DEBUG_USAGE, " --fast-export emit a git-style fast-import stream"); @@ -760,6 +762,13 @@ if (strcmp(argv[i], "-h") == 0) return usage(NULL, NULL); + if (strcmp(argv[i], "-i") == 0) + { + incremental = true; + i++; + continue; + } + if (strcmp(argv[i], "-k") == 0) { keyword_suppression = true; @@ -1551,8 +1560,8 @@ ok: //fprintf(stderr, "Time check: %zd %zd %zd\n", restrict_date_start, restrict_date_end, ps->date); if (restrict_date_start > 0 && - (ps->date < restrict_date_start || - (restrict_date_end > 0 && ps->date > restrict_date_end))) + (ps->date <= restrict_date_start || + (restrict_date_end > 0 && ps->date >= restrict_date_end))) return false; if (restrict_author && strcmp(restrict_author, ps->author) != 0) @@ -1943,6 +1952,8 @@ } if (ancestor_mark) printf("from :%d\n", ancestor_mark); + else if (incremental) + printf("from refs/heads/%s^0\n", outbranch); ps->mark = tip->mark = mark; for all_patchset_members(next, ps) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
