Skip to content

renaming argv_array

Jeff King git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest11 patches 34 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11argv-array: use size_t for count and allocargv-array.h+2 -20 replies
2/11argv-array: rename to strvecargv-array.c argv-array.h exec-cmd.h +9 more+74 -610 replies
3/11strvec: rename files from argv-array to strvecMakefile add-patch.c bisect.c +56 more+61 -610 replies
4/11quote: rename sq_dequote_to_argv_array to mention strvecbisect.c builtin/am.c quote.c +1 more+6 -60 replies
5/11strvec: convert builtin/ callers away from argv_array namebuiltin/add.c builtin/am.c builtin/annotate.c +25 more+503 -5030 replies
6/11strvec: convert more callers away from argv_array nameadd-interactive.c add-patch.c bisect.c +24 more+201 -2010 replies
7/11strvec: convert remaining callers away from argv_array namemerge.c midx.c pager.c +30 more+385 -3850 replies
8/11strvec: fix indentation in renamed callsadd-interactive.c add-patch.c bisect.c +31 more+173 -1742 replies
9/11strvec: update documention to avoid argv_arrayDocumentation/technical/api-parse-options.txt+2 -20 replies
10/11strvec: drop argv_array compatibility layerstrvec.h+0 -138 replies
11/11strvec: rename struct fieldsadd-interactive.c add-patch.c bisect.c +49 more+186 -1866 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/11] renaming argv_array

The argv_array data type has turned out to be useful in our code base, but the name isn't very good. From patch 2 of this series:

