[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Debian website git repo in Salsa (Bug #845297)

Hello all

>> 4.- At that point, our git repo https://salsa.debian.org/webmaster-team/webwml
>> should be mostly usable, and people should be able to continue their work
>> committing to salsa.

the conversion went well and we have a working repo in:


(Note that the website is still built based on the (read only) CVS repo,
we didn't change the cron jobs yet).

For information about Git (the new version control system), for now,
please refer to this mail and general Git documentation.

For information about Salsa (the new software forge and collaboration
tool, that we use instead of Alioth), please refer to the wiki:


Getting notifications

We have setup the configuration of the project in Salsa so commits are
shown in the IRC channel #debian-www

If you want to receive mail notifications when there are
commits in the webwml repo, please subscribe to the "www.debian.org"
pseudopackage via tracker.debian.org and activate the "vcs" keyword
there, following these steps (only once):

* Open a web browser and go to https://tracker.debian.org/pkg/www.debian.org
* Subscribe to the "www.debian.org" pseudopackage. (You can authenticate
via SSO or register an email and password, if you were not using
tracker.debian.org already for other purposes).
* Go to https://tracker.debian.org/accounts/subscriptions/ , "modify
keywords", check "vcs" (if it's not checked) and save.
* From now on you will get emails when somebody commits in the
webwml repo. We will add the other webmaster-team repositories soon.

Working with the repository

You need to install git to work with the repository and configure your
user and email (please refer to general git documentation). Once this is
done, clone the repo with:

$ git clone git@salsa.debian.org:webmaster-team/webwml.git

Note that since git is a distributed (not centralised) system, after you
commit your changes you need to push your changes to the repo in Salsa.
So an edition in an English file will look like this:

1.- Update your local clone getting the last changes of the repo:

$ git pull

2.- Do some change/edition to a file and commit your changes:

$ git add path/to/file(s)
$ git commit

3.- Push your changes to the Salsa repo

$ git push

If you need write access to the repository, please request it via
https://salsa.debian.org/webmaster-team/webwml (if you are new and had
no access in Alioth, please also send a mail to
debian-www@lists.debian.org with your introduction)

Changes in translations

If you change translated files, you need to update the translation-check
header to link to the git commit hash of the corresponding change in the
English file. You can know that hash with

$ git log path/to/english/file

If you do a new translation, please use the "copypage.pl" script and it
will create a template for your language, including the correct
translation header.

Changes in smart_change.pl

There is a *NEW* implementation of smart_change.pl which is limited to
supporting git commit hashes. To use it:

 1. Make the changes to the original file(s), and commit
 2. Update translations
 3. Run smart_change.pl - it will pick up the changes and update
    headers in the translation files
 4. Review the changes (for example with "git diff -u")
 5. Commit the translation changes

This is more involved than previously (needing two commits), but

Note that the "-s" option of smart_change.pl is not usable for now.

This is all, for now, I think.

Laura Arjona Reina

Reply to: