From: Pickfire <pickfire@riseup.net> To: Johannes.Schindelin@gmx.de Cc: git@vger.kernel.org, sbeller@google.com Subject: Re: Re: Re: Re: GSoC Project | Convert interactive rebase to C Date: Tue, 28 Mar 2017 00:31:08 +0800 Message-ID: <20170327163108.QoV1fm8z7%pickfire@riseup.net> (raw) In-Reply-To: <alpine.DEB.2.20.1703271700130.14958@virtualbox> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote: > On Sat, 25 Mar 2017, Ivan Tham wrote: > > > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote: > > > On Tue, 21 Mar 2017, Ivan Tham wrote: > > > > Stefan Beller <sbeller@google.com> wrote: > > > > > On Mon, Mar 20, 2017 at 9:41 AM, Ivan Tham <pickfire@riseup.net> wrote: > > > > > > > > > > > I am interested to work on "Convert interactive rebase to C" > > > > > > > > > > +cc Johannes, who recently worked on rebase and the sequencer. > > > > > > Glad you are interested! Please note that large parts of the > > > interactive rebase are already in C now, but there is enough work left > > > in that corner. > > > > Glad to hear that, I would really like to see interactive rebase in C. > > Please note that a notable part already made it into C in v2.12.1. There > are still a few loose ends to tie, of course; it still makes for a great > head start on your project, methinks. Ah, that's great. And while I was working on the microproject (shell patterns in user diff), I can't produce the output of t/t4034-diff-words.sh manually with: mkdir cpp/ && cd cpp/ && git init cat > pre <<EOF Foo():x(0&&1){} cout<<"Hello World!\n"<<endl; 1 -1e10 0xabcdef 'x' [a] a->b a.b !a ~a a++ a-- a*b a&b a*b a/b a%b a+b a-b a<<b a>>b a<b a<=b a>b a>=b a==b a!=b a&b a^b a|b a&&b a||b a?b:z a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b a,y a::b EOF cat > post <<EOF Foo() : x(0&42) { bar(x); } cout<<"Hello World?\n"<<endl; (1) (-1e10) (0xabcdef) 'y' [x] x->y x.y !x ~x x++ x-- x*y x&y x*y x/y x%y x+y x-y x<<y x>>y x<y x<=y x>y x>=y x==y x!=y x&y x^y x|y x&&y x||y x?y:z x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y x,y x::y EOF echo '* diff="cpp"' > .gitmodules git diff --no-index --color-words pre post > output Surprisingly, it shows (which is very different from the expected output): ^[[1mdiff --git a/pre b/post^[[m ^[[1mindex 23d5c8a..7e8c026 100644^[[m ^[[1m--- a/pre^[[m ^[[1m+++ b/post^[[m ^[[36m@@ -1,19 +1,19 @@^[[m ^[[31mFoo():x(0&&1){}^[[m^[[32mFoo() : x(0&42) { bar(x); }^[[m cout<<"Hello ^[[31mWorld!\n"<<endl;^[[m ^[[31m1 -1e10 0xabcdef 'x'^[[m ^[[31m[a] a->b a.b^[[m ^[[31m!a ~a a++ a-- a*b a&b^[[m ^[[31ma*b a/b a%b^[[m ^[[31ma+b a-b^[[m ^[[31ma<<b a>>b^[[m ^[[31ma<b a<=b a>b a>=b^[[m ^[[31ma==b a!=b^[[m ^[[31ma&b^[[m ^[[31ma^b^[[m ^[[31ma|b^[[m ^[[31ma&&b^[[m ^[[31ma||b^[[m ^[[31ma?b:z^[[m ^[[31ma=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b^[[m ^[[31ma,y^[[m ^[[31ma::b^[[m^[[32mWorld?\n"<<endl;^[[m ^[[32m(1) (-1e10) (0xabcdef) 'y'^[[m ^[[32m[x] x->y x.y^[[m ^[[32m!x ~x x++ x-- x*y x&y^[[m ^[[32mx*y x/y x%y^[[m ^[[32mx+y x-y^[[m ^[[32mx<<y x>>y^[[m ^[[32mx<y x<=y x>y x>=y^[[m ^[[32mx==y x!=y^[[m ^[[32mx&y^[[m ^[[32mx^y^[[m ^[[32mx|y^[[m ^[[32mx&&y^[[m ^[[32mx||y^[[m ^[[32mx?y:z^[[m ^[[32mx=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y^[[m ^[[32mx,y^[[m ^[[32mx::y^[[m Instead of: <BOLD>diff --git a/pre b/post<RESET> <BOLD>index 23d5c8a..7e8c026 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,19 +1,19 @@<RESET> Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<RESET> } cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl; <GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>' [<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET> !<RED>a<RESET><GREEN>x<RESET> ~<RED>a a<RESET><GREEN>x x<RESET>++ <RED>a<RESET><GREEN>x<RESET>-- <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET><<<RED>b a<RESET><GREEN>y x<RESET>>><RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>&<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>^<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>|<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>&&<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>||<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>?<RED>b<RESET><GREEN>y<RESET>:z <RED>a<RESET><GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET> <RED>a<RESET><GREEN>y<RESET> <GREEN>x<RESET>,y <RED>a<RESET><GREEN>x<RESET>::<RED>b<RESET><GREEN>y<RESET> That's does not just happens to cpp builtins, it happens to bibtex as well. Is it that I had missed some configuration since I have tested this on a few machines? > > > > > > aiming to port most builtins stuff to C in which we can reduce > > > > > > the size of git. Additionally, I would also like to convert > > > > > > scripts to builtins as an additional milestone. > > > > > > Careful. It is a ton of work to get the rebase -i conversion done, and > > > then a ton of work to get it integrated. That will fill 3 months, very > > > easily. > > > > My main aim is to reduce the extra dependency of perl, but planning to > > start with rebase, can I make that an optional task where I can help out > > after I had completed my main task during gsoc? > > Sure, you can make it an optional task, and I would be very happy if you > followed up on it even after GSoC! Yes, I can do that as well. I will be happy to have git be smaller. ^^ > As far as the Perl dependency is concerned, I actually think there is only > one serious one left: git add -i. Yes, that as well. But basically the core parts first. > Granted, there is send-email, but it really does not matter all that much > these days *except* if you want to use Git to contribute to projects that > still use a mailing list-based patch submission process (the ones that > come to mind are: Git, Linux and Cygwin). Most Git users actually do not > submit any patches to mailing lists, therefore I tend to ignore this one. I won't ignore that but I will do the others first since some package manager pack it with git but instead let it be a subpackage. > The rest of the Perl scripts interacts with foreign SCMs (archimport, > cvsexportcommit, cvsimport, cvsserver, and svn). I *guess* that it would > be nice to follow up on the remote-svn work (which has not really gone > anywhere so far, AFAICT the main driving contributor pursues different > projects these days), but IMHO none of these are really needed to run Git. As far as I have concern, the conversion stuff are rarely runned, I don't think it is worth converting to C. Good luck and have a nice day! - Ivan
next prev parent reply index Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-20 16:41 Ivan Tham 2017-03-20 17:41 ` Stefan Beller 2017-03-21 6:05 ` Ivan Tham 2017-03-23 17:30 ` Johannes Schindelin 2017-03-23 18:19 ` Stefan Beller 2017-03-25 2:17 ` Inaw Tham 2017-03-27 15:11 ` Johannes Schindelin 2017-03-27 16:31 ` Pickfire [this message] 2017-03-28 6:27 ` Christian Couder
Reply instructions: You may reply publically 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=20170327163108.QoV1fm8z7%pickfire@riseup.net \ --to=pickfire@riseup.net \ --cc=Johannes.Schindelin@gmx.de \ --cc=git@vger.kernel.org \ --cc=sbeller@google.com \ /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
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox