Index: src/TortoiseShell/ColumnProvider.cpp
===================================================================
--- src/TortoiseShell/ColumnProvider.cpp	(revision 19671)
+++ src/TortoiseShell/ColumnProvider.cpp	(working copy)
@@ -29,6 +29,10 @@
 
 const static int ColumnFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT;
 
+// copied from ../TortoiseProc/ProjectProperties.h
+#define PROJECTPROPNAME_USERFILEPROPERTY  "tsvn:userfileproperties"
+#define PROJECTPROPNAME_USERDIRPROPERTY   "tsvn:userdirproperties"
+
 // Defines that revision numbers occupy at most MAX_REV_STRING_LEN characters.
 // There are Perforce repositories out there that have several 100,000 revs.
 // So, don't be too restrictive by limiting this to 6 digits + 1 separator, 
@@ -46,8 +50,6 @@
 STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
 {
 	PreserveChdir preserveChdir;
-	if (dwIndex > 8)
-		return S_FALSE;
 
 	ShellCache::CacheType cachetype = g_ShellCache.GetCacheType();
 	LoadLangDll();
@@ -184,6 +186,19 @@
 			MAKESTRING(IDS_COLDESCAUTHOR);
 			lstrcpynW(psci->wszDescription, stringtablebuffer, MAX_COLUMN_DESC_LEN);
 			break;
+        default:
+			// SVN custom properties
+            if (dwIndex - 8 > columnuserprops.size())
+                return S_FALSE;
+            psci->scid.fmtid = FMTID_UserDefinedProperties;
+            psci->scid.pid = dwIndex - 9;
+            psci->vt = VT_BSTR;
+            psci->fmt = LVCFMT_LEFT;
+            psci->cChars = 30;
+            psci->csFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_SECONDARYUI | SHCOLSTATE_SLOW;
+            lstrcpynW(psci->wszTitle, columnuserprops.at(psci->scid.pid).c_str(), MAX_COLUMN_NAME_LEN);
+            lstrcpynW(psci->wszDescription, columnuserprops.at(psci->scid.pid).c_str(), MAX_COLUMN_DESC_LEN);
+            break;
 	}
 
 	return S_OK;
@@ -198,7 +213,7 @@
 	}
 	LoadLangDll();
 	ShellCache::CacheType cachetype = g_ShellCache.GetCacheType();
-	if (pscid->fmtid == CLSID_TortoiseSVN_UPTODATE && pscid->pid < 8) 
+	if (pscid->fmtid == CLSID_TortoiseSVN_UPTODATE && pscid->pid != 8) 
 	{
 		tstring szInfo;
 		const TCHAR * path = (TCHAR *)pscd->wszFile;
@@ -295,6 +310,18 @@
 		V_BSTR(pvarData) = SysAllocString(wsInfo.c_str());
 		return S_OK;
 	}
+	if(pscid->fmtid == FMTID_UserDefinedProperties && pscid->pid < columnuserprops.size())
+	{
+		// SVN custom properties
+        tstring szInfo;
+        const TCHAR * path = (TCHAR *)pscd->wszFile;
+		if (g_ShellCache.IsPathAllowed(path))
+            ExtractProperty(path, columnuserprops.at(pscid->pid).c_str(), szInfo);
+        const WCHAR * wsInfo = szInfo.c_str();
+        V_VT(pvarData) = VT_BSTR;
+        V_BSTR(pvarData) = SysAllocString(wsInfo);
+        return S_OK;
+	}
 
 	return S_FALSE;
 }
@@ -307,13 +334,61 @@
 	PreserveChdir preserveChdir;
 	if (g_ShellCache.IsColumnsEveryWhere())
 		return S_OK;
