Patchview addon are 3 bash and 1 python scripts

tools (scripts) to work under svn and git repos .

Version 2020-06-26

Update patchview/README.patchview
Co-authored-by: Tim Waugh <[email protected]>

Author: sergiomb2

Makefile.am

@@ -10,6 +10,12 @@ bin_SCRIPTS = \
 	scripts/dehtmldiff \
 	scripts/espdiff
 
+dist_bin_SCRIPTS = \
+	patchview/gitdiff \
+	patchview/gitdiffview \
+	patchview/svndiff \
+	patchview/svndiffview
+
 AM_CFLAGS = -I$(srcdir)/src
 src_interdiff_SOURCES = src/interdiff.c src/util.c src/util.h src/diff.c \
 		src/diff.h src/myerror.c

patchview/README.patchview

@@ -0,0 +1,46 @@
+So what is patchview? It is a wrapper of filterdiff for use with numbered files.
+
+    $ patchview
+    (without args)
+    
+is equivalent to: lsdiff --number
+
+    $ patchview -F2-
+    (or with any other args)
+    
+is equivalent to: filterdiff -F2- (or whatever arguments are supplied)
+
+There are two scripts for working with git (gitdiff and gitdiffview) and two for svn (svndiff and svndiffview).
+
+    $ svndiff
+    $ gitdiff
+    (without args)
+    
+will give the list of files modified
+
+    $ svndiff -F1
+    $ gitdiff -F1
+    
+will show the patch of file #1
+
+    $ svndiffview
+    $ gitdiffview
+    
+pipe all patches through filterdiff to `vim - -R` (in read-only mode, easy to quit), showing complete patch with color.
+
+    $ svndiffview -F2
+    $ gitdiffview -F2
+    (or any other args)
+
+will pipe patch of file #2 to `vim - -R`
+
+Example:
+We can make the following one-line script with the name difftotrunk.sh, to view the differences of two directories or svn repos (trunk and .)
+
+    diff ../trunk . -ru -x .svn | patchview "$@"
+
+    $ ./difftotrunk.sh , will show all different files and his number.
+    $ ./difftotrunk.sh -F3,4 , will show the differences of files #3 and #4 only.
+    $ ./difftotrunk.sh -F3 -#1, will show only hunk #1 of file #3.
+    $ ./difftotrunk.sh -F3 -#x1, will show the differences of files #3 without hunk #1 (x means that exclude).
+

patchview/gitdiff

@@ -0,0 +1,47 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015-2019 Sérgio Basto <[email protected]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+import os
+import sys
+import argparse
+from subprocess import Popen, PIPE
+
+enviro = os.environ
+workdir = '.'
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-v', '--debug',
+                    help='writes the commands that will be executed',
+                    action='store_true')
+parser.add_argument('git_args', nargs='*', default=[])
+parser.add_argument('patchview_args', nargs=argparse.REMAINDER)
+args, unknown = parser.parse_known_args()
+largs = vars(args).get("git_args")
+rargs = vars(args).get("patchview_args")
+
+if args.debug:
+    print("%s | %s" % (" ".join(['git', 'diff'] + largs),
+          " ".join(['patchview'] + rargs + unknown)))
+
+p1 = Popen(['git', 'diff'] + largs, stdout=PIPE, env=enviro, cwd=workdir)
+p2 = Popen(['patchview'] + rargs + unknown, stdin=p1.stdout, stdout=PIPE,
+           env=enviro, cwd=workdir)
+p1.stdout.close()  # Allow p1 to receive a SIGPIPE if p2 exits.
+sys.stdout.buffer.write(p2.communicate()[0])

patchview/gitdiffview

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2014-2019 Sérgio Basto <[email protected]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+gitdiff --filter "$@" | vim -R -

patchview/svndiff

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2014-2019 Sérgio Basto <[email protected]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+svn diff | patchview "$@"

patchview/svndiffview

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2014-2019 Sérgio Basto <[email protected]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+svndiff --filter "$@" | vim -R -