Re: [PATCH] Rewrite as a static table of keywords and loop over these ke...

Hi Anthony,

Thank you for submitting your change through gerrit. I've pushed it to
master. On gerrit, Tor asked you to please combine all three changes
into one; the main reason is that these changes are not "meaningful"
changes by themselves, but the latter two are really "fixes" to the
first one. It is thus cleaner to "squash" the changes into one.

I did the "squash" of the three changes into one. Here's how to do it:

1) I cherry-picked your changes (since you already have these changes
   in your local tree, you wouldn't have needed to do that):

user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/14/3614/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 6), reused 1 (delta 0)
Unpacking objects: 100% (7/7), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/14/3614/1 -> FETCH_HEAD
[master 112e852] Rewrite as a static table of keywords and loop over these keywords
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 25 insertions(+), 33 deletions(-)
user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/15/3615/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 14 (delta 12), reused 4 (delta 2)
Unpacking objects: 100% (14/14), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/15/3615/1 -> FETCH_HEAD
[master b997307] Rewrite as a static table of keywords and loop over them
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 3 insertions(+), 2 deletions(-)
user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/16/3616/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 21 (delta 17), reused 17 (delta 13)
Unpacking objects: 100% (21/21), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/16/3616/1 -> FETCH_HEAD
[master fa8cf51] Change j type to size_t
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 1 insertion(+), 3 deletions(-)


2) Squash them into one:

user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git rebase --interactive
# I then get in my editor:
#  pick 112e852 Rewrite as a static table of keywords and loop over these keywords
#  pick b997307 Rewrite as a static table of keywords and loop over them
#  pick fa8cf51 Change j type to size_t
# I change it to:
#  pick 112e852 Rewrite as a static table of keywords and loop over these keywords
#  squash b997307 Rewrite as a static table of keywords and loop over them
#  squash fa8cf51 Change j type to size_t
# and then close my editor
#  git proceeds and opens my editor again, with the concatenation of
#  all three commit messages. I edit it to make one "good" commit
#  message that covers everything and contains no temporary notes like
#  "does not compile yet":
# I kept the "Change-Id" of the first change.
# close my editor again
# And I'm done!

3) test

4) push / submit to gerrit

5) congratulate Wols for successful patch! ;-)

Thanks for the patch!

On Fri, Apr 26, 2013 at 08:20:49AM +0000, Anthony Youngman (via Code Review) wrote:

> I have submitted a patch for review:

>     https://gerrit.libreoffice.org/3614

> Rewrite as a static table of keywords and loop over these keywords

> It currently contains a compile error - the call the matchIgnoreAsciiCaseAsciiL
> fails.

On Fri, Apr 26, 2013 at 08:20:52AM +0000, Anthony Youngman (via Code Review) wrote:

> I have submitted a patch for review:

>     https://gerrit.libreoffice.org/3615

> Rewrite as a static table of keywords and loop over them
On Fri, Apr 26, 2013 at 08:20:54AM +0000, Anthony Youngman (via Code Review) wrote:

> I have submitted a patch for review:

>     https://gerrit.libreoffice.org/3616

> Change j type to size_t

-- 
Lionel