update_depot_tools.bat - Issue 10263004: Handle updating depot_tools repos that are git cloned.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: update_depot_tools.bat

Issue 10263004: Handle updating depot_tools repos that are git cloned. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 8 years, 7 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

OLD	NEW
1 @echo off	1 @echo off

2 :: Copyright (c) 2012 The Chromium Authors. All rights reserved.	2 :: Copyright (c) 2012 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 batch file will try to sync the root directory.	6 :: This batch file will try to sync the root directory.

7	7

8 setlocal	8 setlocal

9	9

10 :: Will download svn and python.	10 :: Will download svn and python.

(...skipping 13 matching lines...) Expand all Loading...
24 goto :EOF	24 goto :EOF

25	25

26	26

27 :SVN_UPDATE	27 :SVN_UPDATE

28 call svn up -q "%~dp0."	28 call svn up -q "%~dp0."

29 goto :EOF	29 goto :EOF

30	30

31	31

32 :GIT_UPDATE	32 :GIT_UPDATE

33 cd /d "%~dp0."	33 cd /d "%~dp0."

	34 call git config remote.origin.fetch > NUL
	M-A Ruel 2012/04/29 00:49:08 I prefer to do the reverse order of the check. Fir I prefer to do the reverse order of the check. First check for git svn, then check for a remote. The reason is that I git svn clone, then git clone this svn clone and also setup git svn on it. So I end up with one (or 2) git remotes and one git-svn remote. As such, I want the git svn remote to have higher priority. cmp 2012/04/29 00:57:03 I asked M-A over IM if he would explain why he wou I asked M-A over IM if he would explain why he wouldn't just switch to use the supported Git repo for depot_tools after this change lands, to which he replied "ok." So the current patchset is still the preferred way to go. Before this would land, I'll send a PSA to users on chromium-dev@ letting them know that they should switch any Git-based copy of depot_tools to use the new supported repo.
	35 if errorlevel 1 goto :GIT_SVN_UPDATE

	36 call git fetch -q origin

	37 call git rebase -q origin

	38 goto :EOF

	39

	40 :GIT_SVN_UPDATE

	41 cd /d "%~dp0."

34 call git svn rebase -q -q	42 call git svn rebase -q -q

35 goto :EOF	43 goto :EOF

OLD	NEW

« update_depot_tools ('K') | « update_depot_tools ('k') | no next file » | no next file with comments »