Showing
5 changed files
with
30 additions
and
1 deletions
@@ -25,6 +25,8 @@ wasm: | @@ -25,6 +25,8 @@ wasm: | ||
25 | -t web ./ui -- $(WASM_EXTRA) | 25 | -t web ./ui -- $(WASM_EXTRA) |
26 | 26 | ||
27 | build: | 27 | build: |
28 | + $(call msg,PATCH DIFFY) | ||
29 | + @cargo patch | ||
28 | $(call msg,BUILD SERVER) | 30 | $(call msg,BUILD SERVER) |
29 | @PROFILE=$(PROFILE) cargo build $(CARGO_PROFILE) --bin artshop-server | 31 | @PROFILE=$(PROFILE) cargo build $(CARGO_PROFILE) --bin artshop-server |
30 | 32 |
@@ -64,3 +64,9 @@ and parallel: | @@ -64,3 +64,9 @@ and parallel: | ||
64 | 64 | ||
65 | GRANT ALL PRIVILEGES ON artshop.* TO 'artshop'@'%'; | 65 | GRANT ALL PRIVILEGES ON artshop.* TO 'artshop'@'%'; |
66 | CREATE DATABASE artshop CHARACTER SET = 'utf8mb3' COLLATE = 'utf8mb3_general_ci'; | 66 | CREATE DATABASE artshop CHARACTER SET = 'utf8mb3' COLLATE = 'utf8mb3_general_ci'; |
67 | + | ||
68 | +# Get information for github user while not having own account | ||
69 | + | ||
70 | + https://api.github.com/users/xxxxxxx/events/public | ||
71 | + | ||
72 | +where xxxxxxx is the github username. Then search for email. |
1 | +--- src/patch/parse.rs 2022-01-31 14:20:14.539741482 +0100 | ||
2 | ++++ src/patch/parse.rs 2022-01-31 14:21:27.058846339 +0100 | ||
3 | +@@ -193,8 +193,8 @@ | ||
4 | + | ||
5 | + fn verify_hunks_in_order<T: ?Sized>(hunks: &[Hunk<'_, T>]) -> bool { | ||
6 | + for hunk in hunks.windows(2) { | ||
7 | +- if hunk[0].old_range.end() >= hunk[1].old_range.start() | ||
8 | +- || hunk[0].new_range.end() >= hunk[1].new_range.start() | ||
9 | ++ if hunk[0].old_range.end() > hunk[1].old_range.start() | ||
10 | ++ || hunk[0].new_range.end() > hunk[1].new_range.start() | ||
11 | + { | ||
12 | + return false; | ||
13 | + } |
@@ -16,7 +16,7 @@ artshop-common = { path = "../common" } | @@ -16,7 +16,7 @@ artshop-common = { path = "../common" } | ||
16 | async-std = { version = "^1.10", features = ["unstable"] } | 16 | async-std = { version = "^1.10", features = ["unstable"] } |
17 | chrono = "0.4.15" | 17 | chrono = "0.4.15" |
18 | diesel = { version = "1.4.7", features = ["mysql", "sqlite", "r2d2"] } | 18 | diesel = { version = "1.4.7", features = ["mysql", "sqlite", "r2d2"] } |
19 | -diffy = "0.2" | 19 | +diffy = "0.2.1" |
20 | dotenv = "0.15.0" | 20 | dotenv = "0.15.0" |
21 | flate2 = "^1.0" | 21 | flate2 = "^1.0" |
22 | futures = "^0.3" | 22 | futures = "^0.3" |
@@ -31,3 +31,8 @@ serde_derive = "1.0" | @@ -31,3 +31,8 @@ serde_derive = "1.0" | ||
31 | serde_json = "1.0" | 31 | serde_json = "1.0" |
32 | toml = "^0.5" | 32 | toml = "^0.5" |
33 | uuid = { version = "^0.8", features = ["v4", "v5"] } | 33 | uuid = { version = "^0.8", features = ["v4", "v5"] } |
34 | + | ||
35 | +[package.metadata.patch.diffy] | ||
36 | +version = "0.2.1" | ||
37 | +patches = ["./patches/diffy-0.2.1_fix-adjacent-hunk-parsing.patch"] | ||
38 | + |
Please
register
or
login
to post a comment