Joey Hess
5728bb58e0
force git-annex branch update after fetching remotes
...
git-annex normally only runs the branch update once per run, for speed, but
since this fetches new remote git-annex tracking branches, they need to be
merged in after that fetch. An earlier call to Remote.byName was causing
the update to run before the fetch sometimes, but it could have been
anything. Just force the update to happen in the right place.
2011-12-30 16:03:41 -04:00
Joey Hess
925b6390aa
add forceUpdate
...
This code is picked from my tweak-fetch branch, which already did the needed
refactoring.
2011-12-30 15:57:28 -04:00
Joey Hess
dc83d721c2
Merge remote-tracking branch 'nomeata/master' into sync
2011-12-30 15:02:37 -04:00
Joey Hess
5287d1dc3f
fixed behavior when multiple insteadOf configs are provided for the same url base
...
Consider this git config --list case:
url.git+ssh://git@example.com/.insteadOf=gl
url.git+ssh://git@example.com/.insteadOf=shared
Since config is stored in a Map, only the last of the values for this key
was stored and available for use by the insteadOf code. But that
is wrong; git allows either "gl" or "shared" to be used in an url and
the insteadOf value to be substituted in.
To support this, it seems best to keep the existing config map as-is,
and add a second map that accumulates a list of multiple values for
config keys. This new fullconfig map can be used in the rare places where
multiple values for a key make sense, without needing to complicate
everything else.
Haskell's laziness and data sharing keep the overhead of adding
this second map low.
2011-12-30 14:07:46 -04:00
http://www.joachim-breitner.de/
3dffcf9ccb
Added a comment: Finally some code
2011-12-29 19:58:31 +00:00
Joachim Breitner
b6e7b40be4
By default, sync with all remotes having the synced/ branch
2011-12-29 20:50:57 +01:00
Joachim Breitner
0ee1141f30
Implement branch-syncing in Command.Sync
...
as described in the previous commit to the documentation. The loggin UI
is not great yet.
2011-12-29 18:37:30 +01: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
Joey Hess
6d4382a89e
Merge branch 'new-monad-control'
2011-12-24 23:02:42 -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
Joey Hess
499b9dcacd
Merge branch 'master' of ssh://git-annex.branchable.com
2011-12-23 14:09:36 -04:00
Joey Hess
1940e52793
skip repos without a description set when --in="" is specified
...
Picking one of probably several remotes with no description set was not
useful behavior.
2011-12-23 14:08:04 -04: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
Joey Hess
b05c08b5c1
reorder less expensive terminal first
...
Out of general principles, it did not seem to actually speed it
up appreciably. (I suspect ghc is being smart.)
2011-12-23 13:19:28 -04: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
f015ef5fde
cleanup
2011-12-23 01:08:19 -04:00
Joey Hess
fdf02986cf
find --json
2011-12-23 01:08:19 -04: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
