Commit graph

43058 commits

Author SHA1 Message Date
Joey Hess
551d5abeb5
close todo and open new one 2023-02-10 15:51:38 -04:00
Joey Hess
e9b6efac5a
fix buggy sync to exporttree remote when annex-tracking-branch is not checked out
sync: Fix a bug that caused files to be removed from an importtree=yes
exporttree=yes special remote when the remote's annex-tracking-branch was
not the currently checked out branch.

Sponsored-by: Max Thoursie on Patreon
2023-02-10 15:49:15 -04:00
Joey Hess
5c6e1f5178
bug report 2023-02-10 15:32:09 -04:00
Joey Hess
c2b3e870df
finishing up sync in view branch
sync: When run in a view branch, avoid updating synced/ branches, or trying
to merge anything from remotes.

Sponsored-by: Erik Bjäreholt on Patreon
2023-02-10 15:27:42 -04:00
Joey Hess
9e59ebea52
comment 2023-02-10 14:42:14 -04:00
Joey Hess
bb4550c7c1
sync: Warn when the adjusted basis ref cannot be found
As happens eg when the user has renamed branches.

Sponsored-by: Graham Spencer on Patreon
2023-02-10 14:33:21 -04:00
Joey Hess
fb93fbc564
comment 2023-02-10 14:16:23 -04:00
Joey Hess
b6466ffaca
comment 2023-02-10 14:06:34 -04:00
Joey Hess
7473dc6d3a
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-10 13:34:59 -04:00
Joey Hess
96d46db2d5
Support http urls that contain ":" that is not followed by a port number
The same as git does.

Sponsored-by: Dartmouth College's DANDI project
2023-02-10 13:34:47 -04:00
a@92214b2eae95307f511e06845d2cb5b5931b00a3
a497d73b93 2023-02-10 17:08:32 +00:00
jpds
8fa3264f3a 2023-02-10 15:10:17 +00:00
jpds
d696dc5bf5 2023-02-10 14:53:11 +00:00
yarikoptic
8847adacb2 initial report on http urls without port number 2023-02-10 14:16:53 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
e2c5820017 Added a comment 2023-02-09 14:22:19 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
98cd2e0c49 2023-02-09 10:23:12 +00:00
jpds
95c1e0e805 Added a comment 2023-02-09 09:51:21 +00:00
nobodyinperson
11b250352c Added a comment: long filenames in view 2023-02-08 22:11:30 +00:00
nobodyinperson
6e7e9813ee Added a comment: git annex sync when in view 2023-02-08 20:17:12 +00:00
Joey Hess
5f9bf51438
sync in view branch updates the view branch
* sync: When run in a view branch, refresh the view branch to reflect any
    changes that have been made to the parent branch or metadata.

This is basically working, but probably needs some more work to deal with
all the edge cases of things sync does.

Sponsored-by: Lawrence Brogan on Patreon
2023-02-08 15:37:28 -04:00
Joey Hess
a11d6e0baf
avoid sync pushing view branches to remotes, and better view branch names
* sync: Avoid pushing view branches to remotes.
* Changed the name of view branches to include the parent branch.
  Existing view branches checked out using an old name will still work.

It does not seem useful for sync to push view branches around, because
the information in a view branch can entirely be derived from other
information in git. And sync doesn't push adjusted branches around either.

The better view branch names make it more in line with adjusted branch
names, but were also needed to make fromViewBranch be able to return the
original branch name.

Kept the old view branch names still working. But, when those branches
exist in a repo, sync will still try to push them as before. Avoiding
that would need more complicated and/or expensive changes to sync.

