>
> to be
>     %_query_all_fmt         %%{name}-%%{version}--%%{Project}-%% 
> {Branch}-%%{release}.%%{arch}
>

Ad one more change is needed to skip if package does not have  
Project: and Branch: tags,
as well as to add the trailing '-' dash characters in display output.

That I can't type that queryformat directly without errors of some sort.

Here's an example from rpmpopt that prints details of %post
iff %post is included in a package:

%|POSTIN?{postinstall scriptlet\
%|POSTINPROG?{ (using %{POSTINPROG})}|:\n%{POSTIN}\n}:\
{%|POSTINPROG?{postinstall program: %{POSTINPROG}\n}|}|\

So something like (untested) needs to be added:

    %|Project?{-%{Project}}:{}|

Here's my shot (watch for typos and line wrap) at the complete  
definition:

%_query_all_fmt         %%{name}-%%{version}%%|Project?{-%%{Project}}: 
{}|%%|Branch?{-%%{Branch}}:{}|-%%{release}.%%{arch}

hth

73 de Jeff