diff --git a/.travis.yml b/.travis.yml index cedf4fae5a3ae9afe9e68be73b38a395f5b9dde6..be5a1d79900ec7b683688f20451e3833f64f87b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ before_install: - cpanm Test::Most - apt-get moo install: + - sudo apt-get update - sudo apt-get install cowsay git ruby-ronn script: - make test diff --git a/Makefile b/Makefile index 984c623df6a05c764d797c078a0b5aac9348bffe..dfde7a009c896a5845b913546c31dea1b05431aa 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ PREFIX?=/usr DOCDIR_PREFIX=$(PREFIX)/share/doc DOCDIR=$(DOCDIR_PREFIX)/$(self) ZSHDIR=$(PREFIX)/share/zsh/vendor-completions -RONN ?= ronn self=vcsh manpages=$(self).1 diff --git a/_vcsh b/_vcsh index 53eaada4dae3764f4ff63bb88e5e68c80ae11393..3022c6125d6a4a82db9697ee76a5f7c229d12f95 100644 --- a/_vcsh +++ b/_vcsh @@ -23,6 +23,10 @@ function _vcsh-enter () { (( CURRENT == 2 )) && __vcsh_repositories } +function _vcsh-foreach () { + _dispatch git git +} + function _vcsh-help () { _nothing } @@ -36,10 +40,6 @@ function _vcsh-list () { } function _vcsh-list-tracked () { - _nothing -} - -function _vcsh-list-tracked-by () { (( CURRENT == 2 )) && __vcsh_repositories } @@ -100,11 +100,11 @@ function _vcsh () { "commit:commit in all repositories" "delete:delete an existing repository" "enter:enter repository; spawn new <\$SHELL>" + "foreach:execute for all repos" "help:display help" "init:initialize an empty repository" "list:list all local vcsh repositories" "list-tracked:list all files tracked by vcsh" - "list-tracked-by:list files tracked by a repository" "list-untracked:list all files not tracked by vcsh" "pull:pull from all vcsh remotes" "push:push to vcsh remotes" diff --git a/changelog b/changelog index 6f23d0f506739a77e974c4229ddfdf14b8b63074..44a44ad31979d4b0985c438e0b1eb160c4c3c57f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,17 @@ +2015-12-29 Richard Hartmann <richih.mailinglist@gmail.com> + + * Fix tests to always use C locale, this makes vcsh reproducible + * Implement `vcsh foreach` + * Implement `vcsh list-untracked -a` + * Handle Git older than 2.x gracefully + * Fix broken list-tracked-by + * Fix regression in `vcsh which` + * Skip ignored files in the output of list-untracked + * Improve cloning + * Clean up docs + * Implement `vcsh status --terse` + * Improve tests + 2015-05-02 Richard Hartmann <richih.mailinglist@gmail.com> * Release 1.20150502 diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn index cd73ca8b04a8d2cb0d365c552d26965d6ab09983..d5ee0dc53861d6346b74a64e8932d6e97c375076 100644 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@ -11,6 +11,8 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME `vcsh` enter <repo> +`vcsh` foreach [-g] <git command> + `vcsh` help `vcsh` init <repo> @@ -19,7 +21,7 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME `vcsh` list-tracked [<repo>] -`vcsh` list-untracked [<-r>] [<repo>] +`vcsh` list-untracked [<-a>] [<-r>] [<repo>] `vcsh` pull @@ -98,6 +100,11 @@ an interactive user. * enter: Enter repository; spawn new <$SHELL>. +* foreach: + Execute git command for every vcsh repository. + + `-g`: Execute in general context. + * help: Display help. @@ -121,12 +128,14 @@ an interactive user. * list-untracked: List all files NOT tracked by vcsh. + `-a`: Show all files. + By default, the `git ls-files --exclude-standard` is called. + + `-r`: Recursive mode. By default, the file list is shallow and stops at directory levels where - possible. If you prefer to get a list of all files, append `-r` for - recursive mode. + possible. - If you want to list files not tracked by a specific repository, simply - append the repository's name last. + `$repo`: List files not tracked by this specific repository. * pull: Pull from all vcsh remotes. @@ -339,7 +348,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann. ## COPYRIGHT -Copyright 2011-2013 Richard Hartmann <richih@debian.org> +Copyright 2011-2015 Richard Hartmann <richih@debian.org> Licensed under the GNU GPL version 2 or higher. diff --git a/t/100-init.t b/t/100-init.t index f2b3a05155b66cfeb7c124d79cf97168b5cb7043..74facc02655ba9db6b733c754d6685b61d43813d 100644 --- a/t/100-init.t +++ b/t/100-init.t @@ -1,5 +1,7 @@ #!/usr/bin/perl +BEGIN { $ENV{LC_ALL} = 'C' } + use strict; use warnings; @@ -25,7 +27,6 @@ ok $output eq "test1:\n\n", 'Our new repo is there'; chdir $ENV{"HOME"} . '/.config/vcsh/repo.d/test1.git/' or die $!; ok -f 'HEAD'; -ok -d 'branches'; ok -f 'config'; ok -f 'description'; ok -d 'hooks'; diff --git a/t/300-add.t b/t/300-add.t index 24d9a8ae8742f9ae37204fcadccbe430bbbeb601..4acd0a2cc64cccb34ca66cf9ae35f38c95712ca0 100644 --- a/t/300-add.t +++ b/t/300-add.t @@ -29,5 +29,11 @@ A a ", 'Adding a file works'; +$output = `.././vcsh status --terse`; + +ok $output eq "test1: +A a +", 'Terse output works'; + done_testing; diff --git a/vcsh b/vcsh index ab79db254bf53ffe94b03feb98e9b0bd2e4ad49c..3f00b1f3e16ebaa6c3e839b26da0e98bd7cfc19f 100755 --- a/vcsh +++ b/vcsh @@ -1,7 +1,7 @@ #!/bin/sh # This program is licensed under the GNU GPL version 2 or later. -# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014 +# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015 # For details, see LICENSE. To submit patches, you have to agree to # license your code under the GNU GPL version 2 or later. @@ -19,7 +19,7 @@ # If '.git-HEAD' is appended to the version, you are seeing an unreleased # version of vcsh; the master branch is supposed to be clean at all times # so you can most likely just use it nonetheless -VERSION='1.20150502' +VERSION='1.20151229' SELF=$(basename $0) fatal() { @@ -106,20 +106,24 @@ help() { commit Commit in all repositories delete <repo> Delete an existing repository enter <repo> Enter repository; spawn new instance of \$SHELL + foreach [<-g>] + <git command> Execute a command for every repository help Display this help text init <repo> Initialize a new repository list List all repositories list-tracked \\ [<repo>] List all files tracked all or one repositories list-untracked \\ - [<-r>] [<repo>] List all files not tracked by all or one repositories + [<-a>] [<-r>] + [<repo>] List all files not tracked by all or one repositories pull Pull from all vcsh remotes push Push to vcsh remotes rename <repo> \\ <newname> Rename repository run <repo> \\ <command> Use this repository - status [<repo>] Show statuses of all/one vcsh repositories + status \\ + [--terse] [<repo>] Show statuses of all/one vcsh repositories upgrade <repo> Upgrade repository to currently recommended settings version Print version information which <substring> Find substring in name of any tracked file @@ -158,7 +162,12 @@ clone() { You should add files to your new repository." exit fi - git fetch origin "$VCSH_BRANCH" + GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' ) + if [ 1 -lt "$GIT_VERSION_MAJOR" ];then + git fetch origin "$VCSH_BRANCH" + else + git fetch origin + fi hook pre-merge git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do [ -e "$object" ] && @@ -168,7 +177,7 @@ clone() { [ x"$VCSH_CONFLICT" = x'1' ]) && fatal "will stop after fetching and not try to merge! Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17 - git merge origin/"$VCSH_BRANCH" + git -c merge.ff=true merge origin/"$VCSH_BRANCH" hook post-merge hook post-clone retire @@ -214,6 +223,27 @@ enter() { hook post-enter } +foreach() { + hook pre-foreach + + # We default to prefixing `git` to all commands passed to foreach, but + # allow running in general context with -g + command_prefix=git + while getopts "g" flag; do + if [ x"$1" = x'-g' ]; then + unset command_prefix + fi + shift 1 + done + for VCSH_REPO_NAME in $(list); do + echo "$VCSH_REPO_NAME:" + GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR + use + $command_prefix "$@" + done + hook post-foreach +} + git_dir_exists() { [ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12 } @@ -263,7 +293,7 @@ list_tracked_helper() { } list_tracked_by() { - list_tracked $2 + list_tracked '' $2 } list_untracked() { @@ -274,10 +304,13 @@ list_untracked() { temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file' # Hack in support for `vcsh list-untracked -r`... + exclude_standard_opt='--exclude-standard' directory_opt="--directory" shift 1 - while getopts "r" flag; do - if [ x"$1" = x'-r' ]; then + while getopts "ar" flag; do + if [ x"$1" = x'-a' ]; then + unset exclude_standard_opt + elif [ x"$1" = x'-r' ]; then unset directory_opt fi shift 1 @@ -300,7 +333,7 @@ list_untracked() { list_untracked_helper() { export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git" - git ls-files --others "$directory_opt" | ( + git ls-files --others $exclude_standard_opt "$directory_opt" | ( while read line; do echo "$line" directory_component=${line%%/*} @@ -367,19 +400,24 @@ run() { } status() { + if [ -t 1 ]; then + COLORING="-c color.status=always" + fi if [ -n "$VCSH_REPO_NAME" ]; then status_helper $VCSH_REPO_NAME else for VCSH_REPO_NAME in $(list); do - echo "$VCSH_REPO_NAME:" - status_helper $VCSH_REPO_NAME - echo + STATUS=$(status_helper $VCSH_REPO_NAME "$COLORING") + [ -n "$STATUS" -o -z "$VCSH_STATUS_TERSE" ] && echo "$VCSH_REPO_NAME:" + [ -n "$STATUS" ] && echo "$STATUS" + [ -z "$VCSH_STATUS_TERSE" ] && echo done fi } status_helper() { - GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR + GIT_DIR=$VCSH_REPO_D/$1.git; export GIT_DIR + VCSH_GIT_OPTIONS=$2 use remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && { commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l) @@ -387,7 +425,7 @@ status_helper() { [ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits" [ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits" } - git status --short --untracked-files='no' + git ${VCSH_GIT_OPTIONS} status --short --untracked-files='no' VCSH_COMMAND_RETURN_CODE=$? } @@ -419,12 +457,14 @@ use() { } which() { - [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1 - for VCSH_REPO_NAME in $(list); do - for VCSH_FILE in $(get_files); do - echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE" - done - done | sort -u + output=$(for VCSH_REPO_NAME in $(list); do + get_files | grep -- "$VCSH_COMMAND_PARAMETER" | sed "s/^/$VCSH_REPO_NAME: /" + done | sort -u) + if [ -z "$output" ]; then + fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1 + else + echo "$output" + fi } write_gitignore() { @@ -546,6 +586,9 @@ elif [ x"$VCSH_COMMAND" = x'delete' ] || [ x"$VCSH_COMMAND" = x'rename' ] && { VCSH_REPO_NAME_NEW=$3; export VCSH_REPO_NAME_NEW; GIT_DIR_NEW=$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git; export GIT_DIR_NEW; } [ x"$VCSH_COMMAND" = x'run' ] && shift 2 +elif [ x"$VCSH_COMMAND" = x'foreach' ]; then + [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a command" 1 + shift 1 elif [ x"$VCSH_COMMAND" = x'commit' ] || [ x"$VCSH_COMMAND" = x'list' ] || [ x"$VCSH_COMMAND" = x'list-tracked' ] || @@ -554,6 +597,10 @@ elif [ x"$VCSH_COMMAND" = x'commit' ] || [ x"$VCSH_COMMAND" = x'push' ]; then : elif [ x"$VCSH_COMMAND" = x'status' ]; then + if [ x"$2" = x'--terse' ]; then + VCSH_STATUS_TERSE=1; export VCSH_STATUS_TERSE + shift + fi VCSH_REPO_NAME=$2; export VCSH_REPO_NAME elif [ -n "$2" ]; then VCSH_COMMAND='run'; export VCSH_COMMAND diff --git a/vcsh.1 b/vcsh.1 index 9f2484227fed749eb88fb450ca1b8d0e8d63e322..c3cb62c5d461366fd8354ef3e921610cb87dc067 100644 --- a/vcsh.1 +++ b/vcsh.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "VCSH" "1" "October 2014" "" "" +.TH "VCSH" "1" "December 2015" "" "" . .SH "NAME" \fBvcsh\fR \- Version Control System for $HOME \- multiple Git repositories in $HOME @@ -19,6 +19,9 @@ \fBvcsh\fR enter \fIrepo\fR . .P +\fBvcsh\fR foreach [\-g] \fIgit command\fR +. +.P \fBvcsh\fR help . .P @@ -28,10 +31,10 @@ \fBvcsh\fR list . .P -\fBvcsh\fR list\-tracked [\fIrpoe\fR] +\fBvcsh\fR list\-tracked [\fIrepo\fR] . .P -\fBvcsh\fR list\-untracked [\fI\-r\fR] [\fIrepo\fR] +\fBvcsh\fR list\-untracked [\fI\-a\fR] [\fI\-r\fR] [\fIrepo\fR] . .P \fBvcsh\fR pull @@ -123,6 +126,13 @@ enter Enter repository; spawn new \fI$SHELL\fR\. . .TP +foreach +Execute git command for every vcsh repository\. +. +.IP +\fB\-g\fR: Execute in general context\. +. +.TP help Display help\. . @@ -153,10 +163,13 @@ list\-untracked List all files NOT tracked by vcsh\. . .IP -By default, the file list is shallow and stops at directory levels where possible\. If you prefer to get a list of all files, append \fB\-r\fR for recursive mode\. +\fB\-a\fR: Show all files\. By default, the \fBgit ls\-files \-\-exclude\-standard\fR is called\. +. +.IP +\fB\-r\fR: Recursive mode\. By default, the file list is shallow and stops at directory levels where possible\. . .IP -If you want to list files not tracked by a specific repository, simply append the repository\'s name last\. +\fB$repo\fR: List files not tracked by this specific repository\. . .TP pull @@ -366,7 +379,7 @@ vcsh was initally written by madduck\. This version is a re\-implementation from This manpage and \fBvcsh\fR itself were written by Richard "RichiH" Hartmann\. . .SH "COPYRIGHT" -Copyright 2011\-2013 Richard Hartmann \fIrichih@debian\.org\fR +Copyright 2011\-2015 Richard Hartmann \fIrichih@debian\.org\fR . .P Licensed under the GNU GPL version 2 or higher\.