Commit graph

3243 commits

Author SHA1 Message Date
http://peter-simons.myopenid.com/
3a638c7ba1 Added NixOS to the list of distributions that support git-annex. 2012-01-13 18:49:56 +00:00
http://peter-simons.myopenid.com/
226d5c9bb1 Added a comment 2012-01-13 18:48:29 +00:00
Joey Hess
66aac77467 support relative GIT_DIR 2012-01-13 14:40:36 -04:00
Joey Hess
4659172919 Merge branch 'master' of ssh://git-annex.branchable.com 2012-01-13 13:55:37 -04:00
Joey Hess
f4ddecd322 move windows support to a todo item
not holding my breath on this one..
2012-01-13 13:55:14 -04:00
http://joey.kitenet.net/
bb97bc1ebf Added a comment 2012-01-13 17:52:46 +00:00
Joey Hess
92b8e2a1b5 limit news feed to only toplevel 2012-01-13 13:47:56 -04:00
http://peter-simons.myopenid.com/
16d920b301 Added a comment: Not announced on Hackage? 2012-01-13 17:37:13 +00:00
Joey Hess
1ae780ee79 git-annex, git-union-merge: Support GIT_DIR and GIT_WORK_TREE.
Note that GIT_WORK_TREE cannot influence GIT_DIR; that is necessary for
git-fake-bare and vcsh type things to work.
2012-01-13 12:52:09 -04:00
Joey Hess
daff9029ba close 2012-01-13 12:09:02 -04:00
Joey Hess
9e2ab6f1aa add 2012-01-13 10:26:47 -04:00
Joey Hess
abdacf58ed tweaks 2012-01-11 00:06:54 -04:00
Joey Hess
16e7178f20 reorg 2012-01-10 15:29:10 -04:00
Joey Hess
07cacbeee9 break module dependancy loop
A PITA but worth it to clean up the trust configuration code.
2012-01-10 13:32:38 -04:00
Joey Hess
0d5c402210 Add annex-trustlevel configuration settings, which can be used to override the trust level of a remote.
This overrides the trust.log, and is overridden by the command-line trust
parameters.

It would have been nicer to have Logs.Trust.trustMap just look up the
configuration for all remotes, but a dependency loop prevented that
(Remotes depends on Logs.Trust in several ways). So instead, look up
the configuration when building remotes, storing it in the same forcetrust
field used for the command-line trust parameters.
2012-01-09 23:31:44 -04:00
Joey Hess
9ffd97442b don't use GPG_AGENT_INFO to force batch mode in test suite
Fails with gpg 2. Instead, use a different environment variable.

The clean fix would instead be to add an annex.gpg-options configuration.
But, that would be rather a lot of work and it's unlikely it would be
useful for much else.
2012-01-09 18:19:29 -04:00
Joey Hess
7675b83efa map: Fix display of remote repos
A change to break local cycles made remote repos be dropped entirely.
2012-01-08 16:05:57 -04:00
Joey Hess
fc669100e5 avoid showing remotes with no uuid in status
The filtering of remotes with NoUUID is done in remoteMap, rather than
remoteList because a few things should still act on remotes that have no
uuid. Particularly sync.
2012-01-08 14:40:06 -04:00
Joey Hess
dc1d51b2df formatting 2012-01-07 21:54:51 -04:00
Joey Hess
27e3429667 new tip 2012-01-07 21:46:32 -04:00
Joey Hess
a35278430a log: Add --gource mode, which generates output usable by gource.
As part of this, I fixed up how log was getting the descriptions of
remotes.
2012-01-07 18:18:09 -04:00
Joey Hess
2f0c3befbd add news item for git-annex 3.20120106 2012-01-07 13:50:54 -04:00
Joey Hess
3da28cad07 releasing version 3.20120106 2012-01-07 13:50:35 -04:00
http://joey.kitenet.net/
ba233606d2 Added a comment 2012-01-07 17:15:31 +00:00
Joey Hess
60c1aeeb6f Fix overbroad gpg --no-tty fix from last release.
Only set --no-tty when GPG_AGENT_INFO is set and batch mode is used.

In the test suite, set GPG_AGENT_INFO to /dev/null to avoid the test suite
relying on /dev/tty.
2012-01-07 12:38:08 -04:00
Joey Hess
bdc49ddbdb typo 2012-01-07 00:45:01 -04:00
Joey Hess
dfa76069d4 reap zombies 2012-01-07 00:22:16 -04:00
Joey Hess
b8966433ef sped up git annex log rather a lot
See comment! Isn't git fun, always interesting approaches to optimise
things that seemed unfixably slow.
2012-01-07 00:15:01 -04:00
Joey Hess
945f56f348 cleanup
Broke out pure general functions etc.
2012-01-07 00:11:15 -04:00
Joey Hess
24b35113cf tweak 2012-01-06 23:43:18 -04:00
Joey Hess
d9fdc76a14 layout 2012-01-06 21:53:47 -04:00
Joey Hess
64f9d00bed tweak 2012-01-06 21:51:39 -04:00
Joey Hess
2557bb8764 complete set of log options 2012-01-06 21:48:30 -04:00
Joey Hess
def6ca054e Merge branch 'master' of ssh://git-annex.branchable.com 2012-01-06 21:32:43 -04:00
Joey Hess
8e7de01047 log --before=date 2012-01-06 21:32:08 -04:00
Joey Hess
539f8c6f14 --boundry was not needed 2012-01-06 21:09:23 -04:00
Joey Hess
d8d72781af better data type 2012-01-06 18:58:35 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
773af32ee4 2012-01-06 22:14:35 +00:00
Joey Hess
b59759e33c typo 2012-01-06 17:52:16 -04:00
Joey Hess
6055a95c6f Merge branch 'wip' 2012-01-06 17:51:01 -04:00
Joey Hess
bc59da7250 Revert "simplify"
This reverts commit e0d6010d36.
2012-01-06 17:50:58 -04:00
Joey Hess
3c88d57399 log --max-count=n 2012-01-06 17:48:02 -04:00
Joey Hess
078788a9e7 change log display
Including the file in the lines behaves better when limiting with --after,
since only files that changed in the time period are shown.

Still not fully happy with the line layout, but putting the +/- first
followed by the date seems a good change.
2012-01-06 17:36:13 -04:00
Joey Hess
9fb5f3edc7 log --after=date 2012-01-06 17:24:03 -04:00
Joey Hess
47646d44b7 use a zipper 2012-01-06 16:24:40 -04:00
Joey Hess
a3a9f87047 log: New command that displays the location log for file, showing each repository they were added to and removed from.
This needs to run git log on the location log files to get at all past
versions of the file, which tends to be a bit slow.

It would be possible to make a version optimised for showing the location
logs for every key. That would only need to run git log once, so would be
faster, but it would need to process an enormous amount of data, so
would not speed up the individual file case.

In the future it would be nice to support log --format. log --json also
doesn't work right yet.
2012-01-06 15:40:07 -04:00
Joey Hess
1f8a1058c9 tweak 2012-01-06 10:57:57 -04:00
Joey Hess
df21cbfdd2 look up --to and --from remote names only once
This will speed up commands like move and drop.
2012-01-06 04:06:13 -04:00
Joey Hess
e0d6010d36 simplify 2012-01-06 03:31:20 -04:00
Joey Hess
0a36f92a31 more command-specific options
Made --from and --to command-specific options.

Added generic storage for values of command-specific options,
which allows removing some of the special case fields in AnnexState.

(Also added generic storage for command-specific flags, although there are
not yet any.)

Note that this storage uses a Map, so repeatedly looking up the same value
is slightly more expensive than looking up an AnnexState field. But, the
value can be looked up once in the seek stage, transformed as necessary,
and passed in a closure to the start stage, and this avoids that overhead.

Still, I'm hesitant to use this for things like force or fast flags.
It's probably best to reserve it for flags that are only used by a few
commands, or options like --from and --to that it's important only be
allowed to be used with commands that implement them, to avoid user
confusion.
2012-01-06 03:16:42 -04:00