mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1
2526 commits 13 branches 444 tags 108 MiB
Commit graph

286 commits

Author SHA1 Message Date
Joey Hess
6f98fd5391 whereis: Show untrusted locations separately and do not include in location count. 2011-09-06 16:59:53 -04:00
Joey Hess
5bc32c7f34 add json formatted list of remotes 
Wherever a list of remotes is shown, --json now enables a json formatted
list.
 2011-09-01 16:02:01 -04:00
Joey Hess
57dd34c6be generalize quiet flag to output type 
This will allow adding other styles of output.
 2011-09-01 13:35:07 -04:00
Joey Hess
55783d886d add explanation for why strictness is needed here 2011-08-31 19:50:08 -04:00
Joey Hess
f600444ab6 unused --remote: Reduced memory use to 1/4th what was used before. 
Using a single strictness annotation, in just the right place.
Tried several others, none of which helped and some of which potentially
hurt. This is only the second time I've really had to deal with this in
a year of using haskell, which is, I suppose not that bad.
 2011-08-31 19:13:02 -04:00
Joey Hess
d1154d0837 init: Make description an optional parameter. 2011-08-29 14:13:38 -04:00
Joey Hess
678726c10c code simplification thanks to applicative functors 2011-08-25 01:27:19 -04:00
Joey Hess
203148363f split groups of related functions out of Utility 2011-08-22 16:14:12 -04:00
Joey Hess
737b5d14c9 moved files around 2011-08-20 16:11:42 -04:00
Joey Hess
cf33eff684 git-annex-shell configlist should not be standalone 
This makes it initialize the repository with a uuid, and list the uuid,
allowing automatic setup of bare repositories when git-annex is used.
 2011-08-17 14:44:31 -04:00
Joey Hess
56f6923ccb Now "git annex init" only has to be run once 
when a git repository is first being created. Clones will automatically
notice that git-annex is in use and automatically perform a basic
initalization. It's still recommended to run "git annex init" in any
clones, to describe them.
 2011-08-17 14:44:31 -04:00
