Ticket #305: libscm_fix_1_of_1_rev_935264ad298a_Rework_and_fix_HGSourceCodeManager_____revisionLogOf____directory_module__.patch

mercurial/HGSourceCodeManager.st

@@ -1 +1 @@
 "
 stx:libscm - a new source code management library for Smalltalk/X
 Copyright (C) 2012-2015 Jan Vrany
-Copyright (C) 2020 LabWare
+Copyright (C) 2020-2021 LabWare
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -34 +34 @@
 "
 stx:libscm - a new source code management library for Smalltalk/X
 Copyright (C) 2012-2015 Jan Vrany
-Copyright (C) 2020 LabWare
+Copyright (C) 2020-2021 LabWare
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -297 +297 @@
     "Actually do return a revisionLog. The main worker method. This must be implemented by a 
      concrete source-code manager. The interface of this method is just crazy!!
 
-     If numRevisionsOrNil is notNil, it limits the number of revision records returned -
-     only numRevions of the newest revision infos will be collected.
+     If `limitOrNil` is notNil, it limits the number of revision records returned -
+     only `limitOrNil` of the newest revision infos will be collected.
 
      The returned information is a structure (IdentityDictionary)
      filled with:
@@ -330 +330 @@
             revisions are ordered newest first 
             (i.e. the last entry is for the initial revision; the first for the most recent one)
             Attention: if state = 'dead' that revision is no longer valid.
+
+     WARNING: The interface, apart from being crazy, is also designed upon assumption
+     that file has been changed in all revisions. This is essentially true only for
+     CVS (per-file versioning) and does not hold for any modern SCM. Also, it does to take
+     branches into an account. And so on.
+
+     Therefore here we do some really nasty hacks to make sure we answer what's expected
+     by various and many callers and hope it will appear to work. There's little else to
+     do here, the problem is the *broken-by-design* interface of source code manager API.     
     "
 
-    | pkg repo path wcentry info newest oldest startRev stopRev limit log revs startRevIndex stopRevIndex revIndex |
+    | pkg repo path wcentry info newestRev log revs |
 
     info := IdentityDictionary new.
     pkg := HGPackageWorkingCopy named: (moduleDir , ':' , packageDir).
@@ -343 +352 @@
         self breakPoint: #jv info: 'Ooops, could not found given file in working copy. Changeset scanning not yet implemented. You may proceed wot'.
         ^ nil
     ].
-    revs := (rev1OrNil == 0 and:[rev2OrNil == 0]) 
-        ifTrue:[((wcentry changeset / path / classFileName) newer: true) collect:[:f|f changeset]]
-        ifFalse:[wcentry revisions collect:[:f|f changeset]].
-    revs isEmpty ifTrue:[revs add: wcentry changeset].
-    newest := revs first.
-    oldest := revs last.
+
+    "/ Here, the newest revision for 'header' is always the newest revision
+    "/ in the same branch that contains (not neccesarrily modifies!!) the class.
+    "/ Does not care about multiple heads within branch, just return "some", but
+    "/ there's not much else to do due to the method interface.
+    "/ 
+    "/ Hope that's okay with callers.
+    revs := repo changesetsMatching: ('last(contains("%1") and branch("%2"),1)'
+                                                bindWith: wcentry pathNameRelative
+                                                    with: repo workingCopy branch name).
+    self assert: revs size == 1.
+    newestRev := revs first.
 
     info at:#container          put: classFileName.         "/ -> the revision string
     info at:#cvsRoot            put: repo pathName.         "/ -> the CVS root (repository)
     info at:#filename           put: classFileName.         "/ -> the actual source file name
