From 85f1f3a63a025204e931959ec9c5ae2a7812ddff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Dec 2011 23:05:23 -0400 Subject: Updated to build with monad-control 0.3. --- doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn index ca68c2c91..f82224991 100644 --- a/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn +++ b/doc/todo/Please_add_support_for_monad-control_0.3.x.mdwn @@ -5,3 +5,5 @@ Git-annex doesn't compile with the latest version of monad-control. Would it be > > There is now a branch in git called `new-monad-control` that will build > with the new monad-control. --[[Joey]] + +>> Now merged to master. [[done]] --[[Joey]] -- cgit v1.2.3 From 4610f28f17d7a07dc70e42abba33ec5961e2795e Mon Sep 17 00:00:00 2001 From: bremner Date: Fri, 30 Dec 2011 21:41:15 +0000 Subject: Added a comment: repo name conventions? --- .../comment_3_807035f38509ccb9f93f1929ecd37417._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/using_gitolite_with_git-annex/comment_3_807035f38509ccb9f93f1929ecd37417._comment (limited to 'doc') diff --git a/doc/tips/using_gitolite_with_git-annex/comment_3_807035f38509ccb9f93f1929ecd37417._comment b/doc/tips/using_gitolite_with_git-annex/comment_3_807035f38509ccb9f93f1929ecd37417._comment new file mode 100644 index 000000000..243764054 --- /dev/null +++ b/doc/tips/using_gitolite_with_git-annex/comment_3_807035f38509ccb9f93f1929ecd37417._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="bremner" + ip="156.34.79.193" + subject="repo name conventions?" + date="2011-12-30T21:41:13Z" + content=""" +I'm confused by the fact that the git-annex-shell adc rejects any repo names that don't start with /~/ since none of my repos start that way. It seems work ok if I just delete /\~ from the front of the regex, but I feel like I must be missing something. +"""]] -- cgit v1.2.3 From 2260eca688320100e28f4ad3c7dac04c00f51ebf Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Fri, 30 Dec 2011 21:49:07 +0000 Subject: Added a comment --- ...nt_11_6b541ed834ef45606f3b98779a25a148._comment | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 doc/forum/pure_git-annex_only_workflow/comment_11_6b541ed834ef45606f3b98779a25a148._comment (limited to 'doc') diff --git a/doc/forum/pure_git-annex_only_workflow/comment_11_6b541ed834ef45606f3b98779a25a148._comment b/doc/forum/pure_git-annex_only_workflow/comment_11_6b541ed834ef45606f3b98779a25a148._comment new file mode 100644 index 000000000..30932e301 --- /dev/null +++ b/doc/forum/pure_git-annex_only_workflow/comment_11_6b541ed834ef45606f3b98779a25a148._comment @@ -0,0 +1,30 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 11" + date="2011-12-30T21:49:06Z" + content=""" +OMG, my first sizable haskell patch! + +So trying this out.. + +In each repo I want to sync, I first `git branch synced/master` + +Then in each repo, I found I had to pull from each of its remotes, to get the tracking branches that `defaultSyncRemotes` looks for to know those remotes are syncable. This was the surprising thing for me, I had expected sync to somehow work out which remotes were syncable without my explicit pull. And it was not very obvious that sync was not doing its thing before I did that, since it still does a lot of \"stuff\". + +Once set up properly, `git annex sync` fetches from each remote, merges, and then pushes to each remote that has a synced branch. Changes propigate around even when some links are one-directional. Cool! + +So it works fine, but I think more needs to be done to make setting up syncing easier. Ideally, all a user would need to do is run \"git annex sync\" and it syncs from all remotes, without needing to manually set up the synced/master branch. + +While this would lose the ability to control which remotes are synced, I think that being able to `git annex sync origin` and only sync from/to origin is sufficient, for the centralized use case. + +--- + +Code review: + +Why did you make `branch` strict? + +There is a bit of a bug in your use of Command.Merge.start. The git-annex branch merge code only runs once per git-annex run, and often this comes before sync fetches from the remotes, leading to a push conflict. I've fixed this in my \"sync\" branch, along with a few other minor things. + +`mergeRemote` merges from `refs/remotes/foo/synced/master`. But that will only be up-to-date if `git annex sync` has recently been run there. Is there any reason it couldn't merge from `refs/remotes/foo/master`? +"""]] -- cgit v1.2.3 From 5a2a515fffbd7c19397f3825d3b2adcf8cf82f76 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Fri, 30 Dec 2011 23:45:58 +0000 Subject: Added a comment --- .../comment_12_ca8ca35d6cd4a9f94568536736c12adc._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/pure_git-annex_only_workflow/comment_12_ca8ca35d6cd4a9f94568536736c12adc._comment (limited to 'doc') diff --git a/doc/forum/pure_git-annex_only_workflow/comment_12_ca8ca35d6cd4a9f94568536736c12adc._comment b/doc/forum/pure_git-annex_only_workflow/comment_12_ca8ca35d6cd4a9f94568536736c12adc._comment new file mode 100644 index 000000000..5b0259b97 --- /dev/null +++ b/doc/forum/pure_git-annex_only_workflow/comment_12_ca8ca35d6cd4a9f94568536736c12adc._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 12" + date="2011-12-30T23:45:57Z" + content=""" +I have made a new `autosync` branch, where all that the user needs to do is run `git annex sync` and it automatically sets up the synced/master branch. I find this very easy to use, what do you think? + +Note that `autosync` is also pretty smart about not running commands like \"git merge\" and \"git push\" when they would not do anything. So you may find `git annex sync` not showing all the steps you'd expect. The only step a sync always performs now is pulling from the remotes. +"""]] -- cgit v1.2.3 From 133170fb2314f9eb09343460263fed9bebb5b383 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sat, 31 Dec 2011 00:29:45 +0000 Subject: Added a comment --- ...ent_4_eb81f824aadc97f098379c5f7e4fba4c._comment | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment (limited to 'doc') diff --git a/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment b/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment new file mode 100644 index 000000000..a94eec638 --- /dev/null +++ b/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment @@ -0,0 +1,33 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 4" + date="2011-12-31T00:29:45Z" + content=""" +Well a repo url like `gitolite@localhost:testing` puts it in the gitolite user's /~/testing + +This worked when I added the gitolite stuff, anyway.. Let's see if it still does: + + +joey@gnu:~/tmp>mkdir g +joey@gnu:~/tmp>cd g +joey@gnu:~/tmp/g>git init +Initialized empty Git repository in /home/joey/tmp/g/.git/ +joey@gnu:~/tmp/g>git annex init +init ok +joey@gnu:~/tmp/g>git remote add test 'gitolite@localhost:testing' +joey@gnu:~/tmp/g>touch foo +joey@gnu:~/tmp/g>git annex add foo +add foo (checksum...) ok +(Recording state in git...) +joey@gnu:~/tmp/g>git annex copy foo --to test --debug +git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"ls-files\",\"--cached\",\"-z\",\"--\",\"foo\"] +git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"check-attr\",\"annex.numcopies\",\"-z\",\"--stdin\"] +git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"] +git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"show-ref\",\"git-annex\"] +git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"cat-file\",\"--batch\"] +Running: ssh [\"-4\",\"gitolite@localhost\",\"git-annex-shell 'configlist' '/~/testing'\"] +
+
+Still seems right, the ADC's regexp will match this the git-annex shell command.
+"""]]
-- 
cgit v1.2.3


From 230bc8334bb7a947a61a0e213c51fca18decde1c Mon Sep 17 00:00:00 2001
From: Joey Hess 
Date: Fri, 30 Dec 2011 20:30:36 -0400
Subject: typo

---
 .../comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment b/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment
index a94eec638..c53ce01d9 100644
--- a/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment
+++ b/doc/tips/using_gitolite_with_git-annex/comment_4_eb81f824aadc97f098379c5f7e4fba4c._comment
@@ -8,7 +8,7 @@ Well a repo url like `gitolite@localhost:testing` puts it in the gitolite user's
 
 This worked when I added the gitolite stuff, anyway.. Let's see if it still does:
 
-
+
 joey@gnu:~/tmp>mkdir g
 joey@gnu:~/tmp>cd g
 joey@gnu:~/tmp/g>git init
@@ -27,7 +27,7 @@ git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"show
 git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"show-ref\",\"git-annex\"]
 git [\"--git-dir=/home/joey/tmp/g/.git\",\"--work-tree=/home/joey/tmp/g\",\"cat-file\",\"--batch\"]
 Running: ssh [\"-4\",\"gitolite@localhost\",\"git-annex-shell 'configlist' '/~/testing'\"]
-
+

 
 Still seems right, the ADC's regexp will match this the git-annex shell command.
 """]]
-- 
cgit v1.2.3