From: Richard Hartmann Date: Fri, 18 Dec 2015 20:37:20 +0000 (+0100) Subject: Merge branch 'master' into feature/foreach X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/1a142e0ce3cfb86f61fb7f97291f29081c275f58?hp=d921399d97e499b69ed5c9ed98cef69e61704791 Merge branch 'master' into feature/foreach --- diff --git a/doc/INSTALL.md b/doc/INSTALL.md index 29c9889..65fc5f3 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -14,6 +14,12 @@ There are no other dependencies other than `git`, `ronn` and a POSIX shell. sudo make install +## Installing without root privileges ## + + make install DESTDIR=/home/myuser/local + +or simply copy the shell script into any place you like, e.g. `~/bin` + # Uninstalling # diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn index cd73ca8..2bf8a77 100644 --- a/doc/vcsh.1.ronn +++ b/doc/vcsh.1.ronn @@ -19,7 +19,7 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME `vcsh` list-tracked [] -`vcsh` list-untracked [<-r>] [] +`vcsh` list-untracked [<-a>] [<-r>] [] `vcsh` pull @@ -121,12 +121,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 +341,7 @@ This manpage and `vcsh` itself were written by Richard "RichiH" Hartmann. ## COPYRIGHT -Copyright 2011-2013 Richard Hartmann +Copyright 2011-2015 Richard Hartmann Licensed under the GNU GPL version 2 or higher. diff --git a/t/100-init.t b/t/100-init.t index f2b3a05..80a10c9 100644 --- a/t/100-init.t +++ b/t/100-init.t @@ -14,7 +14,7 @@ my $output = `./vcsh status`; ok $output eq "", 'No repos set up yet.'; -$output = `./vcsh init test1`; +$output = `LC_ALL=C ./vcsh init test1`; ok $output eq "Initialized empty shared Git repository in " . $ENV{'HOME'} . "/.config/vcsh/repo.d/test1.git/\n"; @@ -25,7 +25,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 24d9a8a..4acd0a2 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 6ffd964..18faf4c 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 , 2011-2014 +# (c) Richard "RichiH" Hartmann , 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. @@ -112,14 +112,16 @@ help() { list-tracked \\ [] List all files tracked all or one repositories list-untracked \\ - [<-r>] [] List all files not tracked by all or one repositories + [<-a>] [<-r>] + [] List all files not tracked by all or one repositories pull Pull from all vcsh remotes push Push to vcsh remotes rename \\ Rename repository run \\ Use this repository - status [] Show statuses of all/one vcsh repositories + status \\ + [--terse] [] Show statuses of all/one vcsh repositories upgrade Upgrade repository to currently recommended settings version Print version information which Find substring in name of any tracked file @@ -168,7 +170,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 @@ -274,7 +276,7 @@ list_tracked_helper() { } list_tracked_by() { - list_tracked $2 + list_tracked '' $2 } list_untracked() { @@ -285,10 +287,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 @@ -311,7 +316,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%%/*} @@ -323,7 +328,7 @@ list_untracked_helper() { cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file' fi cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file' - comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked + comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked } pull() { @@ -378,19 +383,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) @@ -398,7 +408,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=$? } @@ -430,12 +440,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() { @@ -568,6 +580,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