Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Side by Side Diff: gclient

Issue 125259: Now update git depot_tools checkouts, also add automatic update for git-cl-repo and git-try-repo. (Closed)
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « bootstrap/gclient.sh ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # This script will try to sync the bootstrap directories and then defer control. 6 # This script will try to sync the bootstrap directories and then defer control.
7 7
8 base_dir=$(dirname "$0") 8 base_dir=$(dirname "$0")
9 9
10 # Update git checkouts prior the cygwin check, we don't want to use msysgit.
11 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
12 then
13 (cd "$base_dir"; git svn fetch -q; git merge trunk -q)
Evan Martin 2009/06/17 17:31:01 you can just do "git svn rebase -q" i guess, rathe
14 fi
15
16 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
17 then
18 (cd "$base_dir/git-cl-repo"; git pull -q)
19 fi
20
21 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-try-repo/.git" ]
22 then
23 (cd "$base_dir/git-try-repo"; git pull -q)
24 fi
25
26
10 # Use the batch file as an entry point if on cygwin. 27 # Use the batch file as an entry point if on cygwin.
11 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then 28 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" = "cygwin" ]; then
12 ${base_dir}/gclient.bat "$@" 29 ${base_dir}/gclient.bat "$@"
13 exit 30 exit
14 fi 31 fi
15 32
16 33
34 # We're on POSIX (not cygwin). We can now safely look for svn checkout.
17 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] 35 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
18 then 36 then
19 # Update the bootstrap directory to stay up-to-date with the latest 37 # Update the bootstrap directory to stay up-to-date with the latest
20 # depot_tools. 38 # depot_tools.
21 svn -q up "$base_dir/bootstrap" 39 svn -q up "$base_dir"
40 fi
22 41
23 # Then defer the control to the bootstrapper. 42 exec python "$base_dir/gclient.py" "$@"
24 exec "$base_dir/bootstrap/gclient.sh" "$@"
25 else
26 exec python "$base_dir/gclient.py" "$@"
27 fi
OLDNEW
« no previous file with comments | « bootstrap/gclient.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698