diff -Nru simple-revision-control-1.24/control simple-revision-control-1.26/control --- simple-revision-control-1.24/control 2019-02-07 23:46:40.000000000 +0000 +++ simple-revision-control-1.26/control 2019-05-10 20:44:03.000000000 +0000 @@ -22,3 +22,4 @@ XBS-VC-Tag-Template: %(version)s +XBS-Validate: make check diff -Nru simple-revision-control-1.24/debian/changelog simple-revision-control-1.26/debian/changelog --- simple-revision-control-1.24/debian/changelog 2019-02-13 17:39:23.000000000 +0000 +++ simple-revision-control-1.26/debian/changelog 2019-08-16 07:40:43.000000000 +0000 @@ -1,3 +1,15 @@ +simple-revision-control (1.26-2) unstable; urgency=medium + + * Upload to unstable. + + -- Dmitry Bogatov Fri, 16 Aug 2019 07:40:43 +0000 + +simple-revision-control (1.26-1) experimental; urgency=medium + + * New upstream release + + -- Dmitry Bogatov Sun, 02 Jun 2019 06:20:32 +0000 + simple-revision-control (1.24-1) unstable; urgency=medium * New upstream release diff -Nru simple-revision-control-1.24/debian/.gitlab-ci.yml simple-revision-control-1.26/debian/.gitlab-ci.yml --- simple-revision-control-1.24/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ simple-revision-control-1.26/debian/.gitlab-ci.yml 2019-06-02 06:17:46.000000000 +0000 @@ -0,0 +1,5 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + RELEASE: experimental diff -Nru simple-revision-control-1.24/NEWS simple-revision-control-1.26/NEWS --- simple-revision-control-1.24/NEWS 2019-02-08 00:07:23.000000000 +0000 +++ simple-revision-control-1.26/NEWS 2019-05-12 18:21:20.000000000 +0000 @@ -1,5 +1,13 @@ = src project news = +1.26: 2019-05-12:: + Change name of "lift" command to "srcify". + Proper inline documentation for srcify. + Repair make check; do setup to perform validation before shipping. + +1.25: 2019-05-10:: + New "lift" command for changing RCS and SCCS directories to be SRC-managed. + 1.24: 2019-02-07:: More fast-export bug fixes - make multifile export work properly. diff -Nru simple-revision-control-1.24/src simple-revision-control-1.26/src --- simple-revision-control-1.24/src 2019-02-08 00:07:37.000000000 +0000 +++ simple-revision-control-1.26/src 2019-05-12 18:21:51.000000000 +0000 @@ -81,7 +81,7 @@ except ImportError: pass -version="1.24" +version="1.26" CENTURY = "20" # A Y2.1K problem, but only for SCCS. @@ -541,6 +541,7 @@ diff -- the diff command: dump revision differences to standard output. fast-export -- the fast-export command: export history to other systems. fast-import -- the fast-import command: import history from other systems. +srcify -- the srcify command: change manaagement from SCCS/RCS to src. ignores -- .srcignore files and their uses. The 'help', 'rename', 'ls', 'move', 'copy', 'visualize', and 'version' @@ -737,6 +738,12 @@ handy if you have to interoperate with other tools that expect RCS masters to be in their normal (unlocked/unwritable) state. +src srcify + Move a directory from being RCS- or SCCS-managed to being SRC-managed. + That is: if the current directory contains an RCS directory, rename it + to .src (but leave any SCCS directory in place). Then check out all + masters for editing that are not already checked out. + src version Report the versions of SRC, the underlying Python, and the back end. @@ -976,6 +983,13 @@ The default range is all commits. """, + "srcify" : """ +src srcify + + Change the current directory with an RCS or SCCS subdirectory to be + managed by src instead. Any RCS directory is renamed .src. Then all + files with histories are checked out for editing. +""", "fast-import" : """ src fast-import [-p] ['file'...] @@ -1961,6 +1975,20 @@ with backend.lifter(arg): backend.release(arg) +def srcify_method(*args): + "Move an RCS or SCCS directory into SRC management." + if args: + croak("lift cannot accept arguments") + if not os.path.isdir("RCS") and not os.path.isdir("SCCS"): + croak("no RCS or SCCS directory") + candidates = [f for f in os.listdir(".") if os.path.isfile(f) and not os.path.islink(f)] + for fn in candidates: + if registered(fn) and (not os.path.exists(fn) or not modified(fn)): + with backend.lifter(fn): + backend.checkout(fn, "") + if os.path.isdir("RCS"): + os.rename("RCS", ".src") + def ls_method(*args): "List registered files." if args: @@ -2164,6 +2192,7 @@ "fast-export": fast_export_method, "fast-import": fast_import_method, "release": release_method, + "srcify": srcify_method, "version": version_method, } diff -Nru simple-revision-control-1.24/src.1 simple-revision-control-1.26/src.1 --- simple-revision-control-1.24/src.1 2019-02-08 00:08:56.000000000 +0000 +++ simple-revision-control-1.26/src.1 2019-05-12 18:22:57.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: src .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 -.\" Date: 02/07/2019 +.\" Date: 05/12/2019 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "SRC" "1" "02/07/2019" "\ \&" "\ \&" +.TH "SRC" "1" "05/12/2019" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -205,6 +205,8 @@ .RS 4 Release locks on files\&. This is never necessary in a normal workflow, which will be repeated edit\-commit cycles, but it may be handy if you have to interoperate with other tools that expect RCS masters to be in their normal (unlocked) state\&. .RE +.sp +src srcify Move a directory from being RCS\- or SCCS\-managed to being SRC\-managed\&. That is: if the current directory contains an RCS directory, rename it to \&.src (but leave any SCCS directory in place)\&. Then check out all masters for editing that are not already checked out\&. .PP src version .RS 4 diff -Nru simple-revision-control-1.24/src.adoc simple-revision-control-1.26/src.adoc --- simple-revision-control-1.24/src.adoc 2019-02-07 23:59:25.000000000 +0000 +++ simple-revision-control-1.26/src.adoc 2019-05-12 18:14:47.000000000 +0000 @@ -175,6 +175,12 @@ handy if you have to interoperate with other tools that expect RCS masters to be in their normal (unlocked) state. +src srcify + Move a directory from being RCS- or SCCS-managed to being SRC-managed. + That is: if the current directory contains an RCS directory, rename it + to .src (but leave any SCCS directory in place). Then check out all + masters for editing that are not already checked out. + src version:: Report the versions of SRC, the underlying Python, and the back end. diff -Nru simple-revision-control-1.24/srctest simple-revision-control-1.26/srctest --- simple-revision-control-1.24/srctest 2019-02-07 23:59:56.000000000 +0000 +++ simple-revision-control-1.26/srctest 2019-05-12 18:14:47.000000000 +0000 @@ -1516,6 +1516,21 @@ check "fast-export: consult RFC 822 headers" fi +# Now for the srcify test +rm -fr .src RCS SCCS + cat >srcifyfile </dev/null +fi +$src $TESTOPTS srcify && ls $history >/dev/null && ls srcifyfile >/dev/null +check "srcify command" + echo "srctest ($python $backend): all tests succeeded" rm -fr $SANDBOX