From ff6fd2b1447e1174c553e745796be15461f1b902 Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Thu, 28 Nov 2024 17:58:57 +0000 Subject: [PATCH] feat(sapling): add `ddd` alias for diffing like `...` diff from git When using sapling I often use `HEAD...origin/main` to diff the current changes. This replicates this so you can diff a commit with other changes and or merge commits in it. --- site-modules/core/templates/sapling.conf.liquid | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site-modules/core/templates/sapling.conf.liquid b/site-modules/core/templates/sapling.conf.liquid index 69f13af..4a7d7c6 100644 --- a/site-modules/core/templates/sapling.conf.liquid +++ b/site-modules/core/templates/sapling.conf.liquid @@ -32,3 +32,8 @@ pager = delta nvim_diff.executable = nvim nvim_diff.args = -d $base $local $other nvim_diff.priority = 1 + +[revsetalias] +# Diff between two revs. This is the same as `...`, unlike `a::b` +# this is equivalent to `a..b` in git. +ddd(a, b) = ancestor(a, b)::b