dgit: Include quilt mode in archive/ tag in split view

After this, a program examining this tag can see one of the following
possibilities:

"split --quilt=<splitting>"
   splitting quilt view, `3.0 (quilt)'

"split --quilt=<nonsplitting>"
   `3.0 (quilt)', mostly-dgit-compatible branch, but split view
   (bureaucracy commits not on maintainer branch)

"no-split --quilt=<nonsplitting>"
   `3.0 (quilt)', maintainer uses dgit branch

"split" / "no-split"
   non-`3.0 (quilt)'

No "split" or "no-split"
   generated by old versions of dgit, quilt transformation
   information not captured in machine-readable form

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index e9b2cd54e90a6d29d4d91552dba88516b6d6b713..491cb234447e19df1dfe8248534179ab4cb1fd8b 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4385,6 +4385,10 @@ END
 %s release %s for %s (%s) [dgit]
 ENDT
                or confess "$!";
+           unshift @dtxinfo, "--quilt=$quilt_mode" if madformat($format);
+           unshift @dtxinfo, do_split_brain() ? "split" : "no-split"
+               # rpush protocol 5 and earlier don't tell us
+               unless $we_are_initiator && $protovsn < 6;
            my $dtxinfo = join(" ", "",@dtxinfo);
            print TO <<END or confess "$!";
 [dgit distro=$declaredistro$dtxinfo]