Commit graph

32978 commits

Author SHA1 Message Date
Joey Hess
d662e45424
devblog 2018-10-18 15:36:06 -04:00
Joey Hess
24838547e2
adjust --hide-missing
* At long last there's a way to hide annexed files whose content
  is missing from the working tree: git-annex adjust --hide-missing
* When already in an adjusted branch, running git-annex adjust
  again will update the branch as needed. This is mostly
  useful with --hide-missing to hide/unhide files after their content
  has been dropped or received.

Still needs integration with sync and the assistant, and not as fast as it
could be, but already usable.

This commit was sponsored by Ethan Aubin.
2018-10-18 15:32:42 -04:00
Joey Hess
a6c8de84b6
improve types to allow combining some adjustments
Combinations like --hide-misssing --unlocked seem very useful. On the
other hand, combining --fix with --unlock doesn't make sense because a
file can be either unlocked or a symlink that can be fixed, but not
both.

Changed the serialization of HideMissingAdjustment in passing, but it
has not actually been used yet so nothing will be broken.

This commit was sponsored by Trenton Cronholm on Patreon.
2018-10-18 12:59:05 -04:00
Joey Hess
7625cc58ae
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-17 16:32:21 -04:00
Joey Hess
c797655712
devblog 2018-10-17 16:31:28 -04:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
8c22c81b48 2018-10-17 18:50:34 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
a2326c3b1f removed 2018-10-17 18:47:00 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
3b064e386f Added a comment: comment 2 2018-10-17 18:46:17 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
bfa24ea1f3 Added a comment 2018-10-17 18:45:59 +00:00
Joey Hess
fc7fe2b19d
more thoughts 2018-10-17 13:26:54 -04:00
Joey Hess
558520d27a
fix rekey/migrate bookkeeping in v6
After 220317df5a the test suite still
detected a problem; migrate of an unlocked file replaced it with a
pointer file rather than a file with the content.

This was a bookeeping problem; the worktree file was being copied to the object
file and the inode cache updated, but if that database write didn't get
flushed in time, later checks would think the content was not present.
Fixed by copying the object file to the worktree file instead, which
avoids needing to update the inode cache.

Also, only copy when there's a hard link to break, not always.

This commit was sponsored by Brock Spratlen on Patreon.
2018-10-16 17:18:21 -04:00
Joey Hess
220317df5a
v6: fix migrate of unlocked file
After commit b2bafdb2fc the test suite
threw up a failure migrating unlocked files.

I'm not clear how that commit broke it (presumably by inAnnex reporting
the right information now), but the actual problem is plain:
The inodecache for the worktree file is generated, but then the file is
replaced with a copy (unncessarily unless annex.link is set, but the
code always does so) and so linkToAnnex/linkAnnex then fails because it
notices the inode cache is not valid.

This commit was sponsored by Jake Vosloo on Patreon.
2018-10-16 16:45:08 -04:00
Joey Hess
bdf6783b92
improve error message 2018-10-16 15:52:40 -04:00
Joey Hess
b2bafdb2fc
v6: Fix database inconsistency
That could cause git-annex to get confused about whether a locked file's
content was present, when the object file got touched.

Unfortunately this means more work sometimes when annex.thin is set,
since it has to checksum the file to tell if it's still got the right
content.

Had to suppress output when inAnnex calls isUnmodified, otherwise
"(checksum...)" would be printed in places it ought not to be,
eg "git annex get" could turn out not need to get anything, and
so only display that.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-10-16 13:51:37 -04:00
Joey Hess
6498643caf
bug report 2018-10-16 11:41:12 -04:00
Joey Hess
588db2058f
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-16 11:29:44 -04:00
Joey Hess
3cc273990c
rename to avoid render as html 2018-10-16 11:23:31 -04:00
Joey Hess
11369257de
push back on random conversation in release announcements 2018-10-16 11:17:24 -04:00
Chris
832365809e Added a comment 2018-10-16 15:15:17 +00:00
CandyAngel
0c32f29e21 Added a comment 2018-10-16 15:05:19 +00:00
Joey Hess
8211f6bb87
remove addition
I understand and sympathize with why this was added here, but the fact
is that this kind of warning is clutter that is going to make it harder
to understand this man page overall; this is not the place to document
internal implementation details of the format of URL keys and more than
it would be the place to document how WORM keys mangle and truncate
filenames, or how the extension of a SHAnE key is chosen. I see that
it did get documented better in backends.mdwn, which is a good place
to document it.

