[NEW] show leaves and show obsolete commands are added.

 Changes to be committed:
	modified:   lib/libcommand.sh
	modified:   lib/libcommand_show.sh
	modified:   lib/libdatabase_query.sh
	modified:   lib/libmain.sh
	modified:   lib/main/libcommand.sh
	modified:   lib/main/libusage.sh
	modified:   man/portsreinstall.8

diff --git a/lib/libcommand.sh b/lib/libcommand.sh
index a12496f..6aa0bfa 100644 (file)
--- a/lib/libcommand.sh
+++ b/lib/libcommand.sh
@@ -18,6 +18,7 @@ COMMAND_RESTART=
 COMMAND_SHOW_OPTIONS=
 COMMAND_SHOW_DEPTAG=
 COMMAND_SHOW_LEVEL=
+COMMAND_SHOW_KEYWORD=
 
 # ============= Check the necessity of opening notice =============
 command_all_chk_need_opening_notice ()

diff --git a/lib/libcommand_show.sh b/lib/libcommand_show.sh
index c97722b..fc78dd7 100644 (file)
--- a/lib/libcommand_show.sh
+++ b/lib/libcommand_show.sh
@@ -21,6 +21,10 @@ command_show ()
                database_query_show_single_list_exec "$COMMAND_SHOW_SUBJECT" \
                        "$COMMAND_SHOW_DEPTAG" "$COMMAND_SHOW_LEVEL" || :
                ;;
+       leaves | obsolete )
+               database_query_show_single_list_exec "$COMMAND_SHOW_SUBJECT" \
+                       "$COMMAND_SHOW_KEYWORD" '' || :
+               ;;
        initrequirements )
                grandtitle="Dependencies based on the initially installed packages"
                title="The following port(s) was/were required by %s:"

diff --git a/lib/libdatabase_query.sh b/lib/libdatabase_query.sh
index cce495e..a2fc6a1 100644 (file)
--- a/lib/libdatabase_query.sh
+++ b/lib/libdatabase_query.sh
@@ -648,14 +648,40 @@ database_query_show_single_list_exec ()
                message_echo "The following leaf, obsolete or unneeded ports had been once deleted but are to be or have been restored:"
                message_echo
                list=stage.loop_list/ports_to_restore
-               pkgnamedb='obsolete initial'
+               pkgnamedb='moved_from obsolete initial'
                flag_filter_only_target=y
                ;;
        deleted )
                message_echo "The following leaf, obsolete or unneeded ports are to be or have been deleted:"
                message_echo
                list=stage.loop_list/ports_to_delete
-               pkgnamedb='obsolete initial'
+               pkgnamedb='moved_from obsolete initial'
+               flag_filter_only_target=y
+               ;;
+       leaves )
+               if [ -z "$deptag" ]
+               then
+                       message_echo "The following ports are all detected leaf ports:"
+                       list=leaf_ports
+               else
+                       message_echo "The following ports are all $deptag leaf ports:"
+                       list=leaf_ports_to_delete.$deptag
+               fi
+               message_echo
+               pkgnamedb='moved_from obsolete initial'
+               flag_filter_only_target=y
+               ;;
+       obsolete )
+               if [ -z "$deptag" ]
+               then
+                       message_echo "The following ports are all detected obsolete ports:"
+                       list=obsolete_ports.can_be_deleted
+               else
+                       message_echo "The following ports are all $deptag obsolete ports:"
+                       list=obsolete_ports_to_delete.$deptag
+               fi
+               message_echo
+               pkgnamedb='moved_from obsolete initial'
                flag_filter_only_target=y
                ;;
        esac

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 321c57c..4e5ca22 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180729140632
+       MYVERSION=4.0.0+toward_4.1.0_20180729172016
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
 }
 

diff --git a/lib/main/libcommand.sh b/lib/main/libcommand.sh
index 3ed8cfc..1503b86 100644 (file)
--- a/lib/main/libcommand.sh
+++ b/lib/main/libcommand.sh
@@ -201,7 +201,7 @@ command_all_parse_args ()
                ;;
        show )
                case $COMMAND_SHOW_SUBJECT in
