Commit graph

32647 commits

Author SHA1 Message Date
Joey Hess
398633c12b
fix build on windows 2023-03-03 12:58:39 -04:00
jkniiv
1ad48b1938 report on windows build failure (commit 54ad1b4cf) 2023-03-02 20:03:18 +00:00
Joey Hess
83a3786851
comment 2023-03-01 15:58:47 -04:00
Joey Hess
9417bdab14
comment 2023-03-01 13:04:18 -04:00
Joey Hess
bded62378a
close 2023-03-01 12:34:40 -04:00
Joey Hess
70d89456d2
close 2023-03-01 12:22:38 -04:00
Joey Hess
9c3c4c1712
deprecate git-annex status w/o runtime warning
As far as I can see, git-annex status was added to support direct mode, and
like other things added for that, it ought to be deprecated.

Behavior is similar to git status --short, though not identical in a few
cases eg renamed files.

I think datalad does not use this command, although it might have in the
past. Could not find any use of it in the current datalad code.

A deprecation warning at runtime would be the next step, probably will wait
and do that for all the deprecated commands together (except findref).
2023-02-28 16:34:31 -04:00
mih
3bf2d98e9c Added a comment: Update for git-annex 10.20230227-ga206cdddb4 2023-02-28 15:35:50 +00:00
Joey Hess
c569082cf2
devblog 2023-02-27 16:28:26 -04:00
Joey Hess
9fcaf27cba
done with adjusted view branches!
Well, perhaps it could be documented better, but it's a compositional
feature so users who need it will probably try it and be happy to find
that it works.
2023-02-27 15:55:31 -04:00
Joey Hess
bb54c8a633
support --hide-missing adjustment of view branches
I had thought this would not make sense to combine with view branches,
since removing files from a view changes metadata.

However, that's committing removal of files. With --hide-missing, the
files get removed when git-annex updates the branch itself, so there is
no conflict.

It does not seem likely to be very useful, but it does work! And that's
nice because it means all types of adjusted branches can be combined with
view branches.

Sponsored-by: Max Thoursie on Patreon
2023-02-27 15:39:58 -04:00
Joey Hess
1c4f4b449a
support --unlock-present adjustment of view branches
When generating the view, check if the key is present.

When syncing in a view branch with an adjustment, run adjustedBranchRefreshFull
the same as is done when syncing in other adjusted branches. This is
needed because the docs for git-annex adjust --unlock-present suggest
using git-annex sync to update the branch when annex.adjustedbranchrefresh
is not set.

Note that, with annex.adjustedbranchrefresh set, it just works! The
adjusted branch gets updated in the usual way and it doesn't matter that
there's a view branch underneath.

And of course, re-running git-annex adjut --unlock-present also works,
as suggested in the docs.

Sponsored-by: Erik Bjäreholt on Patreon
2023-02-27 15:37:57 -04:00
Joey Hess
df007925e6
add news item for git-annex 10.20230227 2023-02-27 12:24:03 -04:00
Joey Hess
69d7f935d6
comment 2023-02-27 12:03:09 -04:00
Joey Hess
a5a23f0e9a
comment 2023-02-27 11:57:07 -04:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
d24914f2af Added a comment: Re: Weird behavior of git archive in combination with largefiles configuration 2023-02-26 18:45:31 +00:00
nadir
8716bd2ded Added a comment 2023-02-24 18:56:40 +00:00
nobodyinperson
f9b4b318c2 Added a comment 2023-02-23 22:59:49 +00:00
Joey Hess
338f28f3a6
comment 2023-02-23 15:14:32 -04:00
Joey Hess
595f5b8b1a
comment 2023-02-23 14:46:44 -04:00
Atemu
cfb396becf Added a comment 2023-02-23 08:59:28 +00:00
nobodyinperson
a268dbf401 2023-02-22 21:57:19 +00:00
hurlebouc
5b6202c973 Added a comment 2023-02-21 06:49:27 +00:00
Joey Hess
d1a0f0c7d1
comment 2023-02-20 15:19:31 -04:00
Joey Hess
8f2829e646
Revert "stack.yaml: Update to lts-19.33 and aws-0.24"
This reverts commit 648e59cac2.

