OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2014 the V8 project authors. All rights reserved. | 2 # Copyright 2014 the V8 project authors. All rights reserved. |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following | 10 # copyright notice, this list of conditions and the following |
(...skipping 23 matching lines...) Expand all Loading... |
34 | 34 |
35 ALREADY_MERGING_SENTINEL_FILE = "ALREADY_MERGING_SENTINEL_FILE" | 35 ALREADY_MERGING_SENTINEL_FILE = "ALREADY_MERGING_SENTINEL_FILE" |
36 COMMIT_HASHES_FILE = "COMMIT_HASHES_FILE" | 36 COMMIT_HASHES_FILE = "COMMIT_HASHES_FILE" |
37 TEMPORARY_PATCH_FILE = "TEMPORARY_PATCH_FILE" | 37 TEMPORARY_PATCH_FILE = "TEMPORARY_PATCH_FILE" |
38 | 38 |
39 CONFIG = { | 39 CONFIG = { |
40 BRANCHNAME: "prepare-merge", | 40 BRANCHNAME: "prepare-merge", |
41 PERSISTFILE_BASENAME: "/tmp/v8-merge-to-branch-tempfile", | 41 PERSISTFILE_BASENAME: "/tmp/v8-merge-to-branch-tempfile", |
42 ALREADY_MERGING_SENTINEL_FILE: | 42 ALREADY_MERGING_SENTINEL_FILE: |
43 "/tmp/v8-merge-to-branch-tempfile-already-merging", | 43 "/tmp/v8-merge-to-branch-tempfile-already-merging", |
44 TEMP_BRANCH: "prepare-merge-temporary-branch-created-by-script", | |
45 DOT_GIT_LOCATION: ".git", | 44 DOT_GIT_LOCATION: ".git", |
46 VERSION_FILE: "src/version.cc", | 45 VERSION_FILE: "src/version.cc", |
47 TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch", | 46 TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch", |
48 COMMITMSG_FILE: "/tmp/v8-prepare-merge-tempfile-commitmsg", | 47 COMMITMSG_FILE: "/tmp/v8-prepare-merge-tempfile-commitmsg", |
49 COMMIT_HASHES_FILE: "/tmp/v8-merge-to-branch-tempfile-PATCH_COMMIT_HASHES", | 48 COMMIT_HASHES_FILE: "/tmp/v8-merge-to-branch-tempfile-PATCH_COMMIT_HASHES", |
50 } | 49 } |
51 | 50 |
52 | 51 |
53 class Preparation(Step): | 52 class Preparation(Step): |
54 MESSAGE = "Preparation." | 53 MESSAGE = "Preparation." |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 UploadStep, | 324 UploadStep, |
326 CommitRepository, | 325 CommitRepository, |
327 PrepareSVN, | 326 PrepareSVN, |
328 TagRevision, | 327 TagRevision, |
329 CleanUp, | 328 CleanUp, |
330 ] | 329 ] |
331 | 330 |
332 | 331 |
333 if __name__ == "__main__": # pragma: no cover | 332 if __name__ == "__main__": # pragma: no cover |
334 sys.exit(MergeToBranch(CONFIG).Run()) | 333 sys.exit(MergeToBranch(CONFIG).Run()) |
OLD | NEW |