-               todo | done | redo | resolved | failure | deleted | restored | conflict )
+               todo | done | redo | resolved | failure | deleted | restored | conflict | leaves | obsolete )
                        database_query_chk_preparation_completion;;
                esac
                temp_warn_obsolete_temp_db >&2
@@ -237,6 +237,18 @@ command_all_parse_args ()
                todo | done | redo | resolved | failure | taboo | freeze | need | noneed | restored | deleted | conflict )
                        _command_parse_args__chk_no_arg $#
                        ;;
+               leaves | obsolete )
+                       COMMAND_SHOW_KEYWORD=$1
+                       case $COMMAND_SHOW_KEYWORD in
+                       '' | selected | unselected )    ;;
+                       *)
+                               message_echo "ERROR: Invalid show $COMMAND_SHOW_SUBJECT keyword [$COMMAND_SHOW_KEYWORD]." >&2
+                               exit 1
+                               ;;
+                       esac
+                       shift || :
+                       _command_parse_args__chk_no_arg $#
+                       ;;
                initrequirements | requirements | initdependents | dependents | conflict_files | status | errormessage )
                        _command_parse_args__chk_glob_args $#
                        ;;

diff --git a/lib/main/libusage.sh b/lib/main/libusage.sh
index 39aa7ca..fcab815 100644 (file)
--- a/lib/main/libusage.sh
+++ b/lib/main/libusage.sh
@@ -76,7 +76,9 @@ USAGE: portsreinstall [OPTIONS] [--] [command]
           | packupgrade create | packupgrade crop [path] | packupgrade clean
           | show todo | show done | show resolved | show failure | show redo
           | show taboo | show need | show noneed | show restored | show deleted
-          | show conflict | show requirements glob... | show dependents glob...
+          | show conflict
+          | show leaves [selected | unselected] | show obsolete [selected | unselected]
+          | show requirements glob... | show dependents glob...
           | show initrequirements glob... | show initdependents glob...
           | show conflict_files glob... | show status glob...
           | show errormessage glob...

diff --git a/man/portsreinstall.8 b/man/portsreinstall.8
index 4880d06..dddcabb 100644 (file)
--- a/man/portsreinstall.8
+++ b/man/portsreinstall.8
@@ -287,6 +287,16 @@ With \fB\-a\fR option, the first and second columns denote the flavored origin a
 Conflicting ports which are temporarily deleted.
 With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, and opponent ports concatenated by comma respectively.
 .TP
+\fBleaves\fR [\fBselected\fR | \fBunselected\fR]
+All detected leaf ports.
+Keywords \fBselected\fR and \fBunselected\fR are for filtering only selected (to be deleted) and unselected (to be preserved) ones, respectively.
+With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, and opponent ports concatenated by comma respectively.
+.TP
+\fBobsolete\fR [\fBselected\fR | \fBunselected\fR]
+All detected obsolete ports.
+Keywords \fBselected\fR and \fBunselected\fR are for filtering only selected (to be deleted) and unselected (to be preserved) ones, respectively.
+With \fB\-a\fR option, the first, second and third columns denote the flavored origin, initial/new/current package name, and opponent ports concatenated by comma respectively.
+.TP
 \fBrequirements\fR \fIglob1\fR [\fIglob2\fR ...]
 Ports required by matching ports/packages.
 With \fB\-a\fR option, the first, second, third and fourth columns denote the flavored origin of the queried port, initial/new/current package name of the queried port, flavored origin of a requirement of the queried port and initial/new/current package name of the requirement, respectively.
@@ -1085,7 +1095,7 @@ Configuration file of \fBportupgrade\fR(1).
 .PP
 [NEW] \fBauto\fR command is added to \fBportsreinstall\-chroot\fR(8).
 .PP
-[NEW] \fBerrormessage\fR command is added.
+[NEW] \fBshow errormessage\fR, \fBshow leaves\fR and \fBshow obsolete\fR commands are added.
 .PP
 [NEW] BUILDCONFLICT and INSTCONFLICT sections are added to ${LOCALBASE}/etc/portsreinstall.conf.
 .PP