Skip to contentSkip to conversation

dim: Add range-diff convenience wrapper

PATCH New Daniel Vetter 3 participants 4 messages Oct 4, 2018 – Oct 5, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dim: Add range-diff convenience wrapper

range-diff is awesome, but the interface is a bit silly. Add a bunch of shortcuts, inspired by what git diff does.

---
 dim     | 13 +++++++++++++
 dim.rst |  8 ++++++++
 2 files changed, 21 insertions(+)
dim +13 -0
index 12c80e2051b6..c4663aca6b5c 100755
@@ -475,6 +475,19 @@ function dim_retip
 	git rebase --onto $new_upstream $upstream $branch "$@"
 }
 
+function dim_range_diff
+{
+	local branch
+
+	branch=${1:-@\{1\}}
+
+	if [[ $branch != "" && $(git rev-parse $branch | wc -l) -eq 1 ]] ; then
+		git range-diff $branch...HEAD
+	else
+		git range-diff "$@"
+	fi
+}
+
 # update for-linux-next and for-linux-next-fixes branches
 function update_linux_next # branch next next-fixes fixes
 {
dim.rst +8 -0
index b149fa39445e..9e41133aeb8d 100644
@@ -95,6 +95,14 @@ retip [*branch*] [*git-rebase option* ...]
 Rebase the given local branch, current branch by default, onto drm-tip. Options
 after the branch will be passed to **git-rebase**.
 
+range-diff [ *commit-ish* | *git-range-diff options* ]
+------------------------------------------------------
+
+Convenience wrapper around the git range-diff command which automatically
+compares against HEAD if you only specify a commit-ish. In all other cases
+forwards to git range-diff. Defaults to @{1}, which is very useful for reviewing
+rebases.
+
 COMMANDS FOR COMMITTERS AND MAINTAINERS
 =======================================
 
Signature · 6 lines
2.19.0.rc2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 1/1 dim: Add range-diff convenience wrapper

range-diff is awesome, but the interface is a bit silly. Add a bunch of shortcuts, inspired by what git diff does.

v2: Add it to the developer commmands list. With this dim range-diff is useable on any git repo, not just a dim managed one.

---
 dim     | 14 ++++++++++++++
 dim.rst |  8 ++++++++
 2 files changed, 22 insertions(+)
dim +14 -0
index 12c80e2051b6..f8079aa2dc4d 100755
@@ -475,6 +475,19 @@ function dim_retip
 	git rebase --onto $new_upstream $upstream $branch "$@"
 }
 
+function dim_range_diff
+{
+	local branch
+
+	branch=${1:-@\{1\}}
+
+	if [[ $branch != "" && $(git rev-parse $branch | wc -l) -eq 1 ]] ; then
+		git range-diff $branch...HEAD
+	else
+		git range-diff "$@"
+	fi
+}
+
 # update for-linux-next and for-linux-next-fixes branches
 function update_linux_next # branch next next-fixes fixes
 {
@@ -2188,6 +2201,7 @@ function list_developer_commands
 		"cite"
 		"fixes"
 		"retip"
+		"range-diff"
 		"sparse"
 		"tc"
 		# help commands
dim.rst +8 -0
index b149fa39445e..9e41133aeb8d 100644
@@ -95,6 +95,14 @@ retip [*branch*] [*git-rebase option* ...]
 Rebase the given local branch, current branch by default, onto drm-tip. Options
 after the branch will be passed to **git-rebase**.
 
+range-diff [ *commit-ish* | *git-range-diff options* ]
+------------------------------------------------------
+
+Convenience wrapper around the git range-diff command which automatically
+compares against HEAD if you only specify a commit-ish. In all other cases
+forwards to git range-diff. Defaults to @{1}, which is very useful for reviewing
+rebases.
+
 COMMANDS FOR COMMITTERS AND MAINTAINERS
 =======================================
 
Signature · 6 lines
2.19.0.rc2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw
Quoted 18 lines · Daniel Vetter

range-diff is awesome, but the interface is a bit silly. Add a bunch of shortcuts, inspired by what git diff does.

v2: Add it to the developer commmands list. With this dim range-diff is useable on any git repo, not just a dim managed one.

---
 dim     | 14 ++++++++++++++
 dim.rst |  8 ++++++++
 2 files changed, 22 insertions(+)
dim +0 -0
index 12c80e2051b6..f8079aa2dc4d 100755

dim function dim_retip · line 484

Quoted 10 lines
dim +7 -0
@@ -475,6 +475,19 @@ function dim_retip
        git rebase --onto $new_upstream $upstream $branch "$@"
 }
 
