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

2100 commits

Author SHA1 Message Date
Joey Hess
edcd3123d5 list of git branches 2012-02-06 20:42:48 -04:00
Joey Hess
e2bcf1717e already done 2012-02-06 20:34:07 -04:00
http://jefferai.org/
5e59440533 2012-02-07 00:18:24 +00:00
Joey Hess
91fc975964 note 7.4 needed 2012-02-04 14:51:52 -04:00
Joey Hess
2385fe3c4c add news item 2012-02-04 01:59:53 -04:00
Joey Hess
05f89123e0 update; ghc7.4 branch fixes this pretty well now 2012-02-03 16:25:34 -04:00
Joey Hess
94caa26883 update 2012-02-02 15:44:22 -04:00
Joey Hess
828df56453 update; newghc-edges branch 2012-02-02 15:41:22 -04:00
Joey Hess
fc8a1d213b update 2012-02-02 10:56:39 -04:00
Joey Hess
39e887e8e6 update; unix-compat gets some of the way 2012-02-02 10:56:23 -04:00
Joey Hess
33fd49703c update 2012-02-02 10:31:56 -04:00
Joey Hess
f2081ad056 update 2012-02-01 22:24:40 -04:00
Joey Hess
b91569ba98 spent 3 hours on this bug; developed two incomplete fixes 2012-02-01 16:26:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
b9a317cdbd Added a comment 2012-01-29 01:51:37 +00:00
Joey Hess
0609e10239 reopen 
People seem to want to post comments here with vague details about a new
bug, rather than opening a new bug report.
 2012-01-28 18:09:28 -04:00
Joey Hess
6e89064d27 fixed 2012-01-28 16:01:53 -04:00
http://joey.kitenet.net/
a75eff4a8e Added a comment 2012-01-28 19:40:34 +00:00
http://joey.kitenet.net/
2a6be431d4 Added a comment 2012-01-28 19:32:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
141718da73 Added a comment 2012-01-28 00:21:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
13e78fbf88 Added a comment 2012-01-28 00:17:38 +00:00
http://joey.kitenet.net/
0f8a8ef4a5 Added a comment 2012-01-27 21:00:06 +00:00
Joey Hess
0bb3a31a6e old version? 2012-01-27 16:50:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
ba6f01b137 2012-01-27 08:12:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
9b91db8254 Added a comment 2012-01-26 22:13:19 +00:00
Joey Hess
9b51ec9dbf add 2012-01-25 17:39:38 -04:00
Joey Hess
bc130e355e close 2012-01-24 16:22:24 -04:00
Joey Hess
ce5637498f remove Utility.Conditional and use IfElse 
This drops the >>! and >>? with the nice low fixity. IfElse does have
undocumented >>=>>! and >>=>>? operators, but I deem that too fishy.
Anyway, using whenM and unlessM is easier; I sometimes mixed the operators
up.
 2012-01-24 16:22:07 -04:00
Joey Hess
bed495db64 add news item for git-annex 3.20120123 2012-01-23 15:10:10 -04:00
http://joey.kitenet.net/
549bf0cddb Added a comment 2012-01-23 19:00:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlB7-aXsqwzOi2BIR_Q4sUF8sjj24H6F3c
ece239f086 2012-01-23 18:38:14 +00:00
Joey Hess
6ef82665de add annex.sshcaching config setting 2012-01-20 17:15:46 -04:00
Joey Hess
47250a153a ssh connection caching 
Ssh connection caching is now enabled automatically by git-annex. Only one
ssh connection is made to each host per git-annex run, which can speed some
things up a lot, as well as avoiding repeated password prompts. Concurrent
git-annex processes also share ssh connections. Cached ssh connections are
shut down when git-annex exits.

Note: The rsync special remote does not yet participate in the ssh
connection caching.
 2012-01-20 17:14:56 -04:00
Joey Hess
61dbad505d fsck --from remote --fast 
Avoids expensive file transfers, at the expense of checking file size
and/or contents.

Required some reworking of the remote code.
 2012-01-20 13:23:11 -04:00
Joey Hess
e96726caa3 better design 
Avoids possible repeated password prompts, at the cost of a small bit of
locking complication.
 2012-01-19 21:15:13 -04:00
Joey Hess
3783ccf252 design 2012-01-19 20:41:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
7fa95eff5e 2012-01-19 23:10:25 +00:00
Joey Hess
90319afa41 fsck --from 
Fscking a remote is now supported. It's done by retrieving
the contents of the specified files from the remote, and checking them,
so can be an expensive operation.

(Several optimisations are possible, to speed it up, of course.. This is
the slow and stupid remote fsck to start with.)

Still, if the remote is a special remote, or a git repository that you
cannot run fsck in locally, it's nice to have the ability to fsck it.

If you have any directory special remotes, now would be a good time to
fsck them, in case you were hit by the data loss bug fixed in the
previous release!
 2012-01-19 15:24:05 -04:00
