Thu Nov 22 16:25:53 GMT 2012 Edsko de Vries
* Remove obsolete code
Ignore-this: 80f0a57579216f3bad55e8159b30a3e1
M ./Distribution/Server/Features/ServerApiDoc.hs -8
Fri Nov 23 12:48:44 GMT 2012 Edsko de Vries
* Make export pure
Ignore-this: d7404f43bbb30bf13791b6fb75657ffb
The only reason export lived in IO was because it needed access to the blob
store. Now instead we define
data BackupEntry =
BackupByteString [FilePath] ByteString
| BackupBlob [FilePath] BlobId
This has various other advantages: we now have the option of storing blob
entries differently (or indeed not at all) when we generate the tar file.
For now, the export format is still the same, but at least we have the
option now of treating blobs differently.
Note that there was already an ExportEntry (as opposed to BackupEntry) type
which was isomorphic to the (new) BackupEntry type. I have removed that type
completely, and removed some of the conversions between them.
M! ./Distribution/Server.hs -2 +4
M! ./Distribution/Server/Features/BuildReports.hs -1 +2
M! ./Distribution/Server/Features/BuildReports/Backup.hs -12 +8
M! ./Distribution/Server/Features/Check.hs -2 +3
M! ./Distribution/Server/Features/Core.hs -9 +6
M! ./Distribution/Server/Features/Core/Backup.hs -20 +20
M! ./Distribution/Server/Features/Distro.hs -1 +2
M! ./Distribution/Server/Features/Distro/Backup.hs -5 +4
M! ./Distribution/Server/Features/Documentation.hs -5 +5
M! ./Distribution/Server/Features/DownloadCount.hs -2 +2
M! ./Distribution/Server/Features/DownloadCount/Backup.hs -1 +1
M! ./Distribution/Server/Features/HaskellPlatform.hs -1 +2
M! ./Distribution/Server/Features/Mirror.hs -5 +5
M! ./Distribution/Server/Features/PreferredVersions.hs -2 +3
M! ./Distribution/Server/Features/Tags.hs -2 +2
M! ./Distribution/Server/Features/Tags/Backup.hs -1 +1
M! ./Distribution/Server/Features/Upload.hs -12 +12
M! ./Distribution/Server/Features/Upload/Backup.hs -1 +1
M! ./Distribution/Server/Features/Upload/State.hs -4 +12
M! ./Distribution/Server/Features/Users.hs -13 +13
M! ./Distribution/Server/Framework/BackupDump.hs -31 +22
M! ./Distribution/Server/Framework/BackupRestore.hs -8 +12
M! ./Distribution/Server/Framework/Feature.hs -1 +2
M! ./Distribution/Server/Users/Backup.hs -15 +16
M! ./Distribution/Server/Users/State.hs -4 +12
Fri Nov 23 12:52:53 GMT 2012 Edsko de Vries
* Resolve merge conflicts
Ignore-this: 7f0f37fcf807173ca8e571ac92e12f5b
M ./Distribution/Server/Features/PreferredVersions.hs -1 +1
