Page MenuHomeSoftware Heritage

svn.loader: Drop `build_swh_snapshot` function, oneliner used once
ClosedPublic

Authored by ardumont on Jul 17 2020, 10:41 AM.

Details

Summary

Coverage remained the same as this part is already tested by other scenario.

Test Plan

tox

Diff Detail

Event Timeline

Build has FAILED

Patch application report for D3545 (id=12497)

Rebasing onto 9d16dc0f22...

First, rewinding head to replay your work on top of it...
Applying: svn.loader: Drop unneeded indirection
Using index info to reconstruct a base tree...
M	swh/loader/svn/tests/test_loader.py
Falling back to patching base and 3-way merge...
Auto-merging swh/loader/svn/tests/test_loader.py
CONFLICT (content): Merge conflict in swh/loader/svn/tests/test_loader.py
Patch failed at 0001 svn.loader: Drop unneeded indirection

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto 9d16dc0f22...

Already up to date.
Changes applied before test
commit c4f50c9f9956929609e61d646b34f1a4e6366a6e
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 10:41:23 2020 +0200

    svn.loader: Drop unneeded indirection

Link to build: https://jenkins.softwareheritage.org/job/DLDSVN/job/tests-on-diff/78/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDSVN/job/tests-on-diff/78/console

Build is green

Patch application report for D3545 (id=12498)

Rebasing onto 9d16dc0f22...

Current branch diff-target is up to date.
Changes applied before test
commit c9473c563456352e2723d9f284e19ef0c4d16e4a
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 10:41:23 2020 +0200

    svn.loader: Drop unneeded indirection

See https://jenkins.softwareheritage.org/job/DLDSVN/job/tests-on-diff/79/ for more details.

ok but the commit message should just say something like "kill build_swh_snapshot() function" + one or 2 sentences explaining it's unneeded bc it's a oneliner used only once.

This revision is now accepted and ready to land.Jul 17 2020, 11:13 AM

Good remark, i'll adapt the commit message (i only explained in the diff... might as well make it into the commit ;)

Rework commit message to explicit the reasons of the drop ;)

ardumont retitled this revision from svn.loader: Drop unneeded indirection to svn.loader: Drop `build_swh_snapshot` function, oneliner used once.Jul 17 2020, 11:19 AM
ardumont edited the summary of this revision. (Show Details)

Build is green

Patch application report for D3545 (id=12501)

Rebasing onto 9d16dc0f22...

Current branch diff-target is up to date.
Changes applied before test
commit db932e4a4dd9073f44078fb8dd9884714329fc53
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Jul 17 10:41:23 2020 +0200

    svn.loader: Drop `build_swh_snapshot` function, oneliner used once
    
    Coverage remained the same as this part is already tested by other scenario.

See https://jenkins.softwareheritage.org/job/DLDSVN/job/tests-on-diff/81/ for more details.