-	std::wstring path = psci->wszFolder;
-	if (!path.empty())
-	{
-		if (! g_ShellCache.HasSVNAdminDir(path.c_str(), TRUE))
+    CString path = psci->wszFolder;
+    if (!path.IsEmpty())
+    {
+        if (! g_ShellCache.HasSVNAdminDir(path, TRUE))
 			return E_FAIL;
 	}
 	columnfilepath = _T("");
+
+    // load SVN custom properties of the folder
+    if(g_ShellCache.GetCacheType() != ShellCache::none && path != columnfolder)
+    {
+        columnfolder = path;
+        columnuserprops.clear();
+
+        if(g_ShellCache.IsPathAllowed(path))
+        {
+            // locate user directory and file properties
+            CTSVNPath svnpath;
+		    svnpath.SetFromWin(path, true);
+            std::string values;
+            while(!svnpath.IsEmpty())
+            {
+                if(!g_ShellCache.HasSVNAdminDir(svnpath.GetWinPath(), TRUE))
+                    break;  // beyond root of working copy
+                SVNProperties props(svnpath, false);
+                for (int i=0; i<props.GetCount(); ++i)
+                {
+                    const tstring name = props.GetItemName(i);
+                    if (name.compare(_T(PROJECTPROPNAME_USERFILEPROPERTY))==0 ||
+                        name.compare(_T(PROJECTPROPNAME_USERDIRPROPERTY))==0)
+                        values.append(props.GetItemValue(i)).append("\n");
+                }
+                if(!values.empty())
+                    break;  // user properties found
+                svnpath = svnpath.GetContainingDirectory();
+            }
+
+            // parse user directory and file properties
+            typedef std::set<std::string> props_type;
+            props_type props;
+            std::string::size_type from = values.find_first_not_of("\r\n");
+            while(from != std::string::npos) {
+                std::string::size_type to = values.find_first_of("\r\n", from);
+                ASSERT(to != std::string::npos);    // holds as '\n' was appended last
+                std::string value = values.substr(from, to - from);
+                if(props.insert(value).second) {
+                    // swap sequence avoiding unnecessary copies
+                    columnuserprops.push_back(tstring());
+                    UTF8ToWide(value).swap(columnuserprops.back());
+                }
+                from = values.find_first_not_of("\r\n", to);
+            }
+        }
+    }
+
 	return S_OK;
 }
 
@@ -459,3 +534,14 @@
 	}
 }
 
+void CShellExt::ExtractProperty(const TCHAR* path, const TCHAR* propertyName, tstring& to)
+{
+    SVNProperties props(CTSVNPath(path), false);
+    for (int i=0; i<props.GetCount(); i++)
+    {
+        if (props.GetItemName(i).compare(propertyName)==0)
+        {
+            to = UTF8ToWide((char *)props.GetItemValue(i).c_str());
+        }
+    }
+}
Index: src/TortoiseShell/ShellExt.h
===================================================================
--- src/TortoiseShell/ShellExt.h	(revision 19671)
+++ src/TortoiseShell/ShellExt.h	(working copy)
@@ -208,6 +208,9 @@
 	FN_BeginBufferedPaint pfnBeginBufferedPaint;
 	FN_EndBufferedPaint pfnEndBufferedPaint;
 
+    CString columnfolder;					///< current folder of ColumnProvider
+    std::vector<tstring> columnuserprops;	///< user properties of ColumnProvider
+
 #define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdDWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))
 private:
 	void			InsertSVNMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, SVNCommands com, UINT uFlags);
@@ -224,6 +227,7 @@
 	HRESULT			ConvertBufferToPARGB32(HPAINTBUFFER hPaintBuffer, HDC hdc, HICON hicon, SIZE& sizIcon);
 	bool			HasAlpha(__in ARGB *pargb, SIZE& sizImage, int cxRow);
 	HRESULT			ConvertToPARGB32(HDC hdc, __inout ARGB *pargb, HBITMAP hbmp, SIZE& sizImage, int cxRow);
+    void            ExtractProperty(const TCHAR* path, const TCHAR* propertyName, tstring& to);
 
 
 public:
