enable diff-highlight in git, with variant

[iefdev (Eric F)]

Found a ​saved link/tweet from last year, that I forgot to ask about, and make this request…

 

Last year with v2.13.3, “diff-highlight” disappeard and now you have to manually run a make in that folder to bring it back.

Wouldn't it be good to bring that back with a variant (&/or make it default)? To activate it, one have to add the functionalty to config as normal/before.

Something like:

(a) a/Portfile.orig vs. (b) b/Portfile

@@ -219 +219 @@
     }
 }
 
+variant diff-highlight description {Install the diff-highlight utility from contrib} {
+
+    post-build {
+        system -W "${worksrcpath}/contrib/diff-highlight" "make"
+    }
+
+    notes "
+To add the functionality to config, run:
+
+    $ git config --global interactive.diffFilter diff-highlight
+
+"
+
+}
+
 platform darwin 8 {
     build.args-append   NO_APPLE_COMMON_CRYPTO=1
 }
 
-default_variants    +doc +pcre +credential_osxkeychain
+default_variants    +doc +pcre +credential_osxkeychain +diff-highlight
 
 livecheck.type          regexm
 livecheck.regex         {<span class="version">.*?(\d+\.\d+\.\d+).*?</span>}

Note: Compared to the “osxkeychain” variant… There's a "make [join ${build.args}]" there. Not sure if that would be necessary? You just run make if you do it manually.

 

Anyway, it would be nice to add it in some way, even if not default, but the default would bring the old behaviour back.

Adding a patch (from above), and an example picture incase anyone wonder what the diff-highlight is.

[raimue (Rainer Müller)]

Variant names must not contain a minus as that would be ambiguous (it is used to negate variants). Apparently you have not tested this change, as the Portfile fails to parse.

Your notes do not describe what "functionality" they refer to.

Now that you added a post-build to build the script, would it not also required to be copied in the destroot phase?

[iEFdev]

Replying to raimue:

Variant names must not contain a minus as that would be ambiguous (it is used to negate variants). Apparently you have not tested this change, as the Portfile fails to parse.

Sorry, my bad

 

Your notes do not describe what "functionality" they refer to.

Yes, it sounded a bit vague... I changed it to:

--->  Staging git into destroot
--->  Installing git @2.17.1_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_26
--->  Activating git @2.17.1_0+credential_osxkeychain+diff_highlight+doc+pcre+perl5_26
// … //
--->  Some of the ports you installed have notes:
  git has the following notes:
    To add the use of "diff-highlight" to config, run:
   
        $ git config --global interactive.diffFilter diff-highlight

Better? Perhaps there's another terminlogy to use?

 

Now that you added a post-build to build the script, would it not also required to be copied in the destroot phase?

No, the file/script stays in its contrib folder.

adding a new patch

[mf2k (Frank Schima)]

Note that a "request" ticket type is only for requesting a new port.

[iEFdev]

Replying to mf2k:

Note that a "request" ticket type is only for requesting a new port.

Ok, thanks! I didn't know that.

[iEFdev]

Any update on this, if it will be fixed or not?

Had to go and fix it manually again after the last update.

[reneeotten (Renee Otten)]

it looks like ​this commit (followed by ​this one) resolved this ticket, correct?

[iEFdev]

Replying to reneeotten:

it looks like ​this commit (followed by ​this one) resolved this ticket, correct?

Yes, it showed up tonight when I updated my ports.

Thanks! :+1: