OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2006-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 # Wrapper script around Rietveld's upload.py that groups files into | 6 # Wrapper script around Rietveld's upload.py that groups files into |
7 # changelists. | 7 # changelists. |
8 | 8 |
9 import getpass | 9 import getpass |
10 import os | 10 import os |
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 return | 872 return |
873 else: | 873 else: |
874 args.remove("--no_presubmit") | 874 args.remove("--no_presubmit") |
875 | 875 |
876 no_tree_status_check = ("--force" in args or "-f" in args) | 876 no_tree_status_check = ("--force" in args or "-f" in args) |
877 if not no_tree_status_check and not IsTreeOpen(): | 877 if not no_tree_status_check and not IsTreeOpen(): |
878 print ("Error: The tree is closed. Try again later or use --force to force" | 878 print ("Error: The tree is closed. Try again later or use --force to force" |
879 " the commit. May the --force be with you.") | 879 " the commit. May the --force be with you.") |
880 return | 880 return |
881 | 881 |
882 commit_cmd = ["svn", "commit"] | 882 commit_cmd = ["svn", "commit", "--non-recursive"] |
883 filename = '' | 883 filename = '' |
884 if change_info.issue: | 884 if change_info.issue: |
885 # Get the latest description from Rietveld. | 885 # Get the latest description from Rietveld. |
886 change_info.description = GetIssueDescription(change_info.issue) | 886 change_info.description = GetIssueDescription(change_info.issue) |
887 | 887 |
888 commit_message = change_info.description.replace('\r\n', '\n') | 888 commit_message = change_info.description.replace('\r\n', '\n') |
889 if change_info.issue: | 889 if change_info.issue: |
890 commit_message += ('\nReview URL: http://%s/%s' % | 890 commit_message += ('\nReview URL: http://%s/%s' % |
891 (GetCodeReviewSetting("CODE_REVIEW_SERVER"), | 891 (GetCodeReviewSetting("CODE_REVIEW_SERVER"), |
892 change_info.issue)) | 892 change_info.issue)) |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1138 # the files. This allows commands such as 'gcl diff xxx' to work. | 1138 # the files. This allows commands such as 'gcl diff xxx' to work. |
1139 args =["svn", command] | 1139 args =["svn", command] |
1140 root = GetRepositoryRoot() | 1140 root = GetRepositoryRoot() |
1141 args.extend([os.path.join(root, x) for x in change_info.FileList()]) | 1141 args.extend([os.path.join(root, x) for x in change_info.FileList()]) |
1142 RunShell(args, True) | 1142 RunShell(args, True) |
1143 return 0 | 1143 return 0 |
1144 | 1144 |
1145 | 1145 |
1146 if __name__ == "__main__": | 1146 if __name__ == "__main__": |
1147 sys.exit(main()) | 1147 sys.exit(main()) |
OLD | NEW |