summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Test suite: Test --overwrite=VERSIONIan Jackson2016-09-26
|
* Overwrite: Document --overwrite=VERSIONIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Overwrite: Provide --overwrite=VERSION optionIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Check before doing split tagIan Jackson2016-09-26
|
* Default config: Switch to new tag format onlyIan Jackson2016-09-26
| | | | | | | There are probably not many users relying on the default config, so push forward with it for the benefit of new users. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Ovewrite: Honour $overwrite_version in non-split-brain modeIan Jackson2016-09-26
| | | | | | | Currently there is no commnad line option to set this, so there is no way to exercise this functionality. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Pseudomerge: Break out pseudomerge_version_check and _make_commitIan Jackson2016-09-26
| | | | | | | | We are going to want to reuse these. It's a bit tangled, but this seems better than a single pseudomerge_make function with a bunch of iffery. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Better tag format filteringIan Jackson2016-09-26
| | | | | | | | | The code only makes tag formats `old' and `new'. Make it easier to add a new tag format config item entry later. No functional change with existing configurations. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: infopair tag fetch: Support multiple tagsIan Jackson2016-09-26
| | | | | | No functional change with existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out `infopair' functionsIan Jackson2016-09-26
| | | | | | | | We are going to want to reuse these in a moment. No functional change other than to debug output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain pseudomerge: Test $overwrite_version for definednessIan Jackson2016-09-26
| | | | | | Technically, `0' is a valid version number, but it is falsish. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Only send rpush maint-view param if $maintviewheadIan Jackson2016-09-26
| | | | | | | Fixes a bug where rpush would always make two tags even for a non-`3.0 (quilt)' package. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Have quilt-splitbrains test nowIan Jackson2016-09-26
|
* Test suite: quilt-splitbrains: CommentIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-splitbrains: RenameIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test --quilt=unapplied and --quilt=dpmIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-gbp-pushed-good: Refactor (nfc)Ian Jackson2016-09-26
| | | | | | | Provide various t-splitbrain-*. These will be needed for tests of --quilt=unapplied and --quilt=dpm. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Some extra error reports for wrong split brain modeIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Allow --quilt=dpmIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add two "echo ok."sIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: oldnewtagalt: New testIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add spelling testIan Jackson2016-09-26
| | | | | | Fail this test if the tree contains the misspelling of "pseudo". Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix spelling of "pseudo"Ian Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Turn gc.auto off in our hidden working tree setupsIan Jackson2016-09-26
| | | | | | | | | This avoids potential accidents: git gc --auto might otherwise run and do very undesirable things to the user's working tree. (I haven't been able to trigger such a situation deliberately and none has been reported, luckily...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: examplegit: Importers inherit majorv tooIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Add a todo list itemIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add t-tstunt-parsechangelog to a couple of testsIan Jackson2016-09-25
| | | | | | inarchivecopy and the quilt-gbp tests just use the `example' package. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Done drs-quilt-gbp (actually debpolicy-*)Ian Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp-build-modes-sbuild: Split outIan Jackson2016-09-25
| | | | | | | Now the other tests can run even if the sbuild chroot is not available. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp-build-modes: Lift bulk into lib-build-modesIan Jackson2016-09-25
| | | | | | To split the sbuild test out, we want this to be reusable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Gardening (reorg only)Ian Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: drs-push-rejects: Test push of same version with different dgitIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: drs-push-rejects: Break out re-prep (nfc)Ian Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Some things doneIan Jackson2016-09-25
|
* Split brain: Test suite: quilt-gbp: Test 2nd push (ie, test pseudomerge)Ian Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Make pseudomergeIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Test suite: quilt-gbp: Check that DEP-14 tag was pushedIan Jackson2016-09-25
| | | | | | Test that we pushed the maintainer view as well as the dgit view. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Always push the maintainer view tagIan Jackson2016-09-25
| | | | | | | | | | | Our algorithm for calculating whether to do a pseudomerge to make the dgit view fast forward from the archive contents depends on the maintainer view tag (effectively, it uses it to go back from the archive contents dgit view back to the corresponding maintainer view). So we need to push it too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: dgit-repos-server: Permit pushing maintainer tag tooIan Jackson2016-09-25
| | | | | | | | | Split brain is going to need the maintainer tag on the dgit server. Allow clients to push the _both_ the DEP-14 and new dgit archive/ tag. In this case dgit-repos-server can largely ignore the DEP-14 tag. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Add some debug relating to tagwantsIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: fail: Strip any trailing newlineIan Jackson2016-09-25
| | | | | | This makes it sensible to call fail() with a here doc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: debpolicy-quilt-gbp: New testIan Jackson2016-09-25
| | | | | | Check that drs and Debian policy permit split brain. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Changelog handling: Replace a call to parsechangelog with commit_getclogpIan Jackson2016-09-25
| | | | | | | | This is less code, and takes advantage of the memoisation. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Changelog handling: No not check out last push any more during raw importIan Jackson2016-09-25
| | | | | | | | | | | We now get the changelog with mergeinfo_getclogp (which just fetches the changelog blob). This working tree is not used for anything else, and is deleted at the end of the function. So there is no need to switch branches. There should be no overall behavioural change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Changelog handling: Use mergeinfo_getclogp during raw importIan Jackson2016-09-25
| | | | | | No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Changelog handling: Provide commit_getclogp (nfc)Ian Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Push reorg: Have FF check use dgit view, not HEADIan Jackson2016-09-25
| | | | | | | | Quilt fixup may generate a dgit view, which is not HEAD, and it is the dgit view which will actually be pushed to the archive, so it is that that should be checked. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* del_lrfetchrefs: Improve debug output a bitIan Jackson2016-09-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Push reorg: Postpone FF checkIan Jackson2016-09-25
| | | | | | | We need to do this after the quilt fixup, because we are going to make quilt fixup perhaps generate a pseudo-merge. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: run-all: Ensure tests/tmp/ existsIan Jackson2016-09-25
| | | | | | | | | ca007b4d "Test suite: run-all: record output" introduced a regression: if tests/tmp/ does not exist on entry, tests/run-all fails. So create it first. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 17:21:31 +0000