syncvsvn: synchronize CVS working copy with SVN working copy

I keep all my Drupal sites up-to-date by updating a single Drupal core instance and one install profile. And I keep Drupal core and all modules in this install profile updated through CVS. But then a problem poses: what if a file was added to or removed from CVS? Until now, you’d have to manually svn add or svn rm the file. And in the case of some modules (e.g. Views), that’s a lot of files you’ll have to check.

The solution: syncvsvn

I’m aware that this probably isn’t the best name, but it gets the job done :).

Suppose you’ve just updated the xmlsitemap module:

>: svn status
?      xmlsitemap_user/translations
M      xmlsitemap_user/xmlsitemap_user.module
M      xmlsitemap_user/xmlsitemap_user.install
?      xmlsitemap_user/CVS/Entries.Log
M      xmlsitemap_user/CVS/Entries
?      translations/includes.pot
?      translations/docs.pot
?      translations/general.pot
!      translations/da.po
!      translations/ru.po
!      translations/es.po
!      translations/fr.po
M      translations/xmlsitemap.pot
M      translations/de.po
!      translations/nl.po
!      translations/ja.po
M      translations/CVS/Entries

Your mission: ignore any CVS/Entries.log files, add all files marked with question marks and remove all files marked with exclamation marks. This is a frustrating and time consuming task. This is where syncvsvn comes in to the rescue:

>: syncvsvn
A      xmlsitemap_user/translations
Deleted xmlsitemap_user/CVS/Entries.Log
A      translations/includes.pot
A      translations/docs.pot
A      translations/general.pot
D      translations/da.po
D      translations/ru.po
D      translations/es.po
D      translations/fr.po
D      translations/nl.po
D      translations/ja.po

The script

Now, the actual script (you can also download it below):

#!/usr/bin/php
<?php

define('REGEXP_SVN_ADD', "/^\?.{6}(.*)(?<!CVS\/Entries\.Log)$/");
define('REGEXP_SVN_RM',  "/^\!.{6}(.*)(?<!CVS\/Entries\.Log)$/");
define('REGEXP_FILE_RM', "/^\?.{6}(.*CVS\/Entries\.Log)$/");

// Run svn status.
$output = shell_exec('svn status');
$lines = explode("\n", $output);

// Add/remove files to/from the svn repository and delete CVS/Entries.Log files.
foreach ($lines as $line) {
  if (preg_match(REGEXP_SVN_ADD, $line, $matches)) {
    print shell_exec("svn add $matches[1]");
  }
  elseif (preg_match(REGEXP_SVN_RM, $line, $matches)) {
    print shell_exec("svn rm $matches[1]");
  }
  elseif (preg_match(REGEXP_FILE_RM, $line, $matches)) {
    shell_exec("rm $matches[1]");
    print "Deleted $matches[1]\n";
  }
}

As you can see, it decides what to do based on the output of svn status. This means that if you’ve got a file

foo that’s not added to the repository yet, it will be added as well. I.e. any temporary files will be added as well. You could prevent this by actually looking at CVS’ metadata, but this was sufficient for me.

Put this wherever you store your shell scripts and chmod +x it to make it executable. In case your PHP interpreter cannot be found, use type -a php to find out its location and update this in the first line of the script.