summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* 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>
* Push reorg: Introduce $archive_hash in dopush (nfc)Ian Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* fetch_from_archive: Mention that git_fetch_us must be called firstIan Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: changedir: use confess, to get a stack traceIan Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* fetch_from_archive: Return the hash (and update the comment)Ian Jackson2016-09-18
| | | | | | | | | | All the call sites currently treat the return value as a boolean, and the truthiness and falsishness of return values is unchanged, so there is no overall functional change. Also, clarify the head comment somewhat. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Add a couple of commentsIan Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Push reorg: Move ff check out of cmd_push into dpush (nfc)Ian Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: add some desiresIan Jackson2016-09-18
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gb-build-modes: Test --clean=dpkg-source tooIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gb-build-modes: Fixes, passes nowIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: lib-build-modes: Remove a couple of hardcoded versionsIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp-build-modes: New test, which does not pass yetIan Jackson2016-09-15
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: With sbuild, unapply patches in right dirIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: With gbp-build, provide gbp with patches-unapplied treeIan Jackson2016-09-11
| | | | | | | We may still need to apply, and then unapply, the patches, so as to clean the tree. But gbp itself expects a patches-unapplied tree. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Make maybe_unapply_patches_again reset $patches_applied_dirtilyIan Jackson2016-09-11
| | | | | | That makes it idempotent. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Some more todo itemsIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: TODO re fetch patternsIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Add a new desireIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp: Provide and use t-gbp-pushed-goodIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Break out t-incoming-dsc (nfc)Ian Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Break out t-pushed-good-core (nfc)Ian Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-output: support expecting empty filesIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Push correct view to dgit repos serverIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Test suite: quilt-gbp test: MoreIan Jackson2016-09-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: lrfetchrefs: Delete unneeded fetched refs, etc.Ian Jackson2016-09-11
| | | | | | | | Fetch only the refs we (think we) are going to use, and delete the lrfetchrefs (`refs/dgit-fetch/...') versions of those we give another name to. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Implement `git-fetch --no-insane'Ian Jackson2016-09-11
| | | | | | | | | | git-fetch has some very poor behaviours. Implement a non-insane version. We are going to want to not fetch things we aren't going to use, and this is necessary for that. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: tag-updates: Do not assert a that dgit-fetch/ ref existsIan Jackson2016-09-11
| | | | | | | We don't actually want dgit to leave these lying around unless it has to. So don't insist on that. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: Is finishedIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: use t-sametree-parentIan Jackson2016-09-06
| | | | | | Otherwise different history between fetch and clone breaks the test. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Provide t-sametree-parentIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: need to clean up lrfetchrefsIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: More workIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: More workIan Jackson2016-09-06
| | | | | | Select specifically 1.3 for first test, and do a clone Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: inarchivecopy: New test (does not pass yet)Ian Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: provide for x-dgit-unfinished restrictionIan Jackson2016-09-06
| | | | | | | | This will allow us to add tests which fail or are broken, without causing the test suite as a whole to fail. When the test is good, the restrction should be removed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Add a comment explaining import discardIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Clarify some messages about archive/local skewIan Jackson2016-09-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New fetch algorithm - try to tolerate in-archive copiesIan Jackson2016-09-06
| | | | | | | | | | | | | | | | Big comment explains. Amongst other things: * Introduce the mergeinfo concept * Abolish fetchspec in favour of lrfetchref * Synthesize a pseudo-merge linking the archive's .dsc with the dgit server's git branch, as appropriate. * Introduce mergeinfo_version. I have tried to ensure that where the import done by previous versions of dgit would be correct, the new import is the same. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Remove refs/remotes/dgit/dgit/sid from pari-extra worktreeIan Jackson2016-09-05
| | | | | | | | This, effectively, simulates a previous fetch of something. Do this in the actual tests instead: in this case, only necessary in fetch-localgitonly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: examplegit: make "new" branch be 2.xIan Jackson2016-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-commit: honour $majorv for major versionIan Jackson2016-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Honour t_dgit_xoptsIan Jackson2016-09-05
| | | | | | No callers. This may come in useful, though, at some point. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: examplegit: Make two pushes to unstableIan Jackson2016-09-05
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: examplegit: Save mirror as part of setupIan Jackson2016-09-05
| | | | | | incoming has nothing in it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-setup-*: Fix lock pathIan Jackson2016-09-05
| | | | | | Needs to be not in a directory which may not exist yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 04:36:00 +0000