add confirmed batch ignore and machine-wide rules (3.5.0)

@@ -1 +1 @@1-3.4.61+3.5.0

@@ -136,6 +136,7 @@136136     'peek:restore a save into a temp folder'137137     'init:create .koh here'138138     'doctor:integrity check and cleanup'139+    'ignore:ignore or unignore files and folders'139140     'strip:remove a path from history'140141     'build:build from koh.build'141142     'update:update Koh itself'@@ -163,6 +164,7 @@163164     revert)          _arguments '--yes' ;;164165     remote)          _arguments '1:kind:(folder s3)' '--forget' '--json' ;;165166     steal)           _arguments '--list' '--mine' '--theirs' '--json' ;;167+    ignore)          _arguments '--global[edit ~/.kohignore for every repo]' '--yes[skip the question]' '--json' '*:path:_files' ;;166168     strip)           _arguments '--save[one save]:save:_koh3_ids' '*:path:_files' ;;167169     doctor)          _arguments '--backup[copy .koh to]:path:_files' ;;168170     build)           _arguments '*--platform[target platform]:platform:(macos-aarch64 macos-x86_64 linux-aarch64 linux-x86_64)' '--all' ;;

@@ -33,7 +33,7 @@3333 		text += '\n  ${fmt.gold(row[0])}${' '.repeat(12 - row[0].len)}${fmt.muted(row[1])}\n'3434 	}3535 	text += '\n  ${fmt.dim('also: remote · flag · pluck · peek · build · update')}\n'36-	text += '        ${fmt.dim('init · doctor · strip · migrate')}\n'36+	text += '        ${fmt.dim('init · doctor · ignore · strip · migrate')}\n'3737 	text += '\n  ${fmt.dim('koh man <command>  for options and examples')}\n'3838 	text += '\n  ${fmt.dim('Asha Software · asha.software')}\n'3939 	return text@@ -95,6 +95,9 @@9595 		}9696 		'doctor' {9797 			return cmd_doctor(rest)98+		}99+		'ignore' {100+			return cmd_ignore(rest)98101 		}99102 		'strip' {100103 			return cmd_strip(rest)

@@ -7,6 +7,11 @@77 88 // The history view's `l` key goes through restore_now, which a CLI test cannot99 // reach without a terminal, so it is checked here directly.10+// Global rules must not make source fixtures depend on the developer’s home.11+fn testsuite_begin() {12+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)13+}14+1015 fn test_restore_now_refuses_to_overwrite_unsaved_work() {1116 	dir := os.join_path(os.temp_dir(), 'koh3_cli_restore_now_${os.getpid()}')1217 	os.rmdir_all(dir) or {}@@ -101,4 +106,21 @@101106 		assert false, 'recording a save with a missing object should fail'102107 	}103108 	assert snapshot.restore_pending(store)109+}110+111+fn test_ignore_write_refuses_stale_rules_and_preserves_permissions() {112+	dir := os.join_path(os.temp_dir(), 'koh3_cli_ignore_${os.getpid()}')113+	os.mkdir_all(dir)!114+	defer { os.rmdir_all(dir) or {} }115+	file := os.join_path(dir, '.kohignore')116+	os.write_file(file, '# changed\n')!117+	if _ := write_ignore(file, '# original\n', '/cache/\n') {118+		assert false, 'stale preview replaced changed rules'119+	}120+	assert os.read_file(file)! == '# changed\n'121+	os.chmod(file, 0o600)!122+	write_ignore(file, '# changed\n', '# changed\n/cache/\n')!123+	assert os.stat(file)!.mode & 0o777 == 0o600124+	assert os.read_file(file)! == '# changed\n/cache/\n'125+	assert os.ls(dir)! == ['.kohignore']104126 }

@@ -11,6 +11,11 @@1111 import src.snapshot1212 import src.storage1313 14+// Global rules must not make source fixtures depend on the developer’s home.15+fn testsuite_begin() {16+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)17+}18+1419 fn test_arriving_record_drops_unsafe_paths_and_reports_them() {1520 	mut record := SaveRecord{1621 		files: [

@@ -4,6 +4,11 @@44 import src.snapshot55 import src.storage66 7+// Global rules must not make source fixtures depend on the developer’s home.8+fn testsuite_begin() {9+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)10+}11+712 fn temp_repo(name string) !(storage.Store, string) {813 	dir := os.join_path(os.temp_dir(), 'koh3_hist_${os.getpid()}_${name}')914 	os.rmdir_all(dir) or {}

@@ -22,6 +22,11 @@2222 }2323 2424 // koh2_binary finds Koh 2: `koh2` since the cutover, `koh` before it, and never Koh 3.25+// Global rules must not make source fixtures depend on the developer’s home.26+fn testsuite_begin() {27+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)28+}29+2530 fn quiet(stage string, done int, total int) {}2631 2732 fn koh2_binary() ?string {

