aboutsummaryrefslogtreecommitdiffstats
path: root/admin/update_autogen
diff options
context:
space:
mode:
authorGlenn Morris2017-05-30 21:03:16 -0400
committerGlenn Morris2017-05-30 21:03:16 -0400
commit5b4a95b7b26c21096737738b37d6ab78a19b4986 (patch)
tree1a2a637488aa53fbbdedf998c6edb96d774a7b43 /admin/update_autogen
parent855b3e700fd1db62ae701a89bce4be5ed094352a (diff)
downloademacs-5b4a95b7b26c21096737738b37d6ab78a19b4986.tar.gz
emacs-5b4a95b7b26c21096737738b37d6ab78a19b4986.zip
* admin/update_autogen: Remove bzr support.
Diffstat (limited to 'admin/update_autogen')
-rwxr-xr-xadmin/update_autogen24
1 files changed, 6 insertions, 18 deletions
diff --git a/admin/update_autogen b/admin/update_autogen
index 9393ab0ee90..ba4ed00fa39 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -47,14 +47,7 @@ cd $PD
47cd ../ 47cd ../
48[ -d admin ] || die "Could not locate admin directory" 48[ -d admin ] || die "Could not locate admin directory"
49 49
50if [ -d .bzr ]; then 50[ -d .git ] || die "No .git directory"
51 vcs=bzr
52elif [ -e .git ]; then
53 vcs=git
54else
55 die "Cannot determine vcs"
56fi
57
58 51
59usage () 52usage ()
60{ 53{
@@ -157,10 +150,7 @@ OPTIND=1
157## Run status on inputs, list modified files on stdout. 150## Run status on inputs, list modified files on stdout.
158status () 151status ()
159{ 152{
160 local statflag="-S" 153 git status -s "$@" >| $tempfile || die "git status error for $@"
161 [ "$vcs" = "git" ] && statflag="-s"
162
163 $vcs status $statflag "$@" >| $tempfile || die "$vcs status error for $@"
164 154
165 local stat file modified 155 local stat file modified
166 156
@@ -234,13 +224,11 @@ commit ()
234 224
235 echo "Committing..." 225 echo "Committing..."
236 226
237 $vcs commit -m "; Auto-commit of $type files." "$@" || return $? 227 git commit -m "; Auto-commit of $type files." "$@" || return $?
238 228
239 [ "$vcs" = "git" ] && { 229 ## In case someone else pushed something while we were working.
240 ## In case someone else pushed something while we were working. 230 git pull --rebase || return $?
241 $vcs pull --rebase || return $? 231 git push || return $?
242 $vcs push || return $?
243 }
244 232
245 echo "Committed files: $@" 233 echo "Committed files: $@"
246} # function commit 234} # function commit