summaryrefslogtreecommitdiff
path: root/dgit
Commit message (Collapse)AuthorAge
* Use the old /updates security map for buster (Closes: #1050179)Matthew Vernon2023-08-22
| | | | | | | | | | | | | | | | The suite-map and suite-rmap for debian-security are necessary for the pre-bullseye layout of the security.debian.org archive. Since bullseye (i.e. after buster), the archive layout has changed, and these mappings are no longer necessary (indeed, they cause dgit clone to fail to work with bullseye and later security suites). Buster is the oldest suite still available on security.debian.org, so this is the only suite we still need the mapping for. Signed-off-by: Matthew Vernon <mvernon@wikimedia.org> (cherry picked from commit 82f0b65f189e4c9aee1dc9b0c414e3d3c0358bc0) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit, dgit-maint-merge(7): Merge README.source text into gen. headerSean Whitton2023-02-22
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* Suppress unwanted messages from git-rebase.Ian Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dsc import: Launder the series file before feeding it to gbpIan Jackson2023-02-04
| | | | | Closes: #1030093 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix a call to die to be confess, if an unexpected copy failsIan Jackson2023-02-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix confusing appending of gbp-pq-outputIan Jackson2023-02-04
| | | | | | We don't want to inherit some prior output. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Add TODO about inappropriate translation of SubjectIan Jackson2023-01-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* policy-client-query: Declare that Debian supports thisIan Jackson2022-12-29
| | | | | | | | | This commit should be published in a dgit release after the corresponding server side code is deployed. Closes: #944855 Closes: #1027186 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (fix): Use deliberately()Ian Jackson2022-12-28
| | | | | | | This will allow the tests to bypass the local checks when they want to. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: deliberately: Centralise processing of TEST-dgit-onlyIan Jackson2022-12-28
| | | | | | | Make this apply to every call to deliberately(). (Now it is wrong to not use deliberately().) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (fix): Pass suite in check and use it for HEADIan Jackson2022-12-28
| | | | | | This now produces the same answers as push would. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Do hint addition in common message prepIan Jackson2022-12-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Use common message generator in dgitIan Jackson2022-12-28
| | | | | | The messages now come out the same. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects protocol: Reintroduce time, handle optionalityIan Jackson2022-12-28
| | | | | | | | | | | | According to the poldb schema, gitobjtype is optional, so make it optional in the protocol too. Reintroduce time, as we're about to need it for calling the common message construction. Clarify what optionality means and implement it properly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Check policy-query-supported-ssh valueIan Jackson2022-12-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Add some printdebugsIan Jackson2022-12-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Check overrides firstIan Jackson2022-12-28
| | | | | | This can save on a git-cat-file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* tainted-objects (cleanup): Tidy up an error messageIan Jackson2022-12-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* policy-client-query tainted-objects: Add hint to spec and clientIan Jackson2022-12-28
| | | | | | | | | We're going to want to print a hint. (In this case, the message that would be printed to stderr if we rejected the actual push.) Add it to the spec, and to the client code. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* policy-client-query: dgit: Fix code formattingIan Jackson2022-12-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* policy-client-query: dgit: Mention tainted object typeIan Jackson2022-12-28
| | | | | | And change the data structure to support this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* policy-client-query: dgit: use tainted-objects queryIan Jackson2022-12-28
| | | | | | | | | | Add the config for controlling policy-client-query calls. For now we default to "unknown" everywhere. If supported, check if tainted objects are reachable from $dgithead, and report them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Rename auto quilt mode to try-linearIan Jackson2022-12-26
| | | | | | | | | | "auto" makes it sound like this automatically selects the right quilt mode, which is far from true. Don't even document "auto" any more, but accept it for compatibility. Closes: #935762 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Scan for duplicated orig tarballs with different namesIan Jackson2022-12-26
| | | | | Closes: #993769 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dotdot_bpd_transfer_origs: Promote calculation of $dotdotIan Jackson2022-12-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* include-binaries: Silently tolerate mentions of debian/Ian Jackson2022-12-26
| | | | | Closes: #1026918 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* include-binaries handling: Tiny refactoringIan Jackson2022-12-26
| | | | | | | Hoist the !@bpath check so we can add another statement here with different behaviour. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Make rpush be a configurable alias like pushIan Jackson2022-12-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide rpush-built as an (as yet undocumented) aliasIan Jackson2022-12-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out some_push_aliasIan Jackson2022-12-11
| | | | | | Preparation for rpush-built, rpush-source. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: implement rpush-sourceIan Jackson2022-12-11
| | | | | Closes: #974012 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush: Move responder_send_command into pre_ hookIan Jackson2022-12-11
| | | | | | | | | The main program does little between these: recording and checking the cwd, mainly, and slurping the config. But this comman doesn't depend on the config and doing it earlier will simplify things when we have rpush-source too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix "unknown operation" message to be orig kebab caseIan Jackson2022-12-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: polluted source-only changes: tidyingIan Jackson2022-12-11
| | | | | | Make this function a bit easier to read. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: polluted source-only changes: report info to stderrIan Jackson2022-12-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: handle debian/source/include-binaries in quilt fixupIan Jackson2022-12-11
| | | | | | | | | Oh my god. Writeup here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024233#10 Closes: #1024233 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fake dsc: Copy include-binaries into fake debian/source/Ian Jackson2022-12-11
| | | | | | This necessary, but not yet sufficient. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Add a missing debugcmd for dpkg-source --before-buildIan Jackson2022-12-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dpkg-source -b: when using playtree, pass --no-preparationIan Jackson2022-12-10
| | | | | Closes: 1025694 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: dpkg-source invocation: Move "--" into if armsIan Jackson2022-12-10
| | | | | | This will allow the arms to add options. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not use gdr to make patches with unmarked breakwater startIan Jackson2022-12-10
| | | | | | | | | | | | | | We must also adjust the gdr-fresh test case: now its patches are made by dgit, not gdr. We now check that they are correct (that is, that dgit is now happy with things) but not what they look like). Several other test cases test the dgit gdr makepatches functionality, calling t-gdr-made-patches (via t-gdr-good, for example). (I have verified that changing the remaining "return 1" from branch_is_gdr to "return 0" does cause many test failures.) Closes: #1015779 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix a direct use of chdir, should be changedirIan Jackson2022-12-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push-build: Populate the split brain cache if necessaryIan Jackson2022-11-11
| | | | | | Closes: #1019454 Reported-by: Simon McVittie <smcv@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Soften message about source-only uploads to NEWIan Jackson2022-11-11
| | | | | | | Prompted by #983056. A proper fix would involve encoding more precise knowledge about Debian archive policy. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push: Make it warn (by default)Ian Jackson2022-09-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit push-*: Provide push-built; make push be an aliasIan Jackson2022-09-04
| | | | | | | | | | No overall chagne in behaviour since in this commit the default configuration is "built". However, the documentation already anticipates the change to add the warning. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* quiltify_trees_differ: Fix comment to reflect what we do nowIan Jackson2022-09-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide --quilt=singleIan Jackson2022-09-03
| | | | | | | This is to replace single-debian-patch. Closes: #1018984 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit; Pass --include-removal to dpkg-source -bIan Jackson2022-09-03
| | | | | | | Now, with single-debian-patch, we can still handle file removals. (This may fix other corner cases too.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: unrepresentable check: Don't tolerate symlink creationIan Jackson2022-09-03
| | | | | | | | | | | | git diff can represent changes to symlinks, but dpkg-source uses diff(1) to apply changes, and git diff cannot. The result if we permit them is that we end up making source packages that can't be built, or aren't treesame to our HEAD. Reject this early. This resolves the error handling regression in dgit: quilt fixup: Don't use dpkg-source --commit, but git diff Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>