+function dim_range_diff
+{
+       local branch
+
+       branch=${1:-@\{1\}}
+
+       if [[ $branch != "" && $(git rev-parse $branch | wc -l) -eq 1 ]] ; then

branch is never empty since you are providing a default.

This also seems to fail silently (actually displaying a wrong info) if one does dim range-diff HEAD^

It would sound more useful if falling back to git-tbdiff in case range-diff is not available. What I kind of dislike on wrappers is the inability to provide more arguments. One that would be useful here would be a --no-patch if one only wants to see status change, not the change itself.

I'm still getting used to the tool so I'm always explicit: I always type both ranges to tell exactly what I want to compare.

git range-diff basecommit..origin/branchname basecommit..HEAD

Lucas De Marchi

Quoted 43 lines
dim +7 -0
+               git range-diff $branch...HEAD
+       else
+               git range-diff "$@"
+       fi
+}
+
 # update for-linux-next and for-linux-next-fixes branches
 function update_linux_next # branch next next-fixes fixes
 {
@@ -2188,6 +2201,7 @@ function list_developer_commands
                "cite"
                "fixes"
                "retip"
+               "range-diff"
                "sparse"
                "tc"
                # help commands
dim.rst +8 -1
index b149fa39445e..9e41133aeb8d 100644
@@ -95,6 +95,14 @@ retip [*branch*] [*git-rebase option* ...]
 Rebase the given local branch, current branch by default, onto drm-tip. Options
 after the branch will be passed to **git-rebase**.
 
+range-diff [ *commit-ish* | *git-range-diff options* ]
+------------------------------------------------------
+
+Convenience wrapper around the git range-diff command which automatically
+compares against HEAD if you only specify a commit-ish. In all other cases
+forwards to git range-diff. Defaults to @{1}, which is very useful for reviewing
+rebases.
+
 COMMANDS FOR COMMITTERS AND MAINTAINERS
 =======================================
 
--

2.19.0.rc2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Lucas De Marchi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
Quoted 22 lines · Lucas De Marchi
Quoted 21 lines · Daniel Vetter

range-diff is awesome, but the interface is a bit silly. Add a bunch of shortcuts, inspired by what git diff does.

v2: Add it to the developer commmands list. With this dim range-diff is useable on any git repo, not just a dim managed one.

---
 dim     | 14 ++++++++++++++
 dim.rst |  8 ++++++++
 2 files changed, 22 insertions(+)
dim +0 -0
index 12c80e2051b6..f8079aa2dc4d 100755
@@ -475,6 +475,19 @@ function dim_retip
        git rebase --onto $new_upstream $upstream $branch "$@"
 }
 
Quoted 9 lines

dim function dim_retip · line 484

Quoted 7 lines
dim +7 -0
+function dim_range_diff
+{
+       local branch
+
+       branch=${1:-@\{1\}}
+
+       if [[ $branch != "" && $(git rev-parse $branch | wc -l) -eq 1 ]] ; then

branch is never empty since you are providing a default.

Yeah that's a leftover, at first I didn't have the @{1} default

Quoted 3 lines

This also seems to fail silently (actually displaying a wrong info) if one does dim range-diff HEAD^

$ dim range-diff HEAD^
-:  ------------ > 1:  8506ae553cd3 drm/vblank: Remove old-style comments
$ dim cite HEAD
8506ae553cd3 ("drm/vblank: Remove old-style comments")

Does exactly what I expect it to do.

Quoted 5 lines

It would sound more useful if falling back to git-tbdiff in case range-diff is not available. What I kind of dislike on wrappers is the inability to provide more arguments. One that would be useful here would be a --no-patch if one only wants to see status change, not the change itself.

Can do that easily, it's a tiny change. Not sure about git-tbdiff, since that's not really useful for people who don't have it installed.

Quoted 4 lines

I'm still getting used to the tool so I'm always explicit: I always type both ranges to tell exactly what I want to compare.

git range-diff basecommit..origin/branchname basecommit..HEAD

Way too much typing for me :-)

Cheers, Daniel

Quoted 51 lines

Lucas De Marchi

Quoted 43 lines
dim +7 -0
+               git range-diff $branch...HEAD
+       else
+               git range-diff "$@"
+       fi
+}
+
 # update for-linux-next and for-linux-next-fixes branches
 function update_linux_next # branch next next-fixes fixes
 {
@@ -2188,6 +2201,7 @@ function list_developer_commands
                "cite"
                "fixes"
                "retip"
+               "range-diff"
                "sparse"
                "tc"
                # help commands
dim.rst +8 -1
index b149fa39445e..9e41133aeb8d 100644
@@ -95,6 +95,14 @@ retip [*branch*] [*git-rebase option* ...]
 Rebase the given local branch, current branch by default, onto drm-tip. Options
 after the branch will be passed to **git-rebase**.
 
+range-diff [ *commit-ish* | *git-range-diff options* ]
+------------------------------------------------------
+
+Convenience wrapper around the git range-diff command which automatically
+compares against HEAD if you only specify a commit-ish. In all other cases
+forwards to git range-diff. Defaults to @{1}, which is very useful for reviewing
+rebases.
+
 COMMANDS FOR COMMITTERS AND MAINTAINERS
 =======================================
 
--

2.19.0.rc2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 1 line
Lucas De Marchi
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel