Skip to content

Patchview man pages #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2025
Merged

Patchview man pages #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b622e4
Add stub man pages for patchview-based tools
twaugh Sep 3, 2025
0eacb2c
Update .gitignore
twaugh Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ lib/Makefile.in

# Compiled objects
*.o
*.gcno
*.gcda
*.gcov
src/combinediff
src/filterdiff
src/flipdiff
Expand All @@ -31,6 +34,12 @@ src/lsdiff
src/rediff
src/patchview

# Build artifacts
lib-built
lib/libgnu.a
lib/*.h
lib/sys/

# These are generated from *.in files
/patchutils.spec
/scripts/dehtmldiff
Expand All @@ -42,7 +51,21 @@ src/patchview
/scripts/unwrapdiff

# These are generated from the XML file.
doc/*.1
doc/interdiff.1
doc/filterdiff.1
doc/fixcvsdiff.1
doc/rediff.1
doc/editdiff.1
doc/combinediff.1
doc/lsdiff.1
doc/splitdiff.1
doc/grepdiff.1
doc/recountdiff.1
doc/unwrapdiff.1
doc/dehtmldiff.1
doc/flipdiff.1
doc/espdiff.1
doc/patchview.1

# Tests
/test-arena
Expand Down
7 changes: 6 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,23 @@ src_interdiff_LDADD = lib/libgnu.a @LIBOBJS@
src_filterdiff_LDADD = lib/libgnu.a @LIBOBJS@
src_rediff_LDADD = lib/libgnu.a @LIBOBJS@

# Manual pages that are simple .so references
additional_manpages = doc/gitdiff.1 doc/gitdiffview.1 doc/svndiff.1 doc/svndiffview.1

if HAVE_XMLTO
# The man pages are generated from DocBook XML.
interdiff_manpage = doc/interdiff.1
other_manpages = doc/filterdiff.1 doc/fixcvsdiff.1 doc/rediff.1 \
doc/editdiff.1 doc/combinediff.1 doc/lsdiff.1 doc/splitdiff.1 \
doc/grepdiff.1 doc/recountdiff.1 doc/unwrapdiff.1 doc/dehtmldiff.1 \
doc/flipdiff.1 doc/espdiff.1 doc/patchview.1
man_MANS = $(interdiff_manpage) $(other_manpages)
man_MANS = $(interdiff_manpage) $(other_manpages) $(additional_manpages)

$(other_manpages): $(interdiff_manpage)
$(interdiff_manpage): doc/patchutils.xml
$(XMLTO) man -o doc $<
else
man_MANS = $(additional_manpages)
endif

# Special rules for combinediff, flipdiff, lsdiff, grepdiff and patchview, which are
Expand Down
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Patchutils news
configurations properly. Addresses GitHub issues #61, #91, and #93.
Updated spec file.

Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview
commands. Addresses GitHub issue #112.

0.4.3 (stable)

Added --in-place option to more tools for editing files in place.
Expand Down
1 change: 1 addition & 0 deletions doc/gitdiff.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.so patchview.1
1 change: 1 addition & 0 deletions doc/gitdiffview.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.so patchview.1
1 change: 1 addition & 0 deletions doc/svndiff.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.so patchview.1
1 change: 1 addition & 0 deletions doc/svndiffview.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.so patchview.1