Skip to content

Get-Patch#5987

Merged
Byron merged 9 commits into
gitbutlerapp:masterfrom
Byron:get-patch
Jan 21, 2025
Merged

Get-Patch#5987
Byron merged 9 commits into
gitbutlerapp:masterfrom
Byron:get-patch

Conversation

@Byron

@Byron Byron commented Jan 17, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Add a tauri-callable function to produce a patch from information that was returned by but_core::workspace::changes().

Follow-up of #5945.

Tasks

  • find the right abstractions - what's native diff output, what's processed for frontend
  • `but_core::workspace::unified_diff()
    • test patch creation with overlapping context
    • test symlink diffing
    • deleted files must be convenient
    • test rename
    • diff with diff filtering
    • big file
    • binary file
  • tauri bindings
  • but status with --patch
  • Don't forget: update gitoxide to use latest from main

@vercel

vercel Bot commented Jan 17, 2025 •
edited
Loading

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 21, 2025 4:02pm

@vercel
vercel Bot temporarily deployed to Preview – gitbutler-components January 17, 2025 15:44 Inactive
@vercel

vercel Bot commented Jan 17, 2025

Copy link
Copy Markdown

@Byron is attempting to deploy a commit to the GitButler Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions github-actions Bot added the rust Pull requests that update Rust code label Jan 17, 2025
@Byron Byron mentioned this pull request Jan 20, 2025
Merged
3 tasks
Byron added 8 commits January 21, 2025 16:11
@Byron
add list_commit_files to CLI
93b838c 
This should facilitate looking at what the UI currently expects for patches.
@Byron
Add a conflict test for worktree changes.
f5456db
@Byron
add sketch but_core::UnifiedDiff to obtain patches of content chang…
791c5b6 
…es suitable for consumption.
@Byron
import Code from imara-diff
04fa7f5 
This is the initial state as pulled from

pascalkuthe/imara-diff#14 at state
pascalkuthe/imara-diff@8517f10

The idea is that once it stabilized for us we can hopefully contribute it back.
We'd also want to eventually use the released version of `imara-diff`.
@Byron
update gitoxide to the latest version for universal-diff support.
9408683
@Byron
Implement actual diff creation, along with tests for each relevant ch…
cd407e7 
…ange type.
@Byron
Add support for 'patches-by-treechange` to Tauri.
c44d6b8
@Byron
Add unified diff support to the CLI
c63be2b
@Byron
Byron marked this pull request as ready for review January 21, 2025 15:11
@Byron
Byron requested a review from krlvi January 21, 2025 15:26
krlvi
krlvi reviewed Jan 21, 2025
View reviewed changes
Comment thread crates/gitbutler-tauri/src/diff.rs Outdated
krlvi
krlvi approved these changes Jan 21, 2025
View reviewed changes

@krlvi krlvi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Byron
Byron merged commit cf9f7be into gitbutlerapp:master Jan 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@krlvi krlvi krlvi approved these changes

Assignees

No one assigned

Labels

rust Pull requests that update Rust code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Byron @krlvi