Commit graph

33181 commits

Author SHA1 Message Date
Joey Hess
94aa0e2f64
fix strange test failure
It was trying to git annex adjust when in a direct mode repo, and that
of course fails. What I don't understand though, is how the test suite
managed to work before, when it was clearly checking the wrong thing.
Since the right way to fix it was obvious, I have not bisected.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-10-22 16:51:09 -04:00
Joey Hess
63cf3381f0
fix incomplete renaming of function 2018-10-22 16:44:18 -04:00
Joey Hess
6ee660f33d
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-22 16:30:18 -04:00
Joey Hess
e72c11164b
devblog 2018-10-22 16:26:45 -04:00
Joey Hess
6bd67d4d46
cherry-pick too 2018-10-22 16:24:14 -04:00
yarikoptic
0e7c2655d9 Added a comment 2018-10-22 20:07:38 +00:00
Joey Hess
ede54b93ea
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-22 15:56:01 -04:00
Joey Hess
08b7ac6643
followup 2018-10-22 15:55:51 -04:00
Joey Hess
7b33e6c9f3
simplify 2018-10-22 15:54:12 -04:00
Joey Hess
9fdd91816d
followup 2018-10-22 15:53:13 -04:00
Joey Hess
fcca7adaff
instrument P2P --debug with connection and thread info
For debugging http://git-annex.branchable.com/bugs/annex_get_-J_16_via_ssh_stalls_/

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-10-22 15:52:11 -04:00
Ilya_Shlyakhter
06007d795d Added a comment 2018-10-22 19:22:30 +00:00
yarikoptic
1cfd2c2b96 initial report on FTBS 2018-10-22 18:20:14 +00:00
yarikoptic
8a9d505409 Added a comment: stalling - also with =false 2018-10-22 17:34:28 +00:00
Joey Hess
ba0bbced51
source git-annex-install so it it can add git-annex to PATH
This commit was sponsored by Jack Hill on Patreon.
2018-10-22 13:22:10 -04:00
Joey Hess
ff9ba1f4d3
improve response 2018-10-22 13:10:17 -04:00
Joey Hess
41d6966747
followup 2018-10-22 13:07:40 -04:00
Joey Hess
d6b2468b4c
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-22 13:01:06 -04:00
Joey Hess
4ba9c6608e
add for later 2018-10-22 13:00:42 -04:00
Joey Hess
c24e255de1
Fix concurrency bug that occurred on the first download from an exporttree remote
Block other threads while the export database is being constructed (or
updated) by the first thread to try to access it.

This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
2018-10-22 12:59:10 -04:00
Joey Hess
fc26fd059b
ugh 2018-10-22 12:39:36 -04:00
Joey Hess
3286e68063
analysis 2018-10-22 12:39:31 -04:00
Joey Hess
5012f07630
followup 2018-10-22 12:34:26 -04:00
Ilya_Shlyakhter
4527b475ce added notes on supporting external 2018-10-22 15:45:04 +00:00
Joey Hess
8a7fb2e2d8
plans 2018-10-22 06:16:01 -04:00
anarcat
7a3650fac7 a possible new and faster hash backend 2018-10-22 01:56:22 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
1728d59a2b 2018-10-21 23:06:33 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
8d9680c662 2018-10-21 22:52:54 +00:00
Joey Hess
d0b0589146
link to tip 2018-10-20 14:25:03 -04:00
Joey Hess
a85193f600
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-20 14:23:17 -04:00
Joey Hess
4a6ebb1034
make sync update adjusted branch to hide/unhide
This completes initial support for --hide-missing, although the
assistant still needs to be updated and it perhaps needs to be sped up,
and maybe there needs to be a way for git-annex get to operate on
missing files. Opened some more todos for those things.

This commit was sponsored by Henrik Riomar.
2018-10-20 14:22:28 -04:00
Joey Hess
5a39b5a012
new tip
(Still need to make git annex sync --content update the adjusted branch
to expose files it downloaded, which this relies on.)

This commit was sponsored by Ewen McNeill on Patreon.
2018-10-20 13:55:15 -04:00
Joey Hess
1191d3d22d
document --force 2018-10-20 11:53:35 -04:00
Chris
d27b8f0b89 Added a comment 2018-10-20 08:09:41 +00:00
Joey Hess
3180fa6fd6
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-19 17:57:30 -04:00
Joey Hess
d3e3fcb8fc
devblog 2018-10-19 17:56:53 -04:00
Joey Hess
4a788fbb3b
sync --content now supports --hide-missing adjusted branches
This relies on git ls-files --with-tree, which I'm using in a way that
its man page does not document. Hm. I emailed the git list to try to get
the docs improved, but at least the git test suite does test the same
kind of use case I'm using here.

Performance impact when not in an adjusted branch is limited to some
additional MVar accesses, and a single git call to determine the name of
the current branch. So very minimal.

When in an adjusted branch, the performance impact is
in Annex.WorkTree.lookupFile, which starts doing an equal amount of work
for files that didn't exist as it already did for files that were
unlocked.

This commit was sponsored by Jochen Bartl on Patreon.
2018-10-19 17:51:25 -04:00
Joey Hess
8be5a7269a
refactor getCurrentBranch
Both Command.Sync and Annex.Ingest had their own versions of this.

The one in Annex.Ingest used Git.Branch.currentUnsafe, but does not seem
to need it. That is only checking to see if it's in an adjusted unlocked
branch, and when in an adjusted branch, the branch does in fact exist,
so the added check that Git.Branch.current does is fine.

This commit was sponsored by Denis Dzyubenko on Patreon.
2018-10-19 17:29:18 -04:00
Ilya_Shlyakhter
c742cc41d1 quoted markdown asterisks 2018-10-19 20:41:52 +00:00
Ilya_Shlyakhter
01f7721d56 added suggestion to preserve file extensions in WORM and URL keys 2018-10-19 20:28:12 +00:00
Ilya_Shlyakhter
43a8c564a0 Added a comment 2018-10-19 17:54:49 +00:00
Ilya_Shlyakhter
97aaf38a3c Added a comment 2018-10-19 15:52:22 +00:00
andrey_utkin@49e37627b3060c40292113d73d7ffbf317233e62
c94e62cab5 Added a comment 2018-10-18 23:34:27 +00:00
andrey_utkin@49e37627b3060c40292113d73d7ffbf317233e62
82040ae2aa Added a comment 2018-10-18 20:18:01 +00:00
Joey Hess
5ddfd4f524
response 2018-10-18 15:52:48 -04:00
Joey Hess
bd72dfeaa1
Merge branch 'master' of ssh://git-annex.branchable.com 2018-10-18 15:36:48 -04:00
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
g@aaed65f19d6c3a2a18c33da828e66c7bb915e65a
435108a688 Added a comment: workaround: setting LC_ALL=C 2018-10-18 08:55:19 +00:00