path: Rename "real" to "resolve"

doc_src/cmds/path.rst

@@ -18,7 +18,7 @@ Synopsis
         [-d] [-f] [-l] [-r] [-w] [-x] \
         [(-p | --perm) PERMISSION] [PATH...]
     path normalize GENERAL_OPTIONS [PATH...]
-    path real GENERAL_OPTIONS [PATH...]
+    path resolve GENERAL_OPTIONS [PATH...]
     path change-extension GENERAL_OPTIONS EXTENSION [PATH...]
 
     GENERAL_OPTIONS := [(-z | --null-in)] [(-Z | --null-out)] [(-q | --quiet)]
@@ -256,14 +256,14 @@ Examples
     # The "//" is squashed, but /bin isn't resolved even if your system links it to /usr/bin.
     /bin/bash
     
-"real" subcommand
+"resolve" subcommand
 --------------------
 
 ::
 
-    path real [(-z | --null-in)] [(-Z | --null-out)] [(-q | --quiet)] [PATH...]
+    path resolve [(-z | --null-in)] [(-Z | --null-out)] [(-q | --quiet)] [PATH...]
 
-``path real`` returns the normalized, physical versions of all paths. That means it resolves symlinks and does what ``path normalize`` does: it squashes duplicate "/" (except for two leading "//"), collapses "../" with earlier components and removes "." components.
+``path resolve`` returns the normalized, physical versions of all paths. That means it resolves symlinks and does what ``path normalize`` does: it squashes duplicate "/" (except for two leading "//"), collapses "../" with earlier components and removes "." components.
 
 It is the same as ``realpath``, as it creates the "real", canonical version of the path. However, for nonexistent paths it will resolve as far as it can and normalize the nonexistent part.
 
@@ -274,12 +274,12 @@ Examples
 
 ::
 
-   >_ path real /bin//sh
+   >_ path resolve /bin//sh
    # The "//" is squashed, and /bin is resolved if your system links it to /usr/bin.
    # sh here is bash (on an Archlinux system)
    /usr/bin/bash
     
-   >_ path real /bin/foo///bar/../baz
+   >_ path resolve /bin/foo///bar/../baz
    # Assuming /bin exists and is a symlink to /usr/bin, but /bin/foo doesn't.
    # This resolves the /bin/ and normalizes the nonexistent rest:
    /usr/bin/foo/baz
@@ -339,13 +339,13 @@ This is why
 
 Some examples of combining ``path``::
 
-  # Expand all paths in the current directory, leave only executable files, and print their real path
-  path expand '*' -Z | path filter -zZ --perm=exec --type=file | path real -z
+  # Expand all paths in the current directory, leave only executable files, and print their resolved path
+  path expand '*' -Z | path filter -zZ --perm=exec --type=file | path resolve -z
 
   # The same thing, but using find (note -maxdepth needs to come first or find will scream)
   # (this also depends on your particular version of find)
   # Note the `-z` is unnecessary for any sensible version of find - if `path` sees a NULL,
   # it will split on NULL automatically.
-  find . -maxdepth 1 -type f -executable -print0 | path real -z
+  find . -maxdepth 1 -type f -executable -print0 | path resolve -z
 
-  set -l paths (path filter -p exec $PATH/fish -Z | path real)
+  set -l paths (path filter -p exec $PATH/fish -Z | path resolve)

src/builtins/path.cpp

@@ -619,7 +619,7 @@ static int path_change_extension(parser_t &parser, io_streams_t &streams, int ar
     return n_transformed > 0 ? STATUS_CMD_OK : STATUS_CMD_ERROR;
 }
 
-static int path_real(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv) {
+static int path_resolve(parser_t &parser, io_streams_t &streams, int argc, const wchar_t **argv) {
     options_t opts;
     int optind;
     int retval = parse_opts(&opts, &optind, 0, argc, argv, parser, streams);
@@ -722,7 +722,7 @@ static constexpr const struct path_subcommand {
     {L"filter", &path_filter},
     {L"is", &path_is},
     {L"normalize", &path_normalize},
-    {L"real", &path_real},
+    {L"resolve", &path_resolve},
 };
 ASSERT_SORTED_BY_NAME(path_subcommands);
 

tests/checks/path.fish

@@ -106,18 +106,18 @@ path normalize /bin//bash
 # CHECK:  /bin/bash
 
 # We need to remove the rest of the path because we have no idea what its value looks like.
-path real bin//sh | string match -r -- 'bin/bash$'
+path resolve bin//sh | string match -r -- 'bin/bash$'
 # The "//" is squashed, and the symlink is resolved.
 # sh here is bash
 # CHECK: bin/bash
 
-# `path real` with nonexistent paths
-set -l path (path real foo/bar)
+# `path resolve` with nonexistent paths
+set -l path (path resolve foo/bar)
 string match -rq "^"(string escape --style=regex -- $PWD)'/' -- $path
 and echo It matches pwd!
 # CHECK: It matches pwd!
 string replace -r "^"(string escape --style=regex -- $PWD)'/' "" -- $path
 # CHECK: foo/bar
 
-path real /banana//terracota/terracota/booooo/../pie
+path resolve /banana//terracota/terracota/booooo/../pie
 # CHECK: /banana/terracota/terracota/pie