From: Mike O'Connor Date: Wed, 12 Oct 2011 02:25:01 +0000 (-0400) Subject: merge from joerg X-Git-Url: https://git.toastfreeware.priv.at/gregoa/movein.git/commitdiff_plain/ee203f1829d19cc02f9b33c24e47e05851471826?hp=8278a16022d157a6c5f57cfa7d5f867fdbc72ef3 merge from joerg Signed-off-by: Mike O'Connor --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README new file mode 100644 index 0000000..0d9adce --- /dev/null +++ b/README @@ -0,0 +1,181 @@ +movein - a script to help maintain a direcotry with multiple overlayed +git repositories. + +The latest version should be avaliable from http://stew.vireo.org/movein + +My goal has been to keep my home directory in a version control system +effectively. I have a number of constraints however. I want the +system to be modular. I don't always need X related config files in +my home directory. Sometimes I want just my zsh related files and my +emacs related files. I have multiple machines I check email from, and +on those want to keep my notmuch/offlineimap files in sync, but I +don't need these on every machine I'm on, expecially since those +configurations have more sensitive data. I played around with +[laysvn](http://laysvn.alioth.debian.org/) for a while, but it never +really seemed comfortable. I more recently discovered that +[madduck](http://madduck.net/) had started a +"[vcs-home](http://vcs-home.madduck.net/)" website and mailing list, +talking about doing what I'm trying to do. + +I'm now going with madduck's idea of using git with detached work +trees, so that I can have multiple git repositories all using $HOME as +their $GIT_WORK_TREE. I have a script inspired by his +[vcsh](http://git.madduck.net/v/etc/zsh.git?a=blob;f=.zsh/func/vcsh;hb=HEAD) +script that will create a subshell where the GIT_DIR, GIT_WORK_TREE +variables are set for me. I can do my git operations related to just +one git repository in that shell, while still operating directly on my +config files in $HOME, and avoiding any kind of nasty symlinking or +hardlinking. Since I am usually using my script to allow me to +quickly "move in" to a new host, I named my script "movein". It can +be found [here](http://git.vireo.org/movein.git/). Here's how I'll +typically use it: + + + stew@guppy:~$ movein init + git server hostname? git.vireo.org + path to remote repositories? [~/git] + Local repository directory? [~/.movein] + Location of .mrconfig file? [~/.mrconfig] + stew@guppy:~$ + +This is just run once. It asks me questions about how to setup the +'movein' environment. Now I should have a .moveinrc storing the +answers I gave above, I have a stub of a .mrconfig, and an empty +.movein directory. Next thing to do is to add some of my +repositories. The one I typically add on all machines is my "shell" +repository. It has a .bashrc/.zshrc, an .alias that both source and +other zsh goodies I'll generally wish to be around: + + stew@guppy:~$ ls .zshrc + ls: cannot access .zshrc: No such file or directory + stew@guppy:~$ movein add shell + Initialized empty Git repository in /home/stew/.movein/shell.git/ + remote: Counting objects: 42, done. + remote: Compressing objects: 100% (39/39), done. + remote: Total 42 (delta 18), reused 0 (delta 0) + Unpacking objects: 100% (42/42), done. + From ssh://git.vireo.org//home/stew/git/shell + * [new branch] master -> origin/master + stew@guppy:~$ ls .zshrc + .zshrc + +So what happened here is that the ssh://git.vireo.org/~/git/shell.git +repository was cloned with GIT_WORK_TREE=~ and +GIT_DIR=.movein/shell.git. My .zshrc (along with a bunch of other +files) has appeared. Next perhaps I'll add my emacs config files: + + stew@guppy:~$ movein add emacs + Initialized empty Git repository in /home/stew/.movein/emacs.git/ + remote: Counting objects: 77, done. + remote: Compressing objects: 100% (63/63), done. + remote: Total 77 (delta 10), reused 0 (delta 0) + Unpacking objects: 100% (77/77), done. + From ssh://git.vireo.org//home/stew/git/emacs + * [new branch] emacs21 -> origin/emacs21 + * [new branch] master -> origin/master + stew@guppy:~$ ls .emacs + .emacs + stew@guppy:~$ + +My remote repositry has a master branch, but also has an emacs21 +branch, which I can use when checking out on older machines which +don't yet have newer versions of emacs. + +Let's say I have made changes to my .zshrc file, and I want to check +them in. Since we are working with detached work trees, git can't +immediately help us: + + stew@guppy:~$ git status + fatal: Not a git repository (or any of the parent directories): .git + +The movein script allows me to "login" to one of the repositories. It +will create a subshell with GIT_WORK_TREE and GIT_DIR set. In that +subshell, git operations operate as one might expect: + + stew@guppy:~ $ movein login shell + stew@guppy:~ (shell:master>*) $ echo >> .zshrc + stew@guppy:~ (shell:master>*) $ git add .zshrc + stew@guppy:~ (shell:master>*) $ git commit -m "adding a newline to the end of .zshrc" + [master 81b7311] adding a newline to the end of .zshrc + 1 files changed, 1 insertions(+), 0 deletions(-) + stew@guppy:~ (shell:master>*) $ git push + Counting objects: 8, done. + Delta compression using up to 2 threads. + Compressing objects: 100% (6/6), done. + Writing objects: 100% (6/6), 546 bytes, done. + Total 6 (delta 4), reused 0 (delta 0) + To ssh://git.vireo.org//home/stew/git/shell.git + d24bf2d..81b7311 master -> master + stew@guppy:~ (shell:master*) $ exit + stew@guppy:~ $ + +If I want to create a brand new repository from files in my home directory. I can: + + stew@guppy:~ $ touch methere + stew@guppy:~ $ touch mealsothere + stew@guppy:~ $ movein new oohlala methere mealsothere + Initialized empty Git repository in /home/stew/git/oohlala.git/ + Initialized empty Git repository in /home/stew/.movein/oohlala.git/ + [master (root-commit) 7abe5ba] initial checkin + 0 files changed, 0 insertions(+), 0 deletions(-) + create mode 100644 mealsothere + create mode 100644 methere + Counting objects: 3, done. + Delta compression using up to 2 threads. + Compressing objects: 100% (2/2), done. + Writing objects: 100% (3/3), 224 bytes, done. + Total 3 (delta 0), reused 0 (delta 0) + To ssh://git.vireo.org//home/stew/git/oohlala.git + * [new branch] master -> master + +Above, the command movein new oohlala methere mealsothere +says "create a new repository containing two files: methere, +mealsothere". A bare repository is created on the remote machine, a +repository is created in the .movein directory, the files are +committed, and the new commit is pushed to the remote repository. New +on some other machine, I could run movein add oohlala to get these +two new files. + +The movein script maintains a .mrconfig file, so that joeyh's +[mr](http://kitenet.net/~joey/code/mr/) tool can be used to manage the repositories in bulk. Commands +like "mr update", "mr commit", "mr push" will act on all the known +repositories. Here's an example: + + stew@guppy:~ $ cat .mrconfig + [DEFAULT] + include = cat /usr/share/mr/git-fake-bare + + [/home/stew/.movein/emacs.git] + checkout = git_fake_bare_checkout 'ssh://git.vireo.org//home/stew/git/emacs.git' 'emacs.git' '../../' + + [/home/stew/.movein/shell.git] + checkout = git_fake_bare_checkout 'ssh://git.vireo.org//home/stew/git/shell.git' 'shell.git' '../../' + + [/home/stew/.movein/oohlala.git] + checkout = git_fake_bare_checkout 'ssh://git.vireo.org//home/stew/git/oohlala.git' 'oohlala.git' '../../' + + stew@guppy:~ $ mr update + mr update: /home/stew//home/stew/.movein/emacs.git + From ssh://git.vireo.org//home/stew/git/emacs + * branch master -> FETCH_HEAD + Already up-to-date. + + mr update: /home/stew//home/stew/.movein/oohlala.git + From ssh://git.vireo.org//home/stew/git/oohlala + * branch master -> FETCH_HEAD + Already up-to-date. + + mr update: /home/stew//home/stew/.movein/shell.git + From ssh://git.vireo.org//home/stew/git/shell + * branch master -> FETCH_HEAD + Already up-to-date. + + mr update: finished (3 ok) + stew@guppy:~ $ mr update + +There are still issues I'd like to address. The big one in my mind is +that there is no .gitignore. So when you "movein login +somerepository" then run "git status", It tells you about hundreds of +untracked files in your home directory. Ideally, I just want to know +about the files which are already associated with the repository I'm +logged into. diff --git a/movein b/movein index ada5c7b..e13eb72 100755 --- a/movein +++ b/movein @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Copyright © 2008 Mike O'Connor # @@ -7,7 +7,7 @@ # Free Software Foundation; either version 2, or (at your option) any # later version. # -# This program is distributed in the hope that it will be useful, +# this program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -17,7 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. - set -e set -u @@ -35,17 +34,24 @@ SYNOPSIS $bn init $bn ls $bn list + $bn ls-r + $bn list-remote $bn add repository_name $bn new repository_name file1 [file2 file3...] $bn login repository_name + $bn exec repository_name command [arg1 arg2...] COMMANDS init - create ~/.mrconfig + create ~/.moveinrc, create/update ~/.mrconfig ls list - show a list of repositories + show a list of local repositories + + ls-r + list-remote + show a list of remote repositories add repository_name checkout the repository from the remote host and add it to @@ -59,11 +65,17 @@ COMMANDS login repository_name start a subshell in repository_name + exec repository_name command [arg1 arg2...] + execute a command in the context of repository_name, for example: + $bn exec myrepo git status + $bn exec myrepo git ls-files + EOF exit 1 } +[ $# -ge 1 ] || usage GIT_HOST=git.$(hostname -d) REMOTE_REPOS=~/git @@ -76,41 +88,36 @@ MOVEINRC=~/.moveinrc init() { if [ $# -ne 0 ]; then - usage - fi - - if [ -e $MRCONFIG ]; then - echo $MRCONFIG already exists - exit 1 + usage fi if [ -e $MOVEINRC ]; then - echo $MOVEINRC already exists - exit 1 + echo $MOVEINRC already exists + exit 1 fi echo -n "git server hostname? [${GIT_HOST}] " read GIT_HOST if [ -z "$GIT_HOST" ]; then - GIT_HOST=git.$(hostname -d) + GIT_HOST=git.$(hostname -d) fi echo -n "path to remote repositories? [~/git] " read REMOTE_REPOS if [ -z "$REMOTE_REPOS" ]; then - REMOTE_REPOS=~/git + REMOTE_REPOS=~/git fi echo -n "Local repository directory? [~/.movein] " read LOCAL_REPOS if [ -z "$LOCAL_REPOS" ]; then - LOCAL_REPOS=~/.movein + LOCAL_REPOS=~/.movein fi echo -n "Location of .mrconfig file? [~/.mrconfig] " read MRCONFIG if [ -z "$MRCONFIG" ]; then - MRCONFIG=~/.mrconfig + MRCONFIG=~/.mrconfig fi cat < $MOVEINRC @@ -121,108 +128,117 @@ MRCONFIG=$MRCONFIG EOF if [ ! -d "$LOCAL_REPOS" ]; then - mkdir -p "$LOCAL_REPOS" + mkdir -p "$LOCAL_REPOS" fi - cat < $MRCONFIG -[DEFAULT] -include = cat /usr/share/mr/git-fake-bare -END - + mr -c "$MRCONFIG" config DEFAULT include="cat /usr/share/mr/git-fake-bare" } login() { if [ $# -ne 1 ]; then - usage + usage fi export GIT_DIR="$LOCAL_REPOS/${1}.git" export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)" - $SHELL -i || : + GIT_PS1_SHOWUNTRACKEDFILES= PSMOVEIN="movein:${1}" $SHELL -i || : +} + +execin() { + local REPO + if [ $# -lt 1 ]; then + usage + fi + + REPO=$1;shift + + export GIT_DIR="$LOCAL_REPOS/${REPO}.git" + export GIT_WORK_TREE="$GIT_DIR/$(git config --get core.worktree)" + + "$@" } add() { if [ $# -ne 1 ]; then - usage + usage fi REPO_NAME=$1.git ; shift LOCAL_REPO=$LOCAL_REPOS/$REPO_NAME REPO_URL=ssh://$GIT_HOST/$REMOTE_REPOS/$REPO_NAME if [ -e "$LOCAL_REPO" ]; then - echo $LOCAL_REPO already exists - exit 1 + echo $LOCAL_REPO already exists + exit 1 else - trap "rm -rf $LOCAL_REPO" 0 - mkdir "$LOCAL_REPO" - export GIT_DIR="$LOCAL_REPO" - git init --bare - git remote add origin $REPO_URL - git config branch.master.remote origin - git config branch.master.merge refs/heads/master - git config core.worktree ../../ - git config core.bare false - GIT_WORK_TREE="$PWD" git pull - trap - 0 - cat <> $MRCONFIG - -[$LOCAL_REPO] -checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../' -END + trap "rm -rf $LOCAL_REPO" 0 + mkdir "$LOCAL_REPO" + export GIT_DIR="$LOCAL_REPO" + git init --bare + git remote add origin $REPO_URL + git config branch.master.remote origin + git config branch.master.merge refs/heads/master + git config core.bare false + git config core.worktree ../../ + git config status.showUntrackedFiles no + GIT_WORK_TREE="$LOCAL_REPO/../../" git pull + trap - 0 + + mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'" fi - } list() { find "${LOCAL_REPOS}" -mindepth 1 -maxdepth 1 -type d | sed 's,^.*/\([^/]*\).git$,\1,' } +listremote() { + ssh $GIT_HOST " + find '${REMOTE_REPOS}' -mindepth 1 -maxdepth 1 -type d | sed 's,^.*/\([^/]*\).git$,\1,' + " > $MRCONFIG - -[$LOCAL_REPO] -checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../' -END + export GIT_DIR="$LOCAL_REPO" + git init --bare + git remote add origin $REPO_URL + git config branch.master.remote origin + git config branch.master.merge refs/heads/master + git config core.bare false + git config core.worktree ../../ + git config status.showUntrackedFiles no + export GIT_WORK_TREE="$LOCAL_REPO/../../" + git add "$@" + git commit -m "initial checkin" + git push --all + + trap - 0 + + mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'" fi } @@ -253,28 +269,38 @@ fi command=$1 ; shift case "$command" in init) - init $@ - ;; + preflight + init $@ + ;; add) - preflight - add $@ - ;; + preflight + add $@ + ;; new) - preflight - new $@ - ;; + preflight + new $@ + ;; login) - login $@ - ;; + login $@ + ;; + exec) + execin "$@" + ;; ls) - list - ;; + list + ;; list) - list - ;; + list + ;; + ls-r) + listremote + ;; + list-remote) + listremote + ;; *) - usage - exit 1 - ;; + usage + exit 1 + ;; esac diff --git a/movein.1 b/movein.1 new file mode 100644 index 0000000..4b504c1 --- /dev/null +++ b/movein.1 @@ -0,0 +1,88 @@ +.\" Process this file with +.\" groff -man -Tascii foo.1 +.\" +.TH MOVEIN 1 "2011-10-10" movein +.SH NAME + movein \- manage multiple overlayed git repositories +.SH SYNOPSIS +.B movein +.IR command +[ +.IR args ... +] +.SH DESCRIPTION +Movein is a script which helps you to manage multiple git repositories +which are checked out into the same directory. A common reason for +wanting to do this is to manage your home directory using multiple git +repositories. +.SH COMMANDS +.B movein +.IR init +.RS 4 +Initialize movein. Creates .moveinrc, updates .mrconfig +.RE + +.B movein +.IR ls +.br +.B movein +.IR list +.RS 4 +Show a list of local repositories +.RE + +.B movein +.IR ls-r +.br +.B movein +.IR list-remotes +.RS 4 +Show a list of remote repositories +.RE + +.B movein +.IR add +repository_name +.RS 4 +checkout the repository from the remote host and add it to mr's configuration +.RE + +.B movein +.IR new +repository_name file1 +[ +file2 file3... +] +.RS 4 +checkout the repository from the remote host and add it to mr's configuration +.RE + +.B movein +.IR login +repository_name +.RS 4 +start a subshell in repository_name +.RE + + +.B movein +.IR exec +repository_name command +[ +arg1 arg2... +] +.RS 4 +execute a command in the context of repository_name, for eample +.RS 4 +movein exec myrepo git status +.RE +.RS 4 +movein exec myrepo git ls-files +.RE +.RE + +.SH "SEE ALSO" +git(1), mr(1) +.SH AUTHOR +.TP +Mike O'Connor