681
edits
Changes
Jump to navigation
Jump to search
Line 1:
Line 1: − Initial script to take the latest version of a module and move it to Gitea.+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + − #!/bin/bash − # $1 = Module name e.g. smeserver-ddclient − # $2 = "contrib" ot anything else -=> core module − LocalUser="brianr" − RemoteUser="brianr" − if [ $2 = "contrib" ]; then − CVSFiles="/home/$LocalUser/smecontribs/rpms" − else − CVSFiles="/home/$LocalUser/smeserver/rpms" − fi − GitFiles="/home/$LocalUser/GitFiles" − RemoteRepoURL="https://src.koozali.org/$RemoteUser/$1" − mkdir -p $GitFiles − #Make sure credentials taken from store − git config --global credential.helper store − # Clone the CVS repository+ − + − + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + − # Fully populate the directory (gets the tar file - which is not strictly in CVS)+ − cd $1/contribs10+ − make prep − # Create the local Git repository+ − cd $GitFiles − git init $1 − cd $1 − #pull in all the files we want − if [ $2 = "contrib" ]; then − cp $CVSFiles/$1/contribs10/*.patch . − cp $CVSFiles/$1/contribs10/*.spec . − cp $CVSFiles/$1/contribs10/*.tar.gz . − cp $CVSFiles/$1/contribs10/*.tgz . − cp $CVSFiles/$1/contribs10/*.xz . − else − cp $CVSFiles/$1/sme10/*.patch . − cp $CVSFiles/$1/sme10/*.spec . − cp $CVSFiles/$1/sme10/*.tar.gz . − cp $CVSFiles/$1/sme10/*.tgz . − cp $CVSFiles/$1/sme10/*.xz . − fi − #stage and commit them+ − − git commit -m "initial commit of file from CVS for $1" − # Create the remote repo and push the converted git repository to the remote+ − git remote remove origin+ − git remote add origin $RemoteRepoURL+ − # Need to have created the repo at this point....+ − git pull --no-edit origin master+ − git push -u origin master − echo "Created $1 Repo in $RemoteRepoURL" − exit 0 + + + + − </syntaxhighlight>Issues:+ − # How to partition the repos between smecontribs and core? different User?+ − # Need ssh access to gitea for automatic creation of repos, else each one has to be created by hand!+ − # Realising that I need the contribs10/11/12 directories under the module name if I am going to get make mockbuild to work.+ − # + − #+ + + + + +
no edit summary
The script to use is smedev/git-cvs2git.sh
# $1 = Module name e.g. smeserver-ddclient
# $2 = Organisation (smeserver or smecontrib)e
# optional (can be in any order)
# <local> will use parameters set for local repository else it will use remote
# <debug> turn on debug regardless of ~/.smegit/config
# <noisy> print a line showing how it was called
This will take a CVS package and create a equivalent git repo and copy across the data.
See also:
https://wiki.koozali.org/Howto_create_a_gitea_repo_and_build_an_rpm#Creating_the_Repo_on_the_gitea_Server
DEPRECATED:
==Issues:==
# How to partition the repos between smecontribs and core? different User? - smecontribs and smeserver directories? Then module name.With contribs10 / sme10 directories underneath, and also the common directory.
# Need ssh access to gitea for automatic creation of repos, else each one has to be created by hand!
# Realising that I need the contribs10/11/12 directories under the module name if I am going to get make mockbuild to work.
# Are going to hold the rpm's in the git repo as well? Otherwise we need the .gitignore set to *.rpm
# I presume we will hold the file tree tar file in git?
# I also presume that we will have one git repo per module? Rather than share Importing the a repo across all modules?
==Bringing across all the CVS history as well...==
According to google, git has a parameter "cvsimport" since version 2.1, however the version in my Rocky 8 system is 2.3.1, but has not such parameter. Latest comments I can find are for 2012, and some say it is not very reliable, so I suspect it has been withdrawn.
Only tool I can find is "cvs-fast-import" which will work with git-fast-import to import all the CVS data (inc history)
No rpms seem to exist, so I am having to build it on the Rocky 8 system (on which I also have CVS installed, and have access to the SME CVS)
Code for cvs-fast-import is here : https://gitlab.com/esr/cvs-fast-export
I needed
<syntaxhighlight lang="shell">
<syntaxhighlight lang="shell">
git clone https://gitlab.com/esr/cvs-fast-export
cd $CVSFiles
cd cvs-fast-export
cvs -d:ext:shell.koozali.org:/cvs/smecontribs checkout $1
sudo dnf install dnf-plgins-core
sudo dnf install epel-release
sudo dnf config-manager --set-enabled powertools
sudo buildprep --doc
make install-bin
make install
[brianr@rockysmebuild cvs-fast-export]$ cvs-fast-export --help
Usage: cvs-fast-export [OPTIONS] [FILE]...
Parse RCS files and emit a fast-import stream.
Mandatory arguments to long options are mandatory for short options too.
-h --help This help
-g --graph Dump the commit graph
-V --version Print version
-w --commit-time-window=WINDOW Time window for commits(seconds)
-c --content-only Don't trust commit-IDs
-l --log=LOG_FILE Log file
-a --authorlist Report committer IDs from repository
-A --authormap=AUTHOR_MAP Author map file
-R --revision-map=REV_MAP Revision map file
-r --reposurgeon Issue cvs-revision properties
-T Force deterministic dates
-e --remote=REMOTE Relocate branches to refs/remotes/REMOTE
-s --strip=PREFIX Strip the given PREFIX instead of longest common prefix
-p --progress Enable load-status reporting
-P --promiscuous Process files without ,v extension
-v --verbose Show verbose progress messages
-q --quiet Suppress normal warnings
-i --incremental=TIME Incremental dump beginning after specified RFC3339-format TIME.
-t --threads=N Use threaded scheduler with N threads for CVS master analyses.
-E --embed-id Embed CVS revisions in the commit messages.
Example: find | cvs-fast-export
[brianr@rockysmebuild cvs-fast-export]$
</syntaxhighlight>
It includes a "cvsconvert" script which runs cvs-fast-convert and writes to a git repo.
git add -A
HOWEVER it needs access to the CVS files, not just the cvs client!<syntaxhighlight>
[brianr@rockysmebuild cvs-fast-export]$ more cvsconvert
#!/usr/bin/env python3
"""
cvsconvert - convert a CVS repo and check against the original
Convert, and check the tree content of a gitspace conversion against
the CVS. The tip state of every branch, and every tag, is checked.
Will produce spurious errors if any CVS branch name had to be sanitized.
</syntaxhighlight>cvssync (part of the cvs package) is the way to go.
See here: https://stackoverflow.com/questions/28693868/migration-from-cvs-to-git
This worked:
cvssync brianr@shell.koozali.org:/cvs/smecontribs/rpms smeserver-ddclient
it creates a directory "smeserver-ddclient" of the CVS files.
and "find . | cvs-fast-export | git fast-import" also did something, although I am not sure it was quite what I expected!!
TBC (WIP)