Commit graph

2715 commits

Author SHA1 Message Date
Joey Hess
9fa9214106 A remote can have a annexUrl configured, that is used by git-annex instead of its usual url. (Similar to pushUrl.) 2011-10-14 18:18:28 -04:00
http://joey.kitenet.net/
3e07780bf8 Added a comment: fixed that 2011-10-13 15:36:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
88e9bba97e 2011-10-13 14:52:43 +00:00
Joey Hess
205a5b2aaa typo 2011-10-12 00:29:49 -04:00
Joey Hess
62b24ecff1 Merge branch 'master' of ssh://git-annex.branchable.com 2011-10-12 00:29:34 -04:00
Joey Hess
82d127de99 add git version check to configure
Rather ugly dotted version comparison method, but it does work.
2011-10-12 00:28:33 -04:00
Joey Hess
fa5c016585 add comment about relative/absolute filenames 2011-10-11 23:49:58 -04:00
Joey Hess
2b26b95226 add news item for git-annex 3.20111011 2011-10-11 23:49:25 -04:00
Joey Hess
bcec418495 releasing version 3.20111011 2011-10-11 23:49:19 -04:00
Joey Hess
5a9e3f7377 force files relative
Other code is currently depending on checkAttr forcing absolute filenames
to relative, so keep it doing so.

This is a quick fix, and should sometime be moved elsewhere.
2011-10-11 23:39:29 -04:00
Joey Hess
11b154e811 prep release 2011-10-11 23:03:19 -04:00
Joey Hess
402d9c7c5f oops 2011-10-11 22:54:38 -04:00
Joey Hess
9c04d1e523 fix git 1.7.7 breakage
* This version of git-annex only works with git 1.7.7 and newer.
  The breakage with old versions is subtle, and affects
  annex.numcopies .gitattributes settings, so be sure to upgrade git
  to 1.7.7. (Debian package now depends on that version.)
* Don't pass absolute paths to git show-attr, as it started following
  symlinks when that's done in 1.7.7. Instead, use relative paths,
  which show-attr only handles 100% correctly in 1.7.7. Closes: #645046

Unfortunatly I can find no way to work with the old and new gits, as
the old had bugs that require absolute paths, while the new doesn't like
them at all. And the behavior of git show-attr in 1.7.7. is the same as
eg, git add of an absolute path to a symlink, so seems entirely
intentional and not likely to change.
2011-10-11 22:53:32 -04:00
Joey Hess
b505ba83e8 minor syntax changes 2011-10-11 14:43:45 -04:00
Joey Hess
025ded4a2d tweaks 2011-10-10 17:37:44 -04:00
Joey Hess
10edaf6dc9 reorder 2011-10-10 16:03:32 -04:00
Joey Hess
f0153f9fd7 fix a race
Another process may stage journalled files before the lock is
taken, so need to get the list of journalled files afterwards.

It's unfortunate this means getting the directory contents twice,
but it seems better to do that than sometimes take the lock
unnecessarily.
2011-10-09 16:19:09 -04:00
Joey Hess
81ed7b203d Now supports git's insteadOf configuration, to modify the url used to access a remote. Note that pushInsteadOf is not used; that and pushurl are reserved for actual git pushes. Closes: #644278 2011-10-09 14:58:32 -04:00
Joey Hess
dfee6e1ed6 better layout
And a theoretical fix to branchstate cache invalidation, but not a bug
that could actually happen.
2011-10-07 13:59:34 -04:00
Joey Hess
82e655efd0 performance fix
It was checking if it needed to merge on every branch access, fix it to
only check once.
2011-10-07 13:38:56 -04:00
Joey Hess
44fc358885 avoid merging multiple branches that point to the same tree
avoids git warning "error: duplicate parent xxx ignored"
2011-10-07 13:37:01 -04:00
Joey Hess
3acdba3995 faster union merge of multiple branches into index
only write index once
2011-10-07 13:36:48 -04:00
Joey Hess
5414bbce58 git-annex-shell uuid verification
* git-annex now asks git-annex-shell to verify that it's operating in
  the expected repository.
* Note that this git-annex will not interoperate with remotes using
  older versions of git-annex-shell.