Joey Hess
50c063df06 add 2012-01-18 17:30:21 -04:00
Joey Hess
de96ee7208 thought 2012-01-18 16:19:57 -04:00
Joey Hess
a2428320de add news item for git-annex 3.20120116 2012-01-16 16:52:46 -04:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
0c4f12e8a2 Added a comment: Thanks and sorry 2012-01-15 20:54:55 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
ba85dd41a6 un-tangle unrelated posts 2012-01-15 20:53:40 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
a7f1d8c3bc rename forum/__91__Installation__93___There_is_no_available_version_of_quickcheck_that_satisfies___62____61__2.1.mdwn to forum/__91__Installation__93___base-3.0.3.2_requires_syb___61____61__0.1.0.2_however_syb-0.1.0.2_was_excluded_because_json-0.5_requires_syb___62____61__0.3.3.mdwn 2012-01-15 20:53:09 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
728d7e96e0 un-tangle unrelated posts 2012-01-15 20:48:26 +00:00
http://joey.kitenet.net/
847407f860 Added a comment 2012-01-15 19:53:36 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
bc2337c0d9 syb dependency problem. 2012-01-15 19:22:46 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
37d42ed1e7 rename bugs/__91__Installation__93___There_is_no_available_version_of_quickcheck_that_satisfies___62____61__2.1.mdwn to forum/__91__Installation__93___There_is_no_available_version_of_quickcheck_that_satisfies___62____61__2.1.mdwn 2012-01-15 19:20:29 +00:00
Joey Hess
ba6ca1bc23 no, really, I fixed it 2012-01-15 15:07:01 -04:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
14113f84b5 re-opened. proposed solution doesn't help. 2012-01-15 19:02:06 +00:00
Joey Hess
f0c84686b2 add news item for git-annex 3.20120115 2012-01-15 14:03:00 -04:00
Joey Hess
37b5b1bf0d Fix QuickCheck dependency in cabal file. 2012-01-15 13:53:51 -04:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
072a3f2c99 2012-01-15 17:22:49 +00:00
Joey Hess
5481528058 add news item for git-annex 3.20120113 2012-01-13 16:01:31 -04:00
http://peter-simons.myopenid.com/
cff772031d Document how to install git-annex in Nix 2012-01-13 18:53:41 +00:00
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
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
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
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
http://joey.kitenet.net/
ba233606d2 Added a comment 2012-01-07 17:15:31 +00:00
Joey Hess
2557bb8764 complete set of log options 2012-01-06 21:48:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
773af32ee4 2012-01-06 22:14:35 +00:00
Joey Hess
9fb5f3edc7 log --after=date 2012-01-06 17:24:03 -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
2051d80462 close 2012-01-05 23:42:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
3b450cb6bc Added a comment: Thank you! 2012-01-06 03:38:33 +00:00
Joey Hess
f534fcc7b1 remove S3stub stuff 
Let's keep that in a no-s3 branch, which can be merged into eg,
debian-stable.
 2012-01-05 23:14:10 -04:00
http://joey.kitenet.net/
cdcf0aac71 Added a comment 2012-01-06 03:08:28 +00:00
http://joey.kitenet.net/
8858c24210 Added a comment 2012-01-06 03:04:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
2f2e0f7e0e 2012-01-06 01:41:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
79b95aae09 2012-01-06 01:40:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
9cb3303a27 2012-01-06 01:40:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
aedd4c1984 2012-01-06 01:31:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
17d8646164 2012-01-06 01:27:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
47d98bb446 2012-01-06 01:27:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
ba0c3eb904 2012-01-06 01:25:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
88d3443aea 2012-01-05 20:58:05 +00:00
Joey Hess
3e3ed62bdf add news item for git-annex 3.20120105 2012-01-05 13:51:32 -04:00
Joey Hess
156de9fc40 add twitter feed 2012-01-05 00:45:21 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
9298ea0f3a 2012-01-04 03:51:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
de6a2db36c 2012-01-04 03:44:52 +00:00
Joey Hess
629b794eb5 add sitemap 2012-01-03 21:12:01 -04:00
Joey Hess
2c121d23ce add how it works page 2012-01-03 21:06:16 -04:00
http://peter-simons.myopenid.com/
dda78c61b8 Added a comment 2012-01-03 19:47:12 +00:00
http://joey.kitenet.net/
4fee95dfc6 Added a comment 2012-01-03 19:31:45 +00:00
http://peter-simons.myopenid.com/
299781265a Added a comment 2012-01-03 19:17:36 +00:00
Joey Hess
7e6a54f984 Added quickcheck to build dependencies, and fail if test suite cannot be built. 2012-01-03 14:52:20 -04:00
http://joey.kitenet.net/
6b7ee8486d Added a comment 2012-01-03 18:42:08 +00:00
http://peter-simons.myopenid.com/
917a36f9f1 Added a comment 2012-01-03 18:11:40 +00:00
http://peter-simons.myopenid.com/
390982414b Added a comment 2012-01-03 18:09:42 +00:00
http://joey.kitenet.net/
79f9a2d18d Added a comment 2012-01-03 17:00:53 +00:00
http://joey.kitenet.net/
69875de8ea Added a comment 2012-01-03 16:54:19 +00:00
http://peter-simons.myopenid.com/
7cdeebdcc8 2012-01-03 16:38:47 +00:00
http://peter-simons.myopenid.com/
b6e7b44a12 2012-01-03 16:32:35 +00:00
Joey Hess
34abd7bca8 no implicit dotfiles in add 
Dotfiles, and files inside dotdirs are not added by "git annex add" unless
the dotfile or directory is explicitly listed. So "git annex add ." will
add all untracked files in the current directory except for those in
dotdirs.

One reason for this is that it will make git-annex more usable with vcsh,
where you don't want "vcsh big annex add" to check in all the dotfiles
that are already versioned in other repositories.

(If you're using vcsh for repos that contain non-dotfiles, this won't help,
and you'll need to .gitignore such things, but this will cover the common
case.)

A more general reason why this seems like a good idea is the same reason ls
ignores dotfiles, just the unix convention that they are cruft that is kept
out of the way most of the time.

All the other git-annex commands still do deal with any dotfiles that do
get into the annex. This seemed right because if I've gone to the trouble
to add a dotfile, I will want "git annex get ." to get it along with
everything else.
 2012-01-03 00:11:00 -04:00
http://a-or-b.myopenid.com/
5cd44282a9 Added a comment 2012-01-03 02:49:24 +00:00
http://joey.kitenet.net/
2f241f7dde Added a comment 2012-01-03 00:57:55 +00:00
http://a-or-b.myopenid.com/
17735698f6 Added a comment 2012-01-03 00:49:43 +00:00
http://a-or-b.myopenid.com/
9f7ca3fe0d 2012-01-03 00:43:54 +00:00
http://joey.kitenet.net/
ddc4b3de33 Added a comment 2012-01-03 00:41:08 +00:00
http://joey.kitenet.net/
eec59e7362 Added a comment 2012-01-03 00:35:00 +00:00
http://a-or-b.myopenid.com/
3e678b1140 2012-01-03 00:10:45 +00:00
Joey Hess
f0c4a1c770 annex.web-options also works 2012-01-02 14:22:50 -04:00
Joey Hess
ae99b64b53 mention this commits -a 2012-01-02 14:20:51 -04:00
Joey Hess
aa0882691b Added remote.name.annex-web-options configuration setting, which can be used to provide parameters to whichever of wget or curl git-annex uses (depends on which is available, but most of their important options suitable for use here are the same). 2012-01-02 14:20:20 -04:00
Joey Hess
50ebfd265f Merge remote-tracking branch 'origin/master' 2012-01-02 13:45:44 -04:00
Joey Hess
815fba3b39 add arch link 2012-01-02 13:44:12 -04:00
Nicolas Pouillard
b7f0f9cd0c Add specific instructions for ArchLinux 2012-01-02 18:35:38 +01:00
http://joey.kitenet.net/
1bdd04210f Added a comment 2012-01-02 16:27:55 +00:00
Joey Hess
b927041220 Merge branch 'master' of ssh://git-annex.branchable.com 2012-01-02 12:10:01 -04:00
http://joey.kitenet.net/
0e9444e474 Added a comment 2012-01-02 16:01:49 +00:00
http://www.joachim-breitner.de/
3aed5ff88a Added a comment 2012-01-02 14:02:05 +00:00
bremner
6744c41024 Added a comment: afaict git annex normalizes urls on the client side. 2011-12-31 22:29:40 +00:00
Joey Hess
97d5789157 formatting 2011-12-31 15:18:29 -04:00
Joey Hess
4a57542688 update 2011-12-31 15:12:16 -04:00
Joey Hess
f165e4aa99 add section on syncing to the walkthrough 2011-12-31 14:50:40 -04:00
Joey Hess
dd41be54f9 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-31 14:34:46 -04:00
http://joey.kitenet.net/
68489c5cf2 Added a comment 2011-12-31 18:34:31 +00:00
Joey Hess
09905f6655 Merge branch 'autosync' 2011-12-31 14:32:59 -04:00
http://joey.kitenet.net/
38195a6363 Added a comment 2011-12-31 18:32:28 +00:00
bremner
e073add830 Added a comment: ssh://gitolite-host/repo-name is supposed to work 2011-12-31 03:34:19 +00:00
bremner
db55fa1c07 Added a comment: gitolite gets different paths for different urls 2011-12-31 01:50:50 +00:00
Joey Hess
e7d3e546c2 sync --fast: Selects some of the remotes with the lowest annex.cost and syncs those, in addition to any specified at the command line. 2011-12-30 21:17:36 -04:00
Joey Hess
252376d639 Merge branch 'master' into autosync 2011-12-30 20:38:59 -04:00
Joey Hess
230bc8334b typo 2011-12-30 20:30:36 -04:00
http://joey.kitenet.net/
133170fb23 Added a comment 2011-12-31 00:29:45 +00:00
Joey Hess
93700b14c9 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-30 20:22:36 -04:00
Joey Hess
8f4fdb3f97 Merge branch 'new-monad-control' 
Conflicts:
	debian/changelog
 2011-12-30 20:08:01 -04:00
Joey Hess
b538f45faf add a sync page documenting sync in detail 2011-12-30 20:02:55 -04:00
http://joey.kitenet.net/
5a2a515fff Added a comment 2011-12-30 23:45:58 +00:00
Joey Hess
34c89dc146 improve description of sync 2011-12-30 19:45:23 -04:00
Joey Hess
9d85baa314 improve wording 2011-12-30 17:54:09 -04:00
http://joey.kitenet.net/
2260eca688 Added a comment 2011-12-30 21:49:07 +00:00
bremner
4610f28f17 Added a comment: repo name conventions? 2011-12-30 21:41:15 +00:00
Joey Hess
dc83d721c2 Merge remote-tracking branch 'nomeata/master' into sync 2011-12-30 15:02:37 -04:00
http://www.joachim-breitner.de/
3dffcf9ccb Added a comment: Finally some code 2011-12-29 19:58:31 +00:00
Joachim Breitner
559bbdb424 Outline extended git annex sync semantics in the documentation 2011-12-27 19:23:41 +01:00
http://joey.kitenet.net/
6068cef038 Added a comment: git tweak-fetch 2011-12-26 18:50:36 +00:00
Joey Hess
85f1f3a63a Updated to build with monad-control 0.3. 2011-12-24 23:05:23 -04:00
http://www.openid.albertlash.com/openid/
2101ef20d1 2011-12-25 01:55:45 +00:00
http://www.openid.albertlash.com/openid/
899b20f89c 2011-12-24 17:05:38 +00:00
Joey Hess
ffefe742d8 fix typo 2011-12-24 12:59:45 -04:00
Joey Hess
82cc5d3d31 slightly improve typography 2011-12-24 12:59:45 -04:00
http://joey.kitenet.net/
0c107c98de Added a comment 2011-12-24 16:54:31 +00:00
http://joey.kitenet.net/
c87a814046 Added a comment 2011-12-24 16:49:13 +00:00
http://www.joachim-breitner.de/
ab1435310c Added a comment 2011-12-24 12:51:43 +00:00
http://www.joachim-breitner.de/
ffe9973ed5 Added a comment 2011-12-24 12:49:41 +00:00
http://www.openid.albertlash.com/openid/
ccddaf2f5c Added a comment 2011-12-24 06:08:46 +00:00
http://adamspiers.myopenid.com/
4eafd43cce Added a comment: Any update on this? 2011-12-24 01:05:08 +00:00
http://adamspiers.myopenid.com/
f78b0cb4e7 2011-12-24 00:48:37 +00:00
http://adamspiers.myopenid.com/
1202e605d7 2011-12-24 00:45:43 +00:00
http://adamspiers.myopenid.com/
010780dc55 add a page for openSUSE install instructions 2011-12-24 00:13:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
4fb3114228 Added a comment 2011-12-23 22:04:09 +00:00
http://joey.kitenet.net/
56e4acfa24 Added a comment 2011-12-23 19:19:53 +00:00
http://adamspiers.myopenid.com/
bfa5509dbd Added a comment: Cool 2011-12-23 19:16:51 +00:00
http://joey.kitenet.net/
131d560ba6 Added a comment 2011-12-23 18:43:05 +00:00
http://joey.kitenet.net/
cbaf13e587 Added a comment 2011-12-23 18:02:24 +00:00
http://joey.kitenet.net/
d5889f8271 Added a comment 2011-12-23 17:52:21 +00:00
http://adamspiers.myopenid.com/
74e86b6da2 Added a comment 2011-12-23 17:24:59 +00:00
http://adamspiers.myopenid.com/
d3e80eabe8 Added a comment 2011-12-23 17:22:12 +00:00
http://adamspiers.myopenid.com/
fe65981de8 Added a comment 2011-12-23 17:14:03 +00:00
Joey Hess
3b1c80d795 fix 2011-12-23 12:58:39 -04:00
Joey Hess
6fcf76bcd1 slight simplification 2011-12-23 12:57:52 -04:00
Joey Hess
a0227e81f9 put in explicit fetch ; merge in walkthrough for now 
and link to centralized repository tutorial
 2011-12-23 12:55:11 -04:00
http://joey.kitenet.net/
304930f1fc Added a comment 2011-12-23 16:50:26 +00:00
Joey Hess
9e6ff9e734 improve wording to not imply a pull is done by merge 2011-12-23 12:49:28 -04:00
http://joey.kitenet.net/
0df51acc52 2011-12-23 16:20:43 +00:00
http://joey.kitenet.net/
e2b2c67f05 Added a comment 2011-12-23 16:16:19 +00:00
http://joey.kitenet.net/
538665f477 Added a comment 2011-12-23 16:07:39 +00:00
Joey Hess
8a2105c90a Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-23 11:34:10 -04:00
http://adamspiers.myopenid.com/
abba5d3e82 Added a comment: I think Matt is right. 2011-12-23 14:04:46 +00:00
http://adamspiers.myopenid.com/
77ffd070ad Added a comment 2011-12-23 13:31:34 +00:00
Joey Hess
7227dd8f21 add escape_var hack 
Makes it easy to find files with duplicate contents, anyway.. :)
 2011-12-23 01:08:19 -04:00
Joey Hess
13a0c292b3 update example to actually work with new --format option 2011-12-23 01:08:19 -04:00
Joey Hess
eb7ef6264e fix 2011-12-23 01:08:18 -04:00
Joey Hess
a0872a8ec3 better data type 2011-12-22 19:56:31 -04:00
Joey Hess
06bafae9e0 Format strings can be specified using the new --find option, to control what is output by git annex find. 2011-12-22 18:31:44 -04:00
http://adamspiers.myopenid.com/
c02605919b Added a comment: How much memory would it actually use anyway? 2011-12-22 20:15:23 +00:00
http://adamspiers.myopenid.com/
38ad1065c9 Added a comment 2011-12-22 20:04:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
2a7246864e 2011-12-22 19:33:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
1071a3cf02 2011-12-22 19:21:50 +00:00
Joey Hess
6bffe509d7 Add --include, which is the same as --not --exclude. 2011-12-22 14:00:17 -04:00
http://joey.kitenet.net/
30cf6ce81c Added a comment 2011-12-22 16:39:24 +00:00
http://adamspiers.myopenid.com/
6808b08c1a Added a comment: Here's a Perl version 2011-12-22 15:43:52 +00:00
http://adamspiers.myopenid.com/
97bef4af73 Added a comment: List the duplicate filenames, then let the user decide what to do 2011-12-22 12:31:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
a99af6338e Added a comment 2011-12-21 16:06:26 +00:00
http://joey.kitenet.net/
a2e482b590 Added a comment: Good question! 2011-12-20 23:07:25 +00:00
Ian
58a89c243c 2011-12-20 22:36:03 +00:00
Joey Hess
1c28237e0c map: --fast disables use of dot to display map 
Generally useful, and allows the test suite to test it.
 2011-12-20 16:42:35 -04:00
