Usage: verify-git-from-svn [options]

Options:
  -h, --help            show this help message and exit
  -v, --verbose         make lots of noise
  -d, --debug           make even more lots of noise
  --git-repository=GIT_REPOSITORY_DIR
                        path to git repository
  --svn-url=SVN_URL
  --svn-working-copy=SVN_WORKING_COPY
                        path to svn working copy
  --only-ref=ONLY_REF   verify only this git ref

verify-git-from-svn works with python 2.5 and 2.6 and uses the python-git bindings. For the subversion part I tried pysvn, but had no luck with it because of problems when switching to paths which do not exist in the latest revision (for example kdereview/marble).

The tool still has lots of rough edges but I found it quite useful for detecting errors in the resulting Marble git repository. A run would look like:

jmho@slipstream:~/kde-devel$ jmhos-kde-ruleset/bin/verify-git-from-svn --verbose --git-repository=../src/test/test-geodata-nt-with-two-recurse/marble/ --svn-url=svn+ssh://jmhoffmann@svn.kde.org/home/kde/ --svn-working-copy=$HOME/kde-devel/kdesvn/kdeedu/marble
checking 1/3640 0.03% 24e3bd83bc9ae42506b6bdca280b479ef76321e0 /trunk/KDE/kdeedu/marble/ 949622
checking 2/3640 0.05% 8f6e6020282e45068016fcca6308332a9d03e260 /trunk/KDE/kdeedu/marble/ 949617
checking 3/3640 0.08% 618c8a376d5f8fa66e88ff5573ec021f7b724cae /trunk/KDE/kdeedu/marble/ 949607
checking 4/3640 0.11% 1abc2c85a8cc04a67e72480a342f50439482e35b /trunk/KDE/kdeedu/marble/ 949439
checking 5/3640 0.14% 6d433b7ee3ea67dbe3e539d89d1db99f9396b87c /trunk/KDE/kdeedu/marble/ 949329
checking 6/3640 0.16% 5031918f7a6f867616b1e7d9a63112b101e877c0 /trunk/KDE/kdeedu/marble/ 949322
checking 7/3640 0.19% 805370d5e3af29de2b85dff84ae6a9da8147c978 /trunk/KDE/kdeedu/marble/ 949285
checking 8/3640 0.22% baed1d4f7f2ee2cd190b3b5c53ec708c4ed8f30e /trunk/KDE/kdeedu/marble/ 949265
checking 9/3640 0.25% 06ce3c265cbad695003d39e2753dcbb168bcba0e /trunk/KDE/kdeedu/marble/ 949041
checking 10/3640 0.27% 5c19c332b7c29d93673997a8bc7d94e1c0754415 /trunk/KDE/kdeedu/marble/ 948858
checking 11/3640 0.30% 0fa1b221beb1b045942f9d867c0a9b3384a96da9 /trunk/KDE/kdeedu/marble/ 948855
checking 12/3640 0.33% 899aeb3ea846cf00ab9de251887e591e5b487dc2 /trunk/KDE/kdeedu/marble/ 948854
[...]
checking 78/3640 2.14% 49b49b8215c20ea535203781e97c9e1be0841926 /trunk/KDE/kdeedu/marble/ 946668
checking 79/3640 2.17% 0b0876b05deba3ad917f97cff0f3bb9e1488f999 /trunk/KDE/kdeedu/marble/ 946666
checking 80/3640 2.20% 7c5fc6eaf6470cd272b2acf3e5fd4576f21f2948 /branches/work/marble-geodata-nt/marble/ 946595
checking 81/3640 2.23% 23ca2fcbf4cecf734f6599f64bcad8d3ad7bfb47 /branches/KDE/4.2/kdeedu/marble/ 946592
checking 82/3640 2.25% 02ed6bdc6589a50626b11ab33d3fc818e9b58e5d /trunk/KDE/kdeedu/marble/ 946586
checking 83/3640 2.28% 87f5b059849b6ed2ba4353752bd8afaa2293abe6 /trunk/KDE/kdeedu/marble/ 946576
checking 84/3640 2.31% afc8c5e54ae34335cc914157a64b0c6c2c2e19ec /trunk/KDE/kdeedu/marble/ 946551
checking 85/3640 2.34% c0791ae60c65f2e74b0c32fd8611c6b912313aae /trunk/KDE/kdeedu/marble/ 946144
[...]
checking 3636/3640 99.89% a693bc2531c42bb39bb3456534eecf9218c53b70 /trunk/playground/base/marble/ 590585
checking 3637/3640 99.92% d3a39cba496d52c9e637aa136460f2dce9c6ec18 /trunk/playground/base/marble/ 590583
checking 3638/3640 99.95% d7c0e2ddd3e9ea8bc23f3f15139262bb12033b15 /trunk/playground/base/marble/ 590533
checking 3639/3640 99.97% 71e97dd069c9edab520d9b3b76be257b4c3c40c2 /trunk/playground/base/marble/ 590394
checking 3640/3640 100.00% f975096dceeedb1798f7f94a20840a1fc6e75336 /trunk/playground/base/marble/ 590324
0 errors found

