[Monotone-commits-diffs] Revision 1b0da40cefc620de121c91a4c38839d7f972f3b9

[monotone]

-----------------------------------------------------------------
Revision: 1b0da40cefc620de121c91a4c38839d7f972f3b9
Ancestor: 9836ae69e4d8f046c9d82e04ddcb33dcb51fd3a2
Ancestor: b4ed6c10863d82e7a0a3a1de8c2acdb0f5ede3de
Author: Timothy Brownawell  <address@hidden>
Date: 2009-05-06T00:59:33
Branch: net.venge.monotone.contrib.webhost

Deleted entries:
        usher/bootstrap
Renamed entries:
         to usher
        usher/administrator.cc to usher/src/administrator.cc
        usher/administrator.hh to usher/src/administrator.hh
        usher/basic_io_serverlist_reader.cc to 
usher/src/basic_io_serverlist_reader.cc
        usher/basic_io_serverlist_reader.hh to 
usher/src/basic_io_serverlist_reader.hh
        usher/buffer.cc to usher/src/buffer.cc
        usher/buffer.hh to usher/src/buffer.hh
        usher/channel.cc to usher/src/channel.cc
        usher/channel.hh to usher/src/channel.hh
        usher/dir_serverlist_reader.cc to usher/src/dir_serverlist_reader.cc
        usher/dir_serverlist_reader.hh to usher/src/dir_serverlist_reader.hh
        usher/err.cc to usher/src/err.cc
        usher/err.hh to usher/src/err.hh
        usher/forked_server_manager.cc to usher/src/forked_server_manager.cc
        usher/forked_server_manager.hh to usher/src/forked_server_manager.hh
        usher/io.cc to usher/src/io.cc
        usher/io.hh to usher/src/io.hh
        usher/query_client.cc to usher/src/query_client.cc
        usher/query_client.hh to usher/src/query_client.hh
        usher/server.cc to usher/src/server.cc
        usher/server.hh to usher/src/server.hh
        usher/server_manager.cc to usher/src/server_manager.cc
        usher/server_manager.hh to usher/src/server_manager.hh
        usher/serverlist_reader.cc to usher/src/serverlist_reader.cc
        usher/serverlist_reader.hh to usher/src/serverlist_reader.hh
        usher/sock.cc to usher/src/sock.cc
        usher/sock.hh to usher/src/sock.hh
        usher/usher.cc to usher/src/usher.cc