The name "argv-array" isn't very good, because it describes what the data type can be used for (program argument arrays), not what it actually is (a dynamically-growing string array that maintains a NULL-terminator invariant). This leads to people being hesitant to use it for other cases where it would actually be a good fit. The existing name is also clunky to use. It's overly long, and the name often leads to saying things like "argv.argv" (i.e., the field names overlap with variable names, since they're describing the use, not the type). Let's give it a more neutral name.

This has bugged me for a while, so I decided to finally fix it. It wasn't _too_ painful, though I'm sure there will be a little fallout with topics in flight.

I tried to split out the mechanical bits into their own patches to make reviewing easier. Patches 5-7 really could be a single patch, but they're too big for the mailing list. I'm OK to leave them separate, or they could be squashed together.

We could stop at patch 9 for now and allow topics in flight to catch up before removing the compat layers. But the struct field renaming has to happen as a single step, so it will be a pain whenever we do it. If we're going to go this route, I'd just as soon do it all now and deal with other topics as they get merged.

[01/11]: argv-array: use size_t for count and alloc [02/11]: argv-array: rename to strvec
[03/11]: strvec: rename files from argv-array to strvec [04/11]: quote: rename sq_dequote_to_argv_array to mention strvec [05/11]: strvec: convert builtin/ callers away from argv_array name [06/11]: strvec: convert more callers away from argv_array name [07/11]: strvec: convert remaining callers away from argv_array name [08/11]: strvec: fix indentation in renamed calls [09/11]: strvec: update documention to avoid argv_array [10/11]: strvec: drop argv_array compatibility layer [11/11]: strvec: rename struct fields

 Documentation/technical/api-parse-options.txt |   4 +-
 Makefile                                      |   2 +-
 add-interactive.c                             |  28 +--
 add-patch.c                                   |  48 ++--
 argv-array.c                                  | 109 ---------
 bisect.c                                      |  20 +-
 builtin/add.c                                 |  18 +-
 builtin/am.c                                  |  80 +++----
 builtin/annotate.c                            |  10 +-
 builtin/bisect--helper.c                      |  20 +-
 builtin/bundle.c                              |  14 +-
 builtin/clone.c                               |  38 +--
 builtin/commit.c                              |   8 +-
 builtin/describe.c                            |  44 ++--
 builtin/difftool.c                            |  30 +--
 builtin/fetch.c                               |  64 ++---
 builtin/gc.c                                  |  78 +++----
 builtin/grep.c                                |   2 +-
 builtin/log.c                                 |  12 +-
 builtin/ls-remote.c                           |   6 +-
 builtin/pack-objects.c                        |  26 +--
 builtin/pull.c                                | 160 ++++++-------
 builtin/range-diff.c                          |   4 +-
 builtin/rebase.c                              |  90 ++++----
 builtin/receive-pack.c                        | 126 +++++-----
 builtin/remote-ext.c                          |   4 +-
 builtin/remote.c                              |  26 +--
 builtin/repack.c                              |  72 +++---
 builtin/replace.c                             |  18 +-
 builtin/show-branch.c                         |  16 +-
 builtin/stash.c                               | 162 ++++++-------
 builtin/submodule--helper.c                   | 144 ++++++------
 builtin/update-ref.c                          |   2 +-
 builtin/upload-archive.c                      |  12 +-
 builtin/worktree.c                            |  68 +++---
 bundle.c                                      |  24 +-
 bundle.h                                      |   4 +-
 column.c                                      |  12 +-
 commit.c                                      |  10 +-
 compat/mingw.c                                |   4 +-
 compat/terminal.c                             |  18 +-
 connect.c                                     |  69 +++---
 connected.c                                   |  24 +-
 daemon.c                                      |  60 ++---
 diff.c                                        |  32 +--
 environment.c                                 |  12 +-
 exec-cmd.c                                    |  18 +-
 exec-cmd.h                                    |   4 +-
 fast-import.c                                 |   4 +-
 fetch-pack.c                                  |  46 ++--
 fsmonitor.c                                   |   6 +-
 git.c                                         |  32 +--
 gpg-interface.c                               |  22 +-
 graph.c                                       |  16 +-
 http-backend.c                                |   8 +-
 http-push.c                                   |  18 +-
 http.c                                        |   8 +-
 imap-send.c                                   |   2 +-
 line-log.c                                    |   8 +-
 list-objects-filter-options.c                 |   2 +-
 ls-refs.c                                     |  18 +-
 ls-refs.h                                     |   4 +-
 merge.c                                       |  18 +-
 midx.c                                        |  12 +-
 pager.c                                       |   8 +-
 parse-options-cb.c                            |   8 +-
 pathspec.c                                    |  10 +-
 quote.c                                       |   8 +-
 quote.h                                       |   8 +-
 range-diff.c                                  |  40 ++--
 range-diff.h                                  |   4 +-
 ref-filter.c                                  |  12 +-
 refs.c                                        |   8 +-
 refs.h                                        |   4 +-
 refspec.c                                     |  10 +-
 refspec.h                                     |   4 +-
 remote-curl.c                                 | 102 ++++----
 remote-testsvn.c                              |  10 +-
 remote.c                                      |  20 +-
 remote.h                                      |   4 +-
 revision.c                                    |  20 +-
 run-command.c                                 |  72 +++---
 run-command.h                                 |  12 +-
 send-pack.c                                   |  18 +-
 sequencer.c                                   | 126 +++++-----
 serve.c                                       |  20 +-
 serve.h                                       |   4 +-
 sha1-file.c                                   |  14 +-
 strvec.c                                      | 109 +++++++++
 argv-array.h => strvec.h                      |  58 ++---
 sub-process.c                                 |   2 +-
 submodule.c                                   | 218 +++++++++---------
 submodule.h                                   |   6 +-
 t/helper/test-run-command.c                   |  52 ++---
 t/helper/test-trace2.c                        |   2 +-
 tmp-objdir.c                                  |  20 +-
 transport-helper.c                            |  36 +--
 transport-internal.h                          |   4 +-
 transport.c                                   |  12 +-
 transport.h                                   |   2 +-
 unpack-trees.c                                |  12 +-
 unpack-trees.h                                |   4 +-
 upload-pack.c                                 |  53 +++--
 upload-pack.h                                 |   4 +-
 wt-status.c                                   |  19 +-
 105 files changed, 1619 insertions(+), 1620 deletions(-)
 delete mode 100644 argv-array.c
 create mode 100644 strvec.c
 rename argv-array.h => strvec.h (50%)