Commit graph

44158 commits

Author SHA1 Message Date
Joey Hess
d5d570a96c
avoid replacing otherwise
While authorJoeyHess is True same as otherwise, ghc's exhastiveness
checker turns out to special case otherwise. So this avoids warnings.
2023-11-20 20:25:51 -04:00
Joey Hess
00933f69df
fix build 2023-11-20 20:08:35 -04:00
Joey Hess
70f7982ef8
Merge branch 'master' of ssh://git-annex.branchable.com 2023-11-20 12:29:44 -04:00
Joey Hess
cda3e85164
make my authorship explicit in the code
This is intended to guard against LLM code theft, which is the current
bubble technology de jour.

Note that authorJoeyHess' with a year older than the year I began
developing git-annex will behave badly, by intention. Eg, it will spin
and eventually crash.

This is not the first anti-LLM protection in git-annex. For example see
9562da790f. That method, while much harder
for an adversary to detect and remove, also complicates code somewhat
significantly, and needs extensions to be enabled. There are also
probably significantly fewer ways to implement that method in Haskell.
This new approach, by contrast, will be easy to add throughout the code
base, with very little effort, and without complicating reading or
maintaining it any more than noticing that yes, I am the author of this
code.

An adversary could of course remove all calls to these functions
before feeding code into their LLM-based laundry facility. I think this
would need to be done manually, or with the help of some fairly advanced
Haskell parsing though. In some cases, authorJoeyHess needs to be
removed, while in other places it needs to be replaced with a value.
Also a monadic use of authorJoeyHess' may involve other added monadic
machinery which would need to be eliminated to keep the code compiling.

Alternatively, an adversary could replace my name with something
innocuous. This would be clear intent to remove author attribution
from my code, even more than running it through an LLM laundry is.

If you work for a large company that is laundering my code through an
LLM, please do us a favor and use your immense privilege to quit and go
do something socially beneficial. I will not explain further
developments of this code in such detail, and you have better things to
do than playing cat and mouse with me as I explore directions such as
extending this approach to the type level.

Sponsored-by: k0ld on Patreon
2023-11-20 12:29:12 -04:00
NewUser
fc10ac3be2 Added a comment 2023-11-20 13:17:03 +00:00
nobodyinperson
3de99793d3 Added a comment: forgot to add the new ignored link + shortcoming of 'ln' command 2023-11-20 10:25:52 +00:00
NewUser
3a4883cabb Added a comment: Is annex.tune.objecthashlower=true recommended for interop with windows? 2023-11-20 04:24:35 +00:00
NewUser
544767a5a4 Added a comment: git annex uninit fails when I symlink your symlink 2023-11-20 04:22:02 +00:00
NewUser
f8f1670005 2023-11-20 02:09:42 +00:00
NewUser
289266618a Added a comment: Thanks Yann! 2023-11-19 18:20:03 +00:00
nobodyinperson
37e5866cd1 Added a comment 2023-11-19 16:27:35 +00:00
nobodyinperson
f4bde53022 Make it more clear that git annex webapp will add files and sync via the assistant. 2023-11-19 16:26:44 +00:00
nobodyinperson
3cd54476b5 Added a comment 2023-11-19 16:16:15 +00:00
NewUser
d5664ac5e2 Added a comment: launching git annex webapp starts adding to the annex which is surprising 2023-11-18 20:08:18 +00:00
NewUser
c727550f68 Added a comment: launching git annex webapp starts adding to the annex which is surprising 2023-11-18 20:03:06 +00:00
yarikoptic
dbf1f5d6d6 Added a comment 2023-11-18 01:35:35 +00:00
Joey Hess
6e3bcbf4dd
Make git-annex copy --from --to --fast actually fast
Eg when the destination is logged as containing a file, skip
actively checking that it does contain it.

Note that --fast does not prevent other verifications of content
location that are done in a copy --from --to. Perhaps it could, but this
change will already avoid the real unnecessary work of operating on
files that are already in the remote.

And avoiding other verifications
might cause it to fail if the location log thinks that --to does not
contain the content but does. Such complications with `git-annex copy
--to remote --fast` led to commit d006586cd0
which added a note that gets displayed when that fails, mentioning it
might be due to --fast being enabled.

copy --from --to is already complicated enough without needing to worry
about such edge cases, so continuing to doing some verification of
content location after the initial --fast filtering seems ok.

Sponsored-by: Dartmouth College's DANDI project
2023-11-17 17:37:58 -04:00
Joey Hess
96c0e720c5
small refactoring
Sponsored-by: Dartmouth College's DANDI project
2023-11-17 17:23:24 -04:00
Joey Hess
9f6609d2b1
fixed 2023-11-17 16:46:43 -04:00
Joey Hess
7a8393ce7d
Fix bug in git-annex copy --from --to
Caused it to skip files that were locally present.

