sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,161 Commits
44 Branches
77 Tags
1.9 GiB
Commit Graph

12161 Commits (1c01128050cb938b55c639c7075f62df647d10fb)
 

Author SHA1 Message Date
Wilfred Hughes 1c01128050 Update changelog for last commit 2023-03-16 22:12:10 +07:00
Wilfred Hughes a3cad19bad Merge commit '869dff3ceb8823ca4b17ca33b663667c8e41e8ba' 2023-03-16 22:09:41 +07:00
Wilfred Hughes b914149ccf Merge commit '399605a02bcd5daa309ce63a6459c600dce3473f' 2023-03-16 08:20:22 +07:00
Wilfred Hughes 69e511e638 Tweak UTF-16 heuristics to prefer files with a BOM 2023-03-16 00:46:24 +07:00
Wilfred Hughes 7fbe0d6c2f Improve UTF-16 detection heuristics and add test 2023-03-16 00:31:58 +07:00
Wilfred Hughes c1dc132f4a Add unit test for diffing binary files 2023-03-16 00:18:49 +07:00
Wilfred Hughes e762f77a0b Add a smoke test for inline display 2023-03-16 00:16:58 +07:00
Wilfred Hughes fdc6db4c22 Simplify imports 2023-03-16 00:15:48 +07:00
Wilfred Hughes 3e4df7d7dd Add CLI test for the example in #433 2023-03-16 00:13:41 +07:00
Wilfred Hughes b1ecf00602 Merge commit 'fcacbeb4af6bcdcfb4527978a997bb03f4fe086d' 2023-03-15 23:50:56 +07:00
Wilfred Hughes bc1b5b8217 We're now using the upstream clojure parser directly 2023-03-15 23:25:22 +07:00
Wilfred Hughes 630e843a66 Merge commit '03fa93db133d6048a77d4de154a7b17ea8b9d076' 2023-03-15 23:24:58 +07:00
Wilfred Hughes c07cf052d3
Merge pull request #493 from yusancky/update-manual-translate 
Update Chinese translation of manual
 2023-03-15 22:25:30 +07:00
Wilfred Hughes b636201a8c Merge commit 'f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2' 2023-03-15 21:49:50 +07:00
Wilfred Hughes 4eaba59c5e Merge commit 'b338fa9f4807b9e0336cd4dde04948a8c324a4cf' 2023-03-15 16:11:16 +07:00
Wilfred Hughes 312be7c65d Fix URL in manual 2023-03-15 15:59:39 +07:00
Wilfred Hughes a0f7ed5e78 Set explicit locales for ordering globs in integration test 2023-03-15 15:47:27 +07:00
Wilfred Hughes 20ad284882 Add 'vendored_parsers/tree-sitter-clojure/' from commit '421546c2547c74d1d9a0d8c296c412071d37e7ca' 
Closes #448

git-subtree-dir: vendored_parsers/tree-sitter-clojure
git-subtree-mainline: ebfc043a4a
git-subtree-split: 421546c254
 2023-03-15 15:43:55 +07:00
