Also consider svn:global-ignores when generating .gitignore files and fix wrong patterns not correctly migrated from svn:ignore (#34)

Author: Vampire

src/svn.cpp

@@ -1042,10 +1042,29 @@ int SvnRevision::fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char
     SVN_ERR(svn_fs_node_prop(&prop, fs_root, key, "svn:ignore", pool));
     if (prop) {
         *ignore = QString(prop->data);
+        // remove patterns with slashes or backslashes,
+        // they didn't match anything in Subversion but would in Git eventually
+        ignore->remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
+        // add a slash in front to have the same meaning in Git of only working on the direct children
+        ignore->replace(QRegExp("(^|[\\r\\n])\\s*(?![\\r\\n]|$)"), "\\1/");
     } else {
         *ignore = QString();
     }
 
+    // Get svn:global-ignores
+    prop = NULL;
+    SVN_ERR(svn_fs_node_prop(&prop, fs_root, key, "svn:global-ignores", pool));
+    if (prop) {
+        QString global_ignore = QString(prop->data);
+        // remove patterns with slashes or backslashes,
+        // they didn't match anything in Subversion but would in Git eventually
+        global_ignore.remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
+        ignore->append(global_ignore);
+    }
+
+    // replace multiple asterisks Subversion meaning by Git meaning
+    ignore->replace(QRegExp("\\*+"), "*");
+
     return EXIT_SUCCESS;
 }
 
@@ -1059,7 +1078,7 @@ int SvnRevision::fetchUnknownProps(apr_pool_t *pool, const char *key, svn_fs_roo
     const void *propKey;
     for (hi = apr_hash_first(pool, table); hi; hi = apr_hash_next(hi)) {
         apr_hash_this(hi, &propKey, NULL, &propVal);
-        if (strcmp((char*)propKey, "svn:ignore")!=0 && strcmp((char*)propKey, "svn:mergeinfo") !=0) {
+        if (strcmp((char*)propKey, "svn:ignore")!=0 && strcmp((char*)propKey, "svn:global-ignores")!=0 && strcmp((char*)propKey, "svn:mergeinfo") !=0) {
             qWarning() << "WARN: Unknown svn-property" << (char*)propKey << "set to" << ((svn_string_t*)propVal)->data << "for" << key;
         }
     }