http://joey.kitenet.net/
92de7c8dcd Added a comment 2011-12-20 14:56:12 +00:00
http://adamspiers.myopenid.com/
0de4341c97 Added a comment 2011-12-20 12:00:18 +00:00
http://www.joachim-breitner.de/
89fd3b2e4b Added a comment 2011-12-19 22:56:26 +00:00
Joey Hess
f0f84dbe48 close 2011-12-19 14:31:33 -04:00
http://joey.kitenet.net/
0b38397c6d Added a comment 2011-12-19 18:29:01 +00:00
http://joey.kitenet.net/
cddd521e1f Added a comment 2011-12-19 18:24:59 +00:00
http://joey.kitenet.net/
9b32d02a24 Added a comment 2011-12-19 18:22:25 +00:00
http://adamspiers.myopenid.com/
e341cdf0da Added a comment: extra level of indirection 2011-12-19 12:45:19 +00:00
http://www.joachim-breitner.de/
6a9b3c2f22 Added a comment 2011-12-18 13:57:34 +00:00
Joachim Breitner
0bba09cd5b fix syntax 2011-12-18 13:12:28 +01:00
Joachim Breitner
fa9d83f144 fix syntax 2011-12-18 13:11:41 +01:00
http://www.joachim-breitner.de/
a16f1accbc Added a comment 2011-12-18 12:08:52 +00:00
http://www.joachim-breitner.de/
3f01795a26 2011-12-18 11:59:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
9698eecf0f 2011-12-18 09:35:40 +00:00
Joey Hess
9e82c348b7 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-16 14:21:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko
a3e4bf8c16 2011-12-16 09:23:21 +00:00
http://gebi.myopenid.com/
ec11908799 2011-12-16 00:13:54 +00:00
Joey Hess
38b02de1a8 update 2011-12-15 15:21:03 -04:00
Joey Hess
2b24e16a63 typo 2011-12-14 13:32:13 -04:00
http://joey.kitenet.net/
25a5f6664e Added a comment 2011-12-14 17:31:31 +00:00
http://adamspiers.myopenid.com/
020c845058 2011-12-13 23:26:58 +00:00
http://adamspiers.myopenid.com/
c92d407efd add a link to git-union-merge 2011-12-13 22:01:13 +00:00
http://joey.kitenet.net/
490810ff9f Added a comment 2011-12-13 20:53:23 +00:00
http://www.joachim-breitner.de/
1a06455f5c Added a comment 2011-12-13 18:47:18 +00:00
http://www.joachim-breitner.de/
51b95fbc07 Added a comment 2011-12-13 18:16:09 +00:00
Joey Hess
d3d9c8a9a6 add news item for git-annex 3.20111211 2011-12-11 21:56:17 -04:00
Joey Hess
c4c965d602 detect and recover from branch push/commit race 
Dealing with a race without using locking is exceedingly difficult and tricky.
Fully tested, I hope.

There are three places left where the branch can be updated, that are not
covered by the race recovery code. Let's prove they're all immune to the
race:

1. tryFastForwardTo checks to see if a fast-forward can be done,
   and then does git-update-ref on the branch to fast-forward it.

   If a push comes in before the check, then either no fast-forward
   will be done (ok), or the push set the branch to a ref that can
   still be fast-forwarded (also ok)

   If a push comes in after the check, the git-update-ref will
   undo the ref change made by the push. It's as if the push did not come
   in, and the next git-push will see this, and try to re-do it.
   (acceptable)

2. When creating the branch for the very first time, an empty index
   is created, and a commit of it made to the branch. The commit's ref
   is recorded as the current state of the index. If a push came in
   during that, it will be noticed the next time a commit is made to the
   branch, since the branch will have changed. (ok)

3. Creating the branch from an existing remote branch involves making
   the branch, and then getting its ref, and recording that the index
   reflects that ref.

   If a push creates the branch first, git-branch will fail (ok).

   If the branch is created and a racing push is then able to change it
   (highly unlikely!) we're still ok, because it first records the ref into
   the index.lck, and then updating the index. The race can cause the
   index.lck to have the old branch ref, while the index has the newly pushed
   branch merged into it, but that only results in an unnecessary update of
   the index file later on.
 2011-12-11 20:41:35 -04:00
Joey Hess
81f311103d a new bug report to track a race 2011-12-11 16:41:56 -04:00
Joey Hess
0236bb020b update 2011-12-11 16:19:54 -04:00
Joey Hess
8680c415de slow, stupid, and safe index updating 
Always merge the git-annex branch into .git/annex/index before making a
commit from the index.

This ensures that, when the branch has been changed in any way
(by a push being received, or changes pulled directly into it, or
even by the user checking it out, and committing a change), the index
reflects those changes.

This is much too slow; it needs to be optimised to only update the
index when the branch has really changed, not every time.

Also, there is an unhandled race, when a change is made to the branch
right after the index gets updated. I left it in for now because it's
unlikely and I didn't want to complicate things with additional locking
yet.
 2011-12-11 15:05:53 -04:00
Joey Hess
59971c9230 new bug 2011-12-11 14:47:44 -04:00
Joey Hess
bf6a3b757a close 2011-12-11 01:15:27 -04:00
Joey Hess
10e8028a42 Fix bug in last version in getting contents from bare repositories. 2011-12-10 18:45:55 -04:00
http://schnouki.net/
bfdc9f28fc 2011-12-10 21:40:01 +00:00
http://joey.kitenet.net/
6cf28585b6 Added a comment 2011-12-10 19:43:04 +00:00
Joey Hess
d6fafc463e Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-10 12:33:48 -04:00
http://www.joachim-breitner.de/
e0e9d1cabd Added a comment 2011-12-10 16:28:29 +00:00
Joey Hess
fb8231f3a1 sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you. 2011-12-09 20:27:22 -04:00
http://joey.kitenet.net/
be67294a1e Added a comment 2011-12-09 22:56:11 +00:00
http://www.joachim-breitner.de/
2cd22c1a13 brr, so many typos today. 2011-12-09 21:25:37 +00:00
http://www.joachim-breitner.de/
07c32dd49c typo 2011-12-09 20:57:00 +00:00
http://www.joachim-breitner.de/
d69cf79e20 2011-12-09 20:47:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
e664af5d8c 2011-12-09 10:03:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
b3ac4af6b0 2011-12-08 22:50:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
e0e40964ab 2011-12-08 22:42:29 +00:00
Joey Hess
e3f1568e0f Fix caching of decrypted ciphers, which failed when drop had to check multiple different encrypted special remotes. 2011-12-08 16:01:46 -04:00
http://gebi.myopenid.com/
2568beee07 2011-12-08 14:24:08 +00:00
http://joey.kitenet.net/
2515bb6520 Added a comment 2011-12-07 20:54:51 +00:00
Joey Hess
d2ff311a34 change footer 2011-12-07 13:17:00 -04:00
Joey Hess
5926be6f30 response 2011-12-07 12:36:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
c929f9df0f Added a comment 2011-12-07 07:39:16 +00:00
http://gebi.myopenid.com/
51b7b82870 2011-12-07 05:48:47 +00:00
http://gebi.myopenid.com/
919d58667a 2011-12-07 03:20:43 +00:00
http://gebi.myopenid.com/
ee26ebe6eb 2011-12-07 03:14:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
42c81e5dc0 Added a comment 2011-12-06 23:23:31 +00:00
Joey Hess
6f221f1fc3 response 2011-12-06 17:06:08 -04:00
http://gebi.myopenid.com/
adb1dc65bc 2011-12-06 20:25:06 +00:00
http://joey.kitenet.net/
ba74e2069c Added a comment 2011-12-06 17:08:37 +00:00
Joey Hess
480495beb4 Prevent key names from containing newlines. 
There are several places where it's assumed a key can be written on one
line. One is in the format of the .git/annex/unused files. The difficult
one is that filenames derived from keys are fed into git cat-file --batch,
which has a line based input. (And no -z option.)

So, for now it's best to block such keys being created.
 2011-12-06 13:03:09 -04:00
http://joey.kitenet.net/
cf5353acb4 Added a comment 2011-12-06 16:49:32 +00:00
http://joey.kitenet.net/
340d206efe Added a comment 2011-12-06 16:43:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
c3d3bf3329 2011-12-06 13:36:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
01f7c74d1f 2011-12-06 13:05:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
d62b060f0f Added a comment 2011-12-06 12:50:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
27ce7ba5b4 2011-12-06 12:43:56 +00:00
Joey Hess
20d729514a added a branch for the new monad-control 0.3 2011-12-05 22:54:30 -04:00
Joey Hess
2a1e3bceb3 respond 2011-12-05 15:42:02 -04:00
Joey Hess
fd5c979121 fixed a long time ago 2011-12-05 15:38:04 -04:00
http://peter-simons.myopenid.com/
622c2b9b8b 2011-12-05 19:13:20 +00:00
http://peter-simons.myopenid.com/
04e5bf3644 2011-12-05 19:09:14 +00:00
Joey Hess
58567045b7 add news item for git-annex 3.20111203 2011-12-03 21:13:29 -04:00
Joey Hess
2f8d75638a update for dead repos 2011-12-03 21:01:22 -04:00
Joey Hess
251c01d51e dead: A command which says that a repository is gone for good and you don't want git-annex to mention it again. 2011-12-02 16:59:55 -04:00
Joey Hess
7b08584c55 close 2011-12-02 16:59:09 -04:00
Joey Hess
6f29f9db72 rename 2011-12-02 16:15:18 -04:00
Joey Hess
a08c4462ac Merge branch 'master' into hashdirlower 2011-12-01 17:43:38 -04:00
Joey Hess
3953f7ab81 idea 2011-12-01 17:40:26 -04:00
Joey Hess
f4bf444ae0 store content in hashDirLower directories in bare repositories 
When storing content in bare repositories, use the hashDirLower
directories. Bare repositories can be on USB drives, which might
use the FAT filesystem, and fall afoul of recent bugs in linux's handling
of mixed case on FAT. Using hashDirLower avoids that.
 2011-11-28 22:55:40 -04:00
