git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 01/15] sequencer: lib'ify write_message()

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Aug 24, 2016, 07:09 UTC
Message-ID
<CAPig+cSX_F-vQ_zSrTU6BQSfMeU=5V3krE7xgmBL=g=Jr8i2MA@mail.gmail.com>
In-Reply-To
<6dc5e927cbdd1847db5b6cd75041609dd1e1f76d.1471968378.git.johannes.schindelin@gmx.de>

On Tue, Aug 23, 2016 at 12:06 PM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

Show 20 quoted lines
> To be truly useful, the sequencer should never die() but always return
> an error.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> diff --git a/sequencer.c b/sequencer.c
> @@ -180,17 +180,20 @@ static void print_advice(int show_hint, struct replay_opts *opts)
> -static void write_message(struct strbuf *msgbuf, const char *filename)
> +static int write_message(struct strbuf *msgbuf, const char *filename)
>  {
>         static struct lock_file msg_file;
>
> -       int msg_fd = hold_lock_file_for_update(&msg_file, filename,
> -                                              LOCK_DIE_ON_ERROR);
> +       int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
> +       if (msg_fd < 0)
> +               return error_errno(_("Could not lock '%s'"), filename);
>         if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)
> -               die_errno(_("Could not write to %s"), filename);
> +               return error_errno(_("Could not write to %s"), filename);
Does this need to rollback the lockfile before returning[*]?

[*] I'm not terribly familiar with the lockfile mechanism and I don't have a lot of time to study it presently, so ignore me if this is a stupid question.

Show 7 quoted lines
>         strbuf_release(msgbuf);
>         if (commit_lock_file(&msg_file) < 0)
> -               die(_("Error wrapping up %s."), filename);
> +               return error(_("Error wrapping up %s."), filename);
> +
> +       return 0;
>  }
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 6 of 91 in “Lib'ify quite a few functions in sequencer.c”
  1. 00/15 Lib'ify quite a few functions in sequencer.cJohannes Schindelin, Aug 23, 2016
  2. 07/15 sequencer: lib'ify read_populate_opts()Johannes Schindelin, Aug 23, 2016
  3. Junio C HamanoAug 26, 2016
  4. Johannes SchindelinAug 29, 2016
  5. 01/15 sequencer: lib'ify write_message()Johannes Schindelin, Aug 23, 2016
  6. Eric SunshineAug 24, 2016
  7. Johannes SchindelinAug 24, 2016
  8. 06/15 sequencer: lib'ify read_populate_todo()Johannes Schindelin, Aug 23, 2016
  9. Eric SunshineAug 24, 2016
  10. Johannes SchindelinAug 24, 2016
  11. Junio C HamanoAug 25, 2016
  12. Johannes SchindelinAug 26, 2016
  13. Junio C HamanoAug 26, 2016
  14. 04/15 sequencer: lib'ify prepare_revs()Johannes Schindelin, Aug 23, 2016
  15. Junio C HamanoAug 25, 2016
  16. Johannes SchindelinAug 26, 2016
  17. 02/15 sequencer: lib'ify do_recursive_merge()Johannes Schindelin, Aug 23, 2016
  18. Eric SunshineAug 24, 2016
  19. Johannes SchindelinAug 24, 2016
  20. 03/15 sequencer: lib'ify do_pick_commit()Johannes Schindelin, Aug 23, 2016
  21. Junio C HamanoAug 25, 2016
  22. Johannes SchindelinAug 26, 2016
  23. 13/15 sequencer: lib'ify sequencer_pick_revisions()Johannes Schindelin, Aug 23, 2016
  24. 15/15 sequencer: do not die() in fast_forward_to()Johannes Schindelin, Aug 23, 2016
  25. 08/15 sequencer: lib'ify walk_revs_populate_todo()Johannes Schindelin, Aug 23, 2016
  26. 05/15 sequencer: lib'ify read_and_refresh_cache()Johannes Schindelin, Aug 23, 2016
  27. Eric SunshineAug 24, 2016
  28. Johannes SchindelinAug 24, 2016
  29. Junio C HamanoAug 25, 2016
  30. 09/15 sequencer: lib'ify create_seq_dir()Johannes Schindelin, Aug 23, 2016
  31. Eric SunshineAug 24, 2016
  32. Johannes SchindelinAug 24, 2016
  33. 11/15 sequencer: lib'ify save_todo()Johannes Schindelin, Aug 23, 2016
  34. Eric SunshineAug 24, 2016
  35. Johannes SchindelinAug 24, 2016
  36. 10/15 sequencer: lib'ify save_head()Johannes Schindelin, Aug 23, 2016
  37. Eric SunshineAug 24, 2016
  38. Johannes SchindelinAug 24, 2016
  39. 12/15 sequencer: lib'ify save_opts()Johannes Schindelin, Aug 23, 2016
  40. Junio C HamanoAug 26, 2016
  41. Johannes SchindelinAug 29, 2016
  42. 14/15 sequencer: do not die() in do_pick_commit()Johannes Schindelin, Aug 23, 2016
  43. 00/14 Lib'ify quite a few functions in sequencer.cJohannes Schindelin, Aug 26, 2016
  44. 05/14 sequencer: lib'ify do_pick_commit()Johannes Schindelin, Aug 26, 2016
  45. Junio C HamanoAug 29, 2016
  46. 09/14 sequencer: lib'ify read_populate_todo()Johannes Schindelin, Aug 26, 2016
  47. 12/14 sequencer: lib'ify save_head()Johannes Schindelin, Aug 26, 2016
  48. Junio C HamanoAug 29, 2016
  49. Johannes SchindelinAug 30, 2016
  50. 11/14 sequencer: lib'ify create_seq_dir()Johannes Schindelin, Aug 26, 2016
  51. 10/14 sequencer: lib'ify read_populate_opts()Johannes Schindelin, Aug 26, 2016
  52. Junio C HamanoAug 29, 2016
  53. Junio C HamanoAug 29, 2016
  54. Johannes SchindelinAug 30, 2016
  55. Junio C HamanoAug 30, 2016
  56. 14/14 sequencer: lib'ify save_opts()Johannes Schindelin, Aug 26, 2016
  57. 04/14 sequencer: lib'ify do_recursive_merge()Johannes Schindelin, Aug 26, 2016
  58. 03/14 sequencer: lib'ify write_message()Johannes Schindelin, Aug 26, 2016
  59. Junio C HamanoAug 29, 2016
  60. Johannes SchindelinAug 30, 2016
  61. 13/14 sequencer: lib'ify save_todo()Johannes Schindelin, Aug 26, 2016
  62. 06/14 sequencer: lib'ify walk_revs_populate_todo()Johannes Schindelin, Aug 26, 2016
  63. 07/14 sequencer: lib'ify prepare_revs()Johannes Schindelin, Aug 26, 2016
  64. 08/14 sequencer: lib'ify read_and_refresh_cache()Johannes Schindelin, Aug 26, 2016
  65. Junio C HamanoAug 29, 2016
  66. Johannes SchindelinAug 30, 2016
  67. Junio C HamanoAug 30, 2016
  68. 01/14 sequencer: lib'ify sequencer_pick_revisions()Johannes Schindelin, Aug 26, 2016
  69. 02/14 sequencer: do not die() in do_pick_commit()Johannes Schindelin, Aug 26, 2016
  70. Junio C HamanoAug 29, 2016
  71. 00/17 Lib'ify quite a few functions in sequencer.cJohannes Schindelin, Sep 9, 2016
  72. 01/17 sequencer: lib'ify sequencer_pick_revisions()Johannes Schindelin, Sep 9, 2016
  73. 02/17 sequencer: do not die() in do_pick_commit()Johannes Schindelin, Sep 9, 2016
  74. 04/17 sequencer: lib'ify do_recursive_merge()Johannes Schindelin, Sep 9, 2016
  75. 05/17 sequencer: lib'ify do_pick_commit()Johannes Schindelin, Sep 9, 2016
  76. 06/17 sequencer: lib'ify walk_revs_populate_todo()Johannes Schindelin, Sep 9, 2016
  77. 09/17 sequencer: lib'ify read_populate_todo()Johannes Schindelin, Sep 9, 2016
  78. 08/17 sequencer: lib'ify read_and_refresh_cache()Johannes Schindelin, Sep 9, 2016
  79. 03/17 sequencer: lib'ify write_message()Johannes Schindelin, Sep 9, 2016
  80. 12/17 sequencer: lib'ify save_head()Johannes Schindelin, Sep 9, 2016
  81. 10/17 sequencer: lib'ify read_populate_opts()Johannes Schindelin, Sep 9, 2016
  82. 11/17 sequencer: lib'ify create_seq_dir()Johannes Schindelin, Sep 9, 2016
  83. 14/17 sequencer: lib'ify save_opts()Johannes Schindelin, Sep 9, 2016
  84. 16/17 lib'ify checkout_fast_forward_to()Johannes Schindelin, Sep 9, 2016
  85. Junio C HamanoSep 9, 2016
  86. Johannes SchindelinSep 11, 2016
  87. 13/17 sequencer: lib'ify save_todo()Johannes Schindelin, Sep 9, 2016
  88. 15/17 sequencer: lib'ify fast_forward_to()Johannes Schindelin, Sep 9, 2016
  89. 07/17 sequencer: lib'ify prepare_revs()Johannes Schindelin, Sep 9, 2016
  90. 17/17 sequencer: ensure to release the lock when we could not read the indexJohannes Schindelin, Sep 9, 2016
  91. Junio C HamanoSep 9, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.