Subversion doc for ao repositories

sep10

Software under svn
disc locations for repositories and working copies
Moving to web access
Individual repository info

general
Cima
Wapp
aosoft
pdev
pdevjm
vw
vwTcl
vwcfg

svn commands

Intro (top)

Svn is used for version control in a number of software products at AO. Putting a software project under svn includes:

a repository where source and changes are kept.
a working directory that is checked out of the repository, where changes are made, and then checked back into the repository.

Software currently under svn: (top)

as of 05sep10
Cima:

the gui used for datataking

Wapp:

the software to run the wapps in spectral line and pulsar mode. includes some gui c libraries.

aosoft:

software libraries and source programs (mainly written by phil)

idl:

ao idl routines (mainly written by phil)

pdev

The ao software to take data with the pdev spectrometers.

pdevjm:

jeff mocks last version of his software. Includes the fpga code.

the vxWorks datataking software.

vwTcl

the tcl scripts that are used for datataking.

vwcfg

the config info for the cpus,,
vw/etc..
boot script files for the cpus

Disc locations: (top)

prior to dec12

repository was on /share/megs/phil/svnrepos
access method was via standalone server on megs2: megs2://svn

jan13

moved to web server
running on external webserver: svn.naic.edu..

same server as external webserver. hostname: has1
config info on has1: /etc/httpd/conf.d/subversion.conf
logs: /etc/httpd/logs -> /var/log/httpd/svn/

Disc area for repositories on /share/svnrepos

repos/xxx holds repositories
user_access/xxx holds access

