Commit: 4efc4944590ce4635e23a7711bcf4809531167c6 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 4efc4944590ce4635e23a7711bcf4809531167c6 (tree)
• Zeit: 2012-08-09 23:56:47
• Autor: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Add Subversion support.

This is using an older version of the subversion libraries. I think the better approach is to use the ‘svn’ command line tool because these libraries are a heavy dependency for only getting Subversion status and we need to keep them updated, as Subversion periodically upgrade the repository format in a non-backwards compatible way.

Ändern Zusammenfassung

• add: Frameworks/scm/Makefile
• modified: Frameworks/scm/src/drivers/api.cc
• add: Frameworks/scm/src/drivers/svn.cc
• modified: Frameworks/scm/target
• modified: configure
• modified: target

Diff

--- /dev/null
+++ b/Frameworks/scm/Makefile
@@ -0,0 +1,31 @@
+SVN_VERSION = 1.6.15
+SVN_URL = http://subversion.tigris.org/downloads/subversion-$(SVN_VERSION).tar.bz2
+SVN_DEPS_URL = http://subversion.tigris.org/downloads/subversion-deps-$(SVN_VERSION).tar.bz2
+
+$(DST):
+	@mkdir -p '$@'
+
+$(DST)/subversion-$(SVN_VERSION).tar.bz2: | $(DST)
+	@echo 'Downloading ‘$(@F)’…'
+	@curl -sLo '$@' $(SVN_URL)
+	@echo 'Extracting ‘$(@F)’…'
+	@tar -jxf '$@' -C '$(@D)'
+
+$(DST)/subversion-deps-$(SVN_VERSION).tar.bz2: | $(DST)
+	@echo 'Downloading ‘$(@F)’…'
+	@curl -sLo '$@' $(SVN_DEPS_URL)
+	@echo 'Extracting ‘$(@F)’…'
+	@tar -jxf '$@' -C '$(@D)'
+
+$(DST)/subversion-$(SVN_VERSION)/Makefile: $(DST)/subversion-$(SVN_VERSION).tar.bz2 $(DST)/subversion-deps-$(SVN_VERSION).tar.bz2
+	@echo 'Configuring ‘subversion-$(SVN_VERSION)’……'
+	@cd '$(DST)/subversion-$(SVN_VERSION)' && ./configure >/dev/null CFLAGS=-m32 --enable-static --disable-shared --without-sasl --without-ssl --without-swig --without-neon --without-serf
+
+$(DST)/svnlibs: $(DST)/subversion-$(SVN_VERSION)/Makefile
+	@$(MAKE) EXTRA_CFLAGS=-m32 -sC '$(DST)/subversion-$(SVN_VERSION)' external-all
+	@$(MAKE) EXTRA_CFLAGS=-m32 -sC '$(DST)/subversion-$(SVN_VERSION)' local-all
+	@mkdir -p '$@'
+	@cp "$(DST)/subversion-$(SVN_VERSION)/apr/.libs/libapr-1.a" '$(DST)/svnlibs'
+	@cp "$(DST)/subversion-$(SVN_VERSION)/apr-util/.libs/libaprutil-1.a" '$(DST)/svnlibs'
+	@for LIB in client delta diff fs fs_fs fs_util ra ra_local ra_svn repos subr wc; do cp "$(DST)/subversion-$(SVN_VERSION)/subversion/libsvn_$${LIB}/.libs/libsvn_$${LIB}-1.a" '$(DST)/svnlibs'; done
+	@touch '$@'

--- a/Frameworks/scm/src/drivers/api.cc
+++ b/Frameworks/scm/src/drivers/api.cc
@@ -70,13 +70,14 @@ namespace scm
 	driver_t* git_driver ();
 	driver_t* hg_driver ();
 	driver_t* p4_driver ();
+	driver_t* svn_driver ();
 
 	driver_t const* driver_for_path (std::string const& path, std::string* wcPath)
 	{
 		if(path == NULL_STR || path == "" || path[0] != '/')
 			return NULL;
 
-		static driver_t* const drivers[] = { git_driver(), hg_driver(), p4_driver() };
+		static driver_t* const drivers[] = { git_driver(), hg_driver(), p4_driver(), svn_driver() };
 		for(std::string cwd = path; cwd != "/"; cwd = path::parent(cwd))
 		{
 			iterate(driver, drivers)

--- /dev/null
+++ b/Frameworks/scm/src/drivers/svn.cc
@@ -0,0 +1,64 @@
+#include "api.h"
+#include <svn_client.h>
+#include <svn_cmdline.h>
+#include <svn_pools.h>
+#include <oak/oak.h>
+#include <oak/debug.h>
+
+OAK_DEBUG_VAR(SCM_Subversion);
+
+static scm::status::type type_for_svn_status (svn_wc_status_kind status)
+{
+	switch(status)
+	{
+		case svn_wc_status_modified:     return scm::status::modified;
+		case svn_wc_status_added:        return scm::status::added;
+		case svn_wc_status_missing:
+		case svn_wc_status_deleted:      return scm::status::deleted;
+		case svn_wc_status_conflicted:   return scm::status::conflicted;
+		case svn_wc_status_normal:       return scm::status::versioned;
+		case svn_wc_status_ignored:      return scm::status::ignored;
+		default:                         return scm::status::unversioned;
+	}
+}
+
+static svn_error_t* svn_status_func (void* baton, char const* path, svn_wc_status2_t* status, apr_pool_t* scratch_pool)
+{
+	scm::status_map_t& statusMap = *(scm::status_map_t*)baton;
+	statusMap.insert(std::make_pair(path, type_for_svn_status(status->text_status)));
+	return NULL;
+}
+
+static scm::status_map_t status_for_path (std::string const& path, svn_client_ctx_t* context)
+{
+	D(DBF_SCM_Subversion, bug("%s\n", path.c_str()););
+	scm::status_map_t statusMap;
+	if(apr_pool_t* pool = svn_pool_create(NULL))
+	{
+		svn_client_status4(NULL, path.c_str(), NULL, svn_status_func, &statusMap, svn_depth_infinity, TRUE, FALSE, TRUE, TRUE, NULL, context, pool); // we use svn_depth_infinity since ‘files_with_status’ needs to include all files in the repository, but technically each folder is its own repository, and for normal operation, it’s fine to use svn_depth_immediates
+		svn_pool_destroy(pool);
+	}
+	return statusMap;
+}
+
+namespace scm
+{
+	struct svn_driver_t : driver_t
+	{
+		svn_driver_t () : driver_t("svn", "%s/.svn")
+		{
+			svn_cmdline_init(getprogname(), stderr);
+			_pool = svn_pool_create(NULL);
+			svn_client_create_context(&_context, _pool);
+		}
+
+		std::string branch_name (std::string const& wcPath) const { return NULL_STR;                              }
+		status_map_t status (std::string const& wcPath) const     { return status_for_path(wcPath, _context);     }
+
+	private:
+		apr_pool_t* _pool;
+		svn_client_ctx_t* _context;
+	};
+
+	driver_t* svn_driver () { return new svn_driver_t; }
+}

--- a/Frameworks/scm/target
+++ b/Frameworks/scm/target
@@ -1,5 +1,23 @@
 SOURCES      = src/**/*.cc
 TEST_SOURCES = tests/t_*.cc
 EXPORT       = src/{scm,snapshot}.h
+LIBS         = expat iconv z
 LINK        += text cf io settings OakSystem
 FRAMEWORKS   = Carbon Security
+
+FLAGS       += -I'${builddir}/subversion-${SVN_VERSION}/apr/include' -I'${builddir}/subversion-${SVN_VERSION}/subversion/include'
+
+LIBS        += ${builddir}/svnlibs/libapr-1.a
+LIBS        += ${builddir}/svnlibs/libaprutil-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_client-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_delta-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_diff-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_fs-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_fs_fs-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_fs_util-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_ra-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_ra_local-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_ra_svn-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_repos-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_subr-1.a
+LIBS        += ${builddir}/svnlibs/libsvn_wc-1.a

--- a/configure
+++ b/configure
@@ -89,6 +89,7 @@ done
 
 test -d .git && git submodule update --init
 
+DST="$builddir" make -C Frameworks/scm -j10 "$builddir/svnlibs"
 DST="$builddir/Frameworks/SoftwareUpdate/fixtures" make -C Frameworks/SoftwareUpdate/fixtures
 
 # # Necessary if you do distribution builds (which should include some default bundles)

--- a/target
+++ b/target
@@ -1,3 +1,4 @@
+SVN_VERSION = 1.6.15
 PLIST_FLAGS = -d'APP_NAME=$APP_NAME' -d'APP_VERSION=$APP_VERSION' -d'APP_REVISION=$APP_REVISION' -d'APP_MIN_OS=$APP_MIN_OS'
 
 FLAGS += -c -pipe -fPIC -gdwarf-2