User talk:ConradPino/Project JEDI Wiki Development
Contents
Vendor Branches Used
Date: Thu, 04 Feb 2010 22:01:37 +0100
From: Olivier Sannier <>
To: "Conrad T. Pino" <>
CC: 'Florent Ouchet' <>
Subject: Re: wiki modifications
Hello,
As Florent already pointed out, the web site pages are stored in the svn repository which gets exported on demand to the production server. To make maintenance easier, especially to keep up with public releases of mediawiki and mantisbt, there are "vendor branches" inside our repository. To know more about this concept, please read the svn book here : http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html
This is important for you because if you want use to upgrade to the latest version of MediaWiki, you have to ask me to do it. The same goes if you want to install an extension to the wiki as it will need to have its own vendor branch. These vendor branches are managed by the ExternalsManager tool, which I should be the only one to use.
However, if you want to create minor adjustements in some specific source files, you are welcome to commit them directly to the SVN. Then, once you are satisfied with your changes, please tell me to update to the production server. As this is a time consuming process, I urge you to thoroughly document your changes in the log messages and only ask me to update the server when you are sure of your changes. I'll review them and I will then send them.
Keep in mind that I'm quite busy for the 6 upcoming months, so I might no be able to react as promptly as I used to. If you have any question, please let me know.
Regards
Olivier
Tracking MediaWiki BASH Script
#!/bin/bash
#
mw1140_export(){
svn export https://projectjedi.svn.sourceforge.net/svnroot/projectjedi/vendors/mediawiki/current mw1140
}
mw1141_download(){
wget http://download.wikimedia.org/mediawiki/1.14/mediawiki-1.14.1.tar.gz
tar -xzf mediawiki-1.14.1.tar.gz
mv mediawiki-1.14.1 mw1141
}
mw1151_download(){
wget http://download.wikimedia.org/mediawiki/1.15/mediawiki-1.15.1.tar.gz
tar -xzf mediawiki-1.15.1.tar.gz
mv mediawiki-1.15.1 mw1151
}
[ -d mw1140 ] || mw1140_export
pushd mw1140
find . | sort > ../ls1140.txt
popd
[ -d mw1141 ] || mw1141_download
pushd mw1141
find . | sort > ../ls1141.txt
popd
[ -d mw1151 ] || mw1151_download
pushd mw1151
find . | sort > ../ls1151.txt
popd
rm -rf diffs.txt
echo diff ls1140.txt ls1141.txt >> diffs.txt
diff ls1140.txt ls1141.txt >> diffs.txt
echo diff ls1141.txt ls1151.txt >> diffs.txt
diff ls1141.txt ls1151.txt >> diffs.txt
cat diffs.txt
Conrad T. Pino 08:16, 5 February 2010 (UTC)
MediaWiki 1.14.0 to 1.14.1 File Changes
diff ls1140.txt ls1141.txt 44d43 < ./.htaccess
MediaWiki 1.14.1 to 1.15.1 File Changes
diff ls1141.txt ls1151.txt 65a66 > ./includes/api/ApiFormatRaw.php 71a73 > ./includes/api/ApiImport.php 106a109 > ./includes/api/ApiQueryProtectedTitles.php 125a129 > ./includes/BacklinkCache.php 137a142 > ./includes/ChangeTags.php 140a146 > ./includes/db/DatabaseIbm_db2.php 194a201 > ./includes/ForkController.php 229a237 > ./includes/media/Tiff.php 275a284 > ./includes/parser/Tidy.php 280a290 > ./includes/ProfilerSimpleTrace.php 292a303 > ./includes/SearchIBM_DB2.php 364a376 > ./includes/specials/SpecialTags.php 400,403d411 < ./includes/UploadBase.php < ./includes/UploadFromStash.php < ./includes/UploadFromUpload.php < ./includes/UploadFromUrl.php 421a430 > ./includes/zhtable/Makefile.py 461a471 > ./languages/classes/LanguageGan.php 462a473 > ./languages/classes/LanguageGv.php 560a572,573 > ./languages/messages/MessagesDe_at.php > ./languages/messages/MessagesDe_ch.php 590a604,605 > ./languages/messages/MessagesGan_hans.php > ./languages/messages/MessagesGan_hant.php 673a689 > ./languages/messages/MessagesLzh.php 797a814 > ./languages/messages/MessagesUg_latn.php 803a821 > ./languages/messages/MessagesVep.php 806a825 > ./languages/messages/MessagesVro.php 851a871 > ./maintenance/archives/patch-change_tag.sql 859a880 > ./maintenance/archives/patch-fix-il_from.sql 907a929 > ./maintenance/archives/patch-pl-tl-il-unique.sql 1018a1041,1044 > ./maintenance/gearman > ./maintenance/gearman/gearman.inc > ./maintenance/gearman/gearmanRefreshLinks.php > ./maintenance/gearman/gearmanWorker.php 1022a1049,1051 > ./maintenance/ibm_db2 > ./maintenance/ibm_db2/README > ./maintenance/ibm_db2/tables.sql 1048a1078 > ./maintenance/language/makeMessageDB.php 1087a1118 > ./maintenance/postgres/archives/patch-change_tag.sql 1137c1168,1170 < ./maintenance/sqlite/tables.sql --- > ./maintenance/sqlite/archives > ./maintenance/sqlite/archives/initial-indexes.sql > ./maintenance/sqlite/README 1226a1260 > ./skins/common/changepassword.js 1292a1327 > ./skins/common/images/feed-icon.png 1330a1366,1367 > ./skins/common/images/nextredirectltr.png > ./skins/common/images/nextredirectrtl.png 1385a1423,1424 > ./skins/monobook/external-rtl.png > ./skins/monobook/FF2Fixes.css 1401a1441 > ./skins/monobook/Opera9Fixes.css 1470a1511 > ./trackback.php5
Project JEDI Wiki Development Questions
Conrad T. Pino Thu, 4 Feb 2010 13:43:50 -0800
Date: Thu, 4 Feb 2010 13:43:50 -0800
From: "Conrad T. Pino" <>
To: "'Olivier Sannier'" <>
Cc: "'Florent Ouchet'" <>
Subject: Project JEDI Wiki Development Questions
Hi Olivier,
How does this project test MediaWiki changes before deployment?
These Subversion sub trees seem equivalent:
- projectjedi/vendors/mediawiki/1.14.0/
- projectjedi/vendors/mediawiki/current/
and deliberately differerent than:
- projectjedi/trunk/delphi-jedi.org/wiki/
What concerns me is these subtrees are EMPTY:
- projectjedi/branches/
- projectjedi/tags/
which means deplopyment by Revision (specific or HEAD)?
Thank you,
Conrad
Olivier Sannier Fri, 5 Feb 2010 10:54:27 +0100
Date: Fri, 5 Feb 2010 10:54:27 +0100
From: Olivier Sannier <>
To: "Conrad T. Pino" <>
CC: 'Florent Ouchet' <>
Subject: Re: Project JEDI Wiki Development Questions
Hello,
- How does this project test MediaWiki changes before deployment?
On a private webserver. That's how web development should be done anyway.
- These Subversion sub trees seem equivalent:
- projectjedi/vendors/mediawiki/1.14.0/
- projectjedi/vendors/mediawiki/current/
Yes, because there was only one import of mediawiki sources. Next time we will update, a new one will be added and current will be equal to it.
- and deliberately differerent than:
- projectjedi/trunk/delphi-jedi.org/wiki/
Yes, there are differences, hence the whole point of the vendor branch. The differences should be quite limited though.
- What concerns me is these subtrees are EMPTY:
- projectjedi/branches/
- projectjedi/tags/
- which means deplopyment by Revision (specific or HEAD)?
Well, yes, as always. Basically, we develop in trunk and once we are satisfied with it, we deploy. Until now, it worked just fine because there were only two persons working on the repository and no overlapping changes. What we could come up with in the future is that you create a tag and ask me to deploy a tag so that you can continue to work on trunk without the risk of me deploying your latest changes when I finally have the time to deploy.
Regards
Olivier
Project Member but not Developer?
Conrad T. Pino Thu, 4 Feb 2010 14:31:59 -0800
Date: Thu, 4 Feb 2010 14:31:59 -0800
From: "Conrad T. Pino" <>
To: "Florent Ouchet" <>
Cc: "'Olivier Sannier'" <>
Subject: Project Member but not Developer?
Hi Florent,
I'm not sure if this matters but in "jedi-apilib" I have "Developer" role and in "projectjedi" my role is blank.
I've not tried a Subversion commit; will this role difference matter?
Thank you,
Conrad
Florent Ouchet Fri, 5 Feb 2010 10:48:49 +0100
Date: Fri, 5 Feb 2010 10:48:49 +0100 (CET)
From: Florent Ouchet <>
To: "Conrad T. Pino" <>
Cc: 'Olivier Sannier' <>
Subject: Re:Project Member but not Developer?
Hello,
You are a developer of the "projectjedi" project at sourceforge with SVN access enabled. That means you can make modifications to the files stored in the SVN repository there. However you do not have administrative rights, which means you are not able to modify project information or project membership. Only administrators of the individual JEDI projects should get admin rights from this central project. However, that does not make much differences because "projectjedi" is mainly an administrative group which does not release any file.
Regards,
- Florent
Conrad T. Pino Fri, 5 Feb 2010 09:05:08 -0800
Date: Fri, 5 Feb 2010 09:05:08 -0800
From: "Conrad T. Pino" <>
To: "'Florent Ouchet'" <>
Cc: "'Olivier Sannier'" <>
Subject: RE: Project Member but not Developer?
Thank you the intent clarification helps.
The question then becomes is "Role" significant on these SourceForge pages?
- https://sourceforge.net/project/memberlist.php?group_id=121894
- https://sourceforge.net/project/memberlist.php?group_id=49498
I'll make a small test commit this weekend and let you know.
Small Test Commit Proposal
Conrad T. Pino 5 Feb 2010 09:19:26 -0800
Date: Fri, 5 Feb 2010 09:19:26 -0800
From: "Conrad T. Pino" <>
To: "'Florent Ouchet'" <>
Subject: Small Test Commit Proposal
It strikes me these files are probable not used within the Project JEDI web sites?
Would it be useful to delete them as my small test commit?
Florent Ouchet Fri, 5 Feb 2010 21:09:25 +0100
Date: Fri, 5 Feb 2010 21:09:25 +0100 (CET)
From: Florent Ouchet <>
To: "Conrad T. Pino" <>
Subject: Re:Small Test Commit Proposal
Hello Conrad,
Wrong choice :) These files are here to centralize the jedi.inc files for all JEDI projects.
You can create a test directory and commit some changes there. I did so for the JCL few days ago: http://jcl.svn.sf.net/viewvc/jcl/
Best regards,
- Florent
Olivier Sannier 2010 February 6, 10:37 (UTC)
NO WAY!
They are not in the delphi-jedi subdirectory and as such, they are not used by the web site. These files are here for reference to all JEDI projects. Should SVN one day support cross repository file externals, we will use that feature to import those files into all projects. So please leave those alone.
Conrad T. Pino 16:56, 6 February 2010 (UTC)
Understood; I'm glad I asked! :)
Project JEDI Site Work Units
Public Site Subdirectories
This projects public site (http://www.delphi-jedi.org/) is rooted in Subversion here:
and the respective subdirectories
api cms codeformat help issuetracker jcl jvcl jvcs quicktime sdl webmail wiki www
appear to be reasonable work management units.
Proposed Subversion Branches Tags Structure
The being said I propose creating:
projectjedi/branches/delphi-jedi.org/api projectjedi/branches/delphi-jedi.org/cms projectjedi/branches/delphi-jedi.org/codeformat projectjedi/branches/delphi-jedi.org/help projectjedi/branches/delphi-jedi.org/issuetracker projectjedi/branches/delphi-jedi.org/jcl projectjedi/branches/delphi-jedi.org/jvcl projectjedi/branches/delphi-jedi.org/jvcs projectjedi/branches/delphi-jedi.org/quicktime projectjedi/branches/delphi-jedi.org/sdl projectjedi/branches/delphi-jedi.org/webmail projectjedi/branches/delphi-jedi.org/wiki projectjedi/branches/delphi-jedi.org/www projectjedi/tags/delphi-jedi.org/api projectjedi/tags/delphi-jedi.org/cms projectjedi/tags/delphi-jedi.org/codeformat projectjedi/tags/delphi-jedi.org/help projectjedi/tags/delphi-jedi.org/issuetracker projectjedi/tags/delphi-jedi.org/jcl projectjedi/tags/delphi-jedi.org/jvcl projectjedi/tags/delphi-jedi.org/jvcs projectjedi/tags/delphi-jedi.org/quicktime projectjedi/tags/delphi-jedi.org/sdl projectjedi/tags/delphi-jedi.org/webmail projectjedi/tags/delphi-jedi.org/wiki projectjedi/tags/delphi-jedi.org/www
Olivier Sannier 10:39, 2010 February 6 (UTC)
There is no point in cluttering the repository with all these when they have no use.
Project JEDI Wiki version 1.0.0
The being said I propose copying:
projectjedi/trunk/delphi-jedi.org/wiki
to these locations:
projectjedi/branches/delphi-jedi.org/wiki/1.0 projectjedi/tags/delphi-jedi.org/wiki/1.0.0
Olivier Sannier 10:38, 2010 February 6 (UTC)
There is no point to do so. Branches should only be needed when working on a specific feature and one does not want to interfere with others. Have a look at what is being done for the JCL and JVCL for instance