Sponsored-by: Dartmouth College's DANDI project
2023-11-17 16:30:20 -04:00
Joey Hess
f2f6dbe46b
comment 2023-11-17 16:17:44 -04:00
nobodyinperson
c2620ac4ca 2023-11-17 11:47:53 +00:00
imlew
0120334a51 Added a comment: thank you 2023-11-17 11:43:39 +00:00
nobodyinperson
929db5c5cf Added a comment 2023-11-17 09:49:02 +00:00
imlew
55a7fce119 Added a comment 2023-11-17 09:41:19 +00:00
nobodyinperson
adfe5a4a4c Added a comment 2023-11-17 08:45:56 +00:00
imlew
144500f19d Added a comment: one more question 2023-11-17 08:23:32 +00:00
imlew
2dedf68e53 Added a comment: not about backends after all 2023-11-17 08:09:23 +00:00
yarikoptic
27e705ea72 remove content of now independent issue https://git-annex.branchable.com/bugs/copy_--from_--to_does_not_copy_if_present_locally/ 2023-11-17 02:23:17 +00:00
yarikoptic
0bde6e8cf4 initial dedicated issue on copy --from --to not copying if present locally 2023-11-17 02:07:35 +00:00
yarikoptic
7205876d23 initial report on --fast of being no effect for copy --from --to 2023-11-16 17:54:49 +00:00
nobodyinperson
0018e5769e Added a comment 2023-11-16 16:34:13 +00:00
nobodyinperson
0a43bcb71b Added a comment 2023-11-16 15:55:49 +00:00
nobodyinperson
9b78834f88 Added a comment 2023-11-16 15:54:08 +00:00
imlew
5454ebe53b Added a comment: I guess this question is about backends 2023-11-16 12:51:59 +00:00
Ilya_Shlyakhter
a15446b458 added bug report for git init on a worktree checked out for a submodule. 2023-11-15 18:45:52 +00:00
imlew
15dc5fae10 2023-11-15 16:36:13 +00:00
beryllium@5bc3c32eb8156390f96e363e4ba38976567425ec
aeb4976d07 Added a comment 2023-11-14 22:43:22 +00:00
jcjgraf
d22e8c465e Added a comment 2023-11-14 21:25:24 +00:00
Joey Hess
bca22426d8
Merge branch 'master' of ssh://git-annex.branchable.com 2023-11-14 15:02:06 -04:00
Joey Hess
7d67229884
git-annex log --gnuplot
The gnuplot output is pretty good, but could still be improved with:

* more colors (repeating colors is confusing with a lot of repos)
* better positioning of the legend, making the plot wider and moving it
  from over top of the graph

Sponsored-by: Kevin Mueller on Patreon
2023-11-14 14:56:58 -04:00
Joey Hess
0fdc1a54db
git-annex log --received modifier option
Only counting received and not dropped makes this show the bandwidth of
data coming into the repository, although only in a sense. Since
git-annex branch updates only happen at the end of a command, and we
don't know when a command started, it's only an approximation of the
actual bandwidth. (A previous git-annex branch update made have
happened in a different repository.)

It would be possible to also add a --dropped option, but I don't know
how useful that would be?

Sponsored-by: Nicholas Golder-Manning on Patreon
2023-11-14 14:04:46 -04:00
Joey Hess
21e66ce209
rename --when to --interval
More accurately describes its behavior.
2023-11-14 11:45:16 -04:00
grond66@79ca29ba964cd0d8e2f352871d54452e4a9dad88
a79d819b5b 2023-11-14 04:32:15 +00:00
Joey Hess
1ddec09f7c
close 2023-11-13 17:45:37 -04:00
Joey Hess
cde081a025
guard against wrong timestamps in git log
For example, my sound repo has in the git-annex branch a commit from
2036, which is followed by one from 2034, in amoung commits from 2013.
Clearly there was a problem with the clock.

Since git log --date-order has a behavior of
"Show no parents before all of its children are shown", the data still
gets processed ok. The future timestamp just prevented displaying data
after that commit. It seems better, when the clock was wrong, to display
a wrong date, and then return to right dates.

It would be nice to filter out the wrong dates from display entirely,
but that seems it would need to buffer the whole output. This command is
too slow to buffer it all before displaying anything, and anyway this
kind of problem is probably rare.

Sponsored-by: Joshua Antonishen on Patreon
2023-11-13 15:06:04 -04:00
Joey Hess
2ab11fe06e
treat dead repos as 0 size
With this, git annex log --totalsizes can be compared with
git-annex info's "combined annex size of all repositories"
to double-check it works correctly.

In my sound repo, the two match.

In my big repo, the two report slightly different sizes,
with the former being 1.3 gb smaller than the latter.
I don't know the reason for this disreprency. Given the 30+tb size of
the repo, it's a small difference.

It seems possible that a bug in an old version of git-annex could
explain it. Eg, if an old git-annex lost a line when updating trust.log
or a location log in a merge, git-annex info would see only what it
replaced it with, while git-annex log will see the previous value as
well.

Sponsored-by: Leon Schuermann on Patreon
2023-11-13 15:05:48 -04:00
Joey Hess
38b9ebc5fd
newtype MapLog
Noticed that Semigroup instance of Map is not suitable to use
for MapLog. For example, it behaved like this:

ghci>  parseTrustLog "foo 1 timestamp=10\nfoo 2 timestamp=11" <> parseTrustLog "foo X timestamp=12"
fromList [(UUID "foo",LogEntry {changed = VectorClock 11s, value = SemiTrusted})]

Which was wrong, it lost the newer DeadTrusted value.

Luckily, nothing used that Semigroup when operating on a MapLog. And this
provides a safe instance.

Sponsored-by: Graham Spencer on Patreon
2023-11-13 14:37:22 -04:00
Joey Hess
5d8b8a8ad0
git-annex log --totalsizes
Note that dead repositories are not yet handled so their sizes show as
nonzero after they are marked dead.

Sponsored-By: unqueued on Patreon
2023-11-13 13:15:36 -04:00
Joey Hess
d826dde59a
update 2023-11-13 13:09:39 -04:00