Commit graph

35413 commits

Author SHA1 Message Date
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
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
61b384d2b7
add --sameas option, not yet used 2019-10-01 12:36:25 -04:00
Joey Hess
7b5ce2b330
expand 2019-09-30 17:35:38 -04:00
Joey Hess
ccf9f03c84
Merge branch 'master' of ssh://git-annex.branchable.com 2019-09-30 17:33:08 -04:00
Joey Hess
7302f12bf6
todo 2019-09-30 17:32:41 -04:00
Joey Hess
3066bdb1fb
fix annex.largefiles largerthan/smallerthan bug
Fix bug in handling of annex.largefiles that use largerthan/smallerthan.
When adding a modified file, it incorrectly used the file size of the old
version of the file, not the current size.

That was the only largefiles limit that didn't directly look at the file on
disk already. Added a new type to keep straight the two different ways such
a limit can be matched. I kind of wanted to extend MatchingFile or FileInfo
to indicate that the matcher is supposed to operate on files from disk or
annex, but it turned out to be too complex to implement it that way.

This also changes the LimitAnnexFiles case when lookupFileKey does not find
a key. It used to fall back to statting the file, now it always returns
False. I doubt the old code could really get to that point, but if it
somehow does, it's better for preferred content matching to be consistent.
2019-09-30 17:15:08 -04:00
yarikoptic
47245d7f4b Added a comment 2019-09-30 20:36:00 +00:00
Joey Hess
3b8c94fcbd
fix an old bug, open new bug I noticed while confirming the old bug was fixed 2019-09-30 16:30:29 -04:00
Joey Hess
9df7718e15
close 2019-09-30 15:40:15 -04:00
Joey Hess
4200d2933b
comment 2019-09-30 15:31:55 -04:00
Joey Hess
34ab34d320
remove spam
and an additional probe comment made before the spam
2019-09-30 15:22:41 -04:00
Joey Hess
b90ddbc383
enable-tor: Use pkexec to run command as root when gksu and kdesu are not available.
gksu is no longer in debian, even stable

kdesu in debian is not installed in PATH any longer, though the executable
is still present under /usr/lib

pkexec is packagekit's replacement for those older commands.
2019-09-30 15:19:01 -04:00
Joey Hess
f2737a5fbe
enable-tor: Run kdesu with -c option. 2019-09-30 15:14:05 -04:00
Joey Hess
2b55a2b882
remotedaemon: Don't list --stop in help since it's not supported.
Also, move out of plumbing section. When using tor, the remotedaemon is
part of the user's workflow, as it runs the tor hidden service.
2019-09-30 14:40:46 -04:00
Joey Hess
5fbf30301a
response 2019-09-30 14:27:23 -04:00
Joey Hess
a9f078da43
Merge branch 'master' of ssh://git-annex.branchable.com 2019-09-30 14:21:23 -04:00
Joey Hess
e52fb641a0
comment 2019-09-30 14:19:35 -04:00
Joey Hess
430e33e3dd
comment 2019-09-30 13:53:50 -04:00
Joey Hess
9a22adf358
comment 2019-09-30 13:40:53 -04:00
Joey Hess
84e1b165f5
response 2019-09-30 13:36:11 -04:00
Joey Hess
ca0ca6012f
remove -n from example
That was only needed with git-annex before v7. The pre-commit hook no
longer scans for and re-locks typechanged files.
2019-09-30 13:34:26 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
8587102c2c add commit SHAs and remove irrelevant logs 2019-09-29 23:49:00 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
1c1a724f52 2019-09-29 23:35:29 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
04ec673d51 Fix typo and incorrect references to "git annex peer" 2019-09-29 23:34:25 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
3f609a7742 Added a comment: Commits could be rate-limited too 2019-09-29 23:03:47 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
2e1d2bc6d5 Added a comment: .gitattributes could solve this 2019-09-29 22:59:48 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
774b0ce342 2019-09-29 22:24:47 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
b45deddbcd Added a comment: Follow-up thought 2019-09-29 22:08:29 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
1f28ddf470 Added a comment: Can conversion to/from annexed be made easier? 2019-09-29 22:04:32 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
32c6ea563e fix walktrough typo 2019-09-29 21:46:46 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
142f99c64c 2019-09-29 21:01:01 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
4db7370c4b Added a comment: Issue on openSUSE with Tor's requirement for Python 2.7 2019-09-29 16:41:15 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
7192063f84 Improve installation instructions for Magic Wormhole, and mention Python 2 and executable name dependencies 2019-09-29 16:20:21 +00:00
Joey Hess
56669728d7
response 2019-09-28 12:51:58 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
27b003eff9 Added a comment: Isn't this done? 2019-09-28 12:39:52 +00:00
smithclarkson001@2d22c4a26d6e52831b460b949377a8c9d6139a94
2b63825d7f Added a comment 2019-09-28 10:47:13 +00:00
yarikoptic
6dc5a0574e Added a comment: should there be FSCK and/or CLEAN? 2019-09-28 00:31:51 +00:00
yarikoptic
e51697fe06 initial idea on separating our hint about remotes 2019-09-27 20:37:40 +00:00
Joey Hess
090898a138
adjust --lock: This enters an adjusted branch where files are locked.
Straightforward, except for the issue of how to reverse LockAdjustment.

With --unlock, a commit that modifies/adds unlocked files gets reverse
adjusted to use locked files. That's fairly reasonable, I think.

But reversing --lock by unlocking all modified files feels wrong. Maybe
that's just because repositories typically seem to still have mostly
locked files in them (unless one is in an adjusted unlocked branch of
course!)

It may be that eventually how to reverse both will need to be configurable,
I don't know.
2019-09-27 14:23:25 -04:00
Joey Hess
9f27d03945
fix a typo that didn't matter so far 2019-09-27 14:08:16 -04:00
Joey Hess
2853df5da2
response 2019-09-27 12:59:10 -04:00
Joey Hess
6a218f7a96
comment 2019-09-27 12:55:16 -04:00
Joey Hess
add8632910
Merge branch 'master' of ssh://git-annex.branchable.com 2019-09-27 12:47:30 -04:00
Joey Hess
3d5c1a4912
slightly improve design 2019-09-27 12:46:14 -04:00