From: Stefan Beller <sbeller@google.com>
To: KES <kes-kes@yandex.ru>
Cc: Jacob Keller <jacob.keller@gmail.com>, git <git@vger.kernel.org>
Subject: Re: Feature request: Improve diff algorithm
Date: Tue, 30 Jan 2018 10:26:41 -0800 [thread overview]
Message-ID: <CAGZ79kZbhHugy4EOjXn4DO_XjpdrAnKhk56j4Ew2XGggGYQVyQ@mail.gmail.com> (raw)
In-Reply-To: <1408921517058505@web15o.yandex.ru>
On Sat, Jan 27, 2018 at 5:08 AM, KES <kes-kes@yandex.ru> wrote:
> One yet more:
>
> @@ -43,22 +44,25 @@ sub tariff_title {
> 1;
>
> __DATA__
> -@@ control/tariff.css
> -* {
> - margin: 0;
> - padding: 0;
> - border: 0;
> - -webkit-box-sizing: border-box;
> - box-sizing: border-box; }
> -html {
> - background-color: #121212;
> - color: white;
> - font-family: 'Roboto', 'Arial', sans-serif;
> - font-size: 16px; }
> -a {
> - cursor: pointer; }
>
>
> +@@ control/tariff_about_old.html.ep
> +<div class="option__about">
> + <div class="option__info">
> + <div class="option__icon"><img src="<%= $icon %>"></div>
> + <h3 class="option__name"><%= $title %></h3>
> + </div>
> + <div class="option__duration">
> + <p><%== $option1 %><%= stash->{ comment1 }? "<span> (" .stash->{ comment1 }.")</span>": '' %></
> + <div class="switch option__switch">
> + <input class="switch__toggle" type="checkbox" checked id="<%= $id %>">
> + <label for="<%= $id %>"></label>
> + </div>
> + <p><%== $option2 %><%= stash->{ comment2 }? "<span> (" .stash->{ comment2 }.")</span>": '' %></
> + </div>
> +</div>
> +
> +@@ control/tariff.css
> /* BASE BUTTON FOR TARIFF CARD */
> .button {
> display: -webkit-box;
>
> But it would be better if `@@ control/tariff.css` were untouched:
>
> @@ -43,22 +44,25 @@ sub tariff_title {
> 1;
>
> __DATA__
> +
> +
> +@@ control/tariff_about_old.html.ep
> +<div class="option__about">
> + <div class="option__info">
> + <div class="option__icon"><img src="<%= $icon %>"></div>
> + <h3 class="option__name"><%= $title %></h3>
> + </div>
> + <div class="option__duration">
> + <p><%== $option1 %><%= stash->{ comment1 }? "<span> (" .stash->{ comment1 }.")</span>": '' %></
> + <div class="switch option__switch">
> + <input class="switch__toggle" type="checkbox" checked id="<%= $id %>">
> + <label for="<%= $id %>"></label>
> + </div>
> + <p><%== $option2 %><%= stash->{ comment2 }? "<span> (" .stash->{ comment2 }.")</span>": '' %></
> + </div>
> +</div>
> +
> @@ control/tariff.css
> -* {
> - margin: 0;
> - padding: 0;
> - border: 0;
> - -webkit-box-sizing: border-box;
> - box-sizing: border-box; }
> -html {
> - background-color: #121212;
> - color: white;
> - font-family: 'Roboto', 'Arial', sans-serif;
> - font-size: 16px; }
> -a {
> - cursor: pointer; }
> -
> -
> /* BASE BUTTON FOR TARIFF CARD */
> .button {
> display: -webkit-box;
>
Try the new option that Jonathan Tan implemented:
git diff --anchor="@@ control/tariff.css"
to produce the second diff.
I wonder if we want to have a permanent store for these
lines in given diffs, such that you only have to figure it out once.
(And eventually the community will have a corpus of data to
figure out how to improve the diff for real)
next prev parent reply other threads:[~2018-01-30 18:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-21 8:11 Feature request: Improve diff algorithm KES
2016-11-21 16:56 ` Jacob Keller
2016-11-21 18:17 ` Stefan Beller
2016-11-21 18:55 ` Jacob Keller
2018-01-24 16:43 ` KES
2018-01-24 18:06 ` Jacob Keller
2018-01-25 19:31 ` KES
2018-01-25 20:12 ` SZEDER Gábor
2018-01-25 20:49 ` SZEDER Gábor
2018-01-25 20:34 ` Junio C Hamano
2018-01-27 13:08 ` KES
2018-01-30 18:26 ` Stefan Beller [this message]
2018-01-26 18:29 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kZbhHugy4EOjXn4DO_XjpdrAnKhk56j4Ew2XGggGYQVyQ@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=kes-kes@yandex.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).