Please make sure to use a clean working copy without local modifications when trying it. You can find it here: http://gitorious.org/~jmho/svn2git/jmhos-kde-ruleset/commits/verify-tool.

I’m not entirely happy with the name, if you know a better one, please let me know.

Update: Please make sure to run svn2git with the –add-metadata option, otherwise verify-git-from-svn will not work.

For a Marble version being installed separately it has to have a separate configuration file, a separate user data directory and a separate installation directory. For the first and second part we have to modify the Marble source, the third part is being done by the build system. At the moment of this writing development for KDE 4.5 takes place in svn trunk while development for kdeedu 4.5 (which includes Marble) takes place in the 4.5 branch.
So without further ado:

Setup different kdesvn-build configurations per branch

KDE 4.4.x (Marble 0.9.x): $HOME/.kdesvn-4.4-buildrc

global
    source-dir ~/kde-devel/kdesvn-4.4
    kdedir ~/kde-devel/kde-4.4
    qtdir /usr
    branch 4.4
    svn-server svn://anonsvn.kde.org/home/kde
    cmake-options -DCMAKE_BUILD_TYPE=debugfull
end global

module kdesupport
    tag kdesupport-for-4.4
    cmake-options -DWITH_ASF=TRUE -DWITH_MP4=TRUE -DBUILD_phonon=OFF
end module

module phonon-git
    repository git://gitorious.org/phonon/phonon.git
    branch 4.4
end module

module kdelibs
end module

module kdeedu
end module

KDE 4.5.x (Marble 0.10.x): $HOME/.kdesvn-4.5-buildrc

global
    source-dir ~/kde-devel/kdesvn-4.5
    kdedir ~/kde-devel/kde-4.5
    qtdir /usr
    # atm development for 4.5 takes place in trunk with exception of kdeedu
    # branch 4.5
    svn-server svn://anonsvn.kde.org/home/kde
    cmake-options -DCMAKE_BUILD_TYPE=debugfull
end global

module kdesupport
    # tag kdesupport-for-4.5
    cmake-options -DWITH_ASF=TRUE -DWITH_MP4=TRUE -DBUILD_phonon=OFF
end module

module phonon-git
    repository git://gitorious.org/phonon/phonon.git
end module

module dbusmenu-qt
    repository git://gitorious.org/dbusmenu/dbusmenu-qt.git
end module

module kdelibs
end module

module kdeedu
    branch 4.5
end module

Marble trunk: $HOME/.kdesvn-trunk-buildrc

global
        source-dir ~/kde-devel/kdesvn
        kdedir ~/kde-devel/kde
        qtdir /usr
        svn-server svn://anonsvn.kde.org/home/kde
        cmake-options -DCMAKE_BUILD_TYPE=debugfull
end global

module kdesupport
        cmake-options -DWITH_ASF=TRUE -DWITH_MP4=TRUE
end module

module phonon-git
        repository git://gitorious.org/phonon/phonon.git
end module

module dbusmenu-qt
        repository git://gitorious.org/dbusmenu/dbusmenu-qt.git
end module

module kdelibs
end module

module kdeedu
end module

Define aliases

Now we define some aliases for convenience, here we assume the kdesdk module is already checked out under ~/kde-devel/kdesvn:

alias kdesvn-4.4-build='~/kde-devel/kdesvn/kdesdk/scripts/kdesvn-build --rc-file=$HOME/.kdesvn-4.4-buildrc'
alias kdesvn-4.5-build='~/kde-devel/kdesvn/kdesdk/scripts/kdesvn-build --rc-file=$HOME/.kdesvn-4.5-buildrc'
alias kdesvn-trunk-build='~/kde-devel/kdesvn/kdesdk/scripts/kdesvn-build --rc-file=$HOME/.kdesvn-trunk-buildrc'

Check out, build and install unmodified versions

At this point we check out and build KDE Marble and it’s dependencies for 4.4, 4.5 and trunk using the following commands:

kdesvn-4.4-build -v
kdesvn-4.5-build -v
kdesvn-trunk-build -v

Apply patches

Afterwards we apply the following patches:

KDE 4.4.x (Marble 0.9.x):

Index: marble/src/lib/MarbleDirs.cpp
===================================================================
--- marble/src/lib/MarbleDirs.cpp       (Revision 1137354)
+++ marble/src/lib/MarbleDirs.cpp       (Arbeitskopie)
@@ -214,7 +214,7 @@
 QString MarbleDirs::localPath()
 {
 #ifndef Q_OS_WIN
-    return QString( QDir::homePath() + "/.marble/data" ); // local path
+    return QString( QDir::homePath() + "/.marble-4.4/data" ); // local path
 #else
     HWND hwnd = 0;
     WCHAR *appdata_path = new WCHAR[MAX_PATH+1];
@@ -229,7 +229,7 @@
 QString MarbleDirs::pluginLocalPath()
 {
 #ifndef Q_OS_WIN
-    return QString( QDir::homePath() + "/.marble/plugins" ); // local path
+    return QString( QDir::homePath() + "/.marble-4.4/plugins" ); // local path
 #else
     HWND hwnd = 0;
     WCHAR *appdata_path = new WCHAR[MAX_PATH+1];
Index: marble/src/marble.kcfg
===================================================================
--- marble/src/marble.kcfg      (Revision 1137354)
+++ marble/src/marble.kcfg      (Arbeitskopie)
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="marblerc" />
+ <kcfgfile name="marblerc-4.4" />
  <include>kglobalsettings.h</include>
  <include>"lib/global.h"</include>
  <group name="MarbleWidget" >
Index: marble/src/marble.knsrc
===================================================================
--- marble/src/marble.knsrc     (Revision 1137354)
+++ marble/src/marble.knsrc     (Arbeitskopie)
@@ -1,4 +1,4 @@
 [KNewStuff2]
 ProvidersUrl=http://edu.kde.org/marble/newstuff/providers.xml
-InstallPath=.marble/data/maps
+InstallPath=.marble-4.4/data/maps
 Uncompress=true

KDE 4.5.x (Marble 0.10.x):

Index: marble/src/lib/MarbleDirs.cpp
===================================================================
--- marble/src/lib/MarbleDirs.cpp       (Revision 1137401)
+++ marble/src/lib/MarbleDirs.cpp       (Arbeitskopie)
@@ -222,7 +222,7 @@
     if( dataHome.isEmpty() )
         dataHome = QDir::homePath() + "/.local/share";

-    return dataHome + "/marble"; // local path
+    return dataHome + "/marble-4.5"; // local path
 #else
     HWND hwnd = 0;
     WCHAR *appdata_path = new WCHAR[MAX_PATH+1];
@@ -270,7 +270,7 @@
 QString MarbleDirs::pluginLocalPath()
 {
 #ifndef Q_OS_WIN
-    return QString( QDir::homePath() + "/.marble/plugins" ); // local path
+    return QString( QDir::homePath() + "/.marble-4.5/plugins" ); // local path
 #else
     HWND hwnd = 0;
     WCHAR *appdata_path = new WCHAR[MAX_PATH+1];
Index: marble/src/marble.kcfg
===================================================================
--- marble/src/marble.kcfg      (Revision 1137401)
+++ marble/src/marble.kcfg      (Arbeitskopie)
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
- <kcfgfile name="marblerc" />
+ <kcfgfile name="marblerc-4.5" />
  <include>kglobalsettings.h</include>
  <include>"lib/global.h"</include>
  <group name="MarbleWidget" >
Index: marble/src/marble.knsrc
===================================================================
--- marble/src/marble.knsrc     (Revision 1137401)
+++ marble/src/marble.knsrc     (Arbeitskopie)
@@ -1,10 +1,10 @@
 [KNewStuff2]
 ProvidersUrl=http://edu.kde.org/marble/newstuff/providers.xml
-InstallPath=.marble/data/maps
+InstallPath=.marble-4.5/data/maps
 Uncompress=true

 [KNewStuff3]
 ProvidersUrl=http://edu.kde.org/marble/newstuff/providers.xml
 Categories=Marble,Maps
-XdgTargetDir=marble/maps
+XdgTargetDir=marble-4.5/maps
 Uncompress=archive

Build and install modified versions

It is not necessary to patch the trunk version. We can now build and install our modified versions:

kdesvn-4.4-build -v
kdesvn-4.5-build -v

Ok, that’s it. Now we have ~/kde-devel/kde-4.4/bin/marble, ~/kde-devel/kde-4.5/bin/marble and ~/kde-devel/kde/bin/marble all with separate configurations and data directories.

Please keep in mind, this is not a 100% solution. However for me it work’s good enough. The patches above only work for the Linux platform (perhaps also for other non MS Windows platform, haven’t checked though), this is because MarbleDirs contains some platform dependent code and I only changed the Linux parts.

With his patch, in the meantime committed in trunk, Marble is able to use some WMS maps, for example this one of Saxony:

Here the WMS layer is blended on top of the OpenStreetMap using the blending work I committed about 6 weeks ago. Some more screenshots:

This one uses overlay blending, the first two ones use multiply blending. The blue line in the last screen shot is a ferry line from the OpenStreetMap.

At the moment this is still a little bit experimental, but it should stabilize soon.

Update:

Screenshots in original resolution: second and third.

Thanks Dennis for hosting

Please test and report any issues at http://bugs.kde.org, the marble-devel mailing list or just drop a line in #marble or #kde-edu on freenode.

Here are some screenshots: