Joey Hess
dc39da52f8
direct, indirect: Refuse to do anything when the assistant or git-annex watch daemon is running.
2013-04-22 16:41:46 -04:00
Joey Hess
cfd3b16fe1
add section metadata to all commands
...
Not yet used .. mindless train work.
2013-03-24 18:28:21 -04:00
Joey Hess
0c13d3065e
git subcommand cleanup
...
Pass subcommand as a regular param, which allows passing git parameters
like -c before it. This was already done in the pipeing set of functions,
but not the command running set.
2013-03-03 13:39:07 -04:00
Joey Hess
2d9c046dea
annex.version is now set to 4 for direct mode repositories
...
To avoid old versions of git-annex getting confused.
There is no upgrade required though.
We switch back to 3 when going from direct to indirect.
2013-02-26 15:13:10 -04:00
Joey Hess
e872c3f648
convert notBareRepo to a CommandCheck
...
This avoids some small overhead by only running the check once per command;
it also ensures that, even if the command doesn't find anything to run on,
it still fails to run when in a bare repo.
2012-12-29 14:45:19 -04:00
Joey Hess
05ec4587dd
partial and incomplete automatic merging in direct mode
...
Handles our file right, but not theirs.
2012-12-18 17:15:16 -04:00
Joey Hess
53dbcce645
direct mode merging works!
...
Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
2012-12-18 15:04:44 -04:00
Joey Hess
44402159dd
add ok's
2012-12-13 16:02:10 -04:00
Joey Hess
5df3c66a85
added direct and indirect commands
2012-12-13 15:44:56 -04:00
