This is another post in the FreshPorts-git series.
Yesterday was good progress. This morning (at Sat Jul 4 13:05:10 UTC 2020) I manually initiated another import of commits from git.
It looked like this:
[dan@devgit-ingress01:~/scripts] $ echo /usr/local/libexec/freshports/git-delta.sh | sudo su -fm freshports
/var/db/freshports/ports-jail/var/db/repos/PORTS-head-git
remote: Enumerating objects: 261, done.
remote: Counting objects: 100% (261/261), done.
remote: Compressing objects: 100% (131/131)s done.
remote: Total 265 (delta 149), reused 240 (delta 128), pack-reused 4
Receiving objects: 100% (265/265), 446.50 KiB | 7.09 MiB/s, done.
Resolving deltas: 100% (149/149), completed with 73 local objects.
From https://github.com/freebsd/freebsd-ports
a35902288517..ecb98d7cd285 branches/2020Q3 -> origin/branches/2020Q3
25564d38f64f..322037573d9e master -> origin/master
f86664ab0be0..bbe14661ebcb svn_head -> origin/svn_head
HEAD is now at f2bfe60090b8 net-mgmt/unifi5: Update to 5.11.46
Updating files: 100% (48503/48503), done.
Previous HEAD position was f2bfe60090b8 net-mgmt/unifi5: Update to 5.11.46
Switched to branch 'master'
Your branch is behind 'origin/master' by 37 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Successfully rebased and updated refs/heads/master.
starting point is d8c85e202575
starting
{'path': PosixPath('/var/db/freshports/ports-jail/var/db/repos/PORTS-head-git'), 'commit': 'd8c85e202575', 'output': PosixPath('/var/db/freshports/message-queues/incoming'), 'repo': 'ports', 'os': 'FreeBSD', 'force': False, 'log_level': 'INFO'}
using repo at /var/db/freshports/ports-jail/var/db/repos/PORTS-head-git
322037573d9ecbf0f165556df2e349caeaef0534 ba205b385c9b0e91f1f1080655f1ba0c2e1fe7a8 68435f7018ede781c6ba35a7141f1544534e05c4 0d7872f4f69ec9e7b5f7e3298350295301bce70c f5872271c8b9d14e29a6932defcc018d1723194e 918b387b2ed21dd299c4bc966390f3487c7e34bb 6c6db5424c903041d26ea2d2e229af2b1f1d70d6 3061da4ba638f5f9a66818f1b5dec41877f8582b 56a0228b872c9481e823352ac055a0279c362798 55cc857149775dd6ba0b7b08c40b1e6819b9d202 3946cedbad37f7be74dad0648c8935bac1b5465e 882d8de6e0199c6665f3cbe80713fceab235ac92 15f27776ba4f1265590daac8233ff5b9e3aa2197 8475003fd4dbffee1321a5d6e20a0aa750ea5159 b85fb997401b3dd3b71f4b77613adb53a163091d 753eac4badbe2c0a20c6e4c76a228278e7aa30f7 7669079c8ba321c34459b0e1d77c5fccdb4b94e0 43a8a92f64260db919d59824a83873c2fc6be57a e8cdd0bec45d1401594c2a401745e966cde83dcc e250ee3aa03e3bff627d437d68d542adda7ac686 7af772923aea0850ca4fd1fd0851f33586f2b751 0616869d4329ed675dfa0389c7cbb6ee20bcbf31 d3b846b034254602ac214d969c45b62c7dc0fae5 b4a577fe3ccf1188accc53ad9e6a265f80d21b83 926903c161c402218390429f587f9175ec12b31d ecb0127a683f6952ad6ae3b77baf9a310e8499f8 cec47cde28d46071d527ab4d761fc6262cf90cad 0d83d083c00de50dcfb56d61b1095a4aa1d008dc 2f2e89bcc90d64866861a871e546939ab9a8b4d8 c3f75bbcea90b5aca473c5db897f734dc91e8ffb 8c2aef4fd7eab6577fd744749daa88b24edf45d4 8b0acc2a0e75f1e774b940b2966bcab3bce877d9 16de7316ca6bfc7eb2f5f2515408dcf6ad1145f6 b483cab42afe32c814d51cd898fdfd54f8ccf10d cb4e25ed898c489b7c37c929438354f25523d673 da4a6913b642bb4e490d2f91d9068ed4aac97e8f
starting for loop using d8c85e202575
finished for loop
Would have ran git-to-freshport.py starting at: d8c85e202575
[dan@devgit-ingress01:~/scripts] $
This created one XML file for each git commit. The files are dropped into the ~freshports/messages-queues/incoming directory. The freshports-git daemon (well, it’s a long running shell script, managed via daemontools) notices the new files and processed them into the FreshPorts database.
Compare the commits under these two version of the same port:
devgit, for now, is processing both svn and git commits. This is for development and comparison purposes only.
Being able to process both/either streams is good. I don’t know yet how to avoid duplicate commits once we change over.
