Chris Penner
094f71b709
Use 'v2' branch for auto-pull of base on topic/rehash-codebase ( #2902 )
...
* Use 'v2' branch of base to avoid needing to migrate base on every pull.
This also allows us to keep v1 and v2 versions of base around during the
transition period.
* Fix version parsing tests.
Co-authored-by: Arya Irani <538571+aryairani@users.noreply.github.com>
2022-02-15 10:41:14 -06:00
Chris Penner
3e3b44d1d1
Merge branch 'trunk' into topic/rehash-codebase
2022-02-14 13:31:57 -06:00
Chris Penner
f927e611a7
Merge branch 'trunk' into cp/numbered-todo
2022-02-11 11:07:43 -06:00
Chris Penner
52a9b8f0cd
Merge branch 'trunk' into cp/numbered-todo
2022-02-11 11:04:10 -06:00
Chris Penner
4e9012f019
Merge branch 'trunk' into cp/numbered-history
2022-02-10 12:39:52 -06:00
Chris Penner
3359acf0d4
Fix Branch Hash printing
2022-02-10 12:38:37 -06:00
Chris Penner
7a241ecada
Properly show Branch Hashes.
2022-02-10 11:38:01 -06:00
Chris Penner
72b3692489
Use full hashes in numberedArgs
2022-02-10 11:13:24 -06:00
Chris Penner
be57a82d4f
Add numbered output to view.patch ( #2875 )
...
* Number 'view.patch' output
* Add numbering to patches
* Change transcript to use numbers rather than hashes
* Update transcripts
* use short-hash as lhs of patch outputs in numberedArgs
2022-02-09 16:01:52 -06:00
Chris Penner
2186e962a2
Cleanup
2022-02-09 15:43:31 -06:00
Chris Penner
7de78186b6
Improve todo output.
2022-02-09 14:40:21 -06:00
Chris Penner
c92a9528e9
Better number formatting
2022-02-09 13:37:11 -06:00
Chris Penner
99912bfb1a
Merge branch 'trunk' into topic/rehash-codebase
2022-02-09 11:44:08 -06:00
Chris Penner
5027eb0340
Thread numbering through 'todo'
2022-02-09 10:49:09 -06:00
Chris Penner
7ffe5d4d85
WIP
2022-02-09 10:06:04 -06:00
Chris Penner
69db163bcb
Allow pushing/pulling to git branches.
2022-02-09 09:27:18 -06:00
Chris Penner
e6f93ed47e
Add numbering to history command
2022-02-08 15:07:23 -06:00
Arya Irani
69500746aa
Merge remote-tracking branch 'origin/trunk' into topic/merge-trunk-2022-02-07
2022-02-07 19:56:30 -07:00
Arya Irani
19daa28398
Merge branch 'trunk' into topic/merge-trunk-2022-02-07
2022-02-07 19:29:57 -07:00
Arya Irani
db485f6e90
lookup AuthorInfo dynamically from IOSource.hs
2022-02-07 19:11:19 -07:00
Mitchell Rosen
f430921b12
⅄ trunk → topic/rehash-codebase
2022-01-24 12:43:11 -05:00
Chris Penner
c3c5d69ac3
Fix hashes in gitsync tests
2022-01-21 15:07:05 -06:00
Chris Penner
4cabe956c9
Ormolu SlurpComponent
2022-01-20 13:30:24 -06:00
Chris Penner
c332e46633
Put seenTypes into the types slot,
...
Add transcript for type-dependencies calculations.
2022-01-20 13:30:09 -06:00
Mitchell Rosen
47590b55e6
Merge pull request #2806 from unisonweb/22-01-13-compute-frontier
...
make computeFrontier more efficient, rename to computeDirty
2022-01-19 21:14:45 -05:00
mergify[bot]
d8e163f2c8
Merge pull request #2773 from unisonweb/cp/keep-state-on-pull
...
Persist local changes in Git Cache on pull/push
2022-01-19 17:58:41 +00: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
446cd222d4
Don't glob at all if there's no glob-target specified ( #2804 )
2022-01-14 09:51:38 -06:00
Mitchell Rosen
b8257d306f
make computeFrontier more efficient, rename to computeDirty
2022-01-13 23:58:01 -05:00
Chris Penner
b12fb5be56
Add -- comments to the transcript parser
2022-01-12 12:20:38 -06:00
mergify[bot]
6f3293541c
Merge pull request #2791 from unisonweb/cp/names-fix
...
Don't build slurp names twice
2022-01-10 16:54:27 +00:00
Chris Penner
3d3d761821
Don't rebuild the names twice, a let is fine
2022-01-10 10:38:27 -06:00
Chris Penner
ac9da6faec
No reason to build the same names twice
...
currentPathNames == slurpResultNames
2022-01-10 09:38:30 -06:00
Cody Allen
41a0b21e2a
Merge pull request #2570 from kolharsam/sam/remove-backticks-termparser
...
remove parser for using back-ticks for infix function application
2022-01-07 09:56:34 -08: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
Arya Irani
646d0652fd
Merge branch 'topic/rehash-codebase' into topic/rehash-codebase-reexport-hash
...
# Conflicts:
# parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
2022-01-05 21:16:43 -07:00
Chris Penner
6e121d0199
Merge branch 'trunk' into topic/rehash-codebase
2022-01-05 17:16:51 -06:00
Chris Penner
42368610ab
Merge pull request #2772 from unisonweb/cp/concurrency-safe-push
...
Make push more concurrency-safe by VACUUM into an isolated directory.
2022-01-05 16:11:54 -06:00
Chris Penner
d43fbc70e3
Merge branch 'trunk' into topic/rehash-codebase
2022-01-05 15:54:21 -06:00
Chris Penner
2686162c58
Fix integration tests ( #2774 )
2022-01-04 10:42:09 -06:00
Mitchell Rosen
0354658405
Merge pull request #2768 from unisonweb/21-12-17-get-root-branch-exists
...
Add getRootBranchExists to the Codebase API
2021-12-21 12:42:05 -08:00
Chris Penner
f9bfaa6943
Add local state persistence tests.
2021-12-21 11:42:51 -06:00
Chris Penner
101aa04b5e
Merge branch 'trunk' into cp/concurrency-safe-push
2021-12-20 15:00:05 -06:00
Chris Penner
0bb7e4553d
Get copy codebase logic compiling
2021-12-20 13:49:19 -06:00
Mitchell Rosen
337b1a633e
add getRootBranchExists
2021-12-17 14:00:47 -05:00
solomon
099d6438de
Merge branch 'trunk' into feature/improves-uri-parser-error-printing
2021-12-15 21:13:57 -08:00
solomon
754292f4e9
Updates parseUri error printer.
2021-12-15 20:50:05 -08:00
Chris Penner
78266b2848
Remove Backticks from Lexer entirely
2021-12-15 16:32:10 -06:00
Mitchell Rosen
401d279f14
⅄ trunk → 21-12-08-monomorphize-var
2021-12-15 14:40:57 -05:00
Mitchell Rosen
84520a8ef1
⅄ topic/rehash-codebase → topic/rehash-codebase-reexport-hash
2021-12-15 12:08:55 -05:00
