mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
27705 commits 13 branches 442 tags 103 MiB
Commit graph

1670 commits

Author SHA1 Message Date
Joey Hess
9d49fe2c17 first pass at using new keys 
It compiles. It sorta works. Several subcommands are FIXME marked and
broken, because things that used to accept separate --backend and --key
params need to be changed to accept just a --key that encodes all the key
info, now that there is metadata in keys.
 2011-03-15 21:34:13 -04:00
Joey Hess
83a9bb624b fix error throwing 2011-03-15 11:50:40 -04:00
Joey Hess
bc5c54c987 symlink touching fun 
When adding files to the annex, the symlinks pointing at the annexed
content are made to have the same mtime as the original file. While git
does not preserve that information, this allows a tool like metastore to be
used with annexed files.
 2011-03-14 23:00:23 -04:00
Joey Hess
72d2684016 Rethink filename encoding handling for display. Since filename encoding may or may not match locale settings, any attempt to decode filenames will fail for some files. So instead, do all output in binary mode. 2011-03-12 15:30:17 -04:00
Joey Hess
ef92bd2b0b add copy count 2011-03-05 17:41:36 -04:00
Joey Hess
0de3005c64 whereis: New subcommand to show where a file's content has gotten to. 2011-03-05 17:23:55 -04:00
Joey Hess
6c1607ce66 Support ssh remotes with a port specified. 2011-03-05 15:47:00 -04:00
Joey Hess
aad1372880 move repoConfig out of Remotes 2011-03-05 15:31:46 -04:00
Joey Hess
acde7a1736 improve GitRepos functions for pulling apart URL to repo 2011-03-05 15:13:16 -04:00
Joey Hess
7b2762fb92 better quoting of description via show 2011-03-03 17:22:17 -04:00
Joey Hess
657395b628 add describe subcommand 2011-03-03 17:21:00 -04:00
Joey Hess
b5b78f26ec fix up commands that are trouble on bare repos 
Most will just abort. init does a basic init and gives a command to
run elsewhere to finish it.
 2011-03-03 16:40:55 -04:00
Joey Hess
b88637fff1 prevent trust commands from trying to do things in a bare repo 
Since they need to stage changes, they would actually, if allowed to run,
succeed, but wipe out existing trust.log content.
 2011-03-03 16:22:53 -04:00
Joey Hess
9f20aee219 avoid logging to location log when in a bare repo 
This assumes that changes to content in bare repos are made from some
non-bare repo, and that the location log is updated on that side.

That's true for move --from and move --to.

It's *not* true for dropkey and setkey and recvkey. But those are plumbing
level commands, so I guess it's ok to assume that someone running those
in a bare repo knows what they're doing. And git-annex-shell is used to
run those, and if the bare repo is non-local, it needs to be able to use
them even though they cannot update the location log. So this seems
unavoidable.
 2011-03-03 15:22:53 -04:00
Joey Hess
6206b46e60 fsck: Check for and repair location log damage. 2011-03-02 14:30:36 -04:00
Joey Hess
4cd96ad2db rename 2011-02-28 16:25:31 -04:00
Joey Hess
fcdc4797a9 use ShellParam type 
So, I have a type checked safe handling of filenames starting with dashes,
throughout the code.
 2011-02-28 16:18:55 -04:00
Joey Hess
836e71297b Support filenames that start with a dash; when such a file is passed to a utility it will be escaped to avoid it being interpreted as an option. 2011-02-25 01:13:01 -04:00
Joey Hess
5a50a7cf13 update unicode FilePath handling 
Based on http://hackage.haskell.org/trac/ghc/ticket/3307 ,
whether FilePath contains decoded unicode varies by OS.
So, add a configure check for it.

Also, renamed showFile to filePathToString
 2011-02-11 15:37:37 -04:00
Michael Kenney
285fb2bb08 Fixed missing import of Messages module 2011-02-10 21:06:00 -04:00
Joey Hess
fe55b4644e Fix display of unicode filenames. 
Internally, the filenames are stored as un-decoded unicode.
I tried decoding them, but then haskell tries to access the wrong files.
Hmm.

So, I've unhappily chosen option "B", which is to decode filenames before
they are displayed.
 2011-02-10 14:21:44 -04:00
Joey Hess
35a6506812 unannex: Fix recently introduced bug when attempting to unannex more than one file at a time. 2011-02-09 11:02:21 -04:00
Joey Hess
81e045a539 tweak 2011-02-08 18:26:38 -04:00
Joey Hess
c1b69d1511 fill color for host boxes 2011-02-08 18:17:46 -04:00
Joey Hess
c0ec5a35db show trusted repos in green 2011-02-08 18:04:19 -04:00
Joey Hess
3ae654254d make remotes absolute while spidering 2011-02-08 17:52:32 -04:00
Joey Hess
97d5e23430 map bugfix 
Need to find the absolute repo path before looking up the full info for the
repo. Otherwise, it doesn't find the right full info.
 2011-02-08 17:46:52 -04:00
Joey Hess
ef2d4f650e fix absrepo data loss 
it was dropping the config map for the repos it changed
 2011-02-04 01:56:45 -04:00
Joey Hess
926df3d91e node ordering 2011-02-04 00:13:47 -04:00
Joey Hess
0fd0e414ec color unreachable nodes 2011-02-04 00:06:23 -04:00
Joey Hess
67c1facad1 fix infinite loop 
Local repos with the same path are not different. :)
 2011-02-03 23:23:36 -04:00
Joey Hess
dff47d51e6 cleanup 2011-02-03 23:23:16 -04:00
Joey Hess
1b1a37b7b1 refactor 2011-02-03 22:44:17 -04:00
Joey Hess
17829be0fd map improvements 
added uuid.log repos

group repos by host

avoid displaying most urls

display remote names on edges

still some bugs
 2011-02-03 22:20:55 -04:00
Joey Hess
0c7d17ae06 new map subcommand, basically working 
Still todo:

- add repos from uuid.log that were not directly found
- group repos into their respective hosts
- display inaccessible repos and broken remote connections in red
- anonymize the url display somewhat, so the maps can be shared
- use uuid info to tell when two apparently different repos are actually
  the same repo accessed in different ways
 2011-02-03 19:05:15 -04:00
Joey Hess
0e7984a793 add check for unclean tree 2011-02-01 22:02:19 -04:00
Joey Hess
c77ac11acc unannex: Commit staged changes at end 
to avoid some confusing behavior with the pre-commit hook, which would see
some types of commits after an unannex as checking in of an unlocked file.
 2011-02-01 21:27:23 -04:00
Joey Hess
755029ae0e use forM_ in a few places 2011-01-31 23:27:53 -04:00
Joey Hess
d007e58a54 use mapM_ 2011-01-31 13:52:11 -04:00
Joey Hess
96e561bc47 use Set instead of existence Map 
more efficient and idiomatic

I did try using Set.difference, it's still slower than my method.
 2011-01-30 01:41:15 -04:00
Joey Hess
c64b50a0ce shutdown no longer a special case 2011-01-29 23:32:32 -04:00
Joey Hess
5584ccc8ad factor out pure code 2011-01-29 23:30:08 -04:00
Joey Hess
e6da7eb177 Improved temp file handling 
* Improved temp file handling. Transfers of content can now be resumed
  from temp files later; the resume does not have to be the immediate
  next git-annex run.
* unused: Include partially transferred content in the list.
 2011-01-28 14:10:50 -04:00
Joey Hess
04fe906ac6 use safewritefile 2011-01-28 12:35:51 -04:00
Joey Hess
167523f09d better directory handling 
Rename Locations functions for better consitency, and make their values
more consistent too.

Used </> rather than manually building paths. There are still more places
that manually do so, but are tricky, due to the behavior of </> when
the second FilePath is absolute. So I only changed places where
it obviously was relative.
 2011-01-27 17:00:32 -04:00
Joey Hess
dee9655237 bugfix to move --to 
Due to recent changes, the remotes config was not read before the remote
to act on was picked.
 2011-01-27 15:45:22 -04:00
Joey Hess
e1d213d6e3 make filename available to fsck messages 2011-01-26 20:37:46 -04:00
Joey Hess
b7903eb2d1 move partitioning out of keyPossibilities 
And a bug fix in passing.
 2011-01-26 16:44:14 -04:00
Joey Hess
7f6af79232 trust setting improvements 2011-01-26 16:20:28 -04:00
Joey Hess
7b2da21ab7 avoid moving if src and dest are the same 2011-01-26 15:59:10 -04:00
Joey Hess
268cb35e64 implement 3 level trust storage in trust.log 2011-01-26 15:37:16 -04:00
Joey Hess
6a97b10fcb rework config storage 
Moved away from a map of flags to storing config directly in the AnnexState
structure. Got rid of most accessor functions in Annex.

This allowed supporting multiple --exclude flags.
 2011-01-26 00:17:38 -04:00
Joey Hess
109a719b03 parameterize Backend type 
This allows the Backend type to not depend on the Annex type, and
so the Annex type can later be moved out of TypeInternals.
 2011-01-25 21:02:34 -04:00
Joey Hess
e7b557ef5d got rid of Core module 
Most of it was to do with managing annexed Content, so put there
 2011-01-16 16:05:05 -04:00
