| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # coding: utf-8 | 2 # coding: utf-8 |
| 3 | 3 |
| 4 # This Source Code Form is subject to the terms of the Mozilla Public | 4 # This Source Code Form is subject to the terms of the Mozilla Public |
| 5 # License, v. 2.0. If a copy of the MPL was not distributed with this | 5 # License, v. 2.0. If a copy of the MPL was not distributed with this |
| 6 # file, You can obtain one at http://mozilla.org/MPL/2.0/. | 6 # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| 7 | 7 |
| 8 import sys | 8 import sys |
| 9 import os | 9 import os |
| 10 import posixpath | 10 import posixpath |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 def istype(self, repodir): | 82 def istype(self, repodir): |
| 83 return os.path.exists(os.path.join(repodir, ".git")) | 83 return os.path.exists(os.path.join(repodir, ".git")) |
| 84 | 84 |
| 85 def clone(self, source, target): | 85 def clone(self, source, target): |
| 86 source = source.rstrip("/") | 86 source = source.rstrip("/") |
| 87 if not source.endswith(".git"): | 87 if not source.endswith(".git"): |
| 88 source += ".git" | 88 source += ".git" |
| 89 subprocess.check_call(["git", "clone", "--quiet", source, target]) | 89 subprocess.check_call(["git", "clone", "--quiet", source, target]) |
| 90 | 90 |
| 91 def get_revision_id(self, repo, rev="HEAD"): | 91 def get_revision_id(self, repo, rev="HEAD"): |
| 92 command = ["git", "rev-list", "--remotes=*", "--max-count=1", rev] | 92 command = ["git", "rev-parse", "--revs-only", rev + '^{commit}'] |
|
Wladimir Palant
2015/01/11 23:10:22
Note that I don't really know how to use Git, and
Wladimir Palant
2015/01/11 23:39:28
I noticed that the rev-list with --remotes specifi
|
mathias
2015/01/12 11:51:11
What about ["git", "rev-parse", "--revs-only", "--
Wladimir Palant
2015/01/12 12:50:05
I tried it already, and couldn't see any real diff
|
| 93 process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subproces s.PIPE, cwd=repo) | 93 return subprocess.check_output(command, cwd=repo).strip() |
| 94 | |
| 95 # Ignore stderr output and return code here: if revision lookup failed we | |
| 96 # should simply return an empty string. | |
| 97 result = process.communicate()[0] | |
| 98 return result.strip() | |
| 99 | 94 |
| 100 def pull(self, repo): | 95 def pull(self, repo): |
| 101 subprocess.check_call(["git", "fetch", "--quiet", "--all", "--tags"], cwd=re po) | 96 subprocess.check_call(["git", "fetch", "--quiet", "--all", "--tags"], cwd=re po) |
| 102 | 97 |
| 103 def update(self, repo, rev): | 98 def update(self, repo, rev): |
| 104 subprocess.check_call(["git", "checkout", "--quiet", rev], cwd=repo) | 99 subprocess.check_call(["git", "checkout", "--quiet", rev], cwd=repo) |
| 105 | 100 |
| 106 def ignore(self, target, repo): | 101 def ignore(self, target, repo): |
| 107 module = os.path.relpath(target, repo) | 102 module = os.path.relpath(target, repo) |
| 108 exclude_file = os.path.join(repo, ".git", "info", "exclude") | 103 exclude_file = os.path.join(repo, ".git", "info", "exclude") |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 281 for l in file_content: | 276 for l in file_content: |
| 282 print >>f, l | 277 print >>f, l |
| 283 | 278 |
| 284 if __name__ == "__main__": | 279 if __name__ == "__main__": |
| 285 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) | 280 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO) |
| 286 repos = sys.argv[1:] | 281 repos = sys.argv[1:] |
| 287 if not len(repos): | 282 if not len(repos): |
| 288 repos = [os.getcwd()] | 283 repos = [os.getcwd()] |
| 289 for repo in repos: | 284 for repo in repos: |
| 290 resolve_deps(repo) | 285 resolve_deps(repo) |
| LEFT | RIGHT |