Skip to content

V2 pull integration#296

Open
MarcelGeo wants to merge 40 commits intomasterfrom
v2-pull-integration
Open

V2 pull integration#296
MarcelGeo wants to merge 40 commits intomasterfrom
v2-pull-integration

Conversation

@MarcelGeo
Copy link
Copy Markdown
Contributor

No description provided.

MarcelGeo and others added 30 commits December 8, 2025 13:06
+ tests for both v2 and v1 features
+ projectinfo v2 compatibility test
- models.py for some classes without specific location
- clenup of non-necssary functions from previous version
- refactor of pull handling using PullActions
+ descriptions
+ tests for appl_pull_actions
+ restore get_pull_changes for backward compatibility with project status
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
- unify get_pull_changes with get_pull_delta
- add pull action with rebase and no_rebase
- simplify PullAction class
MarcelGeo and others added 10 commits March 4, 2026 12:44
- in complicated history could server return and client could not have in some version a file and raise would be there
Initial version of v2 pull integration + project info v2
…ion parameter

Co-authored-by: Copilot <copilot@github.com>
Patch project info version before to be compatible with files_at_version
@coveralls
Copy link
Copy Markdown

Coverage Report for CI Build 25310452415

Coverage increased (+0.9%) to 83.322%

Details

  • Coverage increased (+0.9%) from the base build.
  • Patch coverage: 35 uncovered changes across 5 files (675 of 710 lines covered, 95.07%).
  • 16 coverage regressions across 2 files.

Uncovered Changes

File Changed Covered %
mergin/client_pull.py 189 162 85.71%
mergin/client.py 25 22 88.0%
mergin/merginproject.py 122 119 97.54%
mergin/test/test_client.py 79 78 98.73%
mergin/test/test_mergin_project.py 181 180 99.45%

Coverage Regressions

16 previously-covered lines in 2 files lost coverage.

File Lines Losing Coverage Coverage
mergin/merginproject.py 15 89.09%
mergin/client_pull.py 1 82.91%

Coverage Stats

Coverage Status
Relevant Lines: 5648
Covered Lines: 4706
Line Coverage: 83.32%
Coverage Strength: 0.83 hits per line

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants