repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

subversion diff cmd

3b0801705eb54c6d871928fca5578dc212063593

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (12)

.gitignore

Modified
7 7 neovim/profile.log
8 8 neovim/plugin
9 9 neovim/profile.svg
10 +.aider.chat.history.md

PC-00625.symlinks

Modified
19 19 subversion/config
20 20 ~/AppData/Roaming/Subversion/config
22 +subversion/diff
23 +~/AppData/Roaming/Subversion/diff
25 +subversion/diff3
26 +~/AppData/Roaming/Subversion/diff3
28 +subversion/merge
29 +~/AppData/Roaming/Subversion/merge
22 32 cargo/config.toml
23 33 ~/scoop/persist/rustup/.cargo/config.toml

git/gitconfig

Modified
19 19 [difftool "meld"]
20 20 cmd = "meld \"$LOCAL\" \"$REMOTE\""
22 +[difftool "difftastic"]
23 + cmd = "difft \"$LOCAL\" \"$REMOTE\""
25 +[pager]
26 + difftool = true
22 28 [merge]
23 29 tool = meld_merge

helix/themes/nugu-light.toml

Modified
41 41 "markup.link.text" = "important_local"
42 42 "markup.link.label" = "important_global"
43 43 "markup.quote" = { fg = "important_local", modifiers = ["italic"] }
44 -"markup.raw.inline" = { fg = "important_local" }
45 -"markup.raw.block" = { fg = "important_global" }
44 +# "markup.raw.inline" = { fg = "important_local" }
45 +# "markup.raw.block" = { fg = "important_global" }
47 47 "diff.plus" = { fg = "important_local", modifiers = ["bold"] }
48 48 "diff.delta" = { fg = "unfocus" }
81 81 "ui.debug.breakpoint" = { fg = "ui_important_global" }
82 82 "ui.debug.active" = { fg = "ui_important_global" }
84 -"ui.window" = { fg = "ui_unfocus", bg = "ui_backdrop" }
84 +"ui.window" = { fg = "ui_important_global", bg = "ui_backdrop" }
86 86 "ui.help" = { fg = "ui_important_global", bg = "ui_backdrop" }
88 -"ui.text" = { fg = "normal", bg = "backdrop" }
89 -"ui.text.focus" = { fg = "ui_focus" }
88 +# "ui.text" = { fg = "normal", bg = "backdrop" }
89 +"ui.text.focus" = { fg = "ui_accent" , bg= "ui_backdrop"}
90 90 "ui.text.info" = { fg = "ui_normal", bg = "ui_backdrop" }
91 91 "ui.text.inactive" = { fg = "ui_minor" }
97 97 "ui.menu.scroll" = { fg = "ui_accent", bg = "ui_backdrop" }
99 -"ui.popup" = { fg = "normal", bg = "backdrop" }
100 -"ui.popup.info" = { fg = "ui_minor", bg = "ui_backdrop" }
99 +"ui.popup" = { fg = "debug", bg = "debug" }
100 +"ui.popup.info" = { fg = "ui_important_local", bg = "ui_backdrop" }
102 -"ui.highlight" = { bg = "ui_focus" }
102 +"ui.highlight" = { bg = "debug" }
103 103 "ui.highlight.frameline" = { bg = "ui_important_global" }
105 105 "ui.virtual.ruler" = { bg = "ui_unfocus" }
106 106 "ui.virtual.whitespace" = { fg = "ui_unfocus" }
107 -"ui.virtual.inlay-hint" = { fg = "ui_minor" }
107 +"ui.virtual.inlay-hint" = { fg = "minor", modifiers = ["italic"] }
109 109 "error" = { bg = "error" }
110 110 "warning" = { bg = "warning" }

nushell/modules/aliases.nu

Modified
5 5 export alias look = xplr
6 6 export alias browse = firefox
7 7 export alias edit = hx
8 +# TODO ewrite bak command
9 +export alias backup = bak
9 11 # TODO: HOST SPECIFIC ALIASES
10 12 # I do not see a way right now the have different aliases per host with nu.

pop-os.symlinks

