summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Test suite: import-tarbomb: Split out from import-nonnativeIan Jackson2016-11-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: lib-import-chk: Break out from import-nonnativeIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Tests suite: import-nonnative: Put a .pc in the craziest .orig tooIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: remove_stray_gits: Print a slightly better messageIan Jackson2016-11-07
| | | | | | Change all call sites, and callers of mktree_in_ud_from_only_subdir. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: git_add_write_tree: Replace two open-coded git-add sitesIan Jackson2016-11-07
| | | | | | | No overall functional change. (We end up passing `.' to git add, which these two sites didn't previously.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Test origs with .git directoriesIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Test tarbombsIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Cope when an orig tarball is a tarbomb.Ian Jackson2016-11-07
| | | | | | | | | | | | | | | | Ie, if it contains other than one single directory toplevel. Closes:#843422. Specifically: * We change the unpack directory to _unpack-tar in unpack, rather than ../unpack-tar. This means that mktree_in_ud DTRT in that directory, rather than in its supposed only subdiredctory * We do write-tree on the whole tarball. * Then if the tarball had only one subdir in it, we fish the subtree's tree object out of the git tree object. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Check that .orig contents match imported treesIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Prepare for more testsIan Jackson2016-11-07
| | | | | | | | | * Break chk into chk1 and chk2, so we can do stuff in the middle * Remove $p between runs, so that we can do another test with the same $p No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce git_add_write_treeIan Jackson2016-11-07
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix an unconditional print that was supposed to be a printdebug:Ian Jackson2016-11-07
| | | | | | origs <blah>.orig.tar.gz f.same=1 #f._differ=-1 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: aptget: un-disable cache cleanIan Jackson2016-11-07
| | | | | | Have fudged it to see what it did, and it seems to work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Add caveat about multisuite-generated branchesIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: clone-reprepro: Use stunt parsechangelogIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Better error message for inappropriate multi-suiteIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Document multisuiteIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: reprepro: Test multisuite with package absent in suiteIan Jackson2016-11-07
| | | | | | | | It is convenient to do this in this test case, particularly as that lets us check that our apt-get method handles missing packages properly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: multisuite: New testIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Implement multi-suitesIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: lib-reprepro: cope with non-codenamed suitesIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: t-archive: DTRT if $suite is not sidIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Actually honour the branch name for $isuite, if we are on dgit branchIan Jackson2016-11-07
| | | | | | As documented in the manpage. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Print a debug message if clone removes due to errorIan Jackson2016-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Move canonicalise_suite into fetch()Ian Jackson2016-11-07
| | | | | | | | | | | | | | | | | | fetchpullargs has to run before we have dealt with multisuites, which cannot be straightforwardly canonicalised. Move the canonicalisation out of fetchpullargs. Previously, fetchpullargs would always call canonicalise_suite if it wasn't going to fail. In one of the cases it would print a message, but we have just changed canonicalise_suite to print a message too, so the one from fetchpullargs was redundant. fetchpullargs is called right before fetch, in cmd_fetch; and, in cmd_pull. In cmd_pull the split brain check intervenes between fetchpullargs and pull which calls fetch. So overall there is now no functional change other than the loss of the now-redundant message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* clone: Postpone canonicalise_suiteIan Jackson2016-11-07
| | | | | | | We are going to want to do some other things beforehand, but after the dryrun safety catch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Make clone_set_head not depend on $giturlIan Jackson2016-11-07
| | | | | | | When cloning a distro which has no git server, correctly leave the user on the local dgit branch, not on `master'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clone: Break out clone_set_head and clone_finishIan Jackson2016-11-07
| | | | | | | | Again, we are going to want to reuse these bits. No functional change right now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fetch_from_archive: Break out _record_1 and _2.Ian Jackson2016-11-07
| | | | | | | | We are going to want to reuse these bits of the fetch finishing-up. No functional change right now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Always print canonical suite nameIan Jackson2016-11-07
| | | | | | | | Not only when a noncanonical one was specified. This makes some output less confusing - especially when combined with the forthcoming multisuite feature. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: printdone: Use $us.Ian Jackson2016-11-07
| | | | | | | No significant functional change right now. When $us changes, it will be more right. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Pass --force-distribution to dchIan Jackson2016-11-07
| | | | | | If it's wrong, we know what we're doing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Provide reprepro test (for aptget method)Ian Jackson2016-11-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: orig-include-exclude: Remove some commented-out obsolete bitIan Jackson2016-11-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Introduce $t_archive_methodIan Jackson2016-11-06
| | | | | | | | | * Indirect t-archive-none and t-archive-query via this variable * Rename t-archive-updated; it is for callers that have updated aq/package.$suite.$p. There is one out-of-lib caller. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: canonicalise_suite_aptget: Add a bit of debugIan Jackson2016-11-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Support the Debian *-security suites.Ian Jackson2016-11-06
| | | | | | (Provide the configuration to use the aptget method.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: aptget archive access methodIan Jackson2016-11-06
| | | | | | | Uses Sources. This is not very efficient and should be avoided for large apt repositories. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: config: Allow dgit-suite.PATTERN.distroIan Jackson2016-11-06
| | | | | | This is going to be useful for *-security. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce access_nomdistro()Ian Jackson2016-11-06
| | | | | | | | | | | This distro name is used for tag names, protocol elements, etc., and also as a search element for config lookups. Each distro can specify a nominal-distro. No functional change with current config. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Introduce archive_query_prepend_mirrorIan Jackson2016-11-06
| | | | | | | | Now the archive_query functions return urls, not subpaths. No overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: parsecontrol: Support $allowsigned (nfc)Ian Jackson2016-11-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Add fakeroot and make to Test-Depends.Ian Jackson2016-11-01
| | | | | | | | These aren't necessarily pulled in by anything else. (dpkg-dev Recommends build-essential. But we don't actually need build-essential.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 2.10~Ian Jackson2016-11-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* finalise 2.9archive/debian/2.9Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Better summaries of dgit-maint-merge(7) and dgit-maint-gbp(7)Ian Jackson2016-10-31
| | | | | Suggested-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7): Suggest "3.0 (native)" rather than bodging 1.0 nativeIan Jackson2016-10-31
| | | | | | | | This is better than --dpkg-source:-sn because it produces a git tree which doesn't need weird options, and doesn't delete the user's .orig (which might still be useful eg for some dgit fetch). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-sponsorship(7): Suggest supplying sample git-archive(1) cmdsSean Whitton2016-10-31
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit-maint-merge(7): Drop subpoint about "nonlinear histories"Ian Jackson2016-10-31
| | | | | | Suggested by Sean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)Ian Jackson2016-10-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>