[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 5b4a95b: * admin/update_autogen: Remove bzr support
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 5b4a95b: * admin/update_autogen: Remove bzr support. |
Date: |
Tue, 30 May 2017 21:03:27 -0400 (EDT) |
branch: master
commit 5b4a95b7b26c21096737738b37d6ab78a19b4986
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/update_autogen: Remove bzr support.
---
admin/update_autogen | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/admin/update_autogen b/admin/update_autogen
index 9393ab0..ba4ed00 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 5b4a95b: * admin/update_autogen: Remove bzr support.,
Glenn Morris <=