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 sys | |
12 import time | 11 import time |
13 | 12 |
14 import scm | 13 import scm |
15 import gclient_utils | 14 import gclient_utils |
16 | 15 |
17 | 16 |
18 class DiffFilterer(object): | 17 class DiffFilterer(object): |
19 """Simple class which tracks which file is being diffed and | 18 """Simple class which tracks which file is being diffed and |
20 replaces instances of its file name in the original and | 19 replaces instances of its file name in the original and |
21 working copy lines of the svn/git diff output.""" | 20 working copy lines of the svn/git diff output.""" |
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 | 926 |
928 This method returns a new list to be used as a command.""" | 927 This method returns a new list to be used as a command.""" |
929 new_command = command[:] | 928 new_command = command[:] |
930 if revision: | 929 if revision: |
931 new_command.extend(['--revision', str(revision).strip()]) | 930 new_command.extend(['--revision', str(revision).strip()]) |
932 # --force was added to 'svn update' in svn 1.5. | 931 # --force was added to 'svn update' in svn 1.5. |
933 if ((options.force or options.manually_grab_svn_rev) and | 932 if ((options.force or options.manually_grab_svn_rev) and |
934 scm.SVN.AssertVersion("1.5")[0]): | 933 scm.SVN.AssertVersion("1.5")[0]): |
935 new_command.append('--force') | 934 new_command.append('--force') |
936 return new_command | 935 return new_command |
OLD | NEW |