* admin/update_autogen: Remove bzr support.
This commit is contained in:
parent
855b3e700f
commit
5b4a95b7b2
1 changed files with 6 additions and 18 deletions
|
@ -47,14 +47,7 @@ cd $PD
|
|||
cd ../
|
||||
[ -d admin ] || die "Could not locate admin directory"
|
||||
|
||||
if [ -d .bzr ]; then
|
||||
vcs=bzr
|
||||
elif [ -e .git ]; then
|
||||
vcs=git
|
||||
else
|
||||
die "Cannot determine vcs"
|
||||
fi
|
||||
|
||||
[ -d .git ] || die "No .git directory"
|
||||
|
||||
usage ()
|
||||
{
|
||||
|
@ -157,10 +150,7 @@ OPTIND=1
|
|||
## Run status on inputs, list modified files on stdout.
|
||||
status ()
|
||||
{
|
||||
local statflag="-S"
|
||||
[ "$vcs" = "git" ] && statflag="-s"
|
||||
|
||||
$vcs status $statflag "$@" >| $tempfile || die "$vcs status error for $@"
|
||||
git status -s "$@" >| $tempfile || die "git status error for $@"
|
||||
|
||||
local stat file modified
|
||||
|
||||
|
@ -234,13 +224,11 @@ commit ()
|
|||
|
||||
echo "Committing..."
|
||||
|
||||
$vcs commit -m "; Auto-commit of $type files." "$@" || return $?
|
||||
git commit -m "; Auto-commit of $type files." "$@" || return $?
|
||||
|
||||
[ "$vcs" = "git" ] && {
|
||||
## In case someone else pushed something while we were working.
|
||||
$vcs pull --rebase || return $?
|
||||
$vcs push || return $?
|
||||
}
|
||||
## In case someone else pushed something while we were working.
|
||||
git pull --rebase || return $?
|
||||
git push || return $?
|
||||
|
||||
echo "Committed files: $@"
|
||||
} # function commit
|
||||
|
|
Loading…
Add table
Reference in a new issue