Skip to content

Add apply-patch, basic revert and cherry-pick functionality #17902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 56 commits into from
Feb 9, 2022
Merged

Add apply-patch, basic revert and cherry-pick functionality #17902

Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
13ba415
Add apply-patch button
zeripath Jan 26, 2020
d477e5a
placate lint
zeripath Dec 4, 2021
c3326b2
update copyright years
zeripath Dec 5, 2021
f2c01fd
Merge branch 'main' into apply-patch
zeripath Dec 5, 2021
d4a4f1f
Update templates/repo/editor/patch.tmpl
zeripath Dec 6, 2021
8d9a6df
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 9, 2021
d0fc943
Merge remote-tracking branch 'zeripath/apply-patch' into apply-patch
zeripath Dec 9, 2021
ea9f569
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 10, 2021
c767f86
handle conflict
zeripath Dec 10, 2021
6ac0064
Add basic cherry-pick and revert functionality
zeripath Dec 12, 2021
8b3cdba
placate lint
zeripath Dec 12, 2021
2527d2d
slight further improvement
zeripath Dec 15, 2021
427e99c
placate lint
zeripath Dec 15, 2021
20b6b1e
Use git read-tree -m for better cherry-picking and reversion first
zeripath Dec 16, 2021
b23c35b
Improve TestPatch to use git read-tree -m
zeripath Dec 16, 2021
2f65bf9
Merge branch 'main' into update-TestPatch-to-use-read-tree
zeripath Dec 16, 2021
46bcf3e
Implement the git-merge-one-file algorithm
zeripath Dec 17, 2021
cb4e9e1
and handle empty patches too
zeripath Dec 17, 2021
507ede4
placate lint
zeripath Dec 17, 2021
7a523dd
use errConflict instead callback
zeripath Dec 17, 2021
0a38bd1
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 17, 2021
8193743
Merge remote-tracking branch 'origin/main' into update-TestPatch-to-u…
zeripath Dec 17, 2021
e02708e
Merge branch 'update-TestPatch-to-use-read-tree' into apply-patch
zeripath Dec 17, 2021
92de7bf
use the new updated merging from TestPatch
zeripath Dec 17, 2021
490ac9a
move revert and cherry-pick to drop down for operations and add creat…
zeripath Dec 17, 2021
561160f
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 19, 2021
6a47494
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 20, 2021
20c6e69
Split off other actions button
zeripath Dec 23, 2021
d707b88
remove browse-button css
zeripath Dec 23, 2021
406f525
as per review
zeripath Dec 24, 2021
1ac56a6
as per noerw
zeripath Dec 25, 2021
7244187
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Dec 25, 2021
4a4caf2
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Jan 1, 2022
5049cc9
Fix bug
zeripath Jan 1, 2022
d3bbf2e
Merge branch 'main' into apply-patch
zeripath Jan 19, 2022
b43ac20
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Jan 20, 2022
d371168
Merge branch 'main' into apply-patch
zeripath Jan 20, 2022
7170909
Merge remote-tracking branch 'origin/main' into apply-patch
zeripath Jan 20, 2022
7cf8382
fix linting and conflicts from previous prs
zeripath Jan 20, 2022
bed30e6
Merge branch 'main' into apply-patch
6543 Jan 22, 2022
6ec8527
Merge branch 'main' into apply-patch
6543 Feb 2, 2022
046da34
use git.NewCommandContext
6543 Feb 2, 2022
ac0be2d
cmd.RunWithContext do use processManager ...
6543 Feb 2, 2022
2ca39bb
use RunWithContext
6543 Feb 2, 2022
6ca8f13
Merge branch 'main' into apply-patch
zeripath Feb 3, 2022
9557783
Merge branch 'main' into apply-patch
6543 Feb 7, 2022
31fddcb
Merge branch 'master' into apply-patch
6543 Feb 7, 2022
095823d
adapt refactor
6543 Feb 7, 2022
6494e11
pass ctx down
6543 Feb 7, 2022
6fbc6e1
cherrypick use normal ctx
6543 Feb 7, 2022
1f6e6e9
use attr
zeripath Feb 7, 2022
683822b
Merge branch 'main' into apply-patch
zeripath Feb 8, 2022
63c5656
as per reviews
zeripath Feb 8, 2022
f20e9d4
Merge branch 'main' into apply-patch
6543 Feb 9, 2022
ff58993
Merge branch 'main' into apply-patch
zeripath Feb 9, 2022
c7c3c63
Merge branch 'main' into apply-patch
zeripath Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into apply-patch
  • Loading branch information
@zeripath
zeripath committed Dec 17, 2021
commit 0a38bd16d033a1252a7211d6b44bb03771e8d4c1

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.