Re: mr: chaining to absolute paths

2011-11-06 Thread Adam Spiers
On Thu, Nov 3, 2011 at 5:46 PM, Joey Hess j...@kitenet.net wrote:
 Adam Spiers wrote:
     - Do you track your mrconfig files with version control?
 
  yes

 How do you do that?  Are they all in one repo?  How do you get each
 one into the right subdirectory of ~ ?

 They're checked out by mr as part of the repositories that provide the
 subdirectories they're in.

Thanks for the info, but I'm confused because that doesn't seem to
correspond exactly with the layout you gave earlier.  For example, you
said that you have a ~/doc/.mrconfig, but you didn't say that there
was a repository tracking ~/doc itself - only that ~/doc had various
document repositories inside it.

So is your ~/doc/.mrconfig tracked by a repository?  If so it sounds
like you have nested repositories, which git would presumably detect
as submodules unless you are using a symlink manager?

Thanks!  By the way there are good reasons for my curiosity ;-)  I'm
mulling over a similar layout but want to avoid nested repositories
and also prefer a symlink manager to detached git working directories.
___
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home


Re: mr: chaining to absolute paths

2011-11-06 Thread Joey Hess
Adam Spiers wrote:
 Thanks for the info, but I'm confused because that doesn't seem to
 correspond exactly with the layout you gave earlier.  For example, you
 said that you have a ~/doc/.mrconfig, but you didn't say that there
 was a repository tracking ~/doc itself - only that ~/doc had various
 document repositories inside it.

Every directory I showed is a separate repository.

 So is your ~/doc/.mrconfig tracked by a repository?  If so it sounds
 like you have nested repositories, which git would presumably detect
 as submodules unless you are using a symlink manager?

git does not detect nested git repos as submodules, that would have to
be explicitly set up.

-- 
see shy jo
___
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home


Re: various suggestions for mr

2011-11-06 Thread Adam Spiers
On Sun, Oct 30, 2011 at 1:26 PM, Adam Spiers vcs-h...@adamspiers.org wrote:
 On Sat, Oct 29, 2011 at 5:52 PM, Joey Hess j...@kitenet.net wrote:
 Adam Spiers wrote:
 However, the basename operation does not preserve the uniqueness
 property which $MR_REPO had, and that's why I say that we need an
 additional namespace.

 So pick an operation that does? tr / _ would do, for example.

 The other implicit requirement of this namespace was that it is
 easy to remember and type.  The rest of my previous email
 gives the context for this requirement.

OK, I've made a patch which fulfills this requirement pretty well.
Hopefully you'll find it reasonably clean and unintrusive:


https://github.com/aspiers/kitenet-mr/commit/b9a4e45aefe87c11ade1e4c4022e511f0d96d53c

With this patch, if you have .mrconfig files defining repositories:

[path/to/foo]
...

[path/to/bar]
...

then you can limit mr to only act on those via:

mr -r foo,bar $action

If there is a clash of directory names, then it can be resolved via a
new special parameter 'name':

[path/to/foo]
checkout = git clone ...
name = foo.git

[path/to/a/different/foo]
checkout = cvs checkout ...
name = foo.cvs

and then you can do:

mr -r foo.cvs update

etc.
___
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home