Joey Hess
a55faff08f reorg Remote/* 2011-08-16 20:49:54 -04:00
Joey Hess
4545a0e78c split out generic url stuff into a helper library from Remote.Web 2011-08-16 20:49:44 -04:00
Joey Hess
5000aba76e avoid namespace conflict 2011-08-16 20:47:48 -04:00
Joey Hess
dede05171b addurl: --fast can be used to avoid immediately downloading the url. 
The tricky part about this is that to generate a key, the file must be
present already. Worked around by adding (back) an URL key type, which
is used for addurl --fast.
 2011-08-06 14:57:22 -04:00
Joey Hess
00153eed48 unify elipsis handling 
And add a simple dots-based progress display, currently only used in v2
upgrade.
 2011-07-19 14:07:23 -04:00
Joey Hess
6c396a256c finished hlint pass 2011-07-15 12:47:14 -04:00
Joey Hess
9bb797c0ea unannex: only commit, no -a 
-a is actually not needed; only commit staged changes
 2011-07-14 17:18:53 -04:00
Joey Hess
ded2591124 unannex: Clean up use of git commit -a. 
This was more complex than would be expected. unannex has to use git commit -a
since it's removing files from git; git commit filelist won't do.

Allow commands to be added to the Git queue that have no associated files,
and run such commands once.
 2011-07-14 17:15:37 -04:00
Joey Hess
40c6ba99f5 add: Be even more robust to avoid ever leaving the file seemingly deleted. 
A failure at any point after the file is annexed will result in an undo
that puts the original file back into place and wipes the location log.
 2011-07-07 21:30:51 -04:00
Joey Hess
67dcc1f171 add: Avoid a failure mode that resulted in the file seemingly being deleted (content put in the annex but no symlink present). 2011-07-07 19:29:36 -04:00
Joey Hess
cab4ac247c rename 2011-07-05 20:36:43 -04:00
Joey Hess
c98b5cf36e rename 2011-07-05 20:24:10 -04:00
Joey Hess
6040d8aed1 factor out RemoteLog 2011-07-05 20:16:57 -04:00
Joey Hess
9f1577f746 remove unused backend machinery 
The only remaining vestiage of backends is different types of keys. These
are still called "backends", mostly to avoid needing to change user interface
and configuration. But everything to do with storing keys in different
backends was gone; instead different types of remotes are used.

In the refactoring, lots of code was moved out of odd corners like
Backend.File, to closer to where it's used, like Command.Drop and
Command.Fsck. Quite a lot of dead code was removed. Several data structures
became simpler, which may result in better runtime efficiency. There should
be no user-visible changes.
 2011-07-05 19:57:46 -04:00
Joey Hess
d31b84c777 better display of thrown errors 2011-07-05 14:58:33 -04:00
Joey Hess
71c783bf24 uninit: Use unannex in --fast mode, to support unannexing multiple files that link to the same content. 2011-07-04 16:20:50 -04:00
Joey Hess
d7ce51af5a fix usage for setkey 2011-07-04 16:13:44 -04:00
Joey Hess
22a4f5b348 unannex: In --fast mode, file content is left in the annex, and a hard link made to it. 2011-07-04 16:06:28 -04:00
Joey Hess
5beb6bc76f uninit: delete .git/annex/ 2011-07-04 15:55:03 -04:00
Joey Hess
5c63b409d4 uninit: Delete the git-annex branch. 2011-07-04 15:50:30 -04:00
Joey Hess
ace9de37e8 download urls via tmp file, and support resuming 2011-07-01 18:59:40 -04:00
Joey Hess
6bddebdb79 add the addurl command 2011-07-01 17:15:46 -04:00
Joey Hess
cdbcd6f495 add web special remote 
Generalized LocationLog to PresenceLog, and use a presence log to record
urls for the web special remote.
 2011-07-01 15:30:42 -04:00
Joey Hess
f6063a094e renamed GitRepo to Git 
It was always imported qualified as Git anyway
 2011-06-30 13:21:39 -04:00
Joey Hess
2cda9d0a0f generalized safeWriteFile to viaTmp 2011-06-30 00:46:39 -04:00
Joey Hess
06a1f5f742 factor out file list stuff from GitRepo 
GitRepo is getting too large an interface; these all fit nicely into a
submodule.
 2011-06-29 11:55:16 -04:00
Joey Hess
af45d42224 Merge branch 'master' into v3 
Conflicts:
	debian/changelog
 2011-06-29 11:42:35 -04:00
Joey Hess
b3aaf980e4 --force will cause add, etc, to operate on ignored files. 2011-06-29 11:42:00 -04:00
Joey Hess
7ee636f6dd avoid unnecessary read of trust.log 2011-06-23 13:39:04 -04:00
Joey Hess
89fd7b34ce unused command updates for branches 
Now that branches are more likely, unused needs to more explicitly warn
that it does not look in them.
 2011-06-23 12:23:25 -04:00
Joey Hess
af10b2854a v3 upgrade code works 
but write the index file a lot, so slow
 2011-06-23 02:30:20 -04:00
Joey Hess
aad73c5721 rewrite loggedkeys to use git-annex branch 
That sucking sound is a whole page of code vanishing to be replaced with
  return . catMaybes . map (logFileKey . takeFileName) =<< Branch.files
What can I say, git is my database, and haskell my copilot.
 2011-06-22 23:24:14 -04:00
Joey Hess
ad3770e0b2 add merge subcommand 2011-06-22 18:46:56 -04:00
Joey Hess
80302d0b46 improve bare repo handing 
Many more commands can work in bare repos now, thanks to the git-annex
branch.
 2011-06-22 18:32:41 -04:00
Joey Hess
944c51ba26 improve version checking for v3 
Do not set annex.version whenever any command is run. Just do it in init.
This ensures that, if a repo has annex.version=3, it has a git-annex
branch, so we don't have to run a command every time to check for the
branch.

Remove the old ad-hoc logic for v0 and v1, to simplify version checking.
 2011-06-22 18:07:45 -04:00
Joey Hess
4c4ebf2d75 store trust.log and remote.log in the git-annex branch 
.. and I think that's everything that will use the branch
 2011-06-22 17:08:51 -04:00
Joey Hess
1870186632 fixed logFile 2011-06-22 16:17:16 -04:00
Joey Hess
e0bd9d43a2 update for git-annex branch 
stop changing gitattributes on init

create git-annex branch on init

ugly special case for init in a bare repository goes away, yay!

git annex init is also faster, at least in a large existing repo, as
it does not need to run the slow 'git add'
 2011-06-22 16:03:26 -04:00
Joey Hess
5c706d1ec4 stop undoing gitattributes on uninit 
v2 upgrade will undo them
 2011-06-22 16:03:09 -04:00
Joey Hess
d3f0106f2e move LocationLog into Annex monad from IO 
It will need to run in Annex so it can use Branch
 2011-06-22 14:27:50 -04:00
Joey Hess
9f9e17aa0f unlock: Made atomic. 2011-06-20 22:38:18 -04:00
Joey Hess
90dd245522 get --from is the same as copy --from 
get not honoring --from has surprised me a few times, so least surprise
suggests it should just behave like copy --from. This leaves the difference
between get and copy being that copy always requires the remote to copy
from, while get will decide whether to get a file from a key/value store or
a remote.
 2011-06-09 18:54:49 -04:00
Joey Hess
703c437bd9 rename modules for data types into Types/ directory 2011-06-01 21:56:04 -04:00
Joey Hess
971ab27e78 better types allowed breaking module dep loop 2011-06-01 19:11:27 -04:00
Joey Hess
a8fb97d2ce Add --trust, --untrust, and --semitrust options. 2011-06-01 17:57:31 -04:00
Joey Hess
869cb82f49 remove unnecessary imports 2011-06-01 11:53:43 -04:00
Joey Hess
038da52bdd Somewhat sped up git commit of modifications to unlocked files. 
Avoid git reset here too, so I no longer need to care that it's much more
expensive than seems wise (but I asked the git list about that anyway).

It's not necessary to reset the staged file content from the index, as
the `git add` of the the symlink will replace it anyway.

`git commit` of unlocked files is still slow, since git still has to shove
their entire content into the index, only to have it be thrown away. So it's
still better to use `git annex add`
 2011-05-31 16:08:37 -04:00
Joey Hess
fb259033d4 Fix locking of files with staged changes. 
Previously, lock would skip files that had staged changes, but that is
counterintuitive, I think.
 2011-05-31 15:00:56 -04:00
Joey Hess
fafe60768f Massively sped up git annex lock by avoiding use of the uber-slow git reset, and only running git checkout once, even when many files are being locked. 2011-05-31 14:50:41 -04:00
Joey Hess
86c5bd0327 unused --from . checks local repo, for consistency 2011-05-28 22:37:17 -04:00
Joey Hess
14ffb5d47b bugfix: fix unused list numbering 
Introduced in 43f0a666f0
 2011-05-28 22:30:06 -04:00
Joey Hess
66a99d3740 tweak 2011-05-28 22:24:48 -04:00
Joey Hess
25b13673f0 improve unused command's output 
Display the name of the remote being checked, with "." for the current
remote, echoing the way describe takes that to change its description.
 2011-05-28 22:20:22 -04:00
Joey Hess
fdead6b9bb improve error message when no remote name is specified 
list available remotes in case user wanted to use or change one of them
 2011-05-28 21:58:48 -04:00
Joey Hess
c38f826435 Data.Tuple.swap not available with ghc 6.12.3 2011-05-28 11:56:48 -04:00
Joey Hess
f81c1f10e6 show a warning message when failing to find requested key 
Otherwise, the user sees only a rsync protocol error message and then
git-annex's less specific failure message.
 2011-05-22 14:03:06 -04:00
Joey Hess
c91929f693 add whenM and unlessM 
Just more golfing.. I am pretty sure something in a library somewhere can
do this, but I have been unable to find it.
 2011-05-17 03:13:11 -04:00
Joey Hess
75a3f5027f tweak 2011-05-17 01:59:44 -04:00
Joey Hess
33e6425d10 tweak 2011-05-16 22:49:41 -04:00
Joey Hess
21953a802a am I silly to worry about length overflowing int max? 2011-05-16 22:22:37 -04:00
Joey Hess
5068985020 rejigger what's --fast 2011-05-16 22:19:15 -04:00
Joey Hess
1e3da8efb0 add info about any temp files and bad content files 2011-05-16 22:01:50 -04:00
Joey Hess
a8816efc14 status: New subcommand to show info about an annex, including its size. 2011-05-16 21:18:34 -04:00
Joey Hess
d006586cd0 add a message in potenatially confusing copy --fast failure situation 2011-05-16 13:27:19 -04:00
Joey Hess
93c5fb5da7 support remote config values with spaces and other characters 2011-05-16 13:07:56 -04:00
Joey Hess
ceff04ff3e better multiword parameter handling 
This way, individual words as entered on the command line are available
to commands.
 2011-05-16 12:25:54 -04:00
Joey Hess
5256a6b011 migrate: Use current filename when generating new key, for backends where the filename affects the key name. 2011-05-16 12:10:08 -04:00
Joey Hess
cad0e1c8b7 simplified a bunch of Maybe handling 2011-05-15 03:38:08 -04:00
Joey Hess
56bc3e95ca refactor some boilerplate 2011-05-15 02:02:46 -04:00
Joey Hess
43f0a666f0 unused: Now also lists files fsck places in .git/annex/bad/ 2011-04-29 13:59:00 -04:00
Joey Hess
76911a446a Avoid using absolute paths when staging location log, as that can confuse git when a remote's path contains a symlink. Closes: #621386 
This was a real PITA to fix, since location logs can be staged in
both the current repo, as well as in local remote's repos, in
which case the cwd will not be in the repo. And git add needs different
params in both cases, when absolute paths are not used.

In passing, git annex fsck now stages location log fixes.
 2011-04-25 14:54:24 -04:00
Joey Hess
1e84dab4c8 RemoteConfig type 2011-04-15 15:09:36 -04:00
Joey Hess
8ad901a647 refactor 2011-04-09 14:26:32 -04:00
Joey Hess
bc51387e6d Periodically flush git command queue, to avoid boating memory usage too much. 
Since the queue is flushed in between subcommand actions being run,
there should be no issues with actions that expect to queue up some stuff
and have it run after they do other stuff. So I didn't have to audit for
such assumptions.
 2011-04-07 13:59:31 -04:00
Joey Hess
868300d4c1 unused/dropunused: support --from 2011-04-02 21:35:02 -04:00
Joey Hess
ed7fc4fce9 Bugfix: copy --to --fast never really copied, fixed. 2011-04-01 12:34:06 -04:00
Joey Hess
0a4c610b4f initremote works 2011-03-29 14:55:59 -04:00
Joey Hess
05751d55cd clean up remote.log handling 2011-03-29 14:10:12 -04:00
Joey Hess
b1db436816 started on initremote 2011-03-28 23:22:31 -04:00
Joey Hess
996e5eee01 Merge branch 'master' into s3 
Conflicts:
	debian/changelog
 2011-03-28 16:34:58 -04:00
Joey Hess
0956f0dd15 fsck: Ensure that files and directories in .git/annex/objects have proper permissions. 2011-03-28 16:19:20 -04:00
Joey Hess
28bf28a73c rename 2011-03-27 19:23:00 -04:00
Joey Hess
4868b64868 Provide a less expensive version of git annex copy --to, enabled via --fast. This assumes that location tracking information is correct, rather than contacting the remote for every file. 2011-03-27 18:34:30 -04:00
Joey Hess
a70035e981 converted move to use Remote 
Drop old Remotes.hs, now unused!
 2011-03-27 17:24:20 -04:00
Joey Hess
0d83d17f04 convert map to use new code 2011-03-27 17:00:05 -04:00
Joey Hess
30f427700f converted several commands to use Remote 
only move and map still to convert
 2011-03-27 16:55:43 -04:00
Joey Hess
03fdd0d56e dropunused: Significantly sped up; only read unused log file once. 2011-03-23 23:47:02 -04:00
Joey Hess
6246b807f7 migrate: Support migrating v1 SHA keys to v2 SHA keys with size information that can be used for free space checking. 2011-03-23 17:57:10 -04:00
Joey Hess
ad08273ac5 refactor 2011-03-23 17:29:54 -04:00