@@ -13,6 +13,11 @@1313 import src.snapshot1414 import src.storage1515 16+// Global rules must not make source fixtures depend on the developer’s home.17+fn testsuite_begin() {18+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)19+}20+1621 fn scratch(name string) !string {1722 	dir := os.join_path(os.temp_dir(), 'koh3_release_${os.getpid()}_${name}')1823 	os.rmdir_all(dir) or {}

@@ -57,15 +57,46 @@5757 	patterns []Pattern5858 }5959 60-// load reads `.kohignore`; a repo without one simply has no extra rules.60+/// global_ignore_path is the machine-local rule file, outside repository history.61+pub fn global_ignore_path() string {62+	return os.join_path(os.home_dir(), ignore_file)63+}64+65+// Both scopes are additive, so a local rule never overrides a global one.6166 pub fn load(root string) Ignore {62-	path := os.join_path(root, ignore_file)63-	if !os.is_file(path) {64-		return Ignore{}67+	local := os.read_file(os.join_path(root, ignore_file)) or { '' }68+	global := os.read_file(global_ignore_path()) or { '' }69+	return parse(global + '\n' + local)70+}71+72+/// matching_rules returns the lines that make the walk skip a literal path.73+pub fn matching_rules(text string, rel string, is_dir bool) []string {74+	mut rules := []string{}75+	for raw in text.split_into_lines() {76+		rule := raw.trim_space()77+		if rule == '' || rule.starts_with('#') {78+			continue79+		}80+		ig := parse(rule)81+		mut matched := ig.matches(rel, is_dir)82+		parts := rel.split('/')83+		for end in 1 .. parts.len {84+			matched = matched || ig.matches(parts[..end].join('/'), true)85+		}86+		if matched && rule !in rules {87+			rules << rule88+		}6589 	}66-	return parse(os.read_file(path) or { return Ignore{} })90+	return rules6791 }6892 93+/// ignore_rule escapes a literal path in the selected scope.94+pub fn ignore_rule(path string, is_dir bool, global bool) string {95+	prefix := if global { '' } else { '/' }96+	suffix := if is_dir { '/' } else { '' }97+	return prefix + literal(path) + suffix98+}99+69100 // banning adds a whole-history strip's paths as anchored rules, so the tree agrees with the70101 // history on every machine that holds the strip, before `.kohignore` names them there too.71102 fn (ig Ignore) banning(paths []string) Ignore {@@ -97,7 +128,7 @@97128 98129 // literal escapes a path so a rule names it and nothing else.99130 fn literal(path string) string {100-	return path.replace('\\', '\\\\').replace('*', '\\*').replace('?', '\\?')131+	return path.replace('\\', '\\\\').replace('*', '\\*').replace('?', '\\?').replace('#', '\\#')101132 }102133 103134 pub fn parse(text string) Ignore {

@@ -4,6 +4,11 @@44 import time55 import src.storage66 7+// Global rules must not make source fixtures depend on the developer’s home.8+fn testsuite_begin() {9+	os.setenv('HOME', os.join_path(os.temp_dir(), 'koh3-test-home-${os.getpid()}'), true)10+}11+712 fn temp_root(name string) !string {813 	dir := os.join_path(os.temp_dir(), 'koh3_snap_${os.getpid()}_${name}')914 	os.rmdir_all(dir) or {}@@ -370,4 +375,14 @@370375 371376 fn full_path(root string, rel string) string {372377 	return os.join_path(root, rel)378+}379+380+fn test_ignore_toggle_rules_follow_directory_walk_and_escape_literals() {381+	assert matching_rules('# keep\ncache\n*.log\n', 'nested/cache/a', false) == ['cache']382+	assert matching_rules('/cache/\ncache/**\n', 'cache/a', false) == ['/cache/', 'cache/**']383+	assert matching_rules('*.log\n', 'notes.txt', false).len == 0384+	rule := ignore_rule('#draft*.txt', false, true)385+	assert parse(rule).matches('#draft*.txt', false)386+	assert !parse(rule).matches('#draftX.txt', false)387+	assert ignore_rule('cache', true, false) == '/cache/'373388 }

