Fix pub serve on windows.

BUG=https://code.google.com/p/dart/issues/detail?id=12500
[email protected]

Review URL: https://codereview.chromium.org//23291002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@26292 260f80e4-7a28-3924-810f-c04153c831b5

Author: munificent

sdk/lib/_internal/pub/lib/src/command/serve.dart

@@ -226,8 +226,7 @@ class ServeCommand extends PubCommand {
         var subdirectory = path.join(packageDir, name);
         var watcher = new DirectoryWatcher(subdirectory);
         watcher.events.listen((event) {
-          var relativePath = path.relative(event.path, from: packageDir);
-          var id = new AssetId(package, relativePath);
+          var id = pathToAssetId(package, packageDir, event.path);
           if (event.type == ChangeType.REMOVE) {
             _barback.removeSources([id]);
           } else {
@@ -257,10 +256,7 @@ class ServeCommand extends PubCommand {
         // Skip directories.
         if (!fileExists(entry)) continue;
 
-        // AssetId paths use "/" on all platforms.
-        var relative = path.relative(entry, from: packageDir);
-        relative = path.toUri(relative).path;
-        files.add(new AssetId(package, relative));
+        files.add(pathToAssetId(package, packageDir, entry));
       }
     }
 
@@ -274,4 +270,14 @@ class ServeCommand extends PubCommand {
     if (package == entrypoint.root.name) directories.add("web");
     return directories;
   }
+
+  /// Converts a local file path to an [AssetId].
+  AssetId pathToAssetId(String package, String packageDir, String filePath) {
+    var relative = path.relative(filePath, from: packageDir);
+
+    // AssetId paths use "/" on all platforms.
+    relative = path.toUri(relative).path;
+
+    return new AssetId(package, relative);
+  }
 }

sdk/lib/_internal/pub/pub.status

@@ -9,6 +9,3 @@
 # Pub only runs on the standalone VM, not the browser.
 [ $runtime == drt || $runtime == dartium || $runtime == opera ]
 *: Skip
-
-[ $system == windows ]
-test/serve/watch_added_file_test: Pass, Fail # Issue 12500.