Modified
4 4 git/gitconfig
5 5 ~/.config/git/config
7 7 git/gitconfig.linux
8 8 ~/.config/git/.gitconfig.include
10 +subversion/config
11 +~/.subversion/config
13 +subversion/diff
14 +~/.subversion/diff
16 +subversion/diff3
17 +~/.subversion/diff3
19 +subversion/merge
20 +~/.subversion/merge
10 22 tools/git-info
11 23 ~/.local/bin/git-info

subversion/config

Modified
14 14 ### gpg-agent (Unix-like systems)
15 15 ### keychain (Mac OS X)
16 16 ### windows-cryptoapi (Windows)
17 -password-stores = windows-cryptoapi
17 +# password-stores = gpg-agent,gnome-keyring,kwallet
18 18 ### To disable all password stores, use an empty list:
19 19 # password-stores =
21 +### Set KWallet wallet used by Subversion. If empty or unset,
22 +### then the default network wallet will be used.
23 +# kwallet-wallet =
24 +###
25 +### Include PID (Process ID) in Subversion application name when
26 +### using KWallet. It defaults to 'no'.
27 +# kwallet-svn-application-name-with-pid = yes
28 +###
21 29 ### Set ssl-client-cert-file-prompt to 'yes' to cause the client
22 30 ### to prompt for a path to a client cert file when the server
23 31 ### requests a client cert but no client cert file is found in the
28 36 ### The rest of the [auth] section in this file has been deprecated.
29 37 ### Both 'store-passwords' and 'store-auth-creds' can now be
30 38 ### specified in the 'servers' file in your config directory
31 -### and are documented there. Anything specified in this section
39 +### and are documented there. Anything specified in this section
32 40 ### is overridden by settings specified in the 'servers' file.
33 41 # store-passwords = no
34 42 # store-auth-creds = no
37 45 [helpers]
38 46 ### Set editor-cmd to the command used to invoke your text editor.
39 47 ### This will override the environment variables that Subversion
40 -### examines by default to find this information ($EDITOR,
48 +### examines by default to find this information ($EDITOR,
41 49 ### et al).
42 50 editor-cmd = hx
43 51 ### Set diff-cmd to the absolute path of your 'diff' program.
44 52 ### This will override the compile-time default, which is to use
45 53 ### Subversion's internal diff implementation.
46 -# diff-cmd = delta
54 +# TODO windows versions as bat files
55 +diff-cmd = /home/oli/.subversion/diff
47 56 ### Diff-extensions are arguments passed to an external diff
48 57 ### program or to Subversion's internal diff implementation.
49 58 ### Set diff-extensions to override the default arguments ('-u').
50 -# diff-extensions = --tabs 2
59 +# diff-extensions =
51 60 ### Set diff3-cmd to the absolute path of your 'diff3' program.
52 61 ### This will override the compile-time default, which is to use
53 62 ### Subversion's internal diff3 implementation.
54 -# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
63 +# diff3-cmd = /home/oli/.subversion/diff3
55 64 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
56 65 ### accepts the '--diff-program' option.
57 -# diff3-has-program-arg = [yes | no]
66 +# diff3-has-program-arg = no
58 67 ### Set merge-tool-cmd to the command used to invoke your external
59 68 ### merging tool of choice. Subversion will pass 5 arguments to
60 69 ### the specified command: base theirs mine merged wcfile
61 -# merge-tool-cmd = merge_command
70 +merge-tool-cmd = /home/oli/.subversion/merge
63 72 ### Section for configuring tunnel agents.
64 73 [tunnels]
75 84 ### passed to the tunnel agent as <user>@<hostname>.) If the
76 85 ### built-in ssh scheme were not predefined, it could be defined
77 86 ### as:
78 -# ssh = $SVN_SSH ssh -q
87 +# ssh = $SVN_SSH ssh -q -o ControlMaster=no --
79 88 ### If you wanted to define a new 'rsh' scheme, to be used with
80 89 ### 'svn+rsh:' URLs, you could do so as follows:
81 -# rsh = rsh
90 +# rsh = rsh --
82 91 ### Or, if you wanted to specify a full path and arguments:
83 -# rsh = /path/to/rsh -l myusername
92 +# rsh = /path/to/rsh -l myusername --
84 93 ### On Windows, if you are specifying a full path to a command,
85 94 ### use a forward slash (/) or a paired backslash (\\) as the
86 95 ### path separator. A single backslash will be treated as an
89 98 ### Section for configuring miscellaneous Subversion options.
90 99 [miscellany]
91 -encoding = UTF-8
92 100 ### Set global-ignores to a set of whitespace-delimited globs
93 101 ### which Subversion will ignore in its 'status' output, and
94 102 ### while importing or adding files and directories.
96 104 # global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__
97 105 # *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db
98 106 ### Set log-encoding to the default encoding for log messages
99 -log-encoding = UTF-8
107 +# log-encoding = latin1
100 108 ### Set use-commit-times to make checkout/update/switch/revert
101 109 ### put last-committed timestamps on every file touched.
102 110 # use-commit-times = yes

