The Trunk: Monticello-dtl.660.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Monticello-dtl.660.mcz

commits-2
David T. Lewis uploaded a new version of Monticello to project The Trunk:
http://source.squeak.org/trunk/Monticello-dtl.660.mcz

==================== Summary ====================

Name: Monticello-dtl.660
Author: dtl
Time: 4 February 2017, 3:41:36.748119 pm
UUID: 76f4ac3a-8a71-4398-86b8-910e1da4cf13
Ancestors: Monticello-cmm.659

Merge Monticello-mva.648 from inbox.

  Name: Monticello-mva.648
  Author: mva
  Time: 4 February 2017, 10:37:54.334409 am

  fix 'order by filename'

Also remove the exception handler from MCRepositoryInspector>>versionList. The exception handler masked the sort block problem that is fixed in the Monticello-mva.648 update, and is not needed so get rid of it.

=============== Diff against Monticello-cmm.659 ===============

Item was changed:
  ----- Method: MCRepositoryInspector>>orderSpecs (in category 'morphic ui') -----
  orderSpecs
  ^{
  'unchanged' -> nil.
  'order by package' -> [ :x :y | x packageName < y packageName ].
  'order by author' -> [ :x :y | x author caseInsensitiveLessOrEqual: y author ].
  'order by version-string' -> [ :x :y | x versionNumber asString < y versionNumber asString ].
  'order by version-number' -> [ :x :y | x versionNumber > y versionNumber ].
+ 'order by filename' -> [ :x :y | x < y ].
- 'order by filename' -> [ :x :y | x fileName < y fileName ].
  }!

Item was changed:
  ----- Method: MCRepositoryInspector>>versionList (in category 'morphic ui') -----
  versionList
  | result |
  result := selectedPackage
  ifNil: [ self versionNamesForNoPackageSelection ]
  ifNotNil: [ self versionNamesForSelectedPackage ].
- "Not sure why we need this ugly Error trapping here.."
  (self orderSpecs at: order) value ifNotNil:
  [ : sortBlock | result sort:
+ [ : a : b |  sortBlock
- [ : a : b | [ sortBlock
  value: a
+ value: b ] ].
- value: b ]
- on: Error
- do: [ true ] ] ].
  ^ result collect:
  [ : each | self versionHighlight: each ]!