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

Side by Side Diff: gclient

Issue 173246: Replace git-try stub with actual git-try script.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/tools/depot_tools/
Patch Set: Created 11 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « .gitignore ('k') | git-try » ('j') | 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. 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" ] 11 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
12 then 12 then
13 (cd "$base_dir"; git svn rebase -q -q) 13 (cd "$base_dir"; git svn rebase -q -q)
14 fi 14 fi
15 15
16 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ] 16 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
17 then 17 then
18 (cd "$base_dir/git-cl-repo"; git pull -q) 18 (cd "$base_dir/git-cl-repo"; git pull -q)
19 fi 19 fi
20 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
27 # Use the batch file as an entry point if on cygwin. 21 # Use the batch file as an entry point if on cygwin.
28 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then 22 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
29 ${base_dir}/gclient.bat "$@" 23 ${base_dir}/gclient.bat "$@"
30 exit 24 exit
31 fi 25 fi
32 26
33 27
34 # We're on POSIX (not cygwin). We can now safely look for svn checkout. 28 # We're on POSIX (not cygwin). We can now safely look for svn checkout.
35 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] 29 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
36 then 30 then
37 # Update the bootstrap directory to stay up-to-date with the latest 31 # Update the bootstrap directory to stay up-to-date with the latest
38 # depot_tools. 32 # depot_tools.
39 svn -q up "$base_dir" 33 svn -q up "$base_dir"
40 fi 34 fi
41 35
42 exec python "$base_dir/gclient.py" "$@" 36 exec python "$base_dir/gclient.py" "$@"
OLDNEW
« no previous file with comments | « .gitignore ('k') | git-try » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698