]>
git.madduck.net Git - code/vcsh.git/blobdiff - README.md
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
-vcsh - manage and sync config files via git
+vcsh - manage config files in $HOME via fake bare git repositories
-1. Introduction
-2. Overview
-3. Getting Started
-4. Usage
+1. Contact
+2. Introduction
+3. Overview
+4. Getting Started
+5. Usage
+# 1 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
+
+* Pull requests or issues on https://github.com/RichiH/vcsh
+
+# 2 Introduction #
vcsh allows you to have several git repositories, all maintaining their working
trees in $HOME without clobbering each other. That, in turn, means you can have
vcsh allows you to have several git repositories, all maintaining their working
trees in $HOME without clobbering each other. That, in turn, means you can have
advantages of vcsh. See sections 3 and 4 for detailed instructions and
examples.
advantages of vcsh. See sections 3 and 4 for detailed instructions and
examples.
-## 2 .1 Comparison to Other Solutions ##
+## 3 .1 Comparison to Other Solutions ##
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)
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)
and clone a large number of repositories. The use of mr is technically optional
(see 4.3), but it will be an integral part of the proposed system that follows.
and clone a large number of repositories. The use of mr is technically optional
(see 4.3), but it will be an integral part of the proposed system that follows.
-## 2 .2 Default Directory Layout ##
+## 3 .2 Default Directory Layout ##
To illustrate, this is what a possible directory structure looks like.
To illustrate, this is what a possible directory structure looks like.
| | |-- tmux.vcsh -> ../available.d/tmux.vcsh
| | `-- vim.vcsh -> ../available.d/vim.vcsh
| `-- vcsh
| | |-- tmux.vcsh -> ../available.d/tmux.vcsh
| | `-- vim.vcsh -> ../available.d/vim.vcsh
| `-- vcsh
| `-- repo.d
| |-- zsh.git -----------+
| |-- gitconfigs.git |
| `-- repo.d
| |-- zsh.git -----------+
| |-- gitconfigs.git |
| `-- vim.git |
|-- [...] |
|-- .zshrc <----------------------+
| `-- vim.git |
|-- [...] |
|-- .zshrc <----------------------+
+ |-- .gitignore.d
+ | `-- zsh
|-- .mrconfig
`-- .mrtrust
### available.d ###
|-- .mrconfig
`-- .mrtrust
### available.d ###
-The files you see in $XDG_CONFIG _HOME/mr/available.d are mr configuration files
+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
repository. vcsh repo configs end in .vcsh, git configs end in .git, etc. This
is optional and your preference. For example, this is what a zsh.vcsh
that contain the commands to manage (checkout, update etc.) a single
repository. vcsh repo configs end in .vcsh, git configs end in .git, etc. This
is optional and your preference. For example, this is what a zsh.vcsh
-$XDG_CONFIG _HOME/mr/available.d contains *all available* repositories. Only
+$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
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
files/links present in mr/config.d, however, will be used by mr. That means
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
- include = cat $XDG_CONFIG_HOME/mr/config.d/*
+ # Use if your mr does not have vcsh support in mainline, yet
+ include = cat /usr/share/mr/vcsh
+ include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/mr/config.d/*
-$XDG_CONFIG _HOME/vcsh/repo.d is the directory where all git repositories which
+$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.
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.
Optionally, merge your local and your global configs afterwards and push with
`vcsh run foo git push`.
Optionally, merge your local and your global configs afterwards and push with
`vcsh run foo git push`.
-## 2 .3 Moving into a New Host ##
+## 3 .3 Moving into a New Host ##
To illustrate further, the following steps could move your desired
configuration to a new host.
1. Clone the mr repository (containing available.d, config.d etc.); for
To illustrate further, the following steps could move your desired
configuration to a new host.
1. Clone the mr repository (containing available.d, config.d etc.); for
- example: `vcsh clone git://github.com/RichiH/vcsh_mr_template.git`
+ example: `vcsh clone git://github.com/RichiH/vcsh_mr_template.git mr `
2. Choose your repositories by linking them in config.d (or go with the default
you may have already configured by adding symlinks to git).
2. Choose your repositories by linking them in config.d (or go with the default
you may have already configured by adding symlinks to git).
-3. Run mr to clone the repositories: `cd; mr update`.
-4. Done.
+3. Make sure the line 'include = cat /usr/share/mr/vcsh' in .mrconfig points
+ to an existing file
+4. Run mr to clone the repositories: `cd; mr update`.
+5. Done.
Hopefully the above could help explain how this approach saves time by
Hopefully the above could help explain how this approach saves time by
If you want to give vcsh a try, follow the instructions below.
If you want to give vcsh a try, follow the instructions below.
Below, you will find a few different methods for setting up vcsh:
Below, you will find a few different methods for setting up vcsh:
2. The Steal-from-Template Way
3. The Manual Way
2. The Steal-from-Template Way
3. The Manual Way
-### 3 .1 The Template Way ###
+### 4 .1 The Template Way ###
-#### 3 .1.1 Prerequisites ####
+#### 4 .1.1 Prerequisites ####
Make sure none of the following files and directories exist for your test
(user). If they do, move them away for now:
Make sure none of the following files and directories exist for your test
(user). If they do, move them away for now:
-* $XDG_CONFIG _HOME/mr/available.d/mr.vcsh
-* $XDG_CONFIG _HOME/mr/available.d/zsh.vcsh
-* $XDG_CONFIG _HOME/mr/config.d/mr.vcsh
-* $XDG_CONFIG _HOME/vcsh/repo.d/mr.git/
+* $XDG\_CONFIG\ _HOME/mr/available.d/mr.vcsh
+* $XDG\_CONFIG\ _HOME/mr/available.d/zsh.vcsh
+* $XDG\_CONFIG\ _HOME/mr/config.d/mr.vcsh
+* $XDG\_CONFIG\ _HOME/vcsh/repo.d/mr.git/
All of the files are part of the template repository, the directory is where
the template will be stored.
apt-get install mr
All of the files are part of the template repository, the directory is where
the template will be stored.
apt-get install mr
-#### 3 .1.2 Clone the Template ####
+#### 4 .1.2 Clone the Template ####
git clone git://github.com/RichiH/vcsh.git vcsh
git clone git://github.com/RichiH/vcsh.git vcsh
+ # make sure 'include = cat /usr/share/mr/vcsh' points to an exiting file
+ vim .mrconfig
- ln -s vcsh /usr/local/bin # or add it to your PATH
+ ln -s vcsh /usr/local/bin # or add it to your PATH
- vcsh clone git://github.com/RichiH/vcsh_mr_template.git mr.vcsh
+ vcsh clone git://github.com/RichiH/vcsh_mr_template.git mr
-#### 3 .1.3 Enable Your Test Repository ####
+#### 4 .1.3 Enable Your Test Repository ####
mv ~/.zsh ~/zsh.bak
mv ~/.zshrc ~/zshrc.bak
mv ~/.zsh ~/zsh.bak
mv ~/.zshrc ~/zshrc.bak
-#### 3 .1.4 Set Up Your Own Repositories ####
+#### 4 .1.4 Set Up Your Own Repositories ####
Now, it's time to edit the template config and fill it with your own remotes:
Now, it's time to edit the template config and fill it with your own remotes:
-### 3 .2 The Steal-from-Template Way ###
+### 4 .2 The Steal-from-Template Way ###
You're welcome to clone the example repository:
You're welcome to clone the example repository:
- git clone git://github.com/RichiH/vcsh_mr_template.git
+ vcsh clone git://github.com/RichiH/vcsh_mr_template.git mr
+ # make sure 'include = cat /usr/share/mr/vcsh' points to an exiting file
+ vim .mrconfig
Look around in the clone. It should be reasonably simple to understand. If not,
poke me, RichiH, on Freenode (query) or OFTC (#vcs-home).
Look around in the clone. It should be reasonably simple to understand. If not,
poke me, RichiH, on Freenode (query) or OFTC (#vcs-home).
-### 3 .3 The Manual Way ###
+### 4 .3 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.
This is how my old setup procedure looked like. Adapt it to your own style or
copy mine verbatim, either is fine.
~ % cat ~/.mrconfig
[DEFAULT]
~ % cat ~/.mrconfig
[DEFAULT]
+ # adapt /usr/share/mr/vcsh to your system if needed
+ include = cat /usr/share/mr/vcsh
include = cat $XDG_CONFIG_HOME/mr/config.d/*
~ % echo $XDG_CONFIG_HOME
/home/richih/.config
include = cat $XDG_CONFIG_HOME/mr/config.d/*
~ % echo $XDG_CONFIG_HOME
/home/richih/.config
-### 4 .1 Keeping repositories Up-to-Date ###
+### 5 .1 Keeping repositories Up-to-Date ###
This is the beauty of it all. Once you are set up, just run:
This is the beauty of it all. Once you are set up, just run:
-### 4 .1 Making Changes ###
+### 5 .1 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):
After you have made some changes, for which you would normally use `git add`
and `git commit`, use the vcsh wrapper (like above):
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.
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.
-### 4 .3 Using vcsh without mr ###
+### 5 .3 Using vcsh without mr ###
vcsh encourages you to use [mr] [1]. It helps you manage a large number of
repositories by running the necessary vcsh commands for you. You may choose not
vcsh encourages you to use [mr] [1]. It helps you manage a large number of
repositories by running the necessary vcsh commands for you. You may choose not
projects / code / vcsh.git / blobdiff