Index: xcvs/xcvs-commitinfo.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-commitinfo.php,v
retrieving revision 1.6
diff -u -F^f -u -F^f -r1.6 xcvs-commitinfo.php
--- xcvs/xcvs-commitinfo.php	2 Dec 2007 01:13:34 -0000	1.6
+++ xcvs/xcvs-commitinfo.php	8 Jan 2008 15:52:49 -0000
@@ -88,7 +88,7 @@ function xcvs_init($argc, $argv) {
   // Admins and other privileged users don't need to go through any checks.
   if (!in_array($username, $xcvs['allowed_users'])) {
     // Do a full Drupal bootstrap.
-    xcvs_bootstrap($xcvs['drupal_path']);
+    xcvs_bootstrap($xcvs);
 
     // Construct a minimal commit array.
     $commit = array(
Index: xcvs/xcvs-config.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-config.php,v
retrieving revision 1.13
diff -u -F^f -u -F^f -r1.13 xcvs-config.php
--- xcvs/xcvs-config.php	2 Dec 2007 01:13:34 -0000	1.13
+++ xcvs/xcvs-config.php	8 Jan 2008 15:52:49 -0000
@@ -36,6 +36,10 @@
 // usernames (not the Drupal username if they're different).
 $xcvs['allowed_users'] = array();
 
+// If you run a multisite installation, specify the directory
+// name that your settings.php file resides in (ex: www.example.com)
+// If you use the default settings.php file, leave this blank.
+$xcvs['multisite_directory'] = '';
 
 // ------------------------------------------------------------
 // Access control
@@ -55,18 +59,25 @@
 // Shared code
 // ------------------------------------------------------------
 
-function xcvs_bootstrap($drupal_path) {
+function xcvs_bootstrap($xcvs) {
+
   // add $drupal_path to current value of the PHP include_path
-  set_include_path(get_include_path() . PATH_SEPARATOR . $drupal_path);
+  set_include_path(get_include_path() . PATH_SEPARATOR . $xcvs['drupal_path']);
 
   $current_directory = getcwd();
-  chdir($drupal_path);
+  chdir($xcvs['drupal_path']);
 
   // bootstrap Drupal so we can use drupal functions to access the databases, etc.
   if (!file_exists('./includes/bootstrap.inc')) {
     fwrite(STDERR, "Error: failed to load Drupal's bootstrap.inc file.\n");
     exit(1);
   }
+
+  // Set up the multisite directory if necessary.
+  if ($xcvs['multisite_directory']) {
+    $_SERVER['HTTP_HOST'] = $xcvs['multisite_directory'];
+  }
+
   require_once './includes/bootstrap.inc';
   drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
 
@@ -97,7 +108,3 @@ function xcvs_is_last_directory($logfile
   }
   return TRUE;
 }
-
-// $xcvs has to be made global so the xcvs-taginfo.php script works properly.
-global $xcvs_global;
-$xcvs_global = $xcvs;
Index: xcvs/xcvs-generate-passwd.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-generate-passwd.php,v
retrieving revision 1.1
diff -u -F^f -u -F^f -r1.1 xcvs-generate-passwd.php
--- xcvs/xcvs-generate-passwd.php	8 Sep 2007 15:33:07 -0000	1.1
+++ xcvs/xcvs-generate-passwd.php	8 Jan 2008 15:52:49 -0000
@@ -44,7 +44,7 @@ function xcvs_init($argc, $argv) {
   include_once $config_file;
 
   // Do a full Drupal bootstrap.
-  xcvs_bootstrap($xcvs['drupal_path']);
+  xcvs_bootstrap($xcvs);
 
   $repository = versioncontrol_get_repository($xcvs['repo_id']);
   if (!isset($repository)) {
Index: xcvs/xcvs-loginfo.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-loginfo.php,v
retrieving revision 1.22
diff -u -F^f -u -F^f -r1.22 xcvs-loginfo.php
--- xcvs/xcvs-loginfo.php	2 Dec 2007 01:13:34 -0000	1.22
+++ xcvs/xcvs-loginfo.php	8 Jan 2008 15:52:50 -0000
@@ -157,7 +157,7 @@ function xcvs_init($argc, $argv) {
 
     // Do a full Drupal bootstrap. We need it from now on at the latest,
     // starting with the action constants in xcvs_get_commit_action().
-    xcvs_bootstrap($xcvs['drupal_path']);
+    xcvs_bootstrap($xcvs);
 
     while (!feof($fd)) {
       $file_entry = trim(fgets($fd));
Index: xcvs/xcvs-posttag.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-posttag.php,v
retrieving revision 1.9
diff -u -F^f -u -F^f -r1.9 xcvs-posttag.php
--- xcvs/xcvs-posttag.php	2 Dec 2007 01:13:34 -0000	1.9
+++ xcvs/xcvs-posttag.php	8 Jan 2008 15:52:50 -0000
@@ -64,7 +64,7 @@ function xcvs_init($argc, $argv) {
   $dir = array_shift($argv);      // argv[6]
 
   // Do a full Drupal bootstrap.
-  xcvs_bootstrap($xcvs['drupal_path']);
+  xcvs_bootstrap($xcvs);
 
   // The commitinfo script wrote the lastlog file for us.
   // Its only contents is the name of the last directory that commitinfo
Index: xcvs/xcvs-taginfo.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/versioncontrol_cvs/xcvs/xcvs-taginfo.php,v
retrieving revision 1.11
diff -u -F^f -u -F^f -r1.11 xcvs-taginfo.php
--- xcvs/xcvs-taginfo.php	2 Dec 2007 01:13:34 -0000	1.11
+++ xcvs/xcvs-taginfo.php	8 Jan 2008 15:52:50 -0000
@@ -45,7 +45,7 @@ function xcvs_init($argc, $argv) {
   // Admins and other privileged users don't need to go through any checks.
   if (!in_array($username, $xcvs['allowed_users'])) {
     // Do a full Drupal bootstrap.
-    xcvs_bootstrap($xcvs['drupal_path']);
+    xcvs_bootstrap($xcvs);
 
     switch ($cvs_op) {
       case 'add':