fix(gitlab): incremental

Author: line-o

src/modules/github.xqm

@@ -201,11 +201,10 @@ declare function github:incremental-dry($config as map(*)) {
  :)
 declare function github:incremental($config as map(*)) {
  let $last-commit := github:get-last-commit($config)
- let $sha := $last-commit?sha
  let $changes := github:get-changes($config)
  let $del := github:incremental-delete($config, $changes?del)
- let $new := github:incremental-add($config, $changes?new, $sha)
- let $writesha := app:write-commit-info($config?path, $sha, $last-commit?date)
+ let $new := github:incremental-add($config, $changes?new, $last-commit?sha)
+ let $writesha := app:write-commit-info($config?path, $last-commit?sha, $last-commit?date)
  return map {
  'new': array{ $new },
  'del': array{ $del },

src/modules/gitlab.xqm

@@ -222,11 +222,10 @@ declare function gitlab:incremental-dry($config as map(*)) as map(*) {
  :)
 declare function gitlab:incremental($config as map(*)) as map(*) {
  let $last-commit := gitlab:get-last-commit($config)
- let $sha := $last-commit?sha
  let $changes := gitlab:get-changes($config)
- let $new := gitlab:incremental-add($config, $changes?new, $sha)
+ let $new := gitlab:incremental-add($config, $changes?new, $last-commit?sha)
  let $del := gitlab:incremental-delete($config, $changes?del)
- let $writesha := app:write-commit-info($config?path, $sha, $last-commit?committed_date)
+ let $writesha := app:write-commit-info($config?path, $last-commit?sha, $last-commit?date)
  return map {
  'new': array{ $new },
  'del': array{ $del },

test/gitlab.js

@@ -7,7 +7,7 @@ export default () =>
  before(async () => {
  await ensureTuttleIsInstalled();
  });
- const testHASH = '79789e5';
+ const testHASH = '79789e5c4842afaaa63c733c3ed6babe37f70121';
  const collection = 'tuttle-sample-gitlab';
 
  it('Remove lockfile', async function () {

test/tuttle.js

@@ -67,16 +67,18 @@ export default () =>
  assert.deepStrictEqual(repos[1], {
  baseurl: 'https://gitlab.com/api/v4/',
  collection: 'tuttle-sample-gitlab',
- deployed: null,
+ deployed: 'd80c71f0ac63d355f1583cfe2777fe3dcde4d8bc',
  hookuser: 'admin',
- message: 'server connection failed: Forbidden (403)',
+ message: 'remote found',
  owner: 'line-o',
  path: '/db/apps/tuttle-sample-gitlab',
  'project-id': '50872175',
  ref: 'main',
+ remote: 'd80c71f0ac63d355f1583cfe2777fe3dcde4d8bc',
  repo: 'tuttle-sample-data',
- status: 'error',
+ status: 'uptodate',
  type: 'gitlab',
+ url: 'https://gitlab.com/line-o/tuttle-sample-data.git'
  });
  });
  });