Joey Hess
59c9eda962 on second thought, unlock should fail if content is not present 2011-01-14 00:02:33 -04:00
Joey Hess
c1839fdccb unlock: Fix behavior when file content is not present. 2011-01-13 23:46:02 -04:00
Joey Hess
23686cc63d clarify default values when no path is specified 
Much of the code to handle this was unnecessary, as git ls-files is used,
and defaults to returning all files of the desired type.
 2011-01-13 23:36:58 -04:00
Joey Hess
bb4a45f9ce avoid crashing if run before unused log is present 2011-01-12 01:57:49 -04:00
Joey Hess
ba6727f663 always write log, so it's empty if nothing is unused 2011-01-12 01:57:32 -04:00
Joey Hess
e18a4d566b migrate: Fix support for --backend option. 2011-01-11 21:32:38 -04:00
Joey Hess
caa0b6c0c2 quiet git commit messages 2011-01-11 18:49:45 -04:00
Joey Hess
9de982eab7 copyright years 2011-01-08 16:09:17 -04:00
Joey Hess
a78b0555e1 New migrate subcommand can be used to switch files to using a different backend, safely and with no duplication of content. 2011-01-08 15:54:14 -04:00
Joey Hess
32b0e10390 unannex: Now skips files whose content is not present, rather than it being an error. This allows gradual conversion from one backend to another by running unannex followed by add in each repository. 2011-01-08 15:14:41 -04:00
Joey Hess
6cb1dff757 quiet git commits 2011-01-07 13:57:37 -04:00
Joey Hess
e43d4730c5 bugfix: Running copy --to when both local and remote had the key dropped it from local. 2011-01-07 02:14:22 -04:00
Joey Hess
f1b747e6d9 bugfix: Running move --to with a remote whose UUID was not yet known 
* bugfix: Running `move --to` with a remote whose UUID was not yet known
  could result in git-annex not recording on the local side where the
  file was moved to. This could not result in data loss, or even a
  significant problem, since the remote *did* record that it had the file.
* Also, add a general guard to detect attempts to record information
  about repositories with missing UUIDs.
 2011-01-04 17:45:27 -04:00
Joey Hess
a857e1f4ee git-annex-shell: Avoid exposing any git repo config except for the annex.uuid when doing configlist. 2011-01-04 17:34:14 -04:00
Joey Hess
700aed13cf git-annex-shell now exclusively used for all remote access 2010-12-31 19:09:17 -04:00
Joey Hess
30e0065ab9 tuple makes it clearer 2010-12-31 15:52:59 -04:00
Joey Hess
eac433a84a use git-annex-shell configlist 2010-12-31 15:46:33 -04:00
Joey Hess
60df4e5728 git-annex-shell is complete 
still not used
 2010-12-31 13:39:43 -04:00
Joey Hess
f38aa3e83a unfinished switch to using git-annex-shell 2010-12-30 20:31:52 -04:00
Joey Hess
a5a302b77d git-annex-shell mostly done now, only needs 2 more subcommands 2010-12-30 20:08:22 -04:00
Joey Hess
7a52b34e06 add git-annex-shell command 
This is not yet complete, as it does not allow starting rsync or scp.
 2010-12-30 16:52:24 -04:00
