Commit graph

35691 commits

Author SHA1 Message Date
Joey Hess
1b9c1d1737
fix sameas inherited key removal 2019-10-11 13:18:27 -04:00
Joey Hess
8d7dc76dff
fix bad paste of field name 2019-10-11 13:05:25 -04:00
Joey Hess
91eed85fd4
add sameas inherited configs to newConfig
This makes initremote --sameas work with encryption inherited.
2019-10-11 13:05:20 -04:00
Ilya_Shlyakhter
8432c3912f Added a comment: preventing inadvertently adding annexed files in unlocked form 2019-10-11 16:38:07 +00:00
Joey Hess
2bd6e81bb0
support annex-config-uuid when generating remote
This is used by a special remote with sameas-uuid=
The remote's uuid is the sameas-uuid, but it needs to get
its RemoteConfig from the annex-config-uuid.
2019-10-11 12:34:11 -04:00
Ilya_Shlyakhter
599d438fa6 Added a comment 2019-10-11 16:23:08 +00:00
Joey Hess
cb08cb0052
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-10 16:18:46 -04:00
Joey Hess
2d5cce6763
devblog 2019-10-10 16:17:45 -04:00
Joey Hess
0dd5691951
update notes 2019-10-10 16:12:59 -04:00
Joey Hess
df5b0ffab3
inherit other fields
I think this is all that need to be inherited.
2019-10-10 16:11:21 -04:00
Joey Hess
c3975ff3b4
sameas RemoteConfig inheritance
I found a way to avoid inheritance complicating anything outside of
Logs.Remote. It seems fine to require all inherited values to be
inherited and not set in the sameas remote's config. Since inherited
values will be used for stuff like encryption and perhaps chunking, which
control the actual content stored on the remote, it seems likely that
there will not be any reason to need them to vary between two remotes
that access the same underlying data store.

The newer version of containers is free; the minimum ghc version is
bundled with a newer version than that.
2019-10-10 15:58:22 -04:00
Joey Hess
59908586f4
rename RemoteConfigKey to RemoteConfigField
And some associated renames.
I was going to have some values named fooKeyKey otherwise..
2019-10-10 15:44:05 -04:00
Ilya_Shlyakhter
a08e5e2fa8 Added a comment: separate annex.git-add.largefiles and annex.git-annex-add.largefiles settings 2019-10-10 18:33:50 +00:00
Ilya_Shlyakhter
159ba92ea1 added todo for separate annex.largefiles.git-add and annex.largefiles.git-annex-add settings 2019-10-10 18:29:03 +00:00
Joey Hess
d1130ea04a
get rid of hardcoded "name" lookups
Support "sameas-name" being set instead.

In RenameRemote, rename which ever of the two is set.
2019-10-10 13:25:10 -04:00
Joey Hess
92ff30df70
set annex-config-uuid when RemoteConfig contains a sameas-uuid
Initremote sets that, so after both initremote and enableremote,
the git config will be set.

Any remote that does not use Annex.SpecialRemote won't set
annex-config-uuid. But that's only Remote.Git, which doesn't use
RemoteConfig anyway.
2019-10-10 12:58:59 -04:00
Joey Hess
46071a2435
use storeUUIDIn 2019-10-10 12:38:17 -04:00
Joey Hess
97b499a4dc
use sameas-name and sameas-uuid for sameas remotes
initremote --sameas=remotename sets sameas-name and sameas-uuid