subversion/diff

Added
new file mode 100755
1 +#!/usr/bin/java --source 17
3 +import static java.lang.System.* ;
4 +import java.util.*;
6 +class diff {
7 + public static void main(String[] command_line_arguments) throws Throwable
8 + {
9 + if(command_line_arguments.length != 7)
10 + throw fail("svn diff was supposed to give us 7 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 + //some old gnudiff flag, which newer tools ignore
13 + var ignored_unified_flag = command_line_arguments[0];
15 + if(!ignored_unified_flag.equals("-u"))
16 + throw fail("the first argument should be the `-u` flag, which will be ignored, but was %s.", ignored_unified_flag);
18 + var left_label_flag = command_line_arguments[1];
19 + var left_label = command_line_arguments[2];
20 + var right_label_flag = command_line_arguments[3];
21 + var right_label = command_line_arguments[4];
23 + if(!(left_label_flag.equals("-L") && right_label_flag.equals("-L")))
24 + throw fail("flags for the labes should have been `-L`, but were %s and %s.", left_label_flag, right_label_flag);
26 + var left_file = command_line_arguments[5];
27 + var right_file = command_line_arguments[6];
29 + var code = call("difft", "--tab-width","2", right_file, left_file);
30 + throw exit(code);
31 + }
33 + static int call( String... command) throws Exception
34 + {
35 + return new ProcessBuilder()
36 + .command(command)
37 + .inheritIO()
38 + .start()
39 + .onExit()
40 + .join()
41 + .exitValue();
42 + }
44 + static Throwable exit(int code) {
45 + System.exit(code);
46 + //abuse control flow to make compiler realize `exit` will never return
47 + return new Throwable();
48 + }
50 + static String emphasize_global(String message) {
51 + return "\033[4m" + message + "\033[0m";
52 + }
54 + static String emphasize_local(String message) {
55 + return "\033[3m" + message + "\033[0m";
56 + }
58 + static Throwable fail(String message, Object... arguments) {
59 + out.printf(message, arguments);
60 + System.exit(1);
61 + //abuse control flow to make compiler realize `exit` will never return
62 + return new Throwable();
63 + }
65 + static Throwable fail() {
66 + System.exit(1);
67 + //abuse control flow to make compiler realize `exit` will never return
68 + return new Throwable();
69 + }
71 +// vim:ft=java

subversion/diff3

Added
new file mode 100755
1 +#!/usr/bin/java --source 17
3 +import static java.lang.System.* ;
4 +import java.util.*;
6 +class diff3 {
7 + public static void main(String[] command_line_arguments) throws Throwable
8 + {
9 + if(command_line_arguments.length != 9)
10 + throw fail("svn diff3 was supposed to give us 9 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 + //some old gnudiff flag, which meld ignores
13 + var ignored_unified_flag = command_line_arguments[0];
15 + if(!ignored_unified_flag.equals("-u"))
16 + throw fail("the first argument should be the `-u` flag, which meld will ignore, but was %s.", ignored_unified_flag);
18 + var left_label_flag = command_line_arguments[1];
19 + var left_label = command_line_arguments[2];
20 + var right_label_flag = command_line_arguments[3];
21 + var right_label = command_line_arguments[4];
23 + if(!(left_label_flag.equals("-L") && right_label_flag.equals("-L")))
24 + throw fail("flags for the labes should have been `-L`, but were %s and %s.", left_label_flag, right_label_flag);
26 + var left_file = command_line_arguments[5];
27 + var right_file = command_line_arguments[6];
29 + out.printf("%s --label '%s' '%s' --label '%s' '%s'%n", emphasize_global("meld"), left_label, left_file, right_label, right_file);
30 + throw fail("not yet");
31 + // var code = call("meld","--auto-merge", "--label", left_label, left_file, "--label", right_label, right_file);
32 + // throw exit(code);
33 + }
35 + static int call( String... command) throws Exception
36 + {
37 + return new ProcessBuilder()
38 + .command(command)
39 + .inheritIO()
40 + .start()
41 + .onExit()
42 + .join()
43 + .exitValue();
44 + }
46 + static Throwable exit(int code) {
47 + System.exit(code);
48 + //abuse control flow to make compiler realize `exit` will never return
49 + return new Throwable();
50 + }
52 + static String emphasize_global(String message) {
53 + return "\033[4m" + message + "\033[0m";
54 + }
56 + static String emphasize_local(String message) {
57 + return "\033[3m" + message + "\033[0m";
58 + }
60 + static Throwable fail(String message, Object... arguments) {
61 + out.printf(message, arguments);
62 + System.exit(1);
63 + //abuse control flow to make compiler realize `exit` will never return
64 + return new Throwable();
65 + }
67 + static Throwable fail() {
68 + System.exit(1);
69 + //abuse control flow to make compiler realize `exit` will never return
70 + return new Throwable();
71 + }
74 +// vim:ft=java

subversion/merge

Added
new file mode 100755
1 +#!/usr/bin/java --source 17
3 +import static java.lang.System.* ;
4 +import java.util.*;
6 +class merge {
7 + public static void main(String[] command_line_arguments) throws Throwable
8 + {
9 + if(command_line_arguments.length != 5)
10 + throw fail("svn diff was supposed to give us 5 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 + var base_file = command_line_arguments[0];
13 + var theirs_file = command_line_arguments[1];
14 + var mine_file = command_line_arguments[2];
15 + var merged_file = command_line_arguments[3];
16 + var wcpath_file = command_line_arguments[4];
18 + var code = call("meld", "--label", "Mine", mine_file, "--label", "WC", wcpath_file, "--label", "Theirs", theirs_file, "--output", merged_file);
19 + throw exit(code);
20 + }
22 + static int call( String... command) throws Exception
23 + {
24 + return new ProcessBuilder()
25 + .command(command)
26 + .inheritIO()
27 + .start()
28 + .onExit()
29 + .join()
30 + .exitValue();
31 + }
33 + static Throwable exit(int code) {
34 + System.exit(code);
35 + //abuse control flow to make compiler realize `exit` will never return
36 + return new Throwable();
37 + }
39 + static String emphasize_global(String message) {
40 + return "\033[4m" + message + "\033[0m";
41 + }
43 + static String emphasize_local(String message) {
44 + return "\033[3m" + message + "\033[0m";
45 + }
47 + static Throwable fail(String message, Object... arguments) {
48 + out.printf(message, arguments);
49 + System.exit(1);
50 + //abuse control flow to make compiler realize `exit` will never return
51 + return new Throwable();
52 + }
54 + static Throwable fail() {
55 + System.exit(1);
56 + //abuse control flow to make compiler realize `exit` will never return
57 + return new Throwable();
58 + }
60 +// vim:ft=java

wezterm/bugabinga/key_binds.lua

Modified
1 1 local wez = require 'wezterm'
2 -local leader = { key = 'raw:255'}
2 +local leader = { key = 'VoidSymbol'}
4 4 local resize_pane_mode = 'ﭕ Resize Pane Mode'
5 5 local activate_pane_mode = ' Activate Pane Mode'

wezterm/wezterm.service

Modified
2 2 [Unit]
3 3 Description=Wezterm Multiplexing Server
5 5 [Service]
6 -# start with system shell as parent in order to inherit environment variables
7 -ExecStart=/bin/bash -c /usr/bin/wezterm-mux-server
6 +ExecStart=/usr/bin/wezterm-mux-server
8 7 Restart=on-failure
10 9 [Install]