X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/77739e9453107e3f69fa809e940885f316fb9a15..195dd8c17928cddb92bce06182631cbd0d82f4af:/vcsh diff --git a/vcsh b/vcsh index 4464c85..afed6eb 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. @@ -19,12 +19,12 @@ # 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.20141009' +VERSION='1.20141026' SELF=$(basename $0) fatal() { echo "$SELF: fatal: $1" >&2 - [ -z $2] && exit 1 + [ -z $2 ] && exit 1 exit $2 } @@ -100,7 +100,8 @@ help() { -v Enable verbose mode commands: - clone \\ + clone [-b ] \\ + \\ [] Clone from an existing repository commit Commit in all repositories delete Delete an existing repository @@ -111,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 @@ -149,16 +152,17 @@ clone() { hook pre-clone init git remote add origin "$GIT_REMOTE" - git config branch.master.remote origin - git config branch.master.merge refs/heads/master - VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1) - if [ -n "$VCSH_CLONE_ERROR" ]; then - rm -rf "$GIT_DIR" - fatal "$VCSH_CLONE_ERROR" 1 + git checkout -b "$VCSH_BRANCH" || return $? + git config branch."$VCSH_BRANCH".remote origin + git config branch."$VCSH_BRANCH".merge refs/heads/"$VCSH_BRANCH" + if [ $(git ls-remote origin "$VCSH_BRANCH" 2> /dev/null | wc -l ) -lt 1 ]; then + info "remote is empty, not merging anything. + You should add files to your new repository." + exit fi - git fetch + git fetch origin "$VCSH_BRANCH" hook pre-merge - git ls-tree -r --name-only origin/master | (while read object; do + git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do [ -e "$object" ] && error "'$object' exists." && VCSH_CONFLICT=1 @@ -166,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/master + git -c merge.ff=true merge origin/"$VCSH_BRANCH" hook post-merge hook post-clone retire @@ -261,7 +265,7 @@ list_tracked_helper() { } list_tracked_by() { - list_tracked $2 + list_tracked '' $2 } list_untracked() { @@ -272,10 +276,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 @@ -298,7 +305,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%%/*} @@ -310,7 +317,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() { @@ -365,19 +372,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) @@ -385,7 +397,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=$? } @@ -417,12 +429,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() { @@ -497,11 +511,28 @@ case $VCSH_COMMAND in esac if [ x"$VCSH_COMMAND" = x'clone' ]; then + VCSH_BRANCH= + if [ "$2" = -b ]; then + VCSH_BRANCH=$3 + shift + shift + fi [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1 GIT_REMOTE="$2" - [ -n "$3" ] && VCSH_REPO_NAME=$3 || VCSH_REPO_NAME=$(basename "${GIT_REMOTE#*:}" .git) + [ -n "$VCSH_BRANCH" ] || if [ "$3" = -b ]; then + VCSH_BRANCH=$4 + shift + shift + fi + if [ -n "$3" ]; then + VCSH_REPO_NAME=$3 + [ -z "$VCSH_BRANCH" ] && [ "$4" = -b ] && VCSH_BRANCH=$5 + else + VCSH_REPO_NAME=$(basename "${GIT_REMOTE#*:}" .git) + fi [ -z "$VCSH_REPO_NAME" ] && fatal "$VCSH_COMMAND: could not determine repository name" 1 export VCSH_REPO_NAME + [ -n "$VCSH_BRANCH" ] || VCSH_BRANCH=master GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR elif [ "$VCSH_COMMAND" = 'version' ]; then echo "$SELF $VERSION" @@ -535,6 +566,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