The reason for this check is to avoid git-annex getting confused about
what remote repository actually contains a value. It's a prerequisite for
supporting git insteadOf aliases.
2011-10-06 19:24:11 -04:00
Joey Hess
f011033869 add timestamps to remote.log 2011-10-06 16:07:58 -04:00
Joey Hess
f929d0229c Add timestamps to trust.log. 2011-10-06 15:55:50 -04:00
Joey Hess
3e0d2a0803 add timestamp to uuid.log
* New or changed repository descriptions in uuid.log now have a timestamp,
  which is used to ensure the newest description is used when the uuid.log
  has been merged.
* Note that older versions of git-annex will display the timestamp as part
  of the repository description, which is ugly but otherwise harmless.
2011-10-06 15:31:25 -04:00
Joey Hess
52fa409648 add UUIDLog, a generic module for mergable uuid-based logs 2011-10-06 15:23:26 -04:00
Joey Hess
dab5bddc64 propigate test suite failure
(but not test suite build failure)
2011-10-06 11:12:03 -04:00
Joey Hess
e139a99aa0 investigated file formats; appending timestamp should preserve back-compat 2011-10-05 16:35:01 -04:00
Joey Hess
6a6ea06cee rename 2011-10-05 16:02:51 -04:00
Joey Hess
c199a01dd1 bug 2011-10-05 15:59:49 -04:00
Joey Hess
cfe21e85e7 rename 2011-10-04 00:59:08 -04:00
Joey Hess
ff21fd4a65 factor out Annex exception handling module 2011-10-04 00:34:04 -04:00
Joey Hess
1a96d4ab35 use bracket to reset environment
In case the exception is caught higher up, don't leave the environment
dirty.
2011-10-04 00:19:42 -04:00
Joey Hess
8ef2095fa0 factor out common imports
no code changes
2011-10-03 23:29:48 -04:00
Joey Hess
003a604a6e drop the lock on error 2011-10-03 18:20:29 -04:00
Joey Hess
2636ea79c3 avoid taking journal lock unnecessarily 2011-10-03 17:29:28 -04:00
Joey Hess
d357556141 Add locking to avoid races when changing the git-annex branch. 2011-10-03 16:32:36 -04:00
Joey Hess
f77979b8b5 improved git-annex branch changing
All changes to files in the branch are now made via pure functions that
transform the old file into the new. This will allow adding locking
to prevent read/write races. It also makes the code nicer, and purer.

I noticed a behavior change, really a sort of bug fix. Before,
'git annex untrust foo --trust bar' would change both trust levels
permanantly, now the --trust doesn't get stored.
2011-10-03 15:41:25 -04:00
Joey Hess
6dfb94b2d7 update 2011-10-03 14:48:04 -04:00
Joey Hess
61fbea992d when all you have is a zombie, everything looks like a shotgun
Actually, let's do a targeted fix of the actual forkProcess that was not
waited on. The global reap is moved back to the end, after the long-running
git processes actually exit.
2011-10-02 11:42:34 -04:00
Joey Hess
49f21dd9ba Contain the zombie hordes.a
Specifically, when using gpg, a zombie is forked for each file, so waiting
until shutdown to reap won't do.
2011-10-02 11:16:34 -04:00
Joey Hess
1e6b7e901d less space 2011-09-30 16:21:28 -04:00
Joey Hess
29032cb70e When displaying a list of repositories, show git remote names in addition to their descriptions. 2011-09-30 15:02:29 -04:00
Joey Hess
f88738223e don't crash on malformed lines in uuid.log 2011-09-30 15:02:29 -04:00
http://joey.kitenet.net/
d48ae1b8fd Added a comment 2011-09-30 16:47:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
84801918f6 Added a comment 2011-09-30 11:55:36 +00:00
Joey Hess
828f3f1b0c status: List all known repositories. 2011-09-30 03:20:24 -04:00
Joey Hess
8c5e29ad05 Merge branch 'master' of ssh://git-annex.branchable.com 2011-09-30 03:19:18 -04:00
Joey Hess
15eccdf124 better output layout 2011-09-30 03:05:10 -04:00