Commit graph

39928 commits

Author SHA1 Message Date
Joey Hess
7d57866c3e
update for filter-branch 2021-05-17 15:03:47 -04:00
Joey Hess
c525d18cf7
filter-branch: New command, useful to produce a filtered version of the git-annex branch, eg when splitting a repository 2021-05-17 14:16:46 -04:00
Joey Hess
40f093775c
Merge branch 'filter-branch' 2021-05-17 14:16:13 -04:00
Joey Hess
24c7d9ba78
decided not to include export/import trees
They're only needed to cover a gc edge case, and it's better someone
gets caught by that edge case than that someone who does not know about
them ends up with a filtered git-annex branch that contains such a tree
when some of the files listed in it are ones they wanted to *remove*
from the repository.
2021-05-17 14:12:15 -04:00
Joey Hess
2420910ab8
include info for sameas repos
It's not currently possible to exclude a sameas repo using its
annex-config-uuid. (Remote.nameToUUID rejects them).
Since there's no real documented way to learn those, this seems ok, at
least for now. Also it avoids the problem of someone excluding the
parent but including the sameas, which would probably make the sameas
repo not usable when using the filtered branch.
2021-05-17 14:04:14 -04:00
Joey Hess
984034f335
filter-branch working aside from some edge cases
Added a note to man page about what happens to information that is
recorded in the private journal. Since it uses Branch.get, that
information will be copied when options allow. It seemed better to allow
it and document it than not allow it, since the options allow excluding
repositories and so can be used to exclude private repos if desired.
2021-05-17 13:24:58 -04:00
Joey Hess
8b6dad11a2
add createMessage
init: When annex.commitmessage is set, use that message for the commit
that creates the git-annex branch.

This will be used by filter-branch too, and it seems to make sense to let
annex.commitmessage affect it.
2021-05-17 13:07:47 -04:00
Joey Hess
1da9fe5bd8
implemented filter-branch for key info
Not tested yet but should work.

Noted a possible optimisation, which should probably be added, to
speed it up in cases where there is no uuid filtering being done.
It would need Annex.Branch to add a function like getRef that uses
catFileDetails, so the sha is also returned. The difficulty would be
making it support the precached file content; if it didn't it would
probably not be any faster and could even be slower. So probably the
precaching would need to be changed to also cache the sha.
2021-05-17 11:11:39 -04:00
https://esgf-node.llnl.gov/esgf-idp/openid/tom_clune
7d0b42e5cc Added a comment: update 2021-05-17 14:53:19 +00:00
Joey Hess
1d16654a22
convert formatLsTree to ByteString for speed 2021-05-17 10:46:24 -04:00
jrayguinn@616789b2aec6c923cd9897c86987f05581df3601
1e75348405 Added a comment: I Am. 2021-05-17 09:42:32 +00:00
jrayguinn@616789b2aec6c923cd9897c86987f05581df3601
03f91bd1c0 Added a comment: I Am. 2021-05-17 09:42:12 +00:00
Atemu
b4b6977cab Added a comment 2021-05-16 11:37:25 +00:00
Atemu
9b61cea255 2021-05-16 11:30:38 +00:00
Atemu
944b132103 2021-05-16 11:05:15 +00:00
Atemu
54db5df937 Added a comment 2021-05-16 10:27:47 +00:00
Joey Hess
309c1bc1f0
Merge branch 'master' into filter-branch 2021-05-14 14:17:31 -04:00
Joey Hess
80a9944f3b
don't implicitly include all when exclude options are used
This is less erorr-prone, and easier for the user to reason about; it
preserves the man page's promise that only explicitly included
information will be copied.
2021-05-14 14:14:46 -04:00
Joey Hess
a58c90ccf4
skeleton of filter-branch command, with option parser 2021-05-14 10:59:48 -04:00
Joey Hess
5004eed27d
branch 2021-05-13 16:18:35 -04:00
Joey Hess
a71c002ac1
git-annex-filter-branch man page 2021-05-13 16:17:45 -04:00
Joey Hess
715d3d728c
new name for command 2021-05-13 16:07:30 -04:00
Joey Hess
40ade7a515
add some functions listing log files
Not used yet, will be used by copy-branch to generate the list of files
to copy.
2021-05-13 14:57:38 -04:00
Joey Hess
4ff8a1ae2b
refactoring
filterBranch should be reusable for copy-branch command.

Changed LogVariety to differentiate between LocationLog and UrlLog;
only location logs contain uuids and need to be filtered by uuid,
while url logs do not. This does not change current behavior,
but it will let filterBranch be reused without filtering url logs
incorrectly.
2021-05-13 14:43:25 -04:00
Joey Hess
13a8706cda
almost have a plan 2021-05-13 14:09:06 -04:00
Joey Hess
10af498be1
add configLog to otherLogs
This oversight didn't cause any problems because the only place that
uses the information is dropDead, which handles Nothing the same as Just
OtherLog.
2021-05-13 12:48:56 -04:00
Joey Hess
03f46b95e6
comment 2021-05-13 12:05:24 -04:00
Joey Hess
d960d72b9d
Merge branch 'master' of ssh://git-annex.branchable.com 2021-05-13 11:51:31 -04:00
Atemu
d8ed6daeb3 Added a comment 2021-05-13 10:26:53 +00:00
Joey Hess
4de3351c5c
set cwd rarher than changing current process directory
This is not actually used in git-annex though.
2021-05-12 17:44:22 -04:00
Joey Hess
6eadcab5bf
Merge branch 'master' of ssh://git-annex.branchable.com 2021-05-12 15:09:35 -04:00
Joey Hess
947d2a10bc
assistant: Fix a crash on startup by avoiding using forkProcess
ghc 8.8.4 seems to have changed something that broke code that has been
successfully using forkProcess since 2012. Likely a change to GC internals.

Since forkProcess has never had clear documentation about how to
use it safely, avoid using it at all. Instead, when git-annex needs to
daemonize itself, re-run the git-annex command, in a new process group
and session.

This commit was sponsored by Luke Shumaker on Patreon.
2021-05-12 15:08:03 -04:00
Joey Hess
ba7598dbab
comment 2021-05-12 13:39:15 -04:00
https://esgf-node.llnl.gov/esgf-idp/openid/tom_clune
f64937d118 removed 2021-05-12 16:44:38 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/tom_clune
db317f148f Added a comment 2021-05-12 16:41:27 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/tom_clune
9df64128b3 Added a comment 2021-05-12 16:41:07 +00:00
Joey Hess
7500ba7ceb
already implemented 2021-05-12 12:24:55 -04:00
Joey Hess
a0225ff41c
comment 2021-05-12 12:22:17 -04:00
Joey Hess
ea325f41ea
comment 2021-05-12 11:38:35 -04:00
Joey Hess
7e2fda5307
comment 2021-05-12 11:37:36 -04:00
Joey Hess
afdc201d1c
comment 2021-05-12 11:24:55 -04:00
Joey Hess
7949cfe318
Merge branch 'master' of ssh://git-annex.branchable.com 2021-05-12 11:13:00 -04:00
Joey Hess
949627b902
remove inode cache in unannex
Similar to what commit 675556fd9a did for
adding a non-annexed file, this prevents the smudge clean filter
recognising the inode if git add is later run on the unannexed file.
2021-05-12 11:09:38 -04:00
Atemu
9e8e747654 Added a comment 2021-05-12 14:17:06 +00:00
Lukey
20af8b311a 2021-05-11 11:22:31 +00:00
Lukey
27b98f6f0d Added a comment 2021-05-11 10:28:12 +00:00
Lukey
add38774d1 Added a comment 2021-05-11 09:21:38 +00:00
Lukey
61a3a7e0c3 Added a comment 2021-05-11 08:50:36 +00:00
Lukey
810fe88d5a Added a comment 2021-05-11 08:41:42 +00:00
Lukey
06e167291d Added a comment 2021-05-11 07:37:08 +00:00