@@ -1749,3 +1749,139 @@17491749 	assert r.err.contains("doesn't hand out bucket access")17501750 	assert !os.exists(os.join_path(home, '.config', 'koh', 'remote'))17511751 }1752+1753+fn test_ignore_batch_preview_cancel_and_toggle() {1754+	repo := temp_repo('ignore-batch')1755+	home := temp_repo('ignore-home')1756+	defer {1757+		os.rmdir_all(repo) or {}1758+		os.rmdir_all(home) or {}1759+	}1760+	assert run_home(repo, home, 'init').code == 01761+	assert run_home(repo, home, 'save', 'initial').code == 01762+	write(repo, 'one/a.txt', 'a')1763+	write(repo, 'two/b.txt', 'b')1764+	write(repo, 'literal*.txt', 'literal')1765+	before := os.read_file(os.join_path(repo, '.kohignore'))!1766+	refused := run_home(repo, home, 'ignore', 'one', 'two', 'literal*.txt', '--json')1767+	assert refused.code == 11768+	assert refused.out.contains('"changed":false')1769+	assert refused.out.contains('koh strip <path>')1770+	assert os.read_file(os.join_path(repo, '.kohignore'))! == before1771+	cancel := run_pty_home(repo, home, [''], 'ignore', 'one', 'two', 'literal*.txt')1772+	assert cancel.code == 11773+	assert cancel.out.contains('/one/') && cancel.out.contains('/two/')1774+	assert os.read_file(os.join_path(repo, '.kohignore'))! == before1775+	assert run_home(repo, home, 'ignore', 'one').code == 11776+	assert os.read_file(os.join_path(repo, '.kohignore'))! == before1777+	assert run_pty_home(repo, home, ['y'], 'ignore', 'confirmed.txt').code == 01778+	added := run_home(repo, home, 'ignore', 'one', './one', 'two', 'literal*.txt', '--yes', '--json')1779+	assert added.code == 01780+	assert added.out.contains('"changed":true')1781+	text := os.read_file(os.join_path(repo, '.kohignore'))!1782+	assert text.count('/one/\n') == 11783+	assert text.contains('/literal\\*.txt\n')1784+	status := run_home(repo, home, 'status', '--json')1785+	assert status.code == 01786+	assert !status.out.contains('one/a.txt') && !status.out.contains('literal*.txt')1787+	assert run_home(repo, home, 'ignore', 'one', '--yes').code == 01788+	assert run_home(repo, home, 'status', '--json').out.contains('one/a.txt')1789+	assert run_home(repo, home, 'ignore', 'two/b.txt', '--yes').code == 01790+	assert !os.read_file(os.join_path(repo, '.kohignore'))!.contains('/two/')1791+}1792+1793+fn test_ignore_global_rules_and_scope_overlap() {1794+	repo := temp_repo('ignore-global')1795+	other := temp_repo('ignore-other')1796+	home := temp_repo('ignore-home')1797+	defer {1798+		os.rmdir_all(repo) or {}1799+		os.rmdir_all(other) or {}1800+		os.rmdir_all(home) or {}1801+	}1802+	assert run_home(repo, home, 'init').code == 01803+	assert run_home(repo, home, 'save', 'initial').code == 01804+	assert run_home(other, home, 'init').code == 01805+	assert run_home(other, home, 'save', 'initial').code == 01806+	write(repo, 'cache/a', 'a')1807+	write(other, 'nested/cache/b', 'b')1808+	assert run_home(repo, home, 'ignore', 'cache', '--yes').code == 01809+	assert run_home(repo, home, 'ignore', 'cache', '--global', '--yes').code == 01810+	assert os.read_file(os.join_path(home, '.kohignore'))! == 'cache/\n'1811+	assert run_home(other, home, 'save', 'global rules applied').code == 11812+	assert !run_home(other, home, 'status', '--json').out.contains('nested/cache/b')1813+	result := run_home(repo, home, 'ignore', 'cache', '--yes')1814+	assert result.code == 0 && result.out.contains('still ignored')1815+	assert !run_home(repo, home, 'status', '--json').out.contains('cache/a')1816+	assert run_home(repo, home, 'ignore', 'cache', '--global', '--yes').code == 01817+	assert run_home(repo, home, 'status', '--json').out.contains('cache/a')1818+	assert run_home(other, home, 'status', '--json').out.contains('nested/cache/b')1819+	assert run_home(home, home, 'ignore', 'missing/', '--global', '--yes').code == 01820+}1821+1822+fn test_ignore_broad_rules_mixed_batch_and_invalid_paths() {1823+	repo := temp_repo('ignore-rules')1824+	home := temp_repo('ignore-home')1825+	defer {1826+		os.rmdir_all(repo) or {}1827+		os.rmdir_all(home) or {}1828+	}1829+	assert run_home(repo, home, 'init').code == 01830+	assert run_home(repo, home, 'save', 'initial').code == 01831+	write(repo, '.kohignore', '# keep this\n*.log\n/folder/\n')1832+	write(repo, 'folder/a', 'a')1833+	os.symlink(home, os.join_path(repo, 'link'))!1834+	before := os.read_file(os.join_path(repo, '.kohignore'))!1835+	for bad in ['../outside', '.koh', '.kohignore', '.', 'link/a', 'bad\nname'] {1836+		assert run_home(repo, home, 'ignore', 'good', bad, '--yes').code == 11837+		assert os.read_file(os.join_path(repo, '.kohignore'))! == before1838+	}1839+	mixed := run_home(repo, home, 'ignore', 'a.log', 'new.txt', '--yes')1840+	assert mixed.code == 0 && mixed.out.contains('other items')1841+	assert os.read_file(os.join_path(repo, '.kohignore'))! == '# keep this\n/folder/\n/new.txt\n'1842+	assert run_home(os.join_path(repo, 'folder'), home, 'ignore', 'a', '--yes').code == 01843+	assert !os.read_file(os.join_path(repo, '.kohignore'))!.contains('/folder/')1844+	assert run_home(repo, home, 'ignore').code == 21845+}1846+1847+fn test_ignore_reads_symlinked_other_scope_and_subdirectory_rules() {1848+	repo := temp_repo('ignore-symlink')1849+	home := temp_repo('ignore-home')1850+	defer {1851+		os.rmdir_all(repo) or {}1852+		os.rmdir_all(home) or {}1853+	}1854+	assert run_home(repo, home, 'init').code == 01855+	write(home, 'rules', 'cache/\n')1856+	os.symlink(os.join_path(home, 'rules'), os.join_path(home, '.kohignore'))!1857+	local := run_home(repo, home, 'ignore', 'cache/', '--yes')1858+	assert local.code == 0 && local.out.contains('still ignored')1859+	assert run_home(repo, home, 'ignore', 'cache/', '--global', '--yes').code == 11860+	os.rm(os.join_path(home, '.kohignore'))!1861+	write(home, '.kohignore', 'cache/\n')1862+	write(repo, '.kohignore', '/sub/cache/\n')1863+	write(repo, 'sub/cache/a', 'a')1864+	global := run_home(os.join_path(repo, 'sub'), home, 'ignore', 'cache', '--global', '--yes')1865+	assert global.code == 0 && global.out.contains('still ignored')1866+	assert os.read_file(os.join_path(repo, '.kohignore'))! == '/sub/cache/\n'1867+	assert os.read_file(os.join_path(home, '.kohignore'))! == ''1868+}1869+1870+fn test_ignore_refuses_stripped_paths_and_preserves_crlf_comments() {1871+	repo := temp_repo('ignore-stripped')1872+	home := temp_repo('ignore-home')1873+	defer {1874+		os.rmdir_all(repo) or {}1875+		os.rmdir_all(home) or {}1876+	}1877+	assert run_home(repo, home, 'init').code == 01878+	write(repo, 'secret', 'secret')1879+	assert run_home(repo, home, 'save', 'initial').code == 01880+	assert run_pty_home(repo, home, ['y', 'secret'], 'strip', 'secret').code == 01881+	before := os.read_file(os.join_path(repo, '.kohignore'))!1882+	assert run_home(repo, home, 'ignore', 'secret', '--yes').code == 11883+	assert os.read_file(os.join_path(repo, '.kohignore'))! == before1884+	write(repo, '.kohignore', '# keep\r\n*.log\r\nlast')1885+	assert run_home(repo, home, 'ignore', 'one.log', '--yes').code == 01886+	assert os.read_file(os.join_path(repo, '.kohignore'))! == '# keep\r\nlast'1887+}

@@ -1,6 +1,6 @@11 Module {22 	name: 'koh3'3-	version: '3.4.6'3+	version: '3.5.0'44 	description: 'One SQLite file per repo, one line of history.'55 	license: 'MIT'66 }