Improve resolution warning for wit-manifest from commit instead of disk

lib/wit/workspace.py

@@ -168,8 +168,8 @@ def resolve(self, download=False):
             used_commit = pkg.revision
             fs_commit = pkg.repo.get_commit('HEAD')
             if used_commit != fs_commit:
-                log.warn("using '{}' manifest instead of checked-out version of '{}'".format(
-                    pkg.id(), pkg.name))
+                log.warn("using '{}' manifest instead of currently checked-out version in '{}'"
+                         .format(pkg.id(), pkg.name))
                 continue
 
             if pkg.repo.modified_manifest():

t/warn_manifest_changes.t

@@ -33,22 +33,22 @@ wit add-pkg $foo_dir
 output=$(wit update)
 echo $output | grep "disregarding uncommitted changes"
 check "initial wit update should not log uncommitted manifest warnings" [ $? -ne 0 ]
-echo $output | grep "manifest instead of checked-out version"
+echo $output | grep "manifest instead of currently checked-out version"
 check "initial wit update should not log different manifest warnings" [ $? -ne 0 ]
 
 rm foo/wit-manifest.json
 output=$(wit update)
 echo $output | grep "disregarding uncommitted changes"
 check "initial wit update should log uncommitted manifest warnings" [ $? -eq 0 ]
-echo $output | grep "manifest instead of checked-out version"
+echo $output | grep "manifest instead of currently checked-out version"
 check "initial wit update should not log different manifest warnings" [ $? -ne 0 ]
 
 git -C foo add -A
 git -C foo commit -m "remove manifest"
 output=$(wit update)
 echo $output | grep "disregarding uncommitted changes"
 check "initial wit update should not log uncommitted manifest warnings" [ $? -ne 0 ]
-echo $output | grep "manifest instead of checked-out version"
+echo $output | grep "manifest instead of currently checked-out version"
 check "initial wit update should log different manifest warnings" [ $? -eq 0 ]
 
 set +x