Changeset 84550 in vbox for trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py

Timestamp:

May 26, 2020 6:50:43 PM (5 years ago)

Author:

vboxsync

Message:

TestManager: Adding new table for correlating commits and bugs (for xTracker).

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py (modified) (7 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 # $Id$
-# pylint: disable=line-too-long
 
 """
@@ -44 +43 @@
 
 # Test Manager imports
-from testmanager.core.db            import TMDatabaseConnection;
-from testmanager.core.vcsrevisions  import VcsRevisionData, VcsRevisionLogic;
-from common                         import utils;
+from testmanager.config                 import g_kaBugTrackers;
+from testmanager.core.db                import TMDatabaseConnection;
+from testmanager.core.vcsrevisions      import VcsRevisionData, VcsRevisionLogic;
+from testmanager.core.vcsbugreference   import VcsBugReferenceData, VcsBugReferenceLogic;
+from common                             import utils;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
+
 
 class VcsImport(object): # pylint: disable=too-few-public-methods
@@ -52 +58 @@
     Imports revision history from a VSC into the Test Manager database.
     """
+
+    class BugTracker(object):
+        def __init__(self, sDbName, sTag):
+            self.sDbName = sDbName;
+            self.sTag    = sTag;
+
 
     def __init__(self):
@@ -59 +71 @@
 
         oParser = OptionParser()
-        oParser.add_option('-e', '--extra-option', dest = 'asExtraOptions', action = 'append',
+        oParser.add_option('-b', '--only-bug-refs', dest = 'fBugRefsOnly', action = 'store_true',
+                           help = 'Only do bug references, not revisions.');
+        oParser.add_option('-e', '--extra-option', dest = 'asExtraOptions', metavar = 'vcsoption', action = 'append',
                            help = 'Adds a extra option to the command retrieving the log.');
         oParser.add_option('-f', '--full', dest = 'fFull', action = 'store_true',
@@ -93 +107 @@
         oDb = TMDatabaseConnection();
         oLogic = VcsRevisionLogic(oDb);
+        oBugLogic = VcsBugReferenceLogic(oDb);
 
         # Where to start.
         iStartRev = 0;
         if not self.oConfig.fFull:
-            iStartRev = oLogic.getLastRevision(self.oConfig.sRepository);
+            if not self.oConfig.fBugRefsOnly:
+                iStartRev = oLogic.getLastRevision(self.oConfig.sRepository);
+            else:
+                iStartRev = oBugLogic.getLastRevision(self.oConfig.sRepository);
         if iStartRev == 0:
             iStartRev = self.oConfig.iStartRevision;
@@ -118 +136 @@
         # Parse the XML and add the entries to the database.
         oParser = ET.XMLParser(target = ET.TreeBuilder(), encoding = 'utf-8');
-        oParser.feed(sLogXml.encode('utf-8')); # does its own decoding and processOutputChecked always gives us decoded utf-8 now.
+        oParser.feed(sLogXml.encode('utf-8')); # Does its own decoding; processOutputChecked always gives us decoded utf-8 now.
         oRoot = oParser.close();
 
         for oLogEntry in oRoot.findall('logentry'):
             iRevision = int(oLogEntry.get('revision'));
-            sAuthor  = oLogEntry.findtext('author').strip();
+            sAuthor  = oLogEntry.findtext('author', 'unspecified').strip(); # cvs2svn entries doesn't have an author.
             sDate    = oLogEntry.findtext('date').strip();
-            sMessage = oLogEntry.findtext('msg', '').strip();
+            sRawMsg  = oLogEntry.findtext('msg', '').strip();
+            sMessage = sRawMsg;
             if sMessage == '':
                 sMessage = ' ';
@@ -133 +152 @@
                 utils.printOut(u'sDate=%s iRev=%u sAuthor=%s sMsg[%s]=%s'
                                % (sDate, iRevision, sAuthor, type(sMessage).__name__, sMessage));
-            oData = VcsRevisionData().initFromValues(self.oConfig.sRepository, iRevision, sDate, sAuthor, sMessage);
-            oLogic.addVcsRevision(oData);
+
+            if not self.oConfig.fBugRefsOnly:
+                oData = VcsRevisionData().initFromValues(self.oConfig.sRepository, iRevision, sDate, sAuthor, sMessage);
+                oLogic.addVcsRevision(oData);
+
+            # Analyze the raw message looking for bug tracker references.
+            for sBugTrackerKey in g_kaBugTrackers:
+                oBugTracker = g_kaBugTrackers[sBugTrackerKey];
+                for sTag in oBugTracker.asCommitTags:
+                    off = sRawMsg.find(sTag);
+                    while off >= 0:
+                        off += len(sTag);
+                        while off < len(sRawMsg) and sRawMsg[off].isspace():
+                            off += 1;
+
+                        if off < len(sRawMsg) and sRawMsg[off].isdigit():
+                            offNum = off;
+                            while off < len(sRawMsg) and sRawMsg[off].isdigit():
+                                off += 1;
+                            try:
+                                iBugNo = long(sRawMsg[offNum:off]);
+                            except Exception as oXcpt:
+                                utils.printErr(u'error! exception(r%s,"%s"): -> %s' % (iRevision, sRawMsg[offNum:off], oXcpt,));
+                            else:
+                                if not self.oConfig.fQuiet:
+                                    utils.printOut(u' r%u -> sBugTracker=%s iBugNo=%s'
+                                                   % (iRevision, oBugTracker.sDbId, iBugNo,));
+
+                                oBugData = VcsBugReferenceData().initFromValues(self.oConfig.sRepository, iRevision,
+                                                                                oBugTracker.sDbId, iBugNo);
+                                oBugLogic.addVcsBugReference(oBugData);
+
+                        # next
+                        off = sRawMsg.find(sTag, off);
+
         oDb.commit();