Commit Graph

128 Commits

Author SHA1 Message Date
Chris Penner
c3c5d69ac3 Fix hashes in gitsync tests 2022-01-21 15:07:05 -06:00
Chris Penner
5809a9f321 Add test asserting that local changes are wiped out when there's changes on the remote 2022-01-19 11:41:38 -06:00
Chris Penner
bfd4669d02 Remove one-term test
It depends on a hash, but doesn't clarify what it's testing, and the
test after it seems to be accomplishing a similar thing in a more robust
way.
2022-01-06 14:36:40 -06:00
Chris Penner
f9bfaa6943 Add local state persistence tests. 2021-12-21 11:42:51 -06:00
Mitchell Rosen
209ced0fc0 fix gitsync22.sc.history 2021-12-14 14:47:05 -05:00
Mitchell Rosen
3563a47d05 fix gitsync22.sc.gist 2021-12-14 14:41:12 -05:00
Mitchell Rosen
fb022ab855 fix gitsync22.sc.one-term 2021-12-14 14:34:46 -05:00
Chris Penner
9c225cb08d Merge branch 'trunk' into topic/rehash-codebase-merge-trunk 2021-12-14 12:40:18 -06:00
Mitchell Rosen
ceb1692a53
Merge pull request #2708 from unisonweb/21-11-30-unknown-schema-ver
Fix open local codebase logic to handle unknown schema case
2021-12-11 00:28:07 -05:00
Chris Penner
dafa094ad0 Test that we can successfully pull.without-history 2021-12-09 15:14:55 -06:00
Mitchell Rosen
76fac4f811 fix compiler errors in test 2021-12-07 11:49:55 -05:00
Chris Penner
3155ef9cec Add GitSync tests for pushing/pulling with deleted namespaces 2021-12-06 16:01:13 -06:00
Chris Penner
c69048e5e3 Merge branch 'trunk' into cp/order-branch-modifications-1552 2021-12-01 15:15:28 -06:00
Chris Penner
7ce4d3b479 Merge branch 'trunk' into topic/rehash-codebase 2021-11-29 16:48:09 -06:00
Chris Penner
fe0a197f3d Merge branch 'trunk' into cp/order-branch-modifications-1552 2021-11-29 11:31:36 -06:00
Chris Penner
338b945acd Merge branch 'trunk' into cp/ensure-codebase-closes 2021-11-29 11:02:19 -06:00
Mitchell Rosen
1be6574d28
Merge pull request #2657 from unisonweb/21-11-12-gist
Add gist command (fixes #2603)
2021-11-28 12:13:13 -05:00
Chris Penner
9c14f44078 Merge branch 'trunk' into cp/order-branch-modifications-1552 2021-11-24 15:17:02 -06:00
Chris Penner
3771a03ab1 Don't save gitsync transcripts anymore 2021-11-23 15:53:18 -06:00
Chris Penner
9744b3d9a8 Update transcripts 2021-11-23 15:47:13 -06:00
Chris Penner
f8b39a7744 Re-enable ORMOLU on properly formatted files 2021-11-23 12:10:59 -06:00
Chris Penner
54d6fbf1bd Add ORMOLU_DISABLE to every file.
This allows all developers to add ormolu autoformat on save in their
editors without worrying about creating huge diffs on files that haven't
been formatted yet.

If you format a file, remove the DISABLE comment to ensure it stays
formatted in the future.
2021-11-23 12:10:58 -06:00
Mitchell Rosen
feef9dbd5a add gist transcript test 2021-11-23 11:55:36 -05:00
Chris Penner
bfd8fe6d51 Get unison-cli tests building 2021-11-22 15:30:41 -06:00
Chris Penner
30dfd3df50 Update hash embedded in gitsync tests 2021-11-19 14:27:09 -06:00
Arya Irani
14489cc2ed Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/CommandLine/OutputMessages.hs
#	parser-typechecker/src/Unison/PrettyPrintEnv.hs
#	unison-src/transcripts/merges.output.md
#	unison-src/transcripts/reflog.output.md
#	unison-src/transcripts/squash.output.md
2021-11-11 12:06:00 -05:00
Mitchell Rosen
4ad8c385f7 ⅄ trunk → 21-11-02-push-create 2021-11-06 13:38:24 -04:00
Mitchell Rosen
d46bdcbf3e move many ucm-related modules into unison-cli library component 2021-11-05 00:40:50 -04:00