Making the identityMap a String,String Dictionary

Freddy Henin · Freddy Henin · commit c80db59c9168 · 2018-10-08T13:17:28.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -29,29 +29,29 @@
 #include "repository.h"
 #include "svn.h"
 
-QHash<QByteArray, QByteArray> loadIdentityMapFile(const QString &fileName)
+QHash<QString, QString> loadIdentityMapFile(const QString &fileName)
 {
-    QHash<QByteArray, QByteArray> result;
-    if (fileName.isEmpty())
+    QHash<QString, QString> result;
+    if (fileName.isEmpty()) {
         return result;
-
+    }
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly)) {
         fprintf(stderr, "Could not open file %s: %s",
                 qPrintable(fileName), qPrintable(file.errorString()));
         return result;
     }
-
-    while (!file.atEnd()) {
-        QByteArray line = file.readLine();
+    QTextStream in(&file);
+    while (!in.atEnd()) {
+        QString line = in.readLine();
         int comment_pos = line.indexOf('#');
         if (comment_pos != -1)
             line.truncate(comment_pos);
         line = line.trimmed();
         int space = line.indexOf(' ');
-        if (space == -1)
-            continue;           // invalid line
-
+        if (space == -1) {
+            continue;
+        }       // invalid line
         // Support git-svn author files, too
         // - svn2git native:  loginname Joe User <user@example.com>
         // - git-svn:         loginname = Joe User <user@example.com>
@@ -64,9 +64,8 @@ QHash<QByteArray, QByteArray> loadIdentityMapFile(const QString &fileName)
           rightspace += 2;
         }
 
-        QByteArray realname = line.mid(rightspace).trimmed();
+        QString realname = line.mid(rightspace).trimmed();
         line.truncate(leftspace);
-
         result.insert(line, realname);
     };
     file.close();
diff --git a/src/svn.cpp b/src/svn.cpp
@@ -58,7 +58,7 @@
 
 typedef QList<Rules::Match> MatchRuleList;
 typedef QHash<QString, Repository *> RepositoryHash;
-typedef QHash<QByteArray, QByteArray> IdentityHash;
+typedef QHash<QString, QString> IdentityHash;
 
 class AprAutoPool
 {
@@ -403,7 +403,7 @@ class SvnRevision
     int revnum;
 
     // must call fetchRevProps first:
-    QByteArray authorident;
+    QString authorident;
     QByteArray log;
     uint epoch;
     bool ruledebug;
@@ -575,9 +575,11 @@ int SvnRevision::fetchRevProps()
         log = svnlog->data;
     else
         log.clear();
-    authorident = svnauthor ? identities.value(svnauthor->data) : QByteArray();
+    QByteArray svnByteArray = QByteArray((char*)svnauthor->data, 10);
+    authorident = svnauthor ? identities.value(svnByteArray) : QString();
     epoch = svndate ? get_epoch(svndate->data) : 0;
     if (authorident.isEmpty()) {
+        printf("Author Identity NOT Found in file\n");
         if (!svnauthor || svn_string_isempty(svnauthor))
             authorident = "nobody <nobody@localhost>";
         else
@@ -598,7 +600,7 @@ int SvnRevision::commit()
     }
 
     foreach (Repository::Transaction *txn, transactions) {
-        txn->setAuthor(authorident);
+        txn->setAuthor(authorident.toUtf8());
         txn->setDateTime(epoch);
         txn->setLog(log);
 
@@ -852,7 +854,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *ch
             if (rule.annotate) {
                 // create an annotated tag
                 fetchRevProps();
-                repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
+                repo->createAnnotatedTag(branch, svnprefix, revnum, authorident.toUtf8(),
                                          epoch, log);
             }
             return EXIT_SUCCESS;
@@ -937,7 +939,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *ch
     if (rule.annotate) {
         // create an annotated tag
         fetchRevProps();
-        repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
+        repo->createAnnotatedTag(branch, svnprefix, revnum, authorident.toUtf8(),
                                  epoch, log);
     }
 
diff --git a/src/svn.h b/src/svn.h
@@ -35,7 +35,7 @@ class Svn
 
     void setMatchRules(const QList<QList<Rules::Match> > &matchRules);
     void setRepositories(const QHash<QString, Repository *> &repositories);
-    void setIdentityMap(const QHash<QByteArray, QByteArray> &identityMap);
+    void setIdentityMap(const QHash<QString, QString> &identityMap);
     void setIdentityDomain(const QString &identityDomain);
 
     int youngestRevision();
