pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cvs2hg: add support for cvs2fossil's -f flag
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Wed Jun 28 09:41:24 2023 +0200
Changeset: e89b39fb9be0f5f290fa9757b73ecb9762f74a23
Modified Files:
cvs2hg/files/cvs2hg
cvs2hg/files/cvs2hg.1
Log Message:
cvs2hg: add support for cvs2fossil's -f flag
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e89b39fb9be0f5f290fa9757b73ecb9762f74a23
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cvs2hg/files/cvs2hg | 8 +++++---
cvs2hg/files/cvs2hg.1 | 12 +++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diffs:
diff --git a/cvs2hg/files/cvs2hg b/cvs2hg/files/cvs2hg
index fa59b0e4af..e413b199bf 100644
--- a/cvs2hg/files/cvs2hg
+++ b/cvs2hg/files/cvs2hg
@@ -31,11 +31,13 @@
#
set -e
-USAGE="usage: $0 [-m mailmap] source-cvs-rsync-path target-path"
+USAGE="usage: $0 [-f fixup-sql-script] [-m mailmap] source-cvs-rsync-path target-path"
+fixup=""
mailmap=""
-while getopts m: f
+while getopts f:m: f
do
case $f in
+ f) fixup="-f$OPTARG";;
m) mailmap=$OPTARG
case "$mailmap" in
/*);;
@@ -53,7 +55,7 @@ then
fi
SRC="$1"
BASE="$2"
-cvs2fossil -m "$SRC" "$BASE"
+cvs2fossil "$fixup" -m "$SRC" "$BASE"
# creates "$BASE" and "$BASE".fossil, but we don't need "$BASE"
rm -f "$BASE"
# convert to git
diff --git a/cvs2hg/files/cvs2hg.1 b/cvs2hg/files/cvs2hg.1
index 29b091c589..9846b3c23e 100644
--- a/cvs2hg/files/cvs2hg.1
+++ b/cvs2hg/files/cvs2hg.1
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 24, 2023
+.Dd June 28, 2023
.Dt CVS2HG 1
.Os
.Sh NAME
@@ -35,6 +35,7 @@
.Nd convert CVS repository to Mercurial
.Sh SYNOPSIS
.Nm
+.Op Fl f Ar fixup-sql-script
.Op Fl m Ar mailmap
.Ar source
.Ar destination
@@ -73,6 +74,11 @@ You can pass a
file for creating proper author information using the
.Fl m
flag.
+You can pass an SQL fixup script for
+.Xr cvs2fossil
+using the
+.Fl f
+flag.
.Sh EXAMPLES
To convert the NetBSD src repository, if you have developer access, do:
.Bd -literal -offset indent
@@ -96,7 +102,3 @@ and
.Pa src.git ,
respectively.
You can delete them after the conversion.
-.Sh BUGS
-There is no way to provide an
-.Pa authormap
-file to convert Unix user names to email addresses.
Home |
Main Index |
Thread Index |
Old Index