Sponsored-By: Boyd Stephen Smith Jr. on Patreon
2023-02-08 13:57:48 -04:00
Joey Hess
b9d59cf721
document sync in adjusted branch behavior
This was documented in the git-annex-adjust man page, but not in
git-annex-sync
2023-02-08 12:48:31 -04:00
Joey Hess
dcaea65e39
comment 2023-02-08 12:41:54 -04:00
Joey Hess
21e8d201f3
link to related todo 2023-02-08 12:35:29 -04:00
Joey Hess
6f59d2e8eb
comment 2023-02-08 12:24:35 -04:00
Joey Hess
f3d9221131
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-08 12:22:42 -04:00
Joey Hess
ece8f393f8
fix spelling 2023-02-08 12:21:53 -04:00
Joey Hess
f19ee2c479
thought 2023-02-08 12:21:33 -04:00
anarcat
277ad51876 Added a comment 2023-02-08 15:38:03 +00:00
Joey Hess
9a8f6e8d67
todo 2023-02-08 09:40:07 -04:00
Joey Hess
ec5a64cb95
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-07 18:11:40 -04:00
Joey Hess
c209e0f643
add FIELD?=GLOB to git-annex view usage
And also to vadd usage.

Also added some other things to the usage that were omitted before to
save space.

Adding even FIELD?=GLOB made the git-annex --help list of commands grow
too wide for an 80 column display. So, removed the description of
parameters from that list of commands.

Sponsored-By: Brock Spratlen on Patreon
2023-02-07 18:09:10 -04:00
nobodyinperson
4f733c25ba Added a comment 2023-02-07 20:54:48 +00:00
Joey Hess
aa0350ff49
add directory to views for files that lack specified metadata
* view: New field?=glob and ?tag syntax that includes a directory "_"
  in the view for files that do not have the specified metadata set.
* Added annex.viewunsetdirectory git config to change the name of the
  "_" directory in a view.

When in a view using the new syntax, old git-annex will fail to parse the
view log. It errors with "Not in a view.", which is not ideal. But that
only affects view commands.

annex.viewunsetdirectory is included in the View for a couple of reasons.
One is to avoid needing to warn the user that it should not be changed when
in a view, since that would confuse git-annex. Another reason is that it
helped with plumbing the value through to some pure functions.

annex.viewunsetdirectory is actually mangled the same as any other view
directory. So if it's configured to something like "N/A", there won't be
multiple levels of directories, which would also confuse git-annex.

Sponsored-By: Jack Hill on Patreon
2023-02-07 16:28:46 -04:00
Joey Hess
fb30ad7846
comment 2023-02-07 13:31:45 -04:00
Joey Hess
5e7aa16d06
improve docs of view exclude values 2023-02-07 12:46:19 -04:00
Joey Hess
115f72766b
correct docs on view exclude values to not say globs work
globs have never worked in field!=
see commit c2e8c21ca6 when the feature was
added, which discussed why
2023-02-07 12:42:26 -04:00
Joey Hess
4b330203fc
comment 2023-02-07 12:35:01 -04:00
anarcat
a7ece3af99 2023-02-06 21:15:40 +00:00
Joey Hess
e5dd127069
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-06 16:31:06 -04:00
Joey Hess
143de24769
fix build warning 2023-02-06 16:30:50 -04:00
MatusGoljer1
43a66d9396 Added a comment 2023-02-06 19:30:02 +00:00
Joey Hess
04ec726d3b
S3 region=
S3: Support a region= configuration useful for some non-Amazon S3
implementations. This feature needs git-annex to be built with aws-0.24.

datacenter= sets both the AWS hostname and region in one setting, which is
easy when using AWS, but not useful for other hosts. So kept datacenter
as-is, but added this additional config.

Sponsored-By: Brett Eisenberg on Patreon
2023-02-06 14:08:45 -04:00
Joey Hess
5aacc8eb59
comment 2023-02-06 13:05:27 -04:00
Joey Hess
29f4ec248f
comment 2023-02-06 12:50:34 -04:00
mike@2d6d71f56ce2a992244350475251df87c26fe351
0bf650432d Added a comment 2023-02-05 22:41:28 +00:00
nobodyinperson
3965919100 2023-02-03 13:40:41 +00:00
nobodyinperson
6de19ba619 Added a comment: 👍 +1 for updating the view when committing 2023-02-03 13:25:22 +00:00
jpds
209dd1f6c9 Added a comment 2023-02-02 15:53:34 +00:00
jwodder
16fab4676b 2023-02-01 19:55:29 +00:00