The chance that someone is going to have the same misunderstanding and
happen to see this warning does not justify confusing everyone else
with a warning that is really out of place in this documentation.
2018-10-16 11:00:22 -04:00
Joey Hess
6dd31233e8
response 2018-10-16 10:58:39 -04:00
Joey Hess
40dba8e933
prevent find running in bare repo 2018-10-16 10:44:09 -04:00
hoxu
62afca598d Added a comment: wget link broken 2018-10-16 14:23:29 +00:00
CandyAngel
b12b3aa0fe Added a comment 2018-10-16 12:57:55 +00:00
Chris
51dc5fda3f Added a comment 2018-10-16 11:07:30 +00:00
disteph@02005197c6b0e3d92255823d62c08dbe6d7a4d52
6a44da82e8 Added a comment: --all ? 2018-10-15 23:57:27 +00:00
CandyAngel
6b3b072c2a Added a comment 2018-10-15 22:23:06 +00:00
Chris
1c29288356 Added a comment 2018-10-15 21:43:03 +00:00
CandyAngel
f25f24c9dd removed 2018-10-15 13:00:22 +00:00
CandyAngel
b66cb8e120 Added a comment 2018-10-15 12:59:49 +00:00
CandyAngel
cd96275582 Added a comment 2018-10-15 12:59:24 +00:00
Chris
db1beff96d Added a comment 2018-10-15 09:07:44 +00:00
CandyAngel
9643ca148b Added a comment 2018-10-15 07:33:40 +00:00
Chris
294d096f56 Initial question. 2018-10-14 19:38:31 +00:00
Joey Hess
a73bc7a675
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-14 01:31:05 -04:00
Joey Hess
3181533fbc
idea 2018-10-14 01:30:36 -04:00
slackermesut@265fdbc657a03028da3a213cbb9f74a9d621c8ab
f376fd4f8c Added a comment 2018-10-13 20:47:44 +00:00
Joey Hess
9f4587cc9a
update 2018-10-13 15:33:46 -04:00
Joey Hess
5be45cd521
devbog 2018-10-13 15:30:38 -04:00
Joey Hess
42842ea0ea
runshell: Use system locales when built with GIT_ANNEX_PACKAGE_INSTALL set
This is to work around https://github.com/datalad/datalad/issues/2769
which I don't know how to reproduce outside that environment, nor do I
understand the root cause of. For some time, Neurodebian has been working
around it by building its standalone debs with a patch that disables use
of the locales bundled with the standalone build, letting the system
locales be used.

Using the system locales is asking for trouble if there's
significant version skew between the system and bundled glibc, and
possibly also if the architeciture is different, or whatever. That's why
git-annex bundles and uses its own locales, because numerous users
reported real problems with using the system locales.

... However, in the specific case of the Neurodebian standalone debs,
the deb is built on a system very like the one it's targeted to be
installed on. Or well, so they assure me, although doc/install/Ubuntu.mdwn
also promotes those for use across all versions of Ubuntu, and the deb
is built avoiding xz so it will work with old versions of dpkg, so I wonder
how true it is. It does seem that, at least currently, there is no bad
version skew in the locales of the systems the deb is used on, since
it's already been using the system locales for some time.

Anyway, since the Neurodebian build already is setting
GIT_ANNEX_PACKAGE_INSTALL=1 in runshell, I made runshell use system
locales when that's set. This is a small scope creep for
GIT_ANNEX_PACKAGE_INSTALL, but it's not documented and AFAIK only used
for the Neurodebian build, so that seems ok. This will let them stop
carrying their patch for this forward.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-10-13 15:04:10 -04:00
Joey Hess
eff1750e9e
move more 2018-10-13 12:55:47 -04:00
Joey Hess
1c9d86330e
move old comments 2018-10-13 12:54:50 -04:00
Joey Hess
dbb5e31988
fix header 2018-10-13 12:53:26 -04:00
Joey Hess
1566ad7c02
link to Termux:Boot info 2018-10-13 12:52:41 -04:00
Joey Hess
f74c2cf81f
improve link 2018-10-13 12:51:14 -04:00
Joey Hess
b62a43a800
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-13 12:19:09 -04:00
Joey Hess
cbdb6671d6
remove old android app autobuild 2018-10-13 12:13:13 -04:00
Joey Hess
b72f1e1b48
update android docs for termux
This commit was sponsored by John Pellman on Patreon.
2018-10-13 12:11:47 -04:00
Joey Hess
d14983ee68
webapp: fix termux detection
The bundled uname -o says Linux in termux; have runshell on Android
delete it so the termux one is used instead.

This fixes the webapp so it will enter Android mode.

This commit was sponsored by mo on Patreon.
2018-10-13 12:08:27 -04:00