Using sameas-name rather than name prevents old git-annex initremote
from enabling a sameas remote by name, since it would not handle it
correctly.
2019-10-10 12:32:05 -04:00
Joey Hess
17afefd63f
add remote.<name>.annex-config-uuid
for use by sameas remotes
2019-10-10 12:12:22 -04:00
Joey Hess
06c04ffe29
use storeUUIDIn 2019-10-10 12:12:09 -04:00
Joey Hess
d9938b97c6
thought 2019-10-10 12:06:37 -04:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
7e692864de Added a comment: wanted content commands 2019-10-10 08:16:59 +00:00
bugmenot
838465ac63 Added a comment: --link accepts itself 2019-10-10 05:28:53 +00:00
yarikoptic
d4323006d4 Added a comment 2019-10-09 18:10:05 +00:00
yarikoptic
5a68b00f72 initial description of an attempt to establish git-lfs powered github remote from assitant on android phone 2019-10-09 18:04:23 +00:00
yarikoptic
79325b3e66 initial report about missing url= for git-lfs remote 2019-10-09 17:44:14 +00:00
Joey Hess
212abec4b2
add news item for git-annex 7.20191009 2019-10-09 12:33:30 -04:00
Joey Hess
8131451c35
releasing package git-annex version 7.20191009 2019-10-09 12:33:09 -04:00
CandyAngel
fec362dce8 Added a comment 2019-10-09 07:53:44 +00:00
Ilya_Shlyakhter
df42fc998c Added a comment 2019-10-08 20:23:07 +00:00
Ilya_Shlyakhter
936c85e674 Added a comment: preventing git-annex-add of files open for writing 2019-10-08 20:14:41 +00:00
Joey Hess
22dd6b0dff
response 2019-10-08 15:41:16 -04:00
Joey Hess
e15907f138
response 2019-10-08 15:39:58 -04:00
Joey Hess
f4dd7d5191
work around windows having infected git's plumbing
Work around git cat-file --batch's odd stripping of carriage return from
the end of the line (some windows infection), avoiding crashing when the
repo contains a filename ending in a carriage return.
2019-10-08 15:27:05 -04:00
Joey Hess
9a87b3ad31
comment 2019-10-08 14:50:06 -04:00
Joey Hess
8966ba2cff
git-annex-standalone.rpm: Fix the git-annex-shell symlink 2019-10-08 14:43:28 -04:00
Joey Hess
30204cc493
comment 2019-10-08 14:36:21 -04:00
Joey Hess
53da7f1cf8
update uninit to handle all the v7 stuff
* uninit: Remove several git hooks that git-annex init sets up.
* uninit: Remove the smudge and clean filters that git-annex init sets up.
2019-10-08 14:34:00 -04:00
Joey Hess
3de6dffd36
comment 2019-10-08 14:32:42 -04:00
Joey Hess
3cc23df35b
improve conversion example 2019-10-08 14:17:04 -04:00
Joey Hess
bfd786b26a
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-08 14:01:26 -04:00
Joey Hess
1113caa53e
preserve unlocked file mtime when dropping
When dropping an unlocked file, preserve its mtime, which avoids git status
unncessarily running the clean filter on the file.

If the index file has close to the same mtime as a work tree file, git will
not trust the index to be up-to-date, and re-runs the clean filter
unncessarily. Preserving the mtime when depopulating a pointer file avoids
git status doing a little (or maybe a lot) of unncessary work.

There are other places that the mtime could be preserved, including other
places where pointer files are written perhaps, but also
populatePointerFile. But, I don't know of cases where those lead to git
status doing unncessary work, so I just fixed the one I'm aware of for now.
2019-10-08 14:01:12 -04:00
Ilya_Shlyakhter
911278ceb2 Added a comment: git-annex-add on a file that is being written by some process 2019-10-08 17:03:34 +00:00
Joey Hess
7c91eb35f7
comment 2019-10-08 12:19:05 -04:00
Joey Hess
1ba99c31ca
comment 2019-10-08 12:11:19 -04:00
Joey Hess
560c873f50
Merge branch 'master' of ssh://git-annex.branchable.com 2019-10-08 12:09:26 -04:00
Ilya_Shlyakhter
2e8abdae5a Added a comment: automatic retries if index is locked 2019-10-08 16:01:52 +00:00
Joey Hess
08bf984921
more thoughts 2019-10-08 11:39:12 -04:00
Ilya_Shlyakhter
d2369894f0 Added a comment: automaticallly sync content on git push/pull 2019-10-08 06:43:33 +00:00
Ilya_Shlyakhter
a728b78ca2 added todo for operating on files touched by commits in a range 2019-10-08 05:13:23 +00:00