diff --git a/.mailmap b/.mailmap index bf0849747acfe4687d71d559c5a39af6380c690d..1e66b4db2c319380410828aa4a5e91530e4775c3 100644 --- a/.mailmap +++ b/.mailmap @@ -1 +1,2 @@ Richard Hartmann <richih.mailinglist@gmail.com> <richih+github.com@richih.org> +Alexander Skurikhin <a.skurihin@gmail.com> <a.skurihin@gmail.com> diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 76741599431da3da7b45a26a2af09ada3ecd7960..abea9e09c8fa72f4120dd75aa764ac3fcecdb478 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,12 +1,15 @@ Alphabetical list of everyone who ever committed to this repository Vincent Demeester <vincent@demeester.fr> +Thomas Ferris Nicolaisen <tfnico@gmail.com> martin f. krafft <madduck@madduck.net> +Alessandro Ghedini <alessandro@ghedini.me> Valentin Haenel <valentin.haenel@gmx.de> Richard Hartmann <richih.mailinglist@gmail.com> mek-apelsin <mek@pels.in> Dieter Plaetinck <dieter@plaetinck.be> Corey Quinn <corey@sequestered.net> Gernot Schulz <post@gernot-schulz.com> +Alexander Skurikhin <a.skurihin@gmail.com> Jonathan Sternberg <jonathansternberg@gmail.com> Frank Terbeck <ft@bewatermyfriend.org> diff --git a/PACKAGING.md b/PACKAGING.md index b93b17cd351536ee710eff0867c575a3dd667c61..ecbfa55163f10d982b546b21c4484ecf4083fb88 100644 --- a/PACKAGING.md +++ b/PACKAGING.md @@ -1,37 +1,44 @@ -# Archlinux +# Distributions with readily available packages + +## Archlinux AUR does not require any packaging information within this repository. -# Debian +## Debian Debian packages are provided by the author in separate branches, maintained in the upstream repository -## Ubuntu +### Ubuntu Ubuntu imports Debian's package automagically. -# Mac OS X +## Mac OS X / Homebrew Homebrew does not require any packaging information within this repository. A separate branch with a statically compiled manpage and release tags is -provided to ease packaging. The static manpage because Homebrew lacks ronn; -the tag so github generates tarballs Homebrew can be pointed at. - +provided to ease the work of Homebrew packagers: -# Additional notes +* The static manpage because Homebrew lacks ronn +* The tag so GitHub generates tarballs Homebrew can be pointed at -## Static manpage -In case you can not build the manpage because you are missing ronn please -contact the author. The "debian-squeeze" branch carries a quilt patchset with -a pre-compiled manpage and the "homebrew" one carries a static manpage. If you -need, or want, to build your packages against a static version in your own -branch this can be done. +# Supporting new distributions -## Other systems +## Your own work If you are maintaining a package for a different distribution, please get -in touch so your work can be included in another branch, thus allowing others -to adapt it to their needs or to improve upon it. +in touch so your work can be included in a packaging branch in the upstream +repository. +This allows others to adapt your work for their own distributions or +packaging needs. + +## Static manpage + +The "debian-squeeze" branch carries a quilt patchset with a pre-compiled +manpage and the "homebrew" one carries a static manpage. + +In case you can not build the manpage because you are missing ronn or you +prefer a precompiled manpage for another reason, please contact us; we will +gladly provide up-to-date packages with every release. diff --git a/README.md b/README.md index f641ce970ec90dca176a267deca33f1c06b7a085..a83325d979ee4482a828111802d7882a4dbe141c 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,23 @@ -vcsh - manage config files in $HOME via fake bare git repositories +vcsh - Version Control System for $HOME - multiple Git repositories in $HOME -# Index # -1. Contact -2. Introduction -3. Overview -4. Getting Started -5. Usage +# Index -# 1 Contact # +1. [Introduction](#introduction) +2. [30 second howto](#30-second-howto) +3. [Overview](#overview) +4. [Getting Started](#getting-started) +5. [Usage Exmaples](#usage-examples) +6. [Contact](#contact) -There are several ways to get in touch with the author and a small but committed -community around the general idea of version controlling your (digital) life. - -* IRC: #vcs-home on irc.oftc.net - -* Mailing list: [http://lists.madduck.net/listinfo/vcs-home][vcs-home-list] -* Pull requests or issues on [https://github.com/RichiH/vcsh][vcsh] - -# 2 Introduction # +# Introduction [vcsh][vcsh] allows you to maintain several git repositories in one single directory. They all maintain their working trees without clobbering each other or interfering otherwise. By default, all git repositories maintained via -`vcsh` are stored in <$HOME> but you can override this setting if you want to. -All that means that you can have one repository per application or application +`vcsh` are stored in `$HOME` but you can override this setting if you want to. +All this means that you can have one repository per application or application family, i.e. `zsh`, `vim`, `ssh`, etc. This, in turn, allows you to clone custom sets of configurations onto different machines or even for different users; picking and mixing which configurations you want to use where. @@ -33,48 +25,81 @@ For example, you may not need to have your `mplayer` configuration on a server or available to root and you may want to maintain different configuration for `ssh` on your personal and your work machines. -`vcsh` was designed with [mr][mr] in mind so you might want to install that, as -well. - -Read <INSTALL.md> and <PACKAGING.md> for instructions specific to your operating -system. +`vcsh` was designed with [mr][mr], a tool to manage Multiple Repositories, in +mind and the two integrate very nicely. `mr` has native support for `vcsh` +repositories and to `vcsh`, `mr` is just another configuration to track. +This make setting up any new machine a breeze. It takes literally less than +five minutes to go from standard installation to fully set up system -The following overview will try to give you an idea of the use cases and -advantages of `vcsh`. See sections 3 and 4 for detailed instructions and -examples. +A lot of modern UNIX-based systems offer pacakges for `vcsh`. In case yours +does not read `INSTALL.md` for install instructions or `PACKAGING.md` to create +a package, yourself. If you do end up packaging `vcsh` please let us know so we +can give you your own packaging branch in the upstream repository. -## 2.1 Talks ## +## Talks Some people found it useful to look at slides and videos explaining how `vcsh` -works. +works instead of working through the docs, first. They can all be found [on the author's talk page][talks]. -# 3 Overview -## 3.1 Comparison to Other Solutions ## +# 30 second howto + +While it may appear that there's an overwhelming amount of documentation and +while the explanation of the concepts behind `vcsh` needs to touch a few gory +details of `git` internals, getting started with `vcsh` is extremely simple. + +Let's say you want to version control your `vim` configuration: + + vcsh init vim + vcsh vim add ~/.vimrc ~/.vim + vcsh vim commit -m 'Initial commit of my Vim configuration' + # optionally push your files to a remote + vcsh vim remote add origin <remote> + vcsh vim push -u origin master + # from now on you can push additional commits like this + vcsh vim push + +If all that looks a _lot_ like standard `git`, that's no coincidence; it's +a design feature. + + +# Overview + +## From zero to vcsh + +You put a lot of effort into your configuration and want to both protect and +distribute this configuration. Most people who decide to put their dotfiles under version control start with a -single repository in <$HOME>, adding all their dotfiles (and possibly more) +single repository in `$HOME`, adding all their dotfiles (and possibly more) to it. This works, of course, but can become a nuisance as soon as you try to manage more than one host. The next logical step is to create single-purpose repositories in, for example, -<~/.dotfiles> and to create symbolic links into <$HOME>. This gives you the +`~/.dotfiles` and to create symbolic links into `$HOME`. This gives you the flexibility to check out only certain repositories on different hosts. The downsides of this approach are the necessary manual steps of cloning and symlinking the individual repositories. -`vcsh` takes this second approach one step further. It expects -single-purpose repositories and stores them in a hidden directory (similar -to <~/.dotfiles>). However, it does not create symbolic links in <$HOME>; it -puts the actual files right into <$HOME>. +`vcsh` takes this approach one step further. It enables single-purpose +repositories and stores them in a hidden directory. However, it does not create +symbolic links in `$HOME`; it puts the actual files right into `$HOME`. + +As `vcsh` allows you to put an arbitrary number of distinct repositories into +your `$HOME`, you will end up with a lot of repositories very quickly. -Furthermore, by making use of [mr][mr], it makes it very easy to enable/disable -and clone a large number of repositories. The use of `mr` is technically -optional (see section 4.3), but it will be an integral part of the proposed -system that follows. +To manage both `vcsh` and other repositories, we suggest using [mr](mr). `mr` +takes care of pulling in and pushing out new data for a variety of version +control systems. -## 3.2 Default Directory Layout ## + +The last logical step is to maintain all those new repositores with an automated +tool instead of tracking them by hand. +This is where `mr` comes in. While the use of `mr` is technically +optional, but it will be an integral part of the proposed system that follows. + +## Default Directory Layout To illustrate, this is what a possible directory structure looks like. @@ -110,7 +135,7 @@ To illustrate, this is what a possible directory structure looks like. |-- .mrconfig `-- .mrtrust -### available.d ### +### available.d The files you see in $XDG\_CONFIG\_HOME/mr/available.d are mr configuration files that contain the commands to manage (checkout, update etc.) a single @@ -128,7 +153,7 @@ this repository and fork your own. status = vcsh run zsh git status gc = vcsh run zsh git gc -### config.d ### +### config.d $XDG\_CONFIG\_HOME/mr/available.d contains *all available* repositories. Only files/links present in mr/config.d, however, will be used by mr. That means @@ -136,7 +161,7 @@ that in this example, only the zsh, gitconfigs, tmux and vim repositories will be checked out. A simple `mr update` run in $HOME will clone or update those four repositories listed in config.d. -### ~/.mrconfig ### +### ~/.mrconfig Finally, ~/.mrconfig will tie together all those single files which will allow you to conveniently run `mr up` etc. to manage all repositories. It looks like @@ -148,13 +173,13 @@ this: include = cat /usr/share/mr/vcsh include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/mr/config.d/* -### repo.d ### +### repo.d $XDG\_CONFIG\_HOME/vcsh/repo.d is the directory where all git repositories which are under vcsh's control are located. Since their working trees are configured to be in $HOME, the files contained in those repositories will be put in $HOME directly. -Of course, [mr] [1] will work with this layout if configured according to this +Of course, [mr] [mr] will work with this layout if configured according to this document (see above). vcsh will check if any file it would want to create exists. If it exists, vcsh @@ -162,7 +187,7 @@ will throw a warning and exit. Move away your old config and try again. Optionally, merge your local and your global configs afterwards and push with `vcsh run foo git push`. -## 3.3 Moving into a New Host ## +## Moving into a New Host To illustrate further, the following steps could move your desired configuration to a new host. @@ -184,7 +209,8 @@ Hopefully the above could help explain how this approach saves time by If you want to give vcsh a try, follow the instructions below. -# 4 Getting Started # + +# Getting Started Below, you will find a few different methods for setting up vcsh: @@ -192,9 +218,9 @@ Below, you will find a few different methods for setting up vcsh: 2. The Steal-from-Template Way 3. The Manual Way -### 4.1 The Template Way ### +### The Template Way -#### 4.1.1 Prerequisites #### +#### Prerequisites Make sure none of the following files and directories exist for your test (user). If they do, move them away for now: @@ -211,15 +237,15 @@ the template will be stored. apt-get install mr -#### 4.1.2 Install vcsh #### +#### Install vcsh -#### 4.1.2.1 Debian #### +#### Debian If you are using Debian Squeeze, you will need to enable backports apt-get install vcsh -#### 4.1.2.2 Arch Linux #### +#### Arch Linux vcsh is availabe via [AUR](https://aur.archlinux.org/packages.php?ID=54164) and further documentation about the use of AUR is available @@ -232,7 +258,7 @@ and further documentation about the use of AUR is available makepkg -s pacman -U vcsh*.pkg.tar.xz -#### 4.1.2.3 From source #### +#### From source If your version of mr is older than version 1.07, make sure to put @@ -248,11 +274,11 @@ into your .mrconfig . ln -s vcsh /usr/local/bin # or add it to your PATH cd -#### 4.1.3 Clone the Template #### +#### Clone the Template vcsh clone git://github.com/RichiH/vcsh_mr_template.git mr -#### 4.1.4 Enable Your Test Repository #### +#### Enable Your Test Repository mv ~/.zsh ~/zsh.bak mv ~/.zshrc ~/zshrc.bak @@ -261,7 +287,7 @@ into your .mrconfig . cd mr up -#### 4.1.5 Set Up Your Own Repositories #### +#### Set Up Your Own Repositories Now, it's time to edit the template config and fill it with your own remotes: @@ -281,7 +307,7 @@ And then create your own stuff: Done! -### 4.2 The Steal-from-Template Way ### +### The Steal-from-Template Way You're welcome to clone the example repository: @@ -293,7 +319,7 @@ Look around in the clone. It should be reasonably simple to understand. If not, poke me, RichiH, on Freenode (query) or OFTC (#vcs-home). -### 4.3 The Manual Way ### +### The Manual Way This is how my old setup procedure looked like. Adapt it to your own style or copy mine verbatim, either is fine. @@ -331,9 +357,44 @@ mr is used to actually retrieve configs, etc ~ % cd ~ % mr -j 5 up -# 5 Usage # -### 5.1 Keeping repositories Up-to-Date ### +# Usage Examples + +All examples in this section will use the short form of `vcsh` which is the +simplest way to interface with it. If you don't know what that means simply +ignore this fact for now and follow the examples. + +## Initialize a new repository "vim" + + vcsh init vim + +## Clone an existing repository + + vcsh clone <remote> <repository_name> + +## Add files to repository "vim" + + vcsh vim add ~/.vimrc ~/.vim + vcsh vim commit -m 'Update Vim configuration' + +## Add a remote for repository "vim" + + vcsh vim remote add origin <remote> + vcsh vim push origin master:master + vcsh vim branch --track master origin/master + +## Push to remote of repository "vim" + + vcsh vim push + +## Pull from remote of repository "vim" + + vcsh vim pull + + +# mr usage ; will be factored out & rewritten + +### Keeping repositories Up-to-Date This is the beauty of it all. Once you are set up, just run: @@ -342,7 +403,7 @@ This is the beauty of it all. Once you are set up, just run: Neat. -### 5.1 Making Changes ### +### Making Changes After you have made some changes, for which you would normally use `git add` and `git commit`, use the vcsh wrapper (like above): @@ -355,14 +416,13 @@ By the way, you'll have to use -f/--force flag with git-add because all files will be ignored by default. This is to show you only useful output when running git-status. A fix for this problem is being worked on. -### 5.3 Using vcsh without mr ### +### Using vcsh without mr -vcsh encourages you to use [mr] [1]. It helps you manage a large number of +vcsh encourages you to use [mr][mr]. It helps you manage a large number of repositories by running the necessary vcsh commands for you. You may choose not to use mr, in which case you will have to run those commands manually or by other means. -#### A Few Examples #### To initialize a new repository: `vcsh init zsh` @@ -383,6 +443,18 @@ manually. Alternatively, you could try something like this: done +# Contact + +There are several ways to get in touch with the author and a small but committed +community around the general idea of version controlling your (digital) life. + +* IRC: #vcs-home on irc.oftc.net + +* Mailing list: [http://lists.madduck.net/listinfo/vcs-home][vcs-home-list] + +* Pull requests or issues on [https://github.com/RichiH/vcsh][vcsh] + + [mr]: http://kitenet.net/~joey/code/mr/ [talks]: http://richardhartmann.de/talks/ [vcsh]: https://github.com/RichiH/vcsh diff --git a/_vcsh b/_vcsh index 2367fb44c9f513741ae9776fc62f3c3e0bf952e2..47dbd9e69a9582540c563cfc27c0362fc046d453 100644 --- a/_vcsh +++ b/_vcsh @@ -43,6 +43,14 @@ function _vcsh-list-tracked-by () { (( CURRENT == 2 )) && __vcsh_repositories } +function _vcsh-pull () { + _nothing +} + +function _vcsh-push () { + _nothing +} + function _vcsh-rename () { (( CURRENT == 2 )) && __vcsh_repositories (( CURRENT == 3 )) && _message "new repository name" @@ -88,6 +96,7 @@ function _vcsh () { "list:list all local vcsh repositories" "list-tracked:list all files tracked by vcsh" "list-tracked-by:list files tracked by a repository" + "pull:pull from all vcsh remotes" "rename:rename a repository" "run:run command with <\$GIT_DIR> and <\$GIT_WORK_TREE> set" "upgrade:upgrade repository to currently recommended settings" @@ -114,8 +123,7 @@ function _vcsh () { if ! (( ${+functions[_vcsh-$vcshcommand]} )); then # There is no handler function, so this is probably the name # of a repository. Act accordingly. - _message "git sub-command" - #TODO and now we need to complete on git subcommands + _dispatch git git else curcontext="${curcontext%:*:*}:vcsh-${vcshcommand}:" _call_function ret _vcsh-${vcshcommand} diff --git a/changelog b/changelog index 98d5074dce324649ea8b965e48e58589403fb353..0dd7c3f0314956acda80f724461390dfcf16f36a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,22 @@ +2013-07-23 Richard Hartmann <richih.mailinglist@gmail.com> + + * Release 1.20130723 + * Support $VCSH_GITIGNORE == none + * Documentation improvements, + * Improved zsh completion + * Add support for `vcsh pull` + * Add support for `vcsh push` + * Add retire() to tear down vcsh ENV + * Add clone hooks, including one witout vcsh ENV to + allow subsequent cloning of other repos + * Fix `vcsh rename` + * Improve general code robustness + +2013-06-14 Richard Hartmann <richih.mailinglist@gmail.com> + + * Release 1.20130614 + * Lots of documentation improvements, major rewrite + 2013-05-27 Richard Hartmann <richih.mailinglist@gmail.com> * Release 1.3 diff --git a/doc/hooks b/doc/hooks index 5547131cddc8c625e095bf13789833ac403a7fd6..3c72ef88e336f6eb8f109a6871aa7f2068eee469 100644 --- a/doc/hooks +++ b/doc/hooks @@ -1,9 +1,25 @@ Available hooks are: -pre-command -post-command -pre-enter -post-enter -pre-run -post-run -pre-upgrade -post-upgrade + +* pre-clone +* post-clone +* post-clone-retired + Use this if you need to operate on different git repositories after cloning. + This hook can be useful if your configuration needs some remote + repositories, but you do not want to include it into your vcsh + repository. For instance, if you use vim plugins manager (vundle, + NeoBundle), zsh configuration frameworks (oh-my-zsh, prezto), etc. +* pre-command +* post-command +* pre-enter +* post-enter +* pre-pull +* post-pull +* pre-push +* post-push +* pre-run +* post-run +* pre-upgrade +* post-upgrade + +If you write any interesting or useful hooks, please send them upstream +so they can be included in an examples section. diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn index adcd69a7a2771fc6a0af2f5f77675256c6701524..b1957078400381993313762d03449e68b1128790 100644 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@ -1,5 +1,5 @@ -vcsh(1) - manage config files in $HOME via fake bare Git repositories -===================================================================== +vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME +=============================================================================== ## SYNOPSIS @@ -21,6 +21,10 @@ vcsh(1) - manage config files in $HOME via fake bare Git repositories `vcsh` list-tracked-by <repo> +`vcsh` pull + +`vcsh` push + `vcsh` rename <repo> <newname> `vcsh` run <repo> <shell command> @@ -77,6 +81,9 @@ an interactive user. * clone: Clone an existing repository. + If you need to clone a bundle of repositories, look into the + `post-clone-retired` hook. + * delete: Delete an existing repository. @@ -98,6 +105,12 @@ an interactive user. * list-tracked-by: List files tracked by a repository. +* pull: + Pull from all vcsh remotes. + +* push: + Push to all vcsh remotes. + * rename: Rename a repository. @@ -151,14 +164,16 @@ executed in the context of your shell. Interesting knobs you can turn: * <$VCSH_GITIGNORE>: - Can be either <exact> or <recursive>. + Can be <exact>, <recursive>, or <none>. - <exact> will seed the repo-specific <.gitignore> with all file and directory + <exact> will seed the repo-specific ignore file with all file and directory names which `git ls-files` returns. <recursive> will descend through all directories recursively additionally to the above. + <none> will not write any ignore file. + Defaults to <exact>. Less interesting knobs you could turn: @@ -259,7 +274,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann. ## COPYRIGHT -Copyright 2011-2012 Richard Hartmann <richih.mailinglist@gmail.com> +Copyright 2011-2013 Richard Hartmann <richih.mailinglist@gmail.com> Licensed under the GNU GPL version 2 or higher. diff --git a/vcsh b/vcsh index 2509b66cbde0f954aa7329f97752f9458409dacc..ea889318796f40217aff83f34941ceaf233025a2 100755 --- a/vcsh +++ b/vcsh @@ -8,7 +8,7 @@ # While the following is not legally binding, the author would like to # explain the choice of GPLv2+ over GPLv3+. # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain -# full compatibility's with git. In case git ever changes its licensing terms, +# full compatibility's with Git. In case Git ever changes its licensing terms, # which is admittedly extremely unlikely to the point of being impossible, # this software will most likely follow suit. @@ -24,7 +24,7 @@ basename() { } SELF=$(basename $0) -VERSION='1.3' +VERSION='1.20130723' fatal() { echo "$SELF: fatal: $1" >&2 @@ -100,6 +100,8 @@ help() { list-tracked List all files tracked by vcsh list-tracked-by \\ <repo> List files tracked by a repository + pull Pull from all vcsh remotes + push Push to vcsh remotes rename <repo> \\ <newname> Rename repository run <repo> \\ @@ -131,6 +133,7 @@ info() { } clone() { + hook pre-clone init git remote add origin "$GIT_REMOTE" git config branch.master.remote origin @@ -149,6 +152,9 @@ clone() { fatal "will stop after fetching and not try to merge! Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17 git merge origin/master + hook post-clone + retire + hook post-clone-retired } delete() { @@ -220,11 +226,44 @@ list_tracked_by() { git ls-files | sort -u } +pull() { + hook pre-pull + for VCSH_REPO_NAME in $(list); do + echo -n "$VCSH_REPO_NAME: " + export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" + use + git pull + done + hook post-pull +} + +push() { + hook pre-push + for VCSH_REPO_NAME in $(list); do + echo -n "$VCSH_REPO_NAME: " + export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" + use + git push + done + hook post-push +} + +retire() { + unset GIT_WORK_TREE + unset VCSH_DIRECTORY +} + rename() { git_dir_exists [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54 mv -f "$GIT_DIR" "$GIT_DIR_NEW" || fatal "Could not mv '$GIT_DIR' '$GIT_DIR_NEW'" 52 + # Now that the repository has been renamed, we need to fix up its configuration + # Overwrite old name.. + GIT_DIR="$GIT_DIR_NEW" + $VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW" + # ..and clobber all old configuration + upgrade } run() { @@ -238,7 +277,7 @@ upgrade() { hook pre-upgrade use git config core.worktree "$GIT_WORK_TREE" - git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" + [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME" git config vcsh.vcsh 'true' [ -e "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" hook post-upgrade @@ -259,6 +298,12 @@ which() { } write_gitignore() { + # Don't do anything if the user does not want to write gitignore + if [ "x$VCSH_GITIGNORE" = 'xnone' ]; then + info "Not writing gitignore as '\$VCSH_GITIGNORE' is set to 'none'" + exit + fi + use cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11 gitignores=$(for file in $(git ls-files); do @@ -272,7 +317,7 @@ write_gitignore() { echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57 for gitignore in $gitignores; do echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57 - if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then + if [ "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ -d "$gitignore" ]; then { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; } fi done @@ -289,8 +334,8 @@ write_gitignore() { fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53 } -if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then - fatal "'\$VCSH_GITIGNORE' must be either 'exact' or 'recursive'" 1 +if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then + fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1 fi if [ "$1" = 'clone' ]; then @@ -318,15 +363,17 @@ elif [ "$1" = 'delete' ] || [ "$1" = 'write-gitignore' ]; then [ -z $2 ] && fatal "$1: please specify repository to work on" 1 [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1 - [ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1 + [ "$1" = 'run' -a -z "$3" ] && fatal "$1: please specify a command" 1 export VCSH_COMMAND="$1" export VCSH_REPO_NAME="$2" export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" - [ "$VCSH_COMMAND" = 'rename' ] && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git" - [ "$VCSH_COMMAND" = 'run' ] && shift 2 - [ "$VCSH_COMMAND" = 'write-gitignore' ] + [ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3"; + export GIT_DIR_NEW="$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git"; } + [ "$VCSH_COMMAND" = 'run' ] && shift 2 elif [ "$1" = 'list' ] || - [ "$1" = 'list-tracked' ]; then + [ "$1" = 'list-tracked' ] || + [ "$1" = 'pull' ] || + [ "$1" = 'push' ]; then export VCSH_COMMAND="$1" elif [ -n "$2" ]; then export VCSH_COMMAND='run' @@ -352,9 +399,8 @@ if echo $VCSH_REPO_NAME | grep -q '/'; then export VCSH_REPO_NAME=$(basename "$VCSH_REPO_NAME" .git) fi - -for check_directory in "$VCSH_REPO_D" "$VCSH_BASE/.gitignore.d" -do +check_dir() { + check_directory="$1" if [ ! -d "$check_directory" ]; then if [ -e "$check_directory" ]; then fatal "'$check_directory' exists but is not a directory" 13 @@ -363,7 +409,10 @@ do mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50 fi fi -done +} + +check_dir "$VCSH_REPO_D" +[ ! "x$VCSH_GITIGNORE" = 'xnone' ] && check_dir "$VCSH_BASE/.gitignore.d" verbose "$VCSH_COMMAND begin" export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')