Joey Hess
2b3c120506 clarify extent of limit checks 2011-11-28 17:49:03 -04:00
Joey Hess
e32ab766b0 --inbackend can be used to make git-annex only operate on files whose content is stored using a specified key-value backend. 2011-11-28 17:45:47 -04:00
Joey Hess
16653132b7 Merge branch 'master' of ssh://git-annex.branchable.com 2011-11-28 16:45:04 -04:00
Joey Hess
6869e6023e support .git/annex on a different disk than the rest of the repo 
The only fully supported thing is to have the main repository on one disk,
and .git/annex on another. Only commands that move data in/out of the annex
will need to copy it across devices.

There is only partial support for putting arbitrary subdirectories of
.git/annex on different devices. For one thing, but this can require more
copies to be done. For example, when .git/annex/tmp is on one device, and
.git/annex/journal on another, every journal write involves a call to
mv(1). Also, there are a few places that make hard links between various
subdirectories of .git/annex with createLink, that are not handled.

In the common case without cross-device, the new moveFile is actually
faster than renameFile, avoiding an unncessary stat to check that a file
(not a directory) is being moved. Of course if a cross-device move is
needed, it is as slow as mv(1) of the data.
 2011-11-28 16:17:55 -04:00
http://cgray.myopenid.com/
d9e770a836 Added a comment 2011-11-27 22:10:45 +00:00
Joey Hess
ff2d9c8283 response 2011-11-27 17:09:29 -04:00
Joey Hess
5bc7767c21 Merge branch 'master' of ssh://git-annex.branchable.com 2011-11-27 17:01:17 -04:00
http://hcs.furuvik.net/
178a49af75 2011-11-27 20:52:15 +00:00
Joey Hess
faf55ac2b7 update 2011-11-27 13:57:56 -04:00
http://joey.kitenet.net/
a3f4ea1a69 Added a comment 2011-11-27 17:56:31 +00:00
Joey Hess
2bf3addf49 Bugfix: dropunused did not drop keys with two spaces in their name. 2011-11-27 13:50:05 -04:00
Joey Hess
af239e5c33 Merge branch 'master' of ssh://git-annex.branchable.com 2011-11-25 15:32:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
ba1ec2c60f 2011-11-25 05:56:59 +00:00
Joey Hess
566a5f4881 Merge branch 'master' of ssh://git-annex.branchable.com 2011-11-24 11:57:22 -04:00
http://cgray.myopenid.com/
709acf3f24 2011-11-24 01:59:45 +00:00
Joey Hess
3dd66fd2f0 update url 2011-11-22 22:13:11 -04:00
Joey Hess
75a590bdd8 Put a workaround in the directory special remote for strange behavior with VFAT filesystems on Linux (mounted with shortname=mixed) 2011-11-22 18:21:28 -04:00
http://joey.kitenet.net/
fd81b5047b Added a comment 2011-11-22 21:01:14 +00:00
http://joey.kitenet.net/
112399bf1a Added a comment 2011-11-22 20:59:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
6d7e990dca Added a comment 2011-11-22 20:35:03 +00:00
http://joey.kitenet.net/
eeda534e9a Added a comment 2011-11-22 19:56:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
b1c601ac8c Added a comment: Case sensitivity 2011-11-22 18:51:04 +00:00
Joey Hess
2d9099531b add news item for git-annex 3.20111122 2011-11-22 14:41:52 -04:00
Joey Hess
7f7ae7a3b1 find: Support --print0 
It would be nice if command-specific options were supported. The first
difficulty is that which command is being called is not known until after
getopt; but that could be worked around by finding the first non-dashed
parameter. Storing the settings without putting them in the annex monad is
the next difficulty; it could perhaps be handled by making the seek stage
pass applicable settings into the start stage (and from there on to perform
as needed). But that still leaves a problem, what data type to use to
represent the options between getopt and seek?
 2011-11-22 14:06:31 -04:00
Joey Hess
fc2f0e8b1a response; cannot reproduce 2011-11-22 12:37:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
35b4706958 2011-11-22 07:09:24 +00:00
http://cgray.myopenid.com/
6c0448d94c 2011-11-21 22:24:04 +00:00
Joey Hess
2768be7136 response 2011-11-20 14:19:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
1de00df636 2011-11-18 21:12:30 +00:00
Joey Hess
1326bb8635 Avoid excessive escaping for rsync special remotes that are not accessed over ssh. 
This is actually tricky, 45bbf210a1 added
the escaping because it's needed for rsync that does go over ssh.
So I had to detect whether the remote's rsync url will use ssh or not,
and vary the escaping.
 2011-11-18 12:53:48 -04:00
Joey Hess
ed55a750d5 response 2011-11-18 11:58:55 -04:00
http://ertai.myopenid.com/
1516458885 2011-11-18 14:11:08 +00:00
Joey Hess
c70b78d40a migrate: Don't fall over a stale temp file. 2011-11-17 18:29:28 -04:00
Joey Hess
8b892901a9 analysis; not a bug but a feature 2011-11-17 18:20:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
b3bbc1cbb6 2011-11-17 21:56:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
abd4e1192f 2011-11-17 21:51:55 +00:00
Joey Hess
6d9f525f64 clarify 2011-11-16 11:59:17 -04:00
Joey Hess
2bb6b02948 When not run in a git repository, git-annex can still display a usage message, and "git annex version" even works. 
Things that sound simple, but are made hard by the Annex monad being built
with the assumption that there will always be a git repo.
 2011-11-16 00:49:09 -04:00
