summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | 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.pm: Tidying up after tag format: Drop debiantag_oldIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | The one remaining call site was in debiantags, where debiantag_maintview is (also) correct. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): Tidying up after tag format: Drop qualificationsIan Jackson2019-06-28
| | | | | | | | | | | | All servers are now assumed to cope with split view tags. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): Correct --always-dep14tagIan Jackson2019-06-28
| | | | | | | | | | | | | | This was documented as --always-dep14tag but dgit only accepts --dep14tag-always. 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>
* | infra: Drop support for old tag name on server sideIan Jackson2019-06-28
| | | | | | | | 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>
* | dgit: Tidying up after tag format: drop ..._can_splitbrainIan Jackson2019-06-28
| | | | | | | | | | | | Substitute this fixed value into its call sites. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Drop support for old tag formatIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | access_cfg_tagformats_can_splitbrain always returns true now. We'll delete it in a moment. We now insist on protocol version 4 because older ones imply the old tag format. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: tag format: Add missing $protovsn comment re tagformat paramIan Jackson2019-06-28
| | | | | | | | | | | | | | No fuctional change. We are going to get rid of this in a moment, but this change makes clearer what is going on. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Drop all testing of old tag formats, and compatibilityIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | This is quite old now. We are dropping support for it. The new tags came in in dgit 2.0 in October 2016. No version of dgit without them was in any Debian release. We don't expect there are any sites using old servers which do not support the new format, or anyone using a dgit client older than 2.x who cannot upgrade. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: break out t-splitbrain-rm-1-patchIan Jackson2019-06-28
| | | | | | | | | | | | | | | | We are going to call this from one of the force split tests. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: t-{unapplied,dpm}-pushed-good: set $suiteIan Jackson2019-06-28
| | | | | | | | | | | | | | | | t-pushed-good-core wants suite to be set. Rather than having it implicit, make it an argument. Fix the two call sites where suite was not trivially `sid'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Do split brain cache and saving in build_maybe_quilt_fixupIan Jackson2019-06-28
| | | | | | | | | | | | | | This wants to happy whenever we have a split brain, not only in splitting multipatch modes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix --dgit-view-save optionIan Jackson2019-06-28
| | | | | | | | | | | | | | This was supposed to be an alias for --save-dgit-view but didn't work because || forced scalar context. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: quiltify: Go back to dgit-view if appropriateIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | Going back to master is fine with a unified view, but we are going to want to cope with a split view here. No functional change since $do_split_brain is not ever set here, yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Move git chedckout master out of quiltifyIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | This is closer to where it is going to be used, and a bit less confusing. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: When propagating pseudomerge error, strip leading \nIan Jackson2019-06-28
| | | | | | | | | | | | | | | | fail adds an initial \n to provide a blank line separating the error message from previous output. We want to strip any such thing away again. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Split out default_from_access_cfgIan Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: clean mode: Correctly reject bad modes from configIan Jackson2019-06-28
| | | | | | | | | | | | Add the missing ^ and $ (which do not appear in $cleanmode_re). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Slight internal error check improvementsIan Jackson2019-06-28
| | | | | | | | | | | | | | Move the $made_split_brain and $do_split_brain checks outside various conditionals. And change a die to a confess. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Rename $made_split_brainIan Jackson2019-06-28
| | | | | | | | | | | | | | | | This variable is not technnically necessary any more. But tracking this means if we introduce bugs which mean that we didn't do the split brain work, we will get much saner misbehaviour: a crash. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Check $split_brain against $do_split_brainIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | I think by now, $do_split_brain is always set early enough that $split_brain here implies $do_split_brain. And if $split_brain were not set but $do_split_brain was, that would mean we hadn't actually done the necessary work (constructing the and switching to the dgit-view branch in the playtree or computing $dgithead). Double check this with a couple of calls to confess. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: debug print quilt mode in XXXIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix check for --include-dirty --quilt=<splitting>Ian Jackson2019-06-28
| | | | | | | | | | | | | | | | This needs to know whether we are actually in split brain mode. build_or_push_prep_modes has just determined the answer, so put it there. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Move do_split_brain settingIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to introduce a new "time", build_or_push_prep_modes, which is the point at which we know we have a working tree, and know the quilt mode, and know we are pushing or building. There is one call to build_or_push_prep_modes near every call to build_or_push_prep_early - after pushing/notpushing (which also means after parseopts_late_defaults). There is one nontrivial functional difference: Now we use the format from the working tree, rather than from the .dsc. But these ought to be identical in any sane situation. If they are not then the user has done something very strange. The quilt fixup machinery may go wrong, but we should detect a problem later, during the dpkg-source -x check, so nothing wrong will be pushed anywhere. Otherwise no overall functional change other than to debug output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Add a comment about a bug we are about to eliminate.Ian Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Move some split brain code further out.Ian Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are going to want this in other quilt modes. Logically, it should occur in build_maybe_quilt_fixup. Specifically, move: * the quilt cache check * the splitting of the dgit-view branch and setting $split_brain out of quilt_fixup_multipatch. quilt_fixup_multipatch now gets $upstreamversion as a parameter. Right now this logic in build_maybe_quilt_fixup is a bit flabby and confusing. We hope to tidy it up a bit later. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Change an internal error die to confessIan Jackson2019-06-28
| | | | | | | | | | | | No functional change in non-error cases. This was wrong before. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Reject split brain quilt modes with single-debian-patchIan Jackson2019-06-28
| | | | | | | | | | | | | | | | Right now, this malfunctions in dgit: we do not do the split brain stuff. And most of these combinations do not appear to make very much sense. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Check quilt cache iff $do_split_brain (2)Ian Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | When $do_split_brain becomes set when !quiltmode_splitbrain(), we want to check the cache even in the non split brain case. Change the quilt fixup, just before generating a new multipatch conversion. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Check quilt cache iff $do_split_brain (1)Ian Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | When $do_split_brain becomes set when !quiltmode_splitbrain(), we want to check the cache even in the non split brain case. Change in dopush, where we check the cache. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Write down quilt mode split brain plans in a commentIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Move quilt_need_fake_dsc into the places that require itIan Jackson2019-06-28
| | | | | | | | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: gdr linear quilt fixup: Do it in a playtreeIan Jackson2019-06-28
| | | | | | | | | | | | | | | | It will work there, since this operation does not need any of the magic gdr refs. And this means that it will DTRT in split brain mode, when we enable that. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: quilt_need_fake_dsc: Make idempotentIan Jackson2019-06-28
| | | | | | | | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: unpack_playtree_need_cd_work: Make idempotentIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't be able to recover from a truly-messed-up "work" but this is good enough not to have to explicitly arrange for each place that uses it to know whether it has been done already. Checking in the filesystem is OK because mktree_in_ud_here calls playtree_setup which expects the playground to have been set up already - ie, all our callers have called prep_ud already. Add a comment about this requirement. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: rename unpack_playtree_mk_cd_work (from _mkwork)Ian Jackson2019-06-28
| | | | | | | | | | | | | | | | This makes the effect on cwd less confusing. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: quilt fixup: Move split brain branch creation out a bitIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the playtree git branch, and the setting $split_brain from quiltify_splitbrain (inside quilt_fixup_multipatch, conditional on quiltmode_splitbrain) to quilt_fixup_multipatch. This is still not quite right - it needs to be further out, because it should affect quilt_fixup_singlepatch too. Right now singlepatch DTWT in split brain mode. No functional change for now, anyway. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: dopush pseudomerge, break apart from quilt fixupIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | In the future, we are going to have split brain in situations without any quilt fixup. We will use $do_split_brain for this. In that situation, do the splitbrain pseudomerge too. No actual functional change yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Separate out build_check_quilt_splitbrainIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | The only effect of this is to move the tag format check from before the main work of build_maybe_quilt_fixup to later, and to not check it at all for `dgit quilt-fixup'. We don't really care about this any more; this tag format stuff is obsolete and we will delete it at some point... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Move quiltify_splitbrain_needed into its one call siteIan Jackson2019-06-28
| | | | | | | | | | | | | | | | I think $split_brain is always 0 on entry. It is this quiltify_splitbrain which used to calculate whether actually splitting brain was needed based on the quilt mode and the state of the tree. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: split brain reorg: Always _needed in split brain quilt modssIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only differences are: 1. Call quiltify_splitbrain_needed earlier. This is of no consequence. 2. Call it even dpm mode when .gitignore was not edited. This is actually somewhat more correct. In dpm mode we are very likely later going to need split brain to keep the pseudomerge of the dgit view off the maintainer branch. And in fact that is what will happen because dopush fetches the quilt view from the cache and that sets $split_brain unconditionally. With the current code structure dgit's quilt fixup imagines that it can do a quilt fixup for dpm mode without split brain, when the .gitignore is not edited. But actually what is happening is that this is an empty tree fixup, and the history inclusion *will* be done split brain, but later. So overall this change will have no actual overall effect. But it is a move towards helping untangle the quilt mode from split brain. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Drop "dgit view: changes are required..." messageIan Jackson2019-06-28
|/ | | | | | | We are going to stop caring whether any changes are required, so we will no longer have this information to report. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: rpush-quilt: New test to check rpush with splittingIan Jackson2019-06-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush: Work in splitting quilt modes, againIan Jackson2019-06-28
| | | | | | | | | | | | The failure case is missing the obviously-necessary check that the protocol version is, indeed, insufficient! This was broken in 045ec681a42fd823280cdec86a177309ddd741f0 Split tags: Genrate maintainer-view tag too which was first uploaded as part of dgit 2.0. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 8.6Ian Jackson2019-05-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 8.5debian/8.5archive/debian/8.5Ian Jackson2019-05-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document the 8.5 bugfix.Ian Jackson2019-05-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 05:42:21 +0000