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

Side by Side Diff: gclient

Issue 2962013: gclient: update git-cl whenever git-cl is run and not when gclient is run (Closed)
Patch Set: Created 10 years, 5 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 | « no previous file | git-cl » ('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/bash 1 #!/bin/bash
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 # Test git and git --version. 10 # Test git and git --version.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 cd $base_dir 45 cd $base_dir
46 test_git_svn 46 test_git_svn
47 # work around a git-svn --quiet bug 47 # work around a git-svn --quiet bug
48 OUTPUT=`git svn rebase -q -q` 48 OUTPUT=`git svn rebase -q -q`
49 if [[ ! "$OUTPUT" =~ Current.branch ]]; then 49 if [[ ! "$OUTPUT" =~ Current.branch ]]; then
50 echo $OUTPUT 50 echo $OUTPUT
51 fi 51 fi
52 cd - > /dev/null 52 cd - > /dev/null
53 fi 53 fi
54 54
55 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/git-cl-repo/.git" ]
56 then
57 test_git
58 (cd "$base_dir/git-cl-repo"; git pull -q)
59 fi
60
61 # Use the batch file as an entry point if on cygwin. 55 # Use the batch file as an entry point if on cygwin.
62 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then 56 if [ "${OSTYPE}" = "cygwin" -a "${TERM}" != "xterm" ]; then
63 ${base_dir}/gclient.bat "$@" 57 ${base_dir}/gclient.bat "$@"
64 exit 58 exit
65 fi 59 fi
66 60
67 61
68 # We're on POSIX (not cygwin). We can now safely look for svn checkout. 62 # We're on POSIX (not cygwin). We can now safely look for svn checkout.
69 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] 63 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
70 then 64 then
71 # Update the bootstrap directory to stay up-to-date with the latest 65 # Update the bootstrap directory to stay up-to-date with the latest
72 # depot_tools. 66 # depot_tools.
73 svn -q up "$base_dir" 67 svn -q up "$base_dir"
74 fi 68 fi
75 69
76 exec python "$base_dir/gclient.py" "$@" 70 exec python "$base_dir/gclient.py" "$@"
OLDNEW
« no previous file with comments | « no previous file | git-cl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698