Joey Hess
a89a6f2114 refactor in preparation for adding a git-annex-shell command 2010-12-30 15:06:26 -04:00
Joey Hess
6a5be9d53c rename some stuff and prepare to break out more into Command/* 2010-12-30 14:19:16 -04:00
Joey Hess
e64ffc212e support trusted repositories that are not configured as remotes 2010-12-29 16:58:44 -04:00
Joey Hess
d475aac375 refactor 2010-12-29 16:21:38 -04:00
Joey Hess
1f20277ec7 forgot to add these 2010-12-28 17:44:55 -04:00
Joey Hess
dd55f21450 add a newline 2010-12-24 19:28:02 -04:00
Joey Hess
57305570eb Add uninit subcommand. Closes: #605749 2010-12-03 00:33:41 -04:00
Joey Hess
9d82e815ff change name of numcopies attribute 2010-11-28 18:55:49 -04:00
Joey Hess
653ad35a9f In .gitattributes, the git-annex-numcopies attribute can be used to control the number of copies to retain of different types of files. 2010-11-28 15:28:20 -04:00
Joey Hess
92e5d28ca8 precommit: Optimise to avoid calling git-check-attr more than once. 2010-11-28 14:21:30 -04:00
Joey Hess
6dfae19b1b add 2010-11-27 17:09:22 -04:00
Joey Hess
e0518a4adc Fix bug in setkey subcommand triggered by move --to. 2010-11-27 17:07:22 -04:00
Joey Hess
e97d13e29b Add copy subcommand. 2010-11-27 17:02:53 -04:00
Joey Hess
eeae910242 finished hlinting 2010-11-22 17:51:55 -04:00
Joey Hess
161823d6ea Only use cp -a if it is supported, falling back to cp -p or plain cp. 
* cp --reflink=auto is used if supported, and will make git annex unlock
  much faster on filesystems like btrfs that support copy of write.
 2010-11-18 13:49:01 -04:00
Joey Hess
0893820812 fsck: Print warnings to stderr; --quiet can now be used to only see problems. 2010-11-15 18:37:49 -04:00
Joey Hess
a5e7f5329f fix 2010-11-15 18:24:29 -04:00
Joey Hess
11096c200f fsck no longer runs unused 2010-11-15 18:22:50 -04:00
Joey Hess
3a4e9398a1 add 2010-11-15 18:06:21 -04:00
Joey Hess
748a7475bb dropunused 2010-11-15 18:04:19 -04:00
Joey Hess
9dc43d2599 unused: New subcommand, finds unused data (the global part of fsck). 2010-11-15 16:35:06 -04:00
Joey Hess
0e55d6a907 move stuff out of Core 2010-11-14 14:44:24 -04:00
Joey Hess
a5c4dd9743 find: New subcommand. 2010-11-14 12:35:05 -04:00
Joey Hess
19ee56559a better fsck file handling 2010-11-13 16:15:45 -04:00
Joey Hess
7293ba2940 fsck even files not in backend 2010-11-13 16:12:02 -04:00
Joey Hess
498c8e8544 fsck: avoid global checks if files specified 2010-11-13 16:03:25 -04:00
Joey Hess
5fa25a812a fsck improvements 
* fsck: Check if annex.numcopies is satisfied.
* fsck: Verify the sha1 of files when the SHA1 backend is used.
* fsck: Verify the size of files when the WORM backend is used.
* fsck: Allow specifying individual files to fsk if fscking everything
  is not desired.
* fsck: Fix bug, introduced in 0.04, in detection of unused data.
 2010-11-13 14:59:27 -04:00
Joey Hess
da0de293d1 refactor param seeking 2010-11-11 18:54:52 -04:00
Joey Hess
ce62f5abf1 rework command dispatching for add and pre-commit 
Both subcommands do two different operations on different sets of files, so
allowing a subcommand to perform a list of operations cleans things up.
 2010-11-11 17:58:55 -04:00
Joey Hess
dffe949963 Optimize both pre-commit and lock subcommands. 
isLocked was doing the expensive check before the cheap one. Let's not
fork git diff twice per file when committing, especially.

git diff is still run more than strictly necessary (ie, more than once)
if multiple unlocked files are being committed. But much better now.
 2010-11-11 14:54:29 -04:00
Joey Hess
fb824f7eb0 use -- before filenames when running git add, git rm, etc 2010-11-10 14:15:21 -04:00
Joey Hess
31101a8b27 use new git function 2010-11-10 14:08:28 -04:00
Joey Hess
d0886a9ac7 explicity run queue to git add files 2010-11-10 13:32:46 -04:00
Joey Hess
361d28e138 Unlocked files will now automatically be added back into the annex when committed (and the updated symlink committed), by some magic in the pre-commit hook. 2010-11-10 13:01:17 -04:00
Joey Hess
2ab448276c fix handling of staged unlocked files 2010-11-10 13:01:01 -04:00
Joey Hess
55720885ae set write bit on unlocked file 2010-11-10 12:50:00 -04:00
Joey Hess
91c5fe71af add 2010-11-10 10:52:43 -04:00
Joey Hess
536bc97d25 lock and unlock subcommands 2010-11-09 15:59:49 -04:00
Joey Hess
1d32d902c9 Annexed file contents are now made unwritable and put in unwriteable directories, to avoid them accidentially being removed or modified. (Thanks Josh Triplett for the idea.) 2010-11-08 19:26:37 -04:00
Joey Hess
50ec22e322 set version on init 2010-11-08 16:40:28 -04:00
Joey Hess
070e8530c1 refactoring, no code changes really 2010-11-08 15:15:21 -04:00
Joey Hess
009873e0eb fsck works 2010-11-07 18:22:25 -04:00
Joey Hess
ea8ccaa3d5 rough in fsck 2010-11-07 17:26:21 -04:00
Joey Hess
016b6a59e7 add fsck subcommand (stub) 2010-11-06 17:06:59 -04:00
Joey Hess
0eae5b806c broke subcommands out into separate modules 2010-11-02 19:04:24 -04:00