delta/git.git, branch js/prepare-sequencer

i18n: fix unmatched single quote in error message

2016-11-21T17:30:50+00:00

Fixed unmatched single quote introduced by commit:

 * f56fffef9a sequencer: teach write_message() to append an optional LF

Signed-off-by: Jiang Xin 
Acked-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: silence -Wtautological-constant-out-of-range-compare

2016-11-09T03:59:24+00:00

When clang compiles sequencer.c, it complains:

  sequencer.c:632:14: warning: comparison of constant 2 with
    expression of type 'const enum todo_command' is always
    true [-Wtautological-constant-out-of-range-compare]
          if (command < ARRAY_SIZE(todo_command_strings))

This is because "command" is an enum that may only have two
values (0 and 1) and the array in question has two elements.

As it turns out, clang is actually wrong here, at least
according to its own bug tracker:

  https://llvm.org/bugs/show_bug.cgi?id=16154

But it's still worth working around this, as the warning is
present with -Wall, meaning we fail compilation with "make
DEVELOPER=1".

Casting the enum to size_t sufficiently unconfuses clang. As
a bonus, it also catches any possible out-of-bounds access
if the enum takes on a negative value (which shouldn't
happen either, but again, this is a defensive check).

Signed-off-by: Jeff King

sequencer: mark all error messages for translation

2016-10-21T16:32:35+00:00

There was actually only one error message that was not yet marked for
translation.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: start error messages consistently with lower case

2016-10-21T16:32:35+00:00

Quite a few error messages touched by this developer during the work to
speed up rebase -i started with an upper case letter, violating our
current conventions. Instead of sneaking in this fix (and forgetting
quite a few error messages), let's just have one wholesale patch fixing
all of the error messages in the sequencer.

While at it, the funny "error: Error wrapping up..." was changed to a
less funny, but more helpful, "error: failed to finalize...".

Pointed out by Junio Hamano.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: quote filenames in error messages

2016-10-21T16:32:35+00:00

This makes the code consistent by fixing quite a couple of error messages.

Suggested by Jakub Narębski.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: mark action_name() for translation

2016-10-21T16:32:35+00:00

The definition of this function goes back all the way to 043a449
(sequencer: factor code out of revert builtin, 2012-01-11), long before a
serious effort was made to translate all the error messages.

It is slightly out of the context of the current patch series (whose
purpose it is to re-implement the performance critical parts of the
interactive rebase in C) to make the error messages in the sequencer
translatable, but what the heck. We'll just do it while we're looking at
this part of the code.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: remove overzealous assumption in rebase -i mode

2016-10-21T16:32:35+00:00

The sequencer was introduced to make the cherry-pick and revert
functionality available as library function, with the original idea
being to extend the sequencer to also implement the rebase -i
functionality.

The test to ensure that all of the commands in the script are identical
to the overall operation does not mesh well with that.

Therefore let's disable the test in rebase -i mode.

While at it, error out early if the "instruction sheet" (i.e. the todo
script) could not be parsed.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: teach write_message() to append an optional LF

2016-10-21T16:32:35+00:00

This commit prepares for future callers that will have a pointer/length
to some text to be written that lacks an LF, yet an LF is desired.
Instead of requiring the caller to append an LF to the buffer (and
potentially allocate memory to do so), the write_message() function
learns to append an LF at the end of the file.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: refactor write_message() to take a pointer/length

2016-10-21T16:32:35+00:00

Previously, we required an strbuf. But that limits the use case too much.
In the upcoming patch series (for which the current patch series prepares
the sequencer), we will want to write content to a file for which we have
a pointer and a length, not an strbuf.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

sequencer: roll back lock file if write_message() failed

2016-10-21T16:32:35+00:00

There is no need to wait until the atexit() handler kicks in at the end.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano