| Index: tools/release/version.dart
|
| ===================================================================
|
| --- tools/release/version.dart (revision 24095)
|
| +++ tools/release/version.dart (working copy)
|
| @@ -149,22 +149,21 @@
|
|
|
| Future<int> getRevision() {
|
| if (repositoryType == RepositoryType.UNKNOWN) {
|
| - return new Future.value(0);
|
| + return new Future.immediate(0);
|
| }
|
| var isSvn = repositoryType == RepositoryType.SVN;
|
| var command = isSvn ? "svn" : "git";
|
| command = "$command${getExecutableSuffix()}";
|
| var arguments = isSvn ? ["info"] : ["svn", "info"];
|
| + ProcessOptions options = new ProcessOptions();
|
| // Run the command from the root to get the last changed revision for this
|
| // "branch". Since we have both trunk and bleeding edge in the same
|
| // repository and since we always build TOT we need this to get the
|
| // right version number.
|
| Path toolsDirectory = new Path(_versionFileName).directoryPath;
|
| Path root = toolsDirectory.join(new Path(".."));
|
| - var workingDirectory = root.toNativePath();
|
| - return Process.run(command,
|
| - arguments,
|
| - workingDirectory: workingDirectory).then((result) {
|
| + options.workingDirectory = root.toNativePath();
|
| + return Process.run(command, arguments, options).then((result) {
|
| if (result.exitCode != 0) {
|
| return 0;
|
| }
|
| @@ -202,7 +201,7 @@
|
| return "$absolutePath" == '/';
|
| }
|
|
|
| - var currentPath = new Path(Directory.current.path);
|
| + var currentPath = new Path(new Directory.current().path);
|
| while (true) {
|
| if (hasDirectory(currentPath, '.svn')) {
|
| return RepositoryType.SVN;
|
|
|