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

274 Commits (cc064349acc283de01b24711349d47608e127442)

Author SHA1 Message Date
Wilfred Hughes 79af24a577 Fix typo 2024-07-08 08:39:20 +07:00
Wilfred Hughes a259c858a1 Update F# docs 2024-05-14 10:13:37 +07:00
Wilfred Hughes d92b65c5fd Merge remote-tracking branch 'thecentury/f#' 2024-05-14 09:46:55 +07:00
Wilfred Hughes d292546df7 Prefer 'device tree' as two words 2024-05-13 16:59:48 +07:00
Wilfred Hughes d3e5aa5232 Merge remote-tracking branch 'blmaier/support-devicetree' 2024-05-13 16:50:13 +07:00
Wilfred Hughes 5a250d63df Expand usage docs and fix obsolete reference to --language 
Fixes #712
 2024-05-13 16:31:30 +07:00
Grégoire Paris 082abf65d1 Document how to disable difftastic temporarily 
It can be useful if you want to obtain a diff in the standard format and
copy paste it to github, for instance.
 2024-05-07 08:48:20 +07:00
Wilfred Hughes b4ff51f6ac Update URL to Lua parser 2024-04-28 23:34:12 +07:00
Wilfred Hughes 5c40cd0282 Prefer _1 and _2 naming for test files 
This is less to type, and it's now alphabetical, so e.g.
sample_files/*.kt just works as a test argument.
 2024-04-28 23:28:06 +07:00
Ivan Kuchin 287ddd7b42 Much shorter version of dlog alias 
Use `-c` to set config instead of environment variable, so no need for building shell command
 2024-04-08 08:39:49 +07:00
Wilfred Hughes bca6da38ce Improve wording 2024-04-07 15:56:45 +07:00
Wilfred Hughes b40e744a32 Clarify headings on internals pages 2024-04-07 15:55:49 +07:00
Wilfred Hughes a7e2a3914f Add favicon for manual 2024-04-07 15:54:29 +07:00
mbaitelman d718d64a6e
Update installation.md to include chocolatey 2024-03-26 13:40:38 +07:00
Wilfred Hughes e34185f190 Consistent whitespace 2024-03-23 16:07:18 +07:00
Wilfred Hughes ca472bf0f1
Merge pull request #671 from matthewhughes934/add-tab-completion-for-git-alias 
Add tab completion for documented `dlog` alias
 2024-03-23 16:03:29 +07:00
Wilfred Hughes 5aeddd79d4 Add missing from_source manual page 2024-03-22 15:48:31 +07:00
Ed Maste 59d20674f4 Add FreeBSD installation instructions 2024-03-22 10:13:29 +07:00
Matthew Hughes f984413e6b Add tab completion for documented `dlog` alias 
There's a feature of Git's completion scripts that allows
completing function aliases[1]:

> If you use complex aliases of form '!f() { ... }; f', you can use the null
> command ':' as the first command in the function body to declare the desired
> completion style

This allows completion:

    $ git dlog --pat<tab>
    --patch             --patch-with-raw    --patch-with-stat   --patience

Tested on `bash`, though I believe this should also work with `zsh` and
`tsch` since their respective completion scripts also make use of the
`bash` one

[1] https://git.kernel.org/pub/scm/git/git.git/tree/contrib/completion/git-completion.bash?id=11c821f2f2a31e70fb5cc449f9a29401c333aad2#n26
 2024-03-22 08:20:56 +07:00
opakapaka2003 47f63b28f0
Update installation.md 
Revise nix installation instructions to change "ripgrep" to "difftastic"
 2024-03-21 11:37:54 +07:00
Wilfred Hughes a70786d731 Expand installation instructions 
Include more installation commands, split out source installation to a
separate page.
 2024-03-19 08:47:27 +07:00
Wilfred Hughes 7ddd8879b1 Merge branch 'scheme-support' of github.com:kutsurak/difftastic into kutsurak-scheme-support 2024-03-04 08:46:59 +07:00
Brandon Maier e6b27caf06 Add support for devicetrees 2024-02-28 17:11:53 +07:00
Wilfred Hughes 7a00339977
Merge pull request #634 from evanrichter/smali 
Smali language support
 2024-02-19 11:57:54 +07:00
Wilfred Hughes 3490aea9ec Document how to update existing parsers 2024-02-13 08:45:45 +07:00
Panagiotis Koutsourakis 67ada1ccd4 Add support for Scheme 2024-02-12 10:20:57 +07:00
Wilfred Hughes 3476a68efb Simplify description of manual 2024-02-08 08:47:33 +07:00
Wilfred Hughes 6cc1a5f3e3 Add 'hunk' to the glossary 2024-02-06 09:01:25 +07:00
Evan Richter d106c979ee add smali language support 2024-02-01 15:41:14 +07:00
Mikhail Brinchuk 297fa952c2
Merge branch 'Wilfred:master' into f# 2024-01-29 11:45:31 +07:00
Wilfred Hughes 6760559e6f Increase MSRV to 1.65 
See discussion in #570
 2024-01-28 12:55:07 +07:00
Wilfred Hughes a3731067b2
Merge pull request #618 from arbrauns/tree-sitter-vhdl 
Add tree-sitter-vhdl
 2024-01-28 12:04:53 +07:00
Mikhail Brinchuk f671c57069 Added F# to the list of supported languages 2024-01-28 12:46:17 +07:00
Armin Brauns c5638750d6 Add tree-sitter-vhdl 2024-01-09 09:23:51 +07:00
Armin Brauns 1087c805d0 manual: fix instructions for adding new parser 
The `LANG_*` lists were removed and replaced with functions in
4d85b5c15e.
 2024-01-08 15:31:42 +07:00
Wilfred Hughes db86b28a28 Add support for Objective-C 
Closes #600

Co-authored-by: Nick Moore <nick@pilotmoon.com>
 2024-01-07 12:50:19 +07:00
Wilfred Hughes 89c7e6f471 Pass arguments to `git dlog` just like `git log` 2023-12-16 13:05:38 +07:00
Rodolphe Blancho e18b5d0712
Merge branch 'master' into feature/salesforce_apex_support 2023-12-05 12:31:59 +07:00
Wilfred Hughes b9a1302e54 Bump MSRV to 1.63 
In the past I've been more cautious, but this is the version supported
by Debian Stable, and it's more than 12 months old.

A decent number of dependencies are only tested against newer rustc
versions (see e.g. the recent aho-coarasick pin due to no MSRV on that
library). I've filed bugs in some cases, but upgrading rustc versions
more aggressively should make this problem less common.
 2023-11-26 01:24:29 +07:00
Wilfred Hughes 4284c3578a Increase MSRV to 1.60 2023-10-31 16:34:59 +07:00
Wilfred Hughes 69060fd617 Document SCSS support 2023-10-11 20:00:44 +07:00
Rodolphe Blancho 05d78ca741 add support for Salesforce Apex 
Apex Language documentation:
https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_dev_guide.htm

Uses https://github.com/aheber/tree-sitter-sfapex
 2023-10-06 11:08:02 +07:00
Wilfred Hughes 6805939c66 Add missing paren in example 2023-09-28 01:05:58 +07:00
Wilfred Hughes 6c28bc9401 Expand parse error discussion 2023-09-27 15:45:46 +07:00
Wilfred Hughes c153090a65 Fix highlighting 2023-09-15 22:25:01 +07:00
Wilfred Hughes b5942abc66 Rewrite git instructions 2023-09-15 18:18:54 +07:00
Wilfred Hughes c627326e31 Add XML to the languages in the manual 2023-09-09 10:06:10 +07:00
Wilfred Hughes 4fd36915b0 Rust parser is no longer forked 2023-08-18 23:08:36 +07:00
Wilfred Hughes e0a1405453 Add the ability to parse conflict markers and diff the two files 2023-08-15 09:01:15 +07:00
Wilfred Hughes 4fdc8eebcd Increase MSRV to 1.59 2023-08-07 20:32:08 +07:00
Wilfred Hughes b3acf48128 Bump minimum required Rust version to 1.58 
Difftastic is generally conservative about MSRV, and will only
increase the version when there is a compelling reason (e.g. major
performance improvement, important bug fix in a dependendency).

This version increase will enable us to upgrade crossterm to 0.26, which
has better detection of terminal width on Windows.

I've also clarified MSRV details for other dependencies that cannot
currently be upgraded.
 2023-07-26 11:34:05 +07:00
Wilfred Hughes 5374dc4452 Clarify wording and difftastic's status in Tricky Cases 2023-07-24 08:46:20 +07:00
Wilfred Hughes 8da6efa262 Suggest --locked when people install with cargo 2023-07-24 08:25:01 +07:00
Wilfred Hughes 1b9844cd60 Add sliders to the glossary 
Fixes #537
 2023-07-21 08:39:53 +07:00
Wilfred Hughes 2d23eb549d Document the new LaTeX support 2023-07-20 23:05:18 +07:00
Wilfred Hughes d134bc8e9a Move profiling to a separate page in the manual 2023-05-21 23:37:15 +07:00
Wilfred Hughes b0a3a0ada9 Use DFT_LOG as the internal logging environment variable 
Fixes #519
 2023-05-21 23:33:34 +07:00
Cthulhux f0f4baedec
Document how to use difftastic with Fossil (#513) 
* Add Fossil

* Create fossil.md
 2023-05-10 10:33:41 +07:00
grunweg a053d34829
Tweak documentation for adding a parser (#510) 
* fix/doc: change git subtree instructions to use https protocol

Typing the instructions as shown resulted in a git error: `Permission denied (publickey) fatal - Could not read from remote repository`. Switching to the https protocol as [suggested online](https://stackoverflow.com/a/33072867) worked.

* doc: complete instructions for language detection

If there are file extensions associated with my language, I want to add them as well!

* whoops, delete duplicate sentences

* doc: update section on configuring parsing.

- The highlighting definitions got moved to a subdirectory -> adjust the path.
- Mention the sub_languages field, which has also been added since the docs were last edited.

* Tweak description of language detection.
 2023-05-05 15:26:16 +07:00
grunweg 98cc1b5745
doc: extend description of mercurial configuration (#507) 2023-04-30 09:18:37 +07:00
grunweg 79a91f0db2
doc: update mercurial configuration example 
The `--missing-as-empty` option has been removed in version 0.46.
 2023-04-28 16:05:17 +07:00
Wilfred Hughes efd57ddbae Update changelog and manual for Solidity support 2023-04-12 00:56:13 +07:00
Wilfred Hughes 43e561dc34 Link to the changelog in the installation instructions 2023-04-01 16:19:14 +07:00
Wilfred Hughes bc1b5b8217 We're now using the upstream clojure parser directly 2023-03-15 23:25:22 +07:00
Wilfred Hughes 312be7c65d Fix URL in manual 2023-03-15 15:59:39 +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
Wilfred Hughes c404917502 Update changelog and manual for Newick 2023-02-21 08:46:55 +07:00
Wilfred Hughes 9556cd978e Merge branch 'delehef/master' 2023-02-21 08:46:07 +07:00
Franklin Delehelle 21ded51e90 Add newick example files 2023-02-21 08:45:49 +07:00
Wilfred Hughes bdb314de45 Add Racket to the list of languages in the manual 2023-02-21 08:32:38 +07:00
Wilfred Hughes ad4c0d8b9c Fix folder name in manual 2023-01-26 08:50:13 +07:00
Wilfred Hughes 5ed4bac8a5 Add support for R 
Fixes #470
 2023-01-26 08:50:00 +07:00
Wilfred Hughes 5dfa4b64a9 Update new parser instructions 2023-01-26 08:16:06 +07:00
Wilfred Hughes 61a8d1a99f Fix mercurial example 
Piping to less as shown just feeds control codes to less, which isn't
useful.

Closes #461
 2023-01-13 08:33:55 +07:00
Wilfred Hughes 08b3ff138f Rename vendor/ directory 
Closes #453
 2023-01-10 08:35:01 +07:00
Wilfred Hughes c6d8dedc5d Fix duplicate word in manual 2023-01-08 21:33:55 +07:00
Wilfred Hughes a2f22cb17c Only set the exit code if --exit-code is set 
This is important for usage with git log, which terminates on non-zero
exit codes.
 2022-12-18 23:11:18 +07:00
Wilfred Hughes 6a46237bb0 Set the exit code when changes are found 
Closes #285
 2022-12-18 00:28:54 +07:00
Wilfred Hughes afc78e976d Document Erlang support and add test 
Fixes #394
 2022-12-15 23:30:45 +07:00
Wilfred Hughes c152c41691 Document punctuation atoms 2022-10-25 16:12:47 +07:00
Gurjeet Singh cbfc70c0b5 Remove TreeSitterConfig.name from documentation 
TreeSitterConfig doesn't seem to have the `name` attribute, anymore.

I discovered this discrepancy while integrating Markdown language parser
in PR #380.
 2022-10-24 23:06:20 +07:00
Wilfred Hughes a40d93e26c Show possible and desired results in tricky cases manual section 2022-10-09 23:48:21 +07:00
Wilfred Hughes 6630d5f480 Ensure highlighted text has contrast in all manual colour schemes 
Fixes #374
 2022-10-09 11:12:55 +07:00
Wilfred Hughes f8c2258024 Make manual translation more prominent 2022-09-28 23:21:11 +07:00
eric.tao 64fecb0ac1 add a link to change the language version 2022-09-25 15:14:45 +07:00
Wilfred Hughes 345a88fe53 Support - as a CLI argument 
Fixes #389
 2022-09-24 17:23:47 +07:00
Wilfred Hughes 78dabcabce Remove unused manual configuration item 
This 'multlingual' option isn't mentioned in the mdbook docs as far as
I can see.
 2022-09-23 23:08:54 +07:00
Wilfred Hughes ba6d73bcf4 Document Hare in manual and changelog 2022-09-15 09:39:41 +07:00
Wilfred Hughes 4319a9db04 Almost 40 languages now! 2022-09-12 23:14:39 +07:00
Yuya Nishihara 84f0b25fb6 Add support for QML 
QML is a UI language, and its syntax is basically JSON-like structure
+ JavaScript. The tree-sitter parser is named after the upstream grammar
file qmljs.g, but the canonical language name is QML. So I choose Qml as
the Language enum.

https://doc.qt.io/qt-6/qmlapplications.html
 2022-09-10 11:38:35 +07:00
Wilfred Hughes 4c9a12a905 Clarify position symbols in diff diagrams in manual 2022-09-05 17:20:13 +07:00
Wilfred Hughes 7422cb8f2e Document nested sliders case in manual 2022-09-05 15:06:10 +07:00
Wilfred Hughes a9866e1187 Mention --list-languages in the manual 2022-09-02 12:58:36 +07:00
Wilfred Hughes 659f2dd6bd Add support for Makefiles 2022-08-28 16:26:01 +07:00
Wilfred Hughes ae799f39d9 Document environment variables in manual 2022-08-27 17:53:18 +07:00
Wilfred Hughes 734a638ca2 Difftastic uses several factors to detect the language 2022-08-27 17:30:22 +07:00
Wilfred Hughes 515932151f Merge branch 'cmake' 2022-08-20 18:36:07 +07:00
Wilfred Hughes bbdc324b7f Add CMake support 
Fixes #333
 2022-08-20 18:32:32 +07:00
Wilfred Hughes eb0817468e Update manual for rustc bump 2022-08-12 21:51:34 +07:00
Wilfred Hughes 5d93efa51a Document Elm support in the manual and changelog 
This was added in 0.26.
 2022-08-02 09:15:11 +07:00