summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* dgit: checkout: New command.Ian Jackson2018-07-04
| | | | | | Closes:#878443. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: update-vcs-git: Honour --package properly.Ian Jackson2018-07-01
| | | | | | | | | | | Specifically, use package_from_d_control rather than open-coding a substandard implementation. The consequent abolition of $sourcep does mean that if the user specifies the suite `.', and does not specify -p, we needlessly parse debian/control twice. This doesn't really matter. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.7Ian Jackson2018-07-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.6debian/5.6archive/debian/5.6Ian Jackson2018-07-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document empirical effectiveness of new gnupg workaroundIan Jackson2018-07-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: New testIan Jackson2018-06-30
| | | | | | Test that manpages format with only expected roff warnings. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge remote-tracking branch 'dgit/dgit/experimental'Ian Jackson2018-06-30
|\ | | | | | | | | | | | | Conflicts: debian/changelog Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg agent workaround: Fix bugs in log neatening.debian/5.5+exp9archive/debian/5.5+exp9Ian Jackson2018-06-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg agent workaround: Neaten the logging.debian/5.5+exp8archive/debian/5.5+exp8Ian Jackson2018-06-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg-agent workaround: Send ps output to stderr (oops)debian/5.5+exp7archive/debian/5.5+exp7Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg-agent workaround: Cope if ps not found.debian/5.5+exp6archive/debian/5.5+exp6Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 5.5+exp5debian/5.5+exp5archive/debian/5.5+exp5Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg-agent workaround: Kill unexpected leftover agents.Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gpg-agent workaround: Add more debugging output.Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Add bc to appropriate test Depends.debian/5.5+exp4archive/debian/5.5+exp4Ian Jackson2018-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: 5.5+exp3 to placate version checkingdebian/5.5+exp3archive/debian/5.5+exp3Ian Jackson2018-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Merge remote-tracking branch 'dgit/dgit/sid' into experimentaldebian/5.5+exp2archive/debian/5.5+exp2Ian Jackson2018-06-28
| |\
| * | New gnupg agent thingIan Jackson2018-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before (5.3) 1044.27user 126.77system 6:26.89elapsed 302%CPU (0avgtext+0avgdata 402420maxresident)k 1778718inputs+5123720outputs (2370major+57693524minor)pagefaults 0swaps after (5.3 + these changes) 1072.81user 131.38system 6:25.02elapsed 312%CPU (0avgtext+0avgdata 402448maxresident)k 1777558inputs+5124952outputs (2370major+59176578minor)pagefaults 0swaps Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * | No-change upload, for testing.debian/5.4+exp1archive/debian/5.4+exp1Ian Jackson2018-06-28
| | | | | | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | | changelog: start 5.6Ian Jackson2018-06-28
| |/ |/| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: finalise 5.5debian/5.5archive/debian/5.5Ian Jackson2018-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): Fix a wrong reference to \fp, which should be \fP.Ian Jackson2018-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | debian/control: Add missing commaIan Jackson2018-06-28
| | | | | | | | | | | | Closes:#902578. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: start 5.5Ian Jackson2018-06-28
|/ | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.4debian/5.4archive/debian/5.4Ian Jackson2018-06-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-viagit, gdr-newupstream: do not auto-import t-setup-gnupg.Ian Jackson2018-06-27
| | | | | | | | | | | | | | | | We provide a new mechanism for individual tests to disable the automatic t-setup-import of gnupg. We need to add this to all the other setup/ that these import, too. gdr-convert-gbp is particularly awkward because it wants gnupg if $ifarchive isn't `:'. There we arrange to suppress its automatic inclusion, but add it again by hand if appropriate. This fixes these two tests in chroots without gnupg. Closes:#902559. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Better description of --overwrite.Ian Jackson2018-06-27
| | | | | | | | | | In particular, be clear that --overwrite (without previous-version) is quite a weak promise: that the version you are uploading contains everything in your changelog. It won't overwrite willy-nilly. Somewhat apropos of discussion in #902534. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Fix bug ref to #865444 in previous changelog entry.Ian Jackson2018-06-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.4Ian Jackson2018-06-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.3debian/5.3archive/debian/5.3Ian Jackson2018-06-27
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(7): Add discussion of quilt fixup error messagesIan Jackson2018-06-27
| | | | | | | And add cross-references to dgit(1) and the actual error. Somewhat apropos of #842614. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Better message formatting when --overwrite may be neededIan Jackson2018-06-27
| | | | | | Closes:891031. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test ill-advised repeat dgit push after git push failsIan Jackson2018-06-27
| | | | | | | This demonstrates #869146, which is about dgit repeatedly adding the same .orig to the .changes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not introduce duplicate origs in .changes filesIan Jackson2018-06-27
| | | | | | | | | | | | | | | | | | The .dsc and .changes matching code contained roughly $fieldbody =~ / \Q$item\E\n/m but this is wrong when the $fieldbody matches $item in its last line, and there is no trailing newline (as would be usual). This code is obviouslu confused because m affects only ^ $ which don't appear in the regexp. Change these to / \Q$item\E$/m which is what ought to have been, and probably was, intended. In one case we are trying to delete a line. In that case we need to remove the leading newline. The field body always starts with a newline so the use of \n rather than ^ is fine. Closes:#869146. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase new-upstream: Provide better reflog entriesIan Jackson2018-06-26
| | | | | | | | By setting GIT_REFLOG_ACTION. Closes:#901925. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* ref updates: Honour GIT_REFLOG_ACTION everywhere.Ian Jackson2018-06-26
| | | | | | | | Specifically, every time we call git_update_ref_cmd. Closes:#901935. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 5.3~Ian Jackson2018-06-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 5.2debian/5.2archive/debian/5.2Ian Jackson2018-06-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: dgit/gdr interop: test make-patches exiting 7Ian Jackson2018-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: git-debrebase interop: Actually tolerate git-debrebase status 7Ian Jackson2018-06-22
| | | | | | make-patches exiting with status 7 causes $?==7*256, not 7. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: git-debrebase interop: Add a missing debugcmd debugging print.Ian Jackson2018-06-22
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: warn if vcs-git seems out of dateIan Jackson2018-06-21
| | | | | | | Print a warning to stderr on `dgit fetch sid', if your vcs-git remote url disagrees with what's in sid's .dsc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide `update-vcs-git' subcommandIan Jackson2018-06-21
| | | | | | | This is for creating and adjusting the vcs-git remote url. Useful for transition from alioth to salsa. Closes:#902006. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-user(7): Suggest sbuild-debian-developer-setup(1)Sean Whitton2018-06-21
| | | | | | | | | | | | | | | | This will only create the chroot for building packages for the machine's architecture, because sbuild-debian-developer-setup(1) does not have an --architecture option, so sbuild-createchroot(1) will be needed too, hence the 'and'. The nice thing about sbuild-debian-developer-setup(1) is that does fiddly things that a non-expert might forget about, like adding the current user to the sbuild group. So it is still worth recommending even though it does not have an --architecture option. Closes:#895779. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit(1): Clarify that --overwrite does nothing if not needed.Ian Jackson2018-06-21
| | | | | | Closes:#863578. Related to #863576 too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: --overwrite now no longer crashes if there is no $archive_hashIan Jackson2018-06-21
| | | | | | | | | | Ie there is nothing to overwrite (eg, when used with --new). Instead, it is simply ignored, as it is ignored in situations where the push is fast forward. Closes:#863576. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use nproc(1) rather than Sys::CPU.Ian Jackson2018-06-21
| | | | | | | | | This is more portable and does not depend on libsys-cpu-perl being installed. Closes:888496. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Non-noop git fetch is not available with --dry-run, so failIan Jackson2018-06-21
| | | | | | | | | | | | | | | | When fetch or push wants git fetch (other than in a situation where it happes to be a noop) but --dry-run was specified, we would loop with a false coplaint about git fetch. False, because we didn't actually run git fetch so of course it didn't do anything. Instead, fail with an explanation. Closes:#871317. This does not occur, and we do not fail, if git-fetch would be a no-op. We can tell when this is the case, because we use git-ls-remote too. This leads to one suggestion for a workaround for the user, which is to do a not --dry-run fetch first. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Improve message for discrepant quilt fixupIan Jackson2018-06-21
| | | | | | | When quilt fixup fails because of discrepancies, print a git diff rune which will show them. Closes:#865446. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: commit_quilty_patch: Handle other file statuses tooIan Jackson2018-06-21
| | | | | | | | | | | | | | | | In particular, R can occur if all Debian changes have been removed in a package with single-debian-patch, in which case we would fail to commit the patch queue removal. I don't think dpkg-source will remove files in other cases, so this is probably the only actually buggy case. I don't think the other letters are particularly likely but if they occur they should be committed too. I have deliberately excluded U which should definitely not occur. Closes:#893263. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 19:23:16 +0000