-    info at:#newestRevision     put: newest id printString. "/-> the revisionString of the newest revision
-    info at:#numberOfRevisions  put: newest id revno.
+    info at:#newestRevision     put: newestRev id printString. "/ -> the revisionString of the newest revision
+    info at:#numberOfRevisions  put: newestRev id revno. 
+
+"/    (rev1OrNil == 0 and:[rev2OrNil == 0]) ifTrue:[
+"/        ^ info
+"/    ].
+
+    (rev1OrNil notNil and:[ rev1OrNil = rev2OrNil ]) ifTrue: [
+        "/ If we're asked for specific revision, return just that one
+        "/ *NO MATTER* whether it modifies the class or not.
+        revs := Array with: repo @ rev1OrNil.
+    ] ifFalse: [
+        "/ If we're asked for revision range, only return those in that
+        "/ range that *ACTUALLY MODIFIES* the file.
 
-    (rev1OrNil == 0 and:[rev2OrNil == 0]) ifTrue:[
-        limit := 1.
-        startRev := newest.
-        stopRev := newest. 
-    ] ifFalse:[
-        limit := limitOrNil ? (revs size) .
-        startRev := rev1OrNil isNil ifTrue:[newest] ifFalse:[repo @ rev1OrNil].
-        stopRev  := rev2OrNil isNil ifTrue:[oldest] ifFalse:[repo @ rev2OrNil].
+        | from to revset |
+
+        from := rev2OrNil isNil ifTrue:['0'] ifFalse:[rev2OrNil].
+        to  := rev1OrNil isNil ifTrue:['tip'] ifFalse:[rev1OrNil].
+
+        revset := '%1:%2 and file("%3") and branch("%4")'
+                                                bindWith: from
+                                                    with: to
+                                                    with: wcentry pathNameRelative
+                                                    with: repo workingCopy branch name.
+        limitOrNil notNil ifTrue: [
+            revset := 'last(%1, %2)' bindWith: revset with: limitOrNil
+        ].
+
+        revs := repo changesetsMatching: revset.
     ].
+
     log := OrderedCollection new.
 
-    startRevIndex := revs indexOf: startRev.
-    stopRevIndex := revs indexOf: stopRev.
-    limit := limit min: (stopRevIndex - startRevIndex + 1).
+    revs reverseDo: [:rev |
+        | entry |
 
-    revIndex := startRevIndex.
-    limit timesRepeat:[
-        | entry rev |
-        rev := revs at: revIndex.
-        entry :=  IdentityDictionary new.
+        entry := IdentityDictionary new.
         entry at:#revision              put: rev id printString."/ -> the revision string
         entry at:#author                put: rev author."/ -> who checked that revision into the repository
         entry at:#date                  put: rev timestamp printString."/ -> when was it checked in
@@ -383 +413 @@
         entry at:#numberOfChangedLines  put: 'N/A'. "/ -> the number of changed line w.r.t the previous
         entry at:#logMessage            put: rev message."/ -> the checkIn log message.
         log add: entry.
-
-        revIndex := revIndex + 1.
     ].
     info at: #revisions put: log.
 
     ^info
 
     "Modified: / 24-04-2016 / 13:19:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:54:22 / Jan Vrany <jan.vrany@labware.com>"
 ! !
 
 !HGSourceCodeManager class methodsFor:'queries'!

mercurial/HGStXTests.st

@@ -4265 +4265 @@
 
 !HGStXTests methodsFor:'tests - manager API'!
 
+test_issue_305a
+    | rev log |
+
+    rev := HGSourceCodeManager newestRevisionOf: HGTestCase.  
+    log := HGSourceCodeManager revisionLogOf:HGTestCase fromRevision:rev toRevision: rev.
+
+    "Created: / 18-02-2021 / 20:45:30 / Jan Vrany <jan.vrany@labware.com>"
+!
+
 test_log_01
 
     | log repo |
@@ -4462 +4471 @@
 
     self assert: (log at: #container) = 'MocksHGP6Bar.st'.
     self assert: (log at: #cvsRoot) = repo pathName.
-    self assert: (log at: #newestRevision) = '4:f71dfc6c6f9b'.
+    self assert: (log at: #newestRevision) = '6:7d0045fb7dba'.
     self assert: (log at: #revisions) size == 1.
     self assert: ((log at: #revisions) first at:#revision) = '0:c76faa501252'.
 
     "Created: / 11-02-2014 / 11:31:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 11-02-2014 / 12:58:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:55:27 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_log_05b
@@ -4491 +4501 @@
 
     self assert: (log at: #container) = 'MocksHGP6Foo.st'.
     self assert: (log at: #cvsRoot) = repo pathName.
-    self assert: (log at: #newestRevision) = '0:c76faa501252'.
+    self assert: (log at: #newestRevision) = '6:7d0045fb7dba'.
     self assert: (log at: #revisions) size == 1.
     self assert: ((log at: #revisions) first at:#revision) = '0:c76faa501252'.
 
     "Created: / 11-02-2014 / 11:34:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 11-02-2014 / 13:55:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:55:45 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_newestRevisionOf_01
@@ -4507 +4518 @@
 
     rev := HGSourceCodeManager newestRevisionOf: (Smalltalk at: #MocksHGP6Bar).
 
-    self assert: rev = '4:f71dfc6c6f9b'.
+    self assert: rev = '6:7d0045fb7dba'.
 
     "Created: / 24-04-2016 / 11:41:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:11:46 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_newestRevisionOf_02
@@ -4520 +4532 @@
 
     rev := HGSourceCodeManager newestRevisionOf: (Smalltalk at: #MocksHGP6Bar).
 
-    self assert: rev = '4:f71dfc6c6f9b'.
+    self assert: rev = '6:7d0045fb7dba'.
 
     "Created: / 24-04-2016 / 11:46:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:14:03 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_newestRevisionOf_03a
@@ -4533 +4546 @@
 
     rev := HGSourceCodeManager newestRevisionOf: (Smalltalk at: #MocksHGP6Foo).
 
-    self assert: rev = '2:581b3cabbf8f'.
+    self assert: rev = '6:7d0045fb7dba'.
 
     "Created: / 24-04-2016 / 11:47:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:12:32 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_newestRevisionOf_03b
@@ -4551 +4565 @@
         package: 'mocks:hg/p6'.
     rev := HGSourceCodeManager newestRevisionOf: (Smalltalk at: #MocksHGP6Foo).
 
-    self assert: rev = '4:f71dfc6c6f9b'.
+    self assert: rev = '6:7d0045fb7dba'.
 
     "Created: / 24-04-2016 / 11:48:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 19-02-2021 / 07:13:11 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 test_newestRevisionOf_03c