software	Repository name (http://svn.naic.edu/repos or /share/svnrepos/repos/)	Source location within repository	working area
Cima	Cima	Cima/Cima/trunk/Software	/home/cima/svn/Cima mocksp svnwork
Wapp	Wapp	Wapp/Wapp/trunk/Software	/home/cima/svn/Wapp/
aosoft	aosoft	asoft/trunk/	/share/megs/phil/svn/aosoft Online pdevs1: /home.local/phil/svn/aosoft
idl	idl	idl/idl/trunk/	/share/megs/phil/svn/idl
pdev	pdev	pdev/pdev/trunk	/share/megs/phil/svn/pdev Online pdevs1: /home.local/phil/svn/pdev
pdevjm	pdevjm	pdevjm/trunk	/share/megs/phil/svn/pdevjm online
vw	vw	vw/vw/trunk	/home/phil/vw
vwTcl	vwTcl	vwTcl/vwTcl/trunk	/home/online/Tcl
vwcfg	vwcfg	vwcfg/trunk/vw	/home/online/vw

Moving to web acces

On 13jan13 we moved to web access of the repositories:

http://svn.naic.edu/repos/XXXX where XXXX is one of the repository names in the table above
Web server host: www or has1 or armada
repository location: /share/svnrepos/repos on aolc3
passwds on : /share/svnrepos/user_access

Moving working areas to the new repository:

the repository was copied prior to all modifications in working areas being updated
The easiest thing is to keep your current working areas and just edit them to use the new repository rather than the old:
suppose the repository is XXXX then:

cd to the working area
svn switch --relocate file:///share/megs/phil/svnrepos/XXXX http://svn.naic.edu/repos/XXXX
Will switch to the working area to the new repository. This just edits the paths in the working area.

Example: for Cima:

cd /share/megs/phil/svn/Cima
svn switch --relocate file:///share/megs/phil/svnrepos/Cima http://svn.naic.edu/repos/Cima

Individual Repository structure (top)

Generally how directories within repositories are used:

trunk

main developement goes on here

branches

Different versions stores with possible updates needed to fix a version

tags:

snapshots of a particular version. It is frozen. Might be easier to role back

Cima (top)

Repository:

branches

mocksp .. current mock single pixel version.

Software

tags

V3.0.10 (normal)

Software

V3.1.03 (smart)

Software

trunk

Software .. the current version that mods are being tested in.

Moving from working area to online code

The sofware code needs to be moved to the online working area that CIMA expects..
For changes made in the Cima/svn/svnwork code

cd /home/cima/svn/Cima/svnwork
Make

this will rsync svnwork to /home/cima/Software/Svnwork and then cmake install:

Executive,Frontend/Tcl_utilities,Common,Remote,Startup
If you make a change in a different sub directory you will need to cmake install it yourself
see the Makefile in svn/Cima/svnwork.

Creating a new cima version from the current svnwork directory

Suppose you want to make a cima version called mocksp from svnwork
let:

svnW=/home/cima/svn/svnwork/Cima .. work directory
svnO=/home/cima/Software/Svnwork .. online

Make sure svn repository is up to date so you have the correct svn version number in case you want to get this version out of the repository again (this assumes no tags are made).

cd $svnW/Sources ; svn -u status
If anything not updated, svn commit filename .. entering comment for each one.
Record the highest svn version number for documenatation purposes: svn -uv status

cd $svnW ; make install

This will rsync the files to $svnO/, and then cmake in the $svnO directories, and copy the new cmake version back to the $svnW directory

cima_copy Svnwork Mocksp .. It asks the following questions:

Enter version description: Mock single pixel version

this goes in the cima selection menu

Enter a new version name for Mocksp: mocksp

Usually just lower case of the directory.

Enter a new version number: 3.2.00

Optionally make an svn tag for this new verion.

A tag takes a current snapshot of the svn tree of interest and stores it. You could then grab this version easily with the svn switch command. This could also be done be remembering the svn revision number of the repository when the snapshot was to be made.
execute /home/cima/svnwork/Cima/mksvntag.sc.. execute it manually 1 line at a time.

Edit new/version files for selection menu:

/home/cima/Software/news - this goes in the bottom of the selection menu
/home/cima/Software/version - this is displayed when you click on the lower right button in selection menu

Wapp (top)

aosoft: (top)

Repository

branches
tags
trunk

Libraries included. in svn/aosoft/libsrc (working directory)

aovmehdr,phil,pntXform,tie,ttt,vtx

Source programs: in svn/aosoft/src
common - routines that run on multiple architectures

svn/aosoft/common

/bin - mainly shell scripts
/etc - files needed for shell scripts.

Rebuilding:

will build into the architecuture of the machine you are onl
cd /share/megs/phil/svn/
bash.. then . linux.sh

this will setup some env variables differently for:

online pdev
32 bit machines .. /pkg/aosoft/fedora4/i386
64 bit machines ../pkg/aosoft/fedora4/x86_64

cd aosoft
make clean .. to clean out libs
make .. make libsrc then src
make install

idl - holds phil's idl code (top)

Repository

branches
tags
trunk

idl directories under /pkg/rsi/local/libao/phil

Default idl location for idl users:

/pkg/rsi/local/libao/phil
after making changes in the working directory, you need to move these changes to the system idl location:

cd /share/megs/phil/svn/idl
make install

this does the rsync from the working directory (not from the repository).

pdev - the datataking system for pdev. excludes jeff's code (top)

The repository

branches
tags

rev-1026/ before parallactic angle changes 16feb09
rev-879/ before psrfits changes.

trunk

Readme
aosoft/
linux.sh
linuxfiles/
pdev/

editing code and moving it to pdevs1

the online code needs to be compiled on pdevs1
edit working directory code /share/megs/phil/svn/pdev (or aosoft)
commit changes to the repository
slogin pdevs1 as phil
cd svn/pdev (or aosoft)

svn update .. to get the changes moved to the working directory on pdevs1
make clean
make
make install

Be careful that you do aosoft before pdev (since some pdev sources use the libraries in aosoft).

vw - vxWorks datataking code from /home/phil/vw/ (top)

branches
tags
trunk

directory under /home/phil/vw/

vwTcl - tcl procedures for vxWorks. from /home/online/Tcl (top)

branches
tags
trunk

code from /home/online/Tcl

vwcfg - vxworks config info

trunk/vw/

etc
boot
config

I left out load.. since these are stored in source form.
i then : moved /home/online/vw/vw_07aug15
checkedout a working copy in /home/online/vw
copied the things not in the repos vwo vw_07aug15 (load, etc)...
eventually i'll delete vw_07aug15.. need to worry about vxworks links..

svn commands (top)

svn help .. list all commands

svn help status .. help on individual command.

creating a new repository in svn.naic.edu/repos (pkgserv)

svnadmin create reposName can't run directly:

This needs to run locally on the server with the repos (or at least accessible to it)
the repos is owned by user apache.
cpu's have apache account, but it is not a login account
root could run it on pkgserv, but pkgserv does not have svn command

solution. on some other cpu (megs3)

cd /home/phil
svnadmin create vwcfg
goto pkgserv . then cd /export/svnrepos/repos.. su root, cp -pr /home/phil/vwcfg .
chown -R 48.48 vwcfg

you probably then want to create the trunk,branch, tags directories in repos
on megs3:

svn mkdir http://svn.naic.edu/repos/vwcfg/trunk ... ditto branches, tags

accessing the repository:

http://svn.naic.edu/repos/xxxx
i'll use dir to refer to:

dir=http://svn.naic.edu/repos

Moving a repository to a new disc location and then updating the working areas

svn switch --relocate oldPath newPath
this just edits the locations in the working directory to point to the new location of the repository.

list contents of a repository:

svn list $dir/pdev/pdev/trunk

list contents of a working directory (probably easier to just use ls.

cd /share/megs/phil/svn/aosoft
svn list .

find out the repository a working directory is using:

cd /share/megs/phil/svn/aosoft
svn info

check out info from a repository to a new working directory

suppose you want aosoft
cd /share/megs/phil/svn/
checkout $dir/aosoft/trunk aosoftNew

this puts the software in aosoftNew directory.

see status of working area relative to repository

cd working areia
svn -uv status

find difference between working area file and repository

svn diff workingareaFile

Find difference between branch and main version

Might want to first check if trunk,branch working directories are synced to repository. What follows only check the repos.
goto trunk working directory, svn info to get url. svn log $p1 |less .. for the revision
goto branch working dir, do the same
eg

cd /home/cima/Software/Stable/Sources ;

svn info; set p1=http://svn.naic.edu/repos/Cima/Cima/trunk/Software/Sources
svn log $p1; set v1=r1598

cd /home/cima/Software/Untested/Sources

svn info ; set p2=http://svn.naic.edu/repos/Cima/Cima/branches/untested/Sources
svn log $p2|less; set v2=r1603

note the svn info or log does not give the most recent version. svn info $p1 or svn log $p1 does..
Now do the compare

svn diff ${p1}@$r1 ${p2}@$r2 |less
you might want to repeat with the opposite order. below says that if a file is not in the old set it will not be reported..

Find difference between a branch and the current version:

go to working area of branch

cd /home/cima/svn/Cima/mocksp
svn info

outputs:URL: file:///share/megs/phil/svnrepos/Cima/Cima/branches/mocksp

cd /home/cima/svn/Cima/svnwork
svn info

outputs:URL: file:///share/megs/phil/svnrepos/Cima/Cima/trunk

Now diff the 2 directories:

svn diff -old --old file:///share/megs/phil/svnrepos/Cima/Cima/branches/mocksp \ --new file:///share/megs/phil/svnrepos/Cima/Cima/trunk
Probably better to use --old current --new branch..

It compares all the files in old to new. If new file in New and not in Old then it is ignored.
so put --old New --new Old

remove files from working directory, repository

svn delete file

then svn commit file

To remove directly from repository use the url
svn delete $dir/aosoft/trunk/filename -m "message for delete"

create a snapshot of a repository state .. eg a particular version:

svn copy $dir/pdev/pdev/trunk $dir/pdev/tags/rev-1026 -m "message for tag"

copy a new set of files into the repository

svn import ...
isradar example

want to put .py routines in /home/isradar/python/pydt3/ into repository
1st add isr to repository (see creating a new repository above)
create trunk,tags,branches (same above ref)
grab a subset of pydt3 directory to put in repo

in /home/isradar.. mkdir svn
cd svn; mkdir pydt3;cd pydt3
cp ~isradar/python/pydt3/*.py .

cd ... (now in svn/)
use import
import . http://svn.naic.edu/repos/isr/trunk

files end up in repos/isr/trunk/pydt3/ (it creates pydt3 in repos).. using pydt3 instead of . would probably not create pydt3).

checking out files into a directory that already has the files (but is not a working directory).

again the isradar example
cd /home/isradar/python
svn checkout --force http://svn.naic.edu/repos/isr/trunk/pydt3 pydt3

this will not affect any files already there.
If they differ from the repos copy, then svn -uv stat will show them as having been modified

svnlook -commands

svnlook allows administrators to query info in the repository. It needs to be run on the same machine as the repository.

cd /share/megs/phil/svnrepos/Cima

svnlook tree $reposPath --show-ids --full-pahts

prints files id's and revision numbers for each file

svnlook youngest $reposPath

most recent revision in repository.

svnlook changed $reposPath

shows applied but now yet committed changes to the repository

svnlook log $reposPath -r revision

outputs the log messages for each revision

svnversion:

Tells the range of versions that are in the current working direcotory (not the repository).

svnversion .

pwd
/home/cima/svn/Cima/svnwork/Software/Sources/Frontend
svnversion

1451:1463 M if modifications have not been commited

Notes:

170811: copying Stable to untested

copy stable version to untested prior to cbw updates
make sure stable working version has been checked into the repository

cd /home/cima/Software/Stable
svn -uv status .. if some changes, then commit them

copy stable to /branches/untested in the repository

svn copy http://svn.naic.edu/repos/Cima/Cima/trunk/Software http://svn.naic.edu/repos/Cima/Cima/branches/untested

checkout untested from branches/untested

cd /home/cima/Software/Untested
svn switch http://svn.naic.edu/repos/Cima/Cima/branches/untested

updated the cima variables

edit CIMA_VERSION -> Untested version for software testing
edit CIMA_VERSION_NAME -> untested
edit CIMA_VERSION_DATE ->2017-08-11 13:14
svn commit .. to put these in the /branches/untested branch.

home_~phil