OLD | NEW |
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Gclient-specific SCM-specific operations.""" | 5 """Gclient-specific SCM-specific operations.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import posixpath | 9 import posixpath |
10 import re | 10 import re |
11 import subprocess | |
12 import sys | 11 import sys |
13 import time | 12 import time |
14 | 13 |
15 import scm | 14 import scm |
16 import gclient_utils | 15 import gclient_utils |
17 | 16 |
18 | 17 |
19 class DiffFilterer(object): | 18 class DiffFilterer(object): |
20 """Simple class which tracks which file is being diffed and | 19 """Simple class which tracks which file is being diffed and |
21 replaces instances of its file name in the original and | 20 replaces instances of its file name in the original and |
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
960 | 959 |
961 This method returns a new list to be used as a command.""" | 960 This method returns a new list to be used as a command.""" |
962 new_command = command[:] | 961 new_command = command[:] |
963 if revision: | 962 if revision: |
964 new_command.extend(['--revision', str(revision).strip()]) | 963 new_command.extend(['--revision', str(revision).strip()]) |
965 # --force was added to 'svn update' in svn 1.5. | 964 # --force was added to 'svn update' in svn 1.5. |
966 if ((options.force or options.manually_grab_svn_rev) and | 965 if ((options.force or options.manually_grab_svn_rev) and |
967 scm.SVN.AssertVersion("1.5")[0]): | 966 scm.SVN.AssertVersion("1.5")[0]): |
968 new_command.append('--force') | 967 new_command.append('--force') |
969 return new_command | 968 return new_command |
OLD | NEW |