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

Side by Side Diff: update_depot_tools

Issue 9751009: Fix git depot_tools update flow. (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools
Patch Set: fix to unix endlines Created 8 years, 8 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 | « gclient.bat ('k') | update_depot_tools.bat » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2011 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 if [ "$USER" == "root" ]; 8 if [ "$USER" == "root" ];
9 then 9 then
10 echo Running depot tools as root is sad. 10 echo Running depot tools as root is sad.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 OUTPUT=`"$GIT" svn rebase -q -q` 78 OUTPUT=`"$GIT" svn rebase -q -q`
79 if [[ ! "$OUTPUT" == *Current.branch* ]]; then 79 if [[ ! "$OUTPUT" == *Current.branch* ]]; then
80 echo $OUTPUT 1>&2 80 echo $OUTPUT 1>&2
81 fi 81 fi
82 cd - > /dev/null 82 cd - > /dev/null
83 fi 83 fi
84 84
85 # We're on POSIX. We can now safely look for svn checkout. 85 # We're on POSIX. We can now safely look for svn checkout.
86 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] 86 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ]
87 then 87 then
88 # Update the bootstrap directory to stay up-to-date with the latest 88 # Update the root directory to stay up-to-date with the latest depot_tools.
89 # depot_tools.
90 BEFORE_REVISION=$(get_svn_revision) 89 BEFORE_REVISION=$(get_svn_revision)
91 "$SVN" -q up "$base_dir" 90 "$SVN" -q up "$base_dir"
92 AFTER_REVISION=$(get_svn_revision) 91 AFTER_REVISION=$(get_svn_revision)
93 if [[ "$BEFORE_REVISION" != "$AFTER_REVISION" ]]; then 92 if [[ "$BEFORE_REVISION" != "$AFTER_REVISION" ]]; then
94 echo "Depot Tools has been updated to revision $AFTER_REVISION." 1>&2 93 echo "Depot Tools has been updated to revision $AFTER_REVISION." 1>&2
95 fi 94 fi
96 fi 95 fi
97 96
98 find "$base_dir" -iname "*.pyc" -exec rm {} \; 97 find "$base_dir" -iname "*.pyc" -exec rm {} \;
OLDNEW
« no previous file with comments | « gclient.bat ('k') | update_depot_tools.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698