e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
76 lines
2.1 KiB
Markdown
76 lines
2.1 KiB
Markdown
Today I built `git annex view`, and `git annex vadd` and a few related
|
|
commands. A quick demo:
|
|
|
|
<pre>
|
|
joey@darkstar:~/lib/talks>ls
|
|
Chaos_Communication_Congress/ FOSDEM/ Linux_Conference_Australia/
|
|
Debian/ LibrePlanet/ README.md
|
|
joey@darkstar:~/lib/talks>git annex view tag=*
|
|
view (searching...)
|
|
Switched to branch 'views/_'
|
|
ok
|
|
joey@darkstar:~/lib/talks#_>tree -d
|
|
.
|
|
|-- Debian
|
|
|-- android
|
|
|-- bigpicture
|
|
|-- debhelper
|
|
|-- git
|
|
|-- git-annex
|
|
`-- seen
|
|
|
|
7 directories
|
|
joey@darkstar:~/lib/talks#_>git annex vadd author=*
|
|
vadd
|
|
Switched to branch 'views/author=_;_'
|
|
ok
|
|
joey@darkstar:~/lib/talks#author=_;_>tree -d
|
|
.
|
|
|-- Benjamin Mako Hill
|
|
| `-- bigpicture
|
|
|-- Denis Carikli
|
|
| `-- android
|
|
|-- Joey Hess
|
|
| |-- Debian
|
|
| |-- bigpicture
|
|
| |-- debhelper
|
|
| |-- git
|
|
| `-- git-annex
|
|
|-- Richard Hartmann
|
|
| |-- git
|
|
| `-- git-annex
|
|
`-- Stefano Zacchiroli
|
|
`-- Debian
|
|
|
|
15 directories
|
|
joey@darkstar:~/lib/talks#author=_;_>git annex vpop
|
|
vpop 1
|
|
Switched to branch 'views/_'
|
|
ok
|
|
joey@darkstar:~/lib/talks#_>git annex vadd tag=git-annex
|
|
vadd
|
|
Switched to branch 'views/(git-annex)'
|
|
ok
|
|
joey@darkstar:~/lib/talks#(git-annex)>ls
|
|
1025_gitify_your_life_{Debian;2013;DebConf13;high}.ogv@
|
|
git_annex___manage_files_with_git__without_checking_their_contents_into_git_{FOSDEM;2012;lightningtalks}.webm@
|
|
mirror.linux.org.au_linux.conf.au_2013_mp4_gitannex_{Linux_Conference_Australia;2013}.mp4@
|
|
joey@darkstar:~/lib/talks#_>git annex vpop 2
|
|
vpop 2
|
|
Switched to branch 'master'
|
|
ok
|
|
</pre>
|
|
|
|
Not 100% happy with the speed -- the generation of the view branch is close
|
|
to optimal, and fast enough (unless the branch has very many matching
|
|
files). And `vadd` can be quite fast if the view has already limited the
|
|
total number of files to a smallish amount. But `view` has to look at every
|
|
file's metadata, and this can take a while in a large repository. Needs indexes.
|
|
|
|
It also needs integration with `git annex sync`, so the view branches
|
|
update when files are added to the master branch, and moving files around
|
|
inside a view and committing them does not yet update their metadata.
|
|
|
|
---
|
|
|
|
Today's work was sponsored by Daniel Atlas.
|