Wilfred Hughes ebfc043a4a Remove old fork of tree-sitter-clojure 2023-03-15 15:36:43 +07:00
Wilfred Hughes a67be0f845 Treat quoted_keys as atoms in TOML 2023-03-15 15:12:33 +07:00
Wilfred Hughes 5d617a4c3f Add Ada to changelog 2023-03-15 15:08:46 +07:00
Boris Verkhovskiy b338fa9f48
Support file descriptors for here redirect/string (#156) 2023-03-15 23:01:08 +07:00
Wilfred Hughes ec6e4665bc
Merge pull request #494 from karlding/add_ada_support 
Add Ada support
 2023-03-15 10:25:46 +07:00
Karl Ding 01522a9d58 Remove alire.toml from LANG_FILE_NAMES 
Fix an incorrect assumption about how LANG_FILE_NAMES works.

We want the alire.toml file to still be treated as TOML (and not Ada),
so adding an entry here is not necessary for Ada support.
 2023-03-15 01:09:48 +07:00
Wilfred Hughes 6ad77c620c Don't highlight text in purple 
Closes #498
 2023-03-14 23:47:17 +07:00
Karl Ding 4a861c376e Manually order expected sample comparison file 
It appears that the GitHub Actions runner is returning the glob path
results in a different ordering than the ordering obtained when locally
running the compare_all.sh script. This difference in the ordering
causes CI to fail due to differences to the generated expectation file.

This also seems to have been an issue in previous PRs---the solution
here is likely to sort the output before processing or figure out what
shell options cause the difference in glob ordering, and explicitly set
those in the shell script to eliminate the difference (or prevent the
script from inheriting anything but shell defaults).

For now, try reordering the output by hand to match the ordering the
GitHub Action runner likely expects.
 2023-03-14 21:46:40 +07:00
Karl Ding d5ed2deb6e Run formatter over changes 2023-03-14 21:46:40 +07:00
Karl Ding 6b2947b4e9 Add Ada "Hello World" sample file 2023-03-14 21:46:40 +07:00
Karl Ding 5271f65f92 Add language support for Ada 
Implement support in difftastic for the Ada programming language
using the treesitter grammar provided in 'briot/tree-sitter-ada'.

Language detection depends on the following suffixes:

    * adb
    * ads
    * ada

The presence of the alire TOML file (alire.toml) is also used as
a heuristic.
 2023-03-14 21:46:40 +07:00
Karl Ding 9222b92e1e Add Ada parser highlighting symlink 
Add a symlink to the highlights.scm provided by the Ada treesitter
dependency.
 2023-03-14 21:46:40 +07:00
Karl Ding 2c8bda32c9 Add symlink to Ada parser subdirectory 
Add a symlink to the 'src/' parser subdirectory.
 2023-03-14 21:46:40 +07:00
Karl Ding 0febe0af43 Add vendored tree-sitter-ada parser 
Add 'briot/tree-sitter-ada' as a vendored git subtree dependency for
supporting Ada code.
 2023-03-14 21:46:40 +07:00
Jonatan Kłosko 869dff3ceb Release v0.1.0 2023-03-14 10:58:34 +07:00
Jonatan Kłosko 2b4f250db3 Run CI nightly 2023-03-14 10:51:57 +07:00
jonatanklosko 6a996d9391 Generate parser 2023-03-14 09:50:56 +07:00
Jonatan Kłosko be0ea79c91
Support multi-letter uppercase sigils (#50) 2023-03-14 10:49:28 +07:00
Jonatan Kłosko fa10c66d7d
Update package version (#49) 2023-03-14 10:41:49 +07:00
Wilfred Hughes 8a36f69f5f Update changelog for #496 2023-03-13 23:08:45 +07:00
Wilfred Hughes 9a0c169ebb
Merge pull request #496 from skorokithakis/patch-1 
Recognize the Arduino extension as C++
 2023-03-13 23:08:09 +07:00
Stavros Korokithakis 85b9493eaa
Recognize the Arduino extension as C++ 2023-03-13 19:44:46 +07:00
yusancky 3f7e4a148d
Fix 2 small problems 2023-03-11 22:39:18 +07:00
yusancky 348fb07fd5 Update languages_supported.md 2023-03-11 22:31:35 +07:00
yusancky 267ab49610 Update mercurial.md 2023-03-11 22:31:35 +07:00
yusancky 9b9123e2f4 Update git.md 2023-03-11 22:31:35 +07:00
yusancky 9c14372047
Merge branch 'Wilfred:master' into update-manual-translate 2023-03-11 21:52:07 +07:00
yusancky 84cd35fee1
Update usage.md 2023-03-11 16:13:06 +07:00
Wilfred Hughes c7bfc72529 Clarify --exit-code behaviour on plain text 2023-03-09 08:54:21 +07:00
Wilfred Hughes ac35c6c047 Document the different options for --display 
Fixes #491
 2023-03-09 08:54:21 +07:00
Wilfred Hughes c8f99d2153
Merge pull request #492 from michel-slm/unpin-deps 
Relax version dependencies
 2023-03-06 11:37:52 +07:00
Michel Alexandre Salim b4a764f286
Relax version dependencies 
For dependencies we're pinning for Rust 1.57 compatibility, specify
the range of versions allowed rather than just pinning to the maximum
version allowed.

This makes it easier for Linux distribution packaging, where a different
version might already be packaged.

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
 2023-03-06 13:29:10 +07:00