This removes git-rebase--interactive.sh, as its functionnality has been
replaced by git-rebase--interactive2.
git-rebase--interactive2.c is then renamed to git-rebase--interactive.c.
Signed-off-by: Alban Gruin
---
No changes since v6.
.gitignore| 1
favour of a call to the helper.
Signed-off-by: Alban Gruin
---
No changes since v6.
builtin/rebase--helper.c | 13 -
git-rebase--interactive.sh | 11 +--
rebase-interactive.c | 27 +++
rebase-interactive.h | 1 +
4 files changed, 37
as it is useless now.
Signed-off-by: Alban Gruin
---
No changes since v6.
.gitignore | 1 -
Makefile | 1 -
builtin.h | 1 -
builtin/rebase--helper.c | 226 -
builtin/rebase--interactive.c
stategy options is
moved to a new function to allow its use in rebase--helper.c.
Finally, the call to write_basic_state() is removed from
git-rebase--interactive.sh, replaced by a call to `--init-basic-state`.
Signed-off-by: Alban Gruin
---
No changes since v6.
builtin/rebase--helper.c | 28
function,
append_todo_help_to_file(). This function will go away after the
rewrite of complete_action().
Signed-off-by: Alban Gruin
---
No changes since v6.
builtin/rebase--helper.c | 2 +-
rebase-interactive.c | 43
rebase-interactive.h | 4
Signed-off-by: Alban Gruin
---
No changes since v6.
t/t3404-rebase-interactive.sh | 10 ++
1 file changed, 10 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 01616901bd..496d88d7d6 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3
parameter, in addition to the path, the buffer and the
environment variables. launch_sequence_editor() is then added to launch
the sequence editor.
Signed-off-by: Alban Gruin
---
No changes since v6.
cache.h | 1 +
editor.c | 27 +--
strbuf.h | 2 ++
3 files changed, 28
Hi Stephen,
Le 17/08/2019 à 00:56, Stephen Boyd a écrit :
> The Linux kernel receives many patches to the devicetree files each
> release. The hunk header for those patches typically show nothing,
> making it difficult to figure out what node is being modified without
> applying the patch or openi
Hi,
This has been a long time since I have not given an update on this --
sorry about that. I think it’s time to do it.
Le 29/07/2019 à 11:38, Phillip Wood a écrit :
> Hi Alban
>
> -%<-
>
> That's an interesting point about `--continue`. Perhaps if `--edit-todo`
> detects deleted lines in erro
Signed-off-by: Alban Gruin
---
builtin/rebase.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e8319d5946..2097d41edc 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -117,6 +117,11 @@ static struct replay_opts get_replay_op
function so it can be
called from complete_action().
Signed-off-by: Alban Gruin
---
sequencer.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 42313f8de6..ec7ea8d9e5 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2342,6 +2342,16
In a todo list, `done_nr' is the amount of commands that were executed
or skipped, but skip_unnecessary_picks() did not update it.
This variable is mostly used by command prompts (ie. git-prompt.sh and
the like).
Signed-off-by: Alban Gruin
---
sequencer.c | 1 +
1 file changed, 1 inse
`total_nr' is the total amount of items, done and toto, that are in a
todo list. But unlike `nr', it was not updated when an item was
appended to the list.
This variable is mostly used by command prompts (ie. git-prompt.sh and
the like).
Signed-off-by: Alban Gruin
---
sequencer.
Currently, complete_action() calls sequencer_continue() to do the
rebase. Even though the former already has the todo list, the latter
loads it from the disk and parses it. Calling directly pick_commits()
from complete_action() avoids this unnecessary round trip.
Signed-off-by: Alban Gruin
4c86140027, "Third batch").
The tip of this series is tagged as "reduce-todo-list-cont-v1" at
https://github.com/agrn/git.
[0] http://public-inbox.org/git/20190717143918.7406-1-alban.gr...@gmail.com/
[1] http://public-inbox.org/git/1732521.CJWHkCQAay@andromeda/
Alban
Hi Junio and Johannes,
Le 02/10/2019 à 10:59, Junio C Hamano a écrit :
> Johannes Schindelin writes:
>
>> Hi Junio,
>>
>> On Wed, 2 Oct 2019, Junio C Hamano wrote:
>>
>>> Alban Gruin writes:
>>>
>>>> `total_nr' is the total a
Hi Johannes,
Le 02/10/2019 à 10:20, Johannes Schindelin a écrit :
> Hi,
>
> On Fri, 27 Sep 2019, Phillip Wood wrote:
>
>> Hi Alban
>>
>> Thanks for removing some more unnecessary work reloading the the todo list.
>>
>> On 25/09/2019 21:13, Alban G
Hi Junio,
Le 02/10/2019 à 04:38, Junio C Hamano a écrit :
> Alban Gruin writes:
>
>> Currently, complete_action() calls sequencer_continue() to do the
>> rebase. Even though the former already has the todo list, the latter
>> loads it from the disk and parses it. Calli
to
matter.
Signed-off-by: Alban Gruin
---
Reworded commit.
sequencer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sequencer.c b/sequencer.c
index d648aaf416..575b852a5a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2070,6 +2070,7 @@ void todo_list_release(struct todo_list *todo_list)
sta
ut it would start to matter at the end of this
series the same reason.
Signed-off-by: Alban Gruin
---
Reworded commit.
sequencer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sequencer.c b/sequencer.c
index 575b852a5a..42313f8de6 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -5054,6 +5
function so it can be
called from complete_action().
Signed-off-by: Alban Gruin
---
sequencer.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 42313f8de6..ec7ea8d9e5 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2342,6 +2342,16
written() -- this is unnecessary as we're starting
a new rebase.
This changes complete_action() to directly call pick_commits() to avoid
these unnecessary steps.
Signed-off-by: Alban Gruin
---
Reworded commit.
sequencer.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
d
1] http://public-inbox.org/git/1732521.CJWHkCQAay@andromeda/
Alban Gruin (5):
sequencer: update `total_nr' when adding an item to a todo list
sequencer: update `done_nr' when skipping commands in a todo list
sequencer: move the code writing total_nr on the disk to a new
hange that.
Signed-off-by: Alban Gruin
---
Reworded commit.
builtin/rebase.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e8319d5946..2097d41edc 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -117,6 +117,11 @@ static struct replay_opts get_r
Hi Birger,
Le 07/10/2019 à 12:43, Birger Skogeng Pedersen a écrit :
> It seems this topic has kindof derailed(?). But I feel like voicing my
> opinion nonetheless.
>
> -%<-
>
> My biggest gripe with not using Github is how to keep track of replies
> (comments) to a topic. I have to navigate thro
Hi Johannes,
Le 04/10/2019 à 17:09, Johannes Schindelin via GitGitGadget a écrit :
> From: Johannes Schindelin
>
> MSVC would complain thusly:
>
> C4200: nonstandard extension used: zero-sized array in struct/union
>
> Let's just use the `FLEX_ARRAY` constant that we introduced for exactly
Hi,
I was reading the email related to the "convert interactive rebase to C"
idea[1], and I have a few questions about it:
> So the first goal would be to retire git-rebase--interactive.sh. For that
> to happen, --root needs to be supported first.
Combining rebase -i and --root seems to work fin
Le 07/03/2018 à 22:56, Alban Gruin a écrit :
> Hi,
>
> I was reading the email related to the "convert interactive rebase to C"
> idea[1], and I have a few questions about it:
Hi,
I’m writing to you again, in order to have some more information about
the "conv
In the second half of July, I would look for bugs in the new code, test it,
and improve its coverage.
Weeks 12 — July 30, 2018 – August 5, 2018
In the last week, I would polish the code where needed, in order to improve
for performance or to make the code more readable.
ABOUT ME
My name i
Hi Johannes,
Le mardi 20 mars 2018 17:29:28 CET, vous avez écrit :
> > Weeks 1 & 2 — May 14, 2018 – May 28, 2018
> > First, I would refactor --preserve-merges in its own shell script, as
> > described in Dscho’s email.
>
> Could you go into detail a bit here? Like, describe what parts of the
> gi
o fix it.
* Add an option to include the patch in the message of commits to be
reworded, as proposed by Ævar Arnfjörð Bjarmason[4].
ABOUT ME
My name is Alban Gruin. I am an undergraduate at the Paul Sabatier
University in Toulouse, France, where I have been studying Computer
Sciences for a yea
the
mailing list.
ABOUT ME
My name is Alban Gruin. I am an undergraduate at the Paul Sabatier
University in Toulouse, France, where I have been studying Computer
Sciences for a year and a half. My timezone is UTC+02:00.
I have been programming in C for the last 5 years. I learned using
o convert git-stash
> into a builtin.
>
> Alban Gruin and Pratik Karki want to convert parts of git-rebase into
> a builtin. Both are mentored by Christian and myself.
>
> The slots were just announced today, please join me in welcoming them
> to the Git mailing list! (Althoug
Le 25/04/2018 à 14:53, Ulrich Windl a écrit :
> Hi!
>
> This is for git 2.13.6, and it may be an FAQ or frequent feature request.
> Anyway:
> I'm new to Java, and writing my first project using Git, I found that "git
> diff" only reports the class in the diff context, but not the method (as seen
.html
Cheers,
Alban Gruin
Hi,
I published a new blog post about this week. You can read it here:
https://blog.pa1ch.fr/posts/2018/05/12/en/gsoc2018-week-2.html
Please tell me what you think about it :)
Cheers,
Alban
Hi,
I published a new post about this week. You can read it here:
https://blog.pa1ch.fr/posts/2018/05/20/en/gsoc2018-week-3.html
Feel free to give me your feedback! :)
Cheers,
Alban
also removed.
This patch series is based of js/sequencer-and-root-commits.
Alban Gruin (4):
rebase: duplicate git-rebase--interactive.sh to
git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: use the new git-rebase--preserve-merges.sh
This removes the code coming from git-rebase--interactive.sh that is not needed
by preserve-merges.
Signed-off-by: Alban Gruin
---
git-rebase--preserve-merges.sh | 63 +++---
1 file changed, 4 insertions(+), 59 deletions(-)
diff --git a/git-rebase--preserve
This duplicates git-rebase--interactive.sh to
git-rebase--preserve-merges.sh. This is done to split -p from -i. No
modifications are made to this file here, but any code that is not used by -p
will be stripped in the next commit.
Signed-off-by: Alban Gruin
---
.gitignore
All the code specific to preserve-merges was moved to
git-rebase--preserve-merges.sh, and so it’s useless to keep it here.
Signed-off-by: Alban Gruin
---
git-rebase--interactive.sh | 708 +
1 file changed, 8 insertions(+), 700 deletions(-)
diff --git
t;/rewritten left by the
preserve-merges script when calling rebase --continue, --skip, etc., and, if it
exists, sets the rebase mode to preserve-merges. In this case,
interactive_rebase is set to "explicit", as "implied" would break some tests.
Signed-off-by: Alban Gruin
---
gi
Hi Stefan,
Le 22/05/2018 à 20:26, Stefan Beller a écrit :
> On Tue, May 22, 2018 at 6:31 AM, Alban Gruin wrote:
>> This duplicates git-rebase--interactive.sh to
>> git-rebase--preserve-merges.sh. This is done to split -p from -i. No
>> modifications are made to this file he
.
Changes since v1:
- Duplicating the correct version of git-rebase--interactive.sh (thanks
Stefan!)
Alban Gruin (4):
rebase: duplicate git-rebase--interactive.sh to
git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: use the new git-rebase
t;/rewritten left by the
preserve-merges script when calling rebase --continue, --skip, etc., and, if it
exists, sets the rebase mode to preserve-merges. In this case,
interactive_rebase is set to "explicit", as "implied" would break some tests.
Signed-off-by: Alban Gruin
---
gi
This duplicates git-rebase--interactive.sh to
git-rebase--preserve-merges.sh. This is done to split -p from -i. No
modifications are made to this file here, but any code that is not used by -p
will be stripped in the next commit.
Signed-off-by: Alban Gruin
---
.gitignore
This removes the code coming from git-rebase--interactive.sh that is not needed
by preserve-merges.
Signed-off-by: Alban Gruin
---
git-rebase--preserve-merges.sh | 65 +++---
1 file changed, 4 insertions(+), 61 deletions(-)
diff --git a/git-rebase--preserve
All the code specific to preserve-merges was moved to
git-rebase--preserve-merges.sh, and so it’s useless to keep it here.
Signed-off-by: Alban Gruin
---
git-rebase--interactive.sh | 708 +
1 file changed, 8 insertions(+), 700 deletions(-)
diff --git
t;/rewritten left by the
preserve-merges script when calling rebase --continue, --skip, etc., and, if it
exists, sets the rebase mode to preserve-merges. In this case,
interactive_rebase is set to "explicit", as "implied" would break some tests.
Signed-off-by: Alban Gruin
---
gi
This removes the code coming from git-rebase--interactive.sh that is not needed
by preserve-merges.
Signed-off-by: Alban Gruin
---
git-rebase--preserve-merges.sh | 65 +++---
1 file changed, 4 insertions(+), 61 deletions(-)
diff --git a/git-rebase--preserve
.
Changes since v2:
- Removing `
Alban Gruin (4):
rebase: duplicate git-rebase--interactive.sh to
git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: use the new git-rebase--preserve-merges.sh
rebase: remove -p code from git-rebase
All the code specific to preserve-merges was moved to
git-rebase--preserve-merges.sh, and so it’s useless to keep it here.
Signed-off-by: Alban Gruin
---
git-rebase--interactive.sh | 802 +
1 file changed, 8 insertions(+), 794 deletions(-)
diff --git
This duplicates git-rebase--interactive.sh to
git-rebase--preserve-merges.sh. This is done to split -p from -i. No
modifications are made to this file here, but any code that is not used by -p
will be stripped in the next commit.
Signed-off-by: Alban Gruin
---
.gitignore
Hi,
Le 24/05/2018 à 13:49, Alban Gruin a écrit :
> Changes since v2:
- Removing `mark_action_done()` from git-rebase--interactive.sh
- Removing unused variables from git-rebase--interactive.sh
Cheers,
Alban
Hi,
I published my blog post about this week. You can read it here:
https://blog.pa1ch.fr/posts/2018/05/26/en/gsoc2018-week-4.html
All comments are welcome!
Cheers,
Alban
.
Changes since v3:
- Rewording the commits to be more descriptive, and to respect the 72
characters limit.
Alban Gruin (4):
rebase: introduce a dedicated backend for --preserve-merges
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: use the new git-rebase--preserve
All the code specific to preserve-merges was moved to
git-rebase--preserve-merges.sh, and so it’s useless to keep it
here.
The intent of this commit is to clean this script as much as possible to
prepare a peaceful conversion as a builtin written in C.
Signed-off-by: Alban Gruin
---
git-rebase
t;/rewritten
left by the preserve-merges script when calling rebase --continue,
--skip, etc., and, if it exists, sets the rebase mode to
preserve-merges. In this case, interactive_rebase is set to "explicit",
as "implied" would break some tests.
Signed-off-by: Alban Gruin
---
gi
be the only script to be converted.
This also seems to fix a bug where a failure in
`pick_one_preserving_merges()` would fallback to the non-preserve-merges
`pick_one()`.
Signed-off-by: Alban Gruin
---
git-rebase--preserve-merges.sh | 65 +++---
1 file
This duplicates git-rebase--interactive.sh to
git-rebase--preserve-merges.sh. This is done to split -p from -i. No
modifications are made to this file here, but any code that is not used
by -p will be stripped in the next commit.
Signed-off-by: Alban Gruin
---
.gitignore
`strbuf_add_commented_lines()` automatically inserts a newline at the
end of the input, and ignore the last from the input.
Signed-off-by: Alban Gruin
---
sequencer.c | 24 ++--
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index
append_todo_help() to write the help text suited for the edit-todo
mode (`--edit-todo`).
Finally, append_todo_help() is removed from git-rebase--interactive.sh
to use `rebase--helper --append-todo-help` instead.
Signed-off-by: Alban Gruin
---
builtin/rebase--helper.c | 10 ++--
git-rebase
strips newlines from append_todo_help() messages, which
require to update the translations. This change was advised to me by
Stefan Beller, but Johannes Schindelin voiced concerns. I don’t really
have a strong opinion about it, so feel free to give yours.
Alban Gruin (2):
rebase--interactive: rewrite
Hi Phillip,
Le 31/05/2018 à 19:48, Phillip Wood a écrit :
> Hi Alban, it's great to see you working on this
>
> On 31/05/18 12:01, Alban Gruin wrote:
>> This series rewrites append_todo_help() from shell to C. This is part
>> of the effort to rewrite interactive re
Hi Stefan,
Le 31/05/2018 à 20:44, Stefan Beller a écrit :
> On Thu, May 31, 2018 at 10:48 AM, Phillip Wood
> wrote:
>> Hi Alban, it's great to see you working on this
>>
>> On 31/05/18 12:01, Alban Gruin wrote:
>>> This series rewrites append_todo_help() fr
, floats, complex
numbers and operators, according to the go specification.
Signed-off-by: Alban Gruin
---
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 1 +
t/t4018/golang-complex-function | 8
t/t4018/golang-func | 4
t/t4018/golang-interface
>> diff --git a/userdiff.c b/userdiff.c
>> @@ -38,6 +38,15 @@ IPATTERN("fortran",
>> +PATTERNS("golang",
>> +/* Functions */
>> +"^[ \t]*(func[ \t]*.*(\\{[ \t]*)?)\n"
>
> Why is the brace (and possible following whitespace) optional?
> Considering that the language demands that the
Le 28/02/2018 à 23:00, Eric Sunshine a écrit :
> On Wed, Feb 28, 2018 at 4:31 PM, Alban Gruin wrote:
>>>> diff --git a/userdiff.c b/userdiff.c
>>>> @@ -38,6 +38,15 @@ IPATTERN("fortran",
>>>> +PATTERNS("golang",
>>>> +
Le 28/02/2018 à 23:32, Junio C Hamano a écrit :
> Eric Sunshine writes:
>
>> On Wed, Feb 28, 2018 at 5:17 PM, Alban Gruin wrote:
>>> Yes, but I can split the line like that:
>>>
>>> % cat >baz.go<<\EOF
>>> packag
and operators, according to the go specification.
Signed-off-by: Alban Gruin
---
Documentation/gitattributes.txt | 2 ++
t/t4018-diff-funcname.sh| 1 +
t/t4018/golang-complex-function | 8
t/t4018/golang-func | 4
t/t4018/golang-interface| 4
t/t4018
Hi Junio,
Le 08/10/2019 à 04:45, Junio C Hamano a écrit :
> Alban Gruin writes:
>
>> This can be seen as a continuation of ag/reduce-rewriting-todo.
>>
>> Currently, complete_action() releases its todo list before calling
>> sequencer_continue(), which reloads the
401 - 471 of 471 matches
Mail list logo
