summaryrefslogtreecommitdiff
path: root/dgit
Commit message (Collapse)AuthorAge
* dgit: Do not translate tag subject linesIan Jackson2019-07-06
| | | | | | | These are parsed by dgit-repos-server. Translating them breaks things. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Include dgit tag metadata in maintainer view tag tooIan Jackson2019-07-06
| | | | | | | This is for the use of git-debpush and other tools which want to figure out the quilt mode from the git history. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: tags: Add missing blank lines to messagesIan Jackson2019-07-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Move tag metadata calculation earlierIan Jackson2019-07-06
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Allow -p with various push modesIan Jackson2019-07-06
| | | | | | This checks the supplied package name against the changelog. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Move $suite_re from dgitIan Jackson2019-07-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Include quilt mode in archive/ tag in split viewIan Jackson2019-07-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* dgit: rpush protocol version 6: Include splitbrain paramIan Jackson2019-07-05
| | | | | | | | And, in the push responder, check that we agree. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush protocol: Actually select version 5 !Ian Jackson2019-07-05
| | | | | | | | | These must be most-preferred first, ie in reverse order. Change the comment, to mention this. The information about protocol changes is in the detailed protocol description. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: determine_whether_split_brain: Make it take $formatIan Jackson2019-07-05
| | | | | | | Rather than returning it. Adjust the two call sites. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush: Move push_parse_dsc earlierIan Jackson2019-07-05
| | | | | | | | We are going to want this information sooner. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push_mktags: Provide $formatIan Jackson2019-07-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out format_quiltmode_splittingIan Jackson2019-07-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push_mktags: Refactor introducing @dtxinfoIan Jackson2019-07-05
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: push_mktags: Rename variable $dtxinfoIan Jackson2019-07-05
| | | | | | No functional change Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Honour baredebian+git alias for baredebianIan Jackson2019-06-30
| | | | | | | We convert this to `baredebian' internally, and that is what will appear in messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not translate import commit messagesIan Jackson2019-06-30
| | | | | | Translating these was a mistake. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New quilt mode "baredebian+tarball"Ian Jackson2019-06-30
| | | | | | No documentation yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: return $r1authline from import_tarball_commitsIan Jackson2019-06-30
| | | | | | No functional change for existing caller, which just discards it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: import_tarball_tartrees: Provide OrigPartIan Jackson2019-06-30
| | | | | | No functional change for existing caller. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: import_tarball_tartrees: Handle @dfi==1 case in callerIan Jackson2019-06-30
| | | | | | | | We are going to introduce a caller which doesn't want this check. No overall functional change other than to debugging output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: import_tarball_tartrees: Honour Path in dfisIan Jackson2019-06-30
| | | | | | | | | | | | | These do not appear in information collected from a .dsc; in that case, the files are arranged to be in the playground where they can be simply picked up. But we are going to want to direct import_tarball_tartrees to tarballs found elsewhere. No functional change with the current sources of dfi information. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out import_tarball_commitsIan Jackson2019-06-30
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out import_tarball_tartreesIan Jackson2019-06-30
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out $quilt_options_reIan Jackson2019-06-30
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Reject --clean=gitIan Jackson2019-06-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Note upstream commitish source in proseIan Jackson2019-06-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Provide $quilt_upstream_commitish_messageIan Jackson2019-06-29
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Note upstream version and commitish sourceIan Jackson2019-06-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Add translator notes about ASCII art changes displayIan Jackson2019-06-29
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: New quilt modeIan Jackson2019-06-29
| | | | | | | This is the bulk of the implementation including all essential changes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: baredebian: Introduce --upstream-commitishIan Jackson2019-06-29
| | | | | | | | | Not documented yet. Nor, used, since $quilt_mode is not ever baredebian yet. So currently just an option you can pass to make dgit bomb out. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce $uhead and $uhead_whatshortIan Jackson2019-06-29
| | | | | | | | No overall functional change other than (sadly) to complicate the life of translators. I will add some notes for translators after I've made this string actually vary. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Make $format available in build_or_push_prep_modesIan Jackson2019-06-29
| | | | | | | | By returning it from determine_whether_split_brain. No functional change yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Move hash_commit from dgitIan Jackson2019-06-29
| | | | | | No functional change other than to no longer honour @git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Rename various *make_commit* to *hash_commit*Ian Jackson2019-06-29
| | | | | | | | This avoids a subroutine name clash with make_commit in gdr. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Reject split view with correct messageIan Jackson2019-06-28
| | | | | | | | | | Now, it is not just a splitting quilt mode which might cause this, but also an explicit request for split view. This has some duplicated text, which I understand is easier for translators. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Support split view in non-splitting quilt modesIan Jackson2019-06-28
| | | | | | | | | Provide --split-view|brain=auto|always|never and the corresponding access cfg option .split-view. This is not documented or tested yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: In code, rename splitbrain quilt modes to splittingIan Jackson2019-06-28
| | | | | | | | | | | | | A "splitting" quilt mode is going to be one which requires split brain mode. But split brain mode is going to be possible in other quilt modes too. The existing name of the splitbrain quilt cache is correct: it is used precisely for quilt fixup, in split brain modes (even for non splitting quilt modes, now). In split brain mode without quilt, it is not needed or used. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Reject dgit pull in split brain modeIan Jackson2019-06-28
| | | | | | | | | | | In splitting quilt modes dgit pull would have to back-convert the changes and currently there is no code to do this, and these cases were correctly rejected before. But in other quilt modes it would still have to strip off pseudomerges or quilt fixup commits. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Move determine_whether_split_brain further up the fileIan Jackson2019-06-28
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out determine_whether_split_brainIan Jackson2019-06-28
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Crash if we forgot to set $do_split_brainIan Jackson2019-06-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Put !! inside do_split_brain()Ian Jackson2019-06-28
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce do_split_brain()Ian Jackson2019-06-28
| | | | | | No functional change yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Tidying up after tag format: Drop splitbrain conditionalIan Jackson2019-06-28
| | | | | | | | | Now, debiantags is always just debiantag_new plus debiantag_maintview. So we can drop this complexity. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Tidying up after tag format: Drop debiantagIan Jackson2019-06-28
| | | | | | | | | | | Remove the now-superfluous level of indirection. No functional change. At some future point we may rename debiantag_new to debiantag everywhere, but not right now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Tidying up after tag format: Collapse $dodep14tag testIan Jackson2019-06-28
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce $protovsn 5; part of tidying up after tag formatIan Jackson2019-06-28
| | | | | | | | | | | This drops the tagformat param; the semantics are as if `new' were specified. Eventually, when we can drop support for $protovsn 4, all traces of this parameter can then be gone. No overall functional change. No immediate compatibility implications. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Drop $protovsn < 4; part of tidying up after tag formatIan Jackson2019-06-28
| | | | | | | | | | This drops support for rpush where our peer is older than dgit 2.0. (This does not include the dgit in any Debian release.) No nontrivial functional change, since we already rejected older dgits due to them implying the old tag format. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 18:38:36 +0000