Failed to build on windows, because

       In the dependencies for haskeline-0.8.2:
           Win32-2.11.1.0 from Stack configuration does not match >=2.1 && <2.10 || >=2.12 (latest
                          matching version is 2.13.4.0)

jkniiv did find a solution that builds:

-- Win32-2.11.1.0
+- Win32-2.9.0.0
+- Cabal-3.6.3.0
+- directory-1.3.7.1
+- process-1.6.17.0
+- time-1.11.1.2

But that is a quite old version of Win32 and risks bugs from it, and bumping
Cabal and directory to newer than lts-19.33 has seems also likely to be risky.

So, I've given up. aws-0.24 won't be able to be in the stack build until
there's a stackage lts (or nightly) that has filepath (>=1.4.100.0),
which will not happen until sometime after the next ghc release.
2023-02-20 15:15:06 -04:00
Joey Hess
326f01f5a3
response 2023-02-20 15:00:59 -04:00
Joey Hess
75a2fb9441
comment and close 2023-02-20 14:46:47 -04:00
Joey Hess
ab1dd317c0
comment 2023-02-20 14:38:22 -04:00
Joey Hess
16d3097a08
fix reversion in info, and add test case
info: Fix reversion in last release involving handling of unsupported input
by continuing to handle any other inputs, before exiting nonzero at the
end.

Sponsored-by: Dartmouth College's Datalad project
2023-02-20 14:31:37 -04:00
jg123h12jh3y12g3y
4199c457e2 2023-02-20 13:09:45 +00:00
yarikoptic
349f8afecb Added a comment 2023-02-17 21:50:19 +00:00
yarikoptic
36c76040e2 duplicating report here to possibly expedite resolution 2023-02-17 18:15:48 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
804ea016d0 Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:46:34 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
ff601ddc45 removed 2023-02-17 09:45:14 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
5c4d53be19 Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:44:35 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
d31e605b02 removed 2023-02-17 09:43:51 +00:00
arnaud.legrand@e79f5d4cff79116f56388885021e8507bef18e12
4e83ff3bbd Added a comment: Weird behavior of git archive in combination with largefiles configuration 2023-02-17 09:43:20 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
e8297e9cb2 Added a comment 2023-02-17 01:42:58 +00:00
jkniiv
221aa59bfb report on resolver LTS 19 still (!) causing trouble with Win32 for stack builds 2023-02-16 21:44:30 +00:00
Joey Hess
da61d564f1
fix view reversion caused by optimisation
view: Fix a reversion in 10.20230214 that omitted a file from a view when
the file had no metadata set, but the view only used path fields.

Sponsored-by: Jack Hill on Patreon
2023-02-16 15:18:17 -04:00
Joey Hess
1c2e5b4519
close bug as dup and update todo item with implementation plan 2023-02-16 14:51:00 -04:00
jkniiv
5565f6b61b a todo on: explicit metadata needed for view inclusion or not 2023-02-15 19:07:25 +00:00
Joey Hess
cb2f071377
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-15 14:51:51 -04:00
Joey Hess
3048d2f3d7
close bug as submitter cannot reproduce it 2023-02-15 13:53:19 -04:00
jkniiv
33ac9eb02c report on sync not working properly with view branches on top of adjusted branches 2023-02-15 15:23:29 +00:00
Daniel Höxtermann
474ea248e0 Fix typo "intiremote" 2023-02-14 21:21:46 +01:00
anarcat
22fe15c8ce Added a comment 2023-02-14 19:03:24 +00:00
Joey Hess
672258c8f4
Revert "revert recent bug fix temporarily for release"
This reverts commit 16f1e24665.
2023-02-14 14:11:23 -04:00
Joey Hess
dd1a5f4961
add news item for git-annex 10.20230214 2023-02-14 14:09:25 -04:00
Joey Hess
16f1e24665
revert recent bug fix temporarily for release
Decided this bug is not severe enough to delay the release until
tomorrow, so this will be re-applied after the release.
2023-02-14 14:06:29 -04:00