Joey Hess
6d0af3b211 Merge branch 'master' of ssh://git-annex.branchable.com 2011-11-16 00:05:15 -04:00
Joey Hess
e83b966eb5 cleanup 2011-11-15 23:51:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
e92534e5b5 Added a comment 2011-11-16 03:24:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
eb0c8c955c 2011-11-16 03:22:29 +00:00
Joey Hess
3c45371115 close as resolved 2011-11-15 01:53:28 -04:00
http://cgray.myopenid.com/
d99fa3ec4e removed 2011-11-15 05:22:09 +00:00
http://cgray.myopenid.com/
8d9d94f90c Added a comment 2011-11-15 05:15:47 +00:00
http://cgray.myopenid.com/
eb214f719c Added a comment 2011-11-15 05:14:05 +00:00
http://joey.kitenet.net/
cfc518190c Added a comment 2011-11-15 04:46:13 +00:00
http://joey.kitenet.net/
a6091dc271 Added a comment 2011-11-15 04:40:35 +00:00
http://cgray.myopenid.com/
6368c79fe4 Fix typo 2011-11-15 00:47:57 +00:00
http://cgray.myopenid.com/
c093839a40 2011-11-15 00:41:08 +00:00
Joey Hess
bfe38f8ff1 status --json --fast for esc 
* status: Fix --json mode (only the repository lists are currently
  displayed)
* status: --fast is back
 2011-11-14 19:27:22 -04:00
http://joey.kitenet.net/
02f1d5467a Added a comment 2011-11-14 22:48:03 +00:00
http://joey.kitenet.net/
4d72c1b69c Added a comment 2011-11-14 22:46:35 +00:00
http://www.joachim-breitner.de/
522df3da58 2011-11-14 22:30:02 +00:00
Joey Hess
aa4fbbdd33 status: Now displays trusted, untrusted, and semitrusted repositories separately. 2011-11-14 16:14:17 -04:00
Joey Hess
04edae6791 Optimised union merging; now only runs git cat-file once. 2011-11-12 17:45:12 -04:00
Joey Hess
e9bfa8eaed avoid unnecessary auto-merge when only changing a file in the branch. 
Avoids doing auto-merging in commands that don't need fully current
information from the git-annex branch. In particular, git annex add no
longer needs to auto-merge. Affected commands: Anything that doesn't
look up data from the branch, but does write a change to it.

It might seem counterintuitive that we can change a value without first
making sure we have the current value. This optimisation works because
these two sequences are equivilant:

1. pull from remote
2. union merge
3. read file from branch
4. modify file and write to branch

vs.

1. read file from branch
2. modify file and write to branch
3. pull from remote
4. union merge

After either sequence, the git-annex branch contains the same logical content
for the modified file. (Possibly with lines in a different order or
additional old lines of course).
 2011-11-12 15:15:57 -04:00
Joey Hess
fe4ad93e4a add 2011-11-12 14:46:32 -04:00
Joey Hess
6e946b9a39 add 2011-11-12 14:24:14 -04:00
Joey Hess
15b92ad6a1 add news item for git-annex 3.20111111 2011-11-11 16:29:57 -04:00
Joey Hess
71b216d1fb map: Support remotes with /~/ and /~user/ 
More accurately, it was supported already when map uses git-annex-shell,
but not when it does not.

Note that the user name cannot be shell escaped using git-annex's current
approach for shell escaping. I tried and some shells like dash cannot
cd ~'joey'. Rest of directory is still shell escaped, not for security but
in case a directory has a space or other weird character.
 2011-11-11 16:18:53 -04:00
Joey Hess
e4105df78a tested all known types of cycles, all are fixed 
My testing involved widening the race by adding sleeps, and making sure
something sane happens in each case.
 2011-11-10 03:06:08 -04:00
Joey Hess
a218ce41cf exclusive locks, ugh 2011-11-09 22:15:33 -04:00
Joey Hess
d3e1a3619f safer inannex checking 
git-annex-shell inannex now returns always 0, 1, or 100 (the last when
it's unclear if content is currently in the index due to it currently being
moved or dropped).

(Actual locking code still not yet written.)
 2011-11-09 18:33:15 -04:00
Joey Hess
8ce7e73f74 reorg to allow taking content lock 
The lock will only persist during the perform stage, so the content must
be removed from the annex then, rather than in the cleanup stage.

(No lock is actually taken yet.)
 2011-11-09 16:54:18 -04:00
Joey Hess
58563c5b1a warning about version of git-annex shipped in recent Ubuntu release 2011-11-09 14:37:14 -04:00
Joey Hess
a243d6e6e9 directly lock content? 2011-11-09 14:32:31 -04:00
Joey Hess
393b6b1bde problem that came to me at 2 am 2011-11-09 13:34:17 -04:00
Joey Hess
2ff8915365 fix 2011-11-08 12:24:56 -04:00
Joey Hess
67c9f84a1f fix broken links 2011-11-08 12:23:03 -04:00
Joey Hess
d35cd6ff26 wiki updates 2011-11-08 12:16:02 -04:00
Joey Hess
05b7608113 update 2011-11-08 01:27:06 -04:00
Joey Hess
faa4935047 Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change. 2011-11-07 18:10:31 -04:00