Added files:
        COPYING Makefile README TODO hostconfig.dist htaccess
        install install-config.dist reset schema.sql
        skel/keys/address@hidden skel/monotonerc
        usher/doc/documentation.html
        usher/src/dir_serverlist_reader.cc
        usher/src/dir_serverlist_reader.hh usher/test/monotonerc
        usher/test/populate-branch.sh usher/test/run-tests.sh
        usher/test/test1/databases.txt usher/test/test1/script.txt
        usher/test/test1/usher.conf usher/test/usher.conf.head
        usher.cc webhost.conf webhost.cronjob webhost.initscript
        www/JSON.php www/about.php www/admin-description.js
        www/admin-description.php www/admin-description_backend.php
        www/admin-files.js www/admin-files.php
        www/admin-files_backend.php www/admin-permissions.js
        www/admin-permissions.php www/admin-permissions_backend.php
        www/admin-resources.js www/admin-resources.php
        www/admin-resources_backend.php www/admin-source_control.js
        www/admin-source_control.php
        www/admin-source_control_backend.php www/admin-web.js
        www/admin-web.php www/admin-web_backend.php www/admin.php
        www/administrator.js www/automation.php www/common-ctrl.php
        www/common-resource.php www/common.js www/common.php
        www/errpage.php www/index.php www/login.php www/logo.png
        www/main.css www/proj-ctrl.php www/project.php
        www/sidebar.js www/sidebar.php www/top.php
        www/user-actions.php www/user-ctrl.php www/user.php
        www/userlist.php www/viewmtn/AUTHORS www/viewmtn/ChangeLog
        www/viewmtn/INSTALL www/viewmtn/LICENSE www/viewmtn/Makefile
        www/viewmtn/README www/viewmtn/TODO www/viewmtn/ancestry.py
        www/viewmtn/branchdiv.py www/viewmtn/common.py
        www/viewmtn/config.py.example www/viewmtn/experiments/README
        www/viewmtn/experiments/grapher/grapher.py
        www/viewmtn/experiments/tests/automate.py
        www/viewmtn/fdo/__init__.py www/viewmtn/fdo/icontheme.py
        www/viewmtn/fdo/sharedmimeinfo.py
        www/viewmtn/fdo/xdgbasedir.py www/viewmtn/genproxy.py
        www/viewmtn/handlers.py www/viewmtn/json.py
        www/viewmtn/links.py www/viewmtn/mk2.py www/viewmtn/mtn.py
        www/viewmtn/release.py www/viewmtn/release.sh
        www/viewmtn/render.py
        www/viewmtn/static/MochiKit/MochiKit.js
        www/viewmtn/static/MochiKit/__package__.js
        www/viewmtn/static/highlight.css
        www/viewmtn/static/rss_feed.gif
        www/viewmtn/static/viewmtn.css www/viewmtn/static/viewmtn.js
        www/viewmtn/syntax.py www/viewmtn/templates/about.html
        www/viewmtn/templates/base.html
        www/viewmtn/templates/branch.html
        www/viewmtn/templates/branchchanges.html
        www/viewmtn/templates/branchchangesrss.html
        www/viewmtn/templates/branchchoosehead.html
        www/viewmtn/templates/branchtags.html
        www/viewmtn/templates/choosedb.html
        www/viewmtn/templates/databases.html
        www/viewmtn/templates/help.html
        www/viewmtn/templates/index.html
        www/viewmtn/templates/revision.html
        www/viewmtn/templates/revisionbrowse.html
        www/viewmtn/templates/revisiondiff.html
        www/viewmtn/templates/revisionfile.html
        www/viewmtn/templates/revisionfilebin.html
        www/viewmtn/templates/revisionfilechanges.html
        www/viewmtn/templates/revisionfilechangesrss.html
        www/viewmtn/templates/revisionfileimg.html
        www/viewmtn/templates/revisionfileobj.html
        www/viewmtn/templates/revisionfiletxt.html
        www/viewmtn/templates/revisionfileview.html
        www/viewmtn/templates/revisioninfo.html
        www/viewmtn/templates/tags.html www/viewmtn/tests.py
        www/viewmtn/urls.py www/viewmtn/utility.py
        www/viewmtn/viewmtn.py www/viewmtn/web/__init__.py
        www/viewmtn/web/cheetah.py www/viewmtn/web/db.py
        www/viewmtn/web/debugerror.py www/viewmtn/web/form.py
        www/viewmtn/web/http.py www/viewmtn/web/httpserver.py
        www/viewmtn/web/net.py www/viewmtn/web/request.py
        www/viewmtn/web/template.py www/viewmtn/web/utils.py
        www/viewmtn/web/webapi.py www/viewmtn/web/wsgi.py
        www/viewmtn/web/wsgiserver/__init__.py
Added directories:
        . graphs projects sessions skel skel/keys usher/doc
        usher/src usher/test usher/test/test1 www www/projects
        www/viewmtn www/viewmtn/experiments
        www/viewmtn/experiments/grapher
        www/viewmtn/experiments/tests www/viewmtn/fdo
        www/viewmtn/static www/viewmtn/static/MochiKit
        www/viewmtn/templates www/viewmtn/web
        www/viewmtn/web/wsgiserver
Modified files:
        usher/Makefile.am usher/README usher/configure.in
        usher/src/administrator.cc
        usher/src/basic_io_serverlist_reader.cc usher/src/buffer.hh
        usher/src/channel.cc usher/src/server.cc
        usher/src/server_manager.cc usher/src/server_manager.hh
        usher/src/usher.cc
Modified attrs:
        install reset usher/test/populate-branch.sh
        usher/test/run-tests.sh webhost.cronjob webhost.initscript
        www/logo.png www/viewmtn/experiments/grapher/grapher.py
        www/viewmtn/experiments/tests/automate.py
        www/viewmtn/fdo/icontheme.py
        www/viewmtn/fdo/sharedmimeinfo.py www/viewmtn/genproxy.py
        www/viewmtn/mk2.py www/viewmtn/release.sh
        www/viewmtn/static/rss_feed.gif www/viewmtn/syntax.py
        www/viewmtn/tests.py www/viewmtn/viewmtn.py

ChangeLog: 

merge in usher changes


monotone --db={your.database} diff 
--revision=9836ae69e4d8f046c9d82e04ddcb33dcb51fd3a2 
--revision=1b0da40cefc620de121c91a4c38839d7f972f3b9
monotone --db={your.database} diff 
--revision=b4ed6c10863d82e7a0a3a1de8c2acdb0f5ede3de 
--revision=1b0da40cefc620de121c91a4c38839d7f972f3b9
----------------------------------------------------------------------