summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* dgit(7): Mention git-debrebase and gbp pq alongside git-dpmIan Jackson2018-07-04
| | | | | | in the comment about handling patch stacks. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: checkout: new testIan Jackson2018-07-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): checkout: Document when this acceses the networkIan Jackson2018-07-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: checkout: New command.Ian Jackson2018-07-04
| | | | | | Closes:#878443. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fetch: Introduce new dofetch()Ian Jackson2018-07-04
| | | | | | | This actually does all that is needed. It replaces two now-identical calling patterns. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fetch: Reorganise cmd_fetchIan Jackson2018-07-04
| | | | | | | | | | | This slightly odd construction is actually how the return value from fork_for_multisuite should be handled. It now looks much more like the calling pattern in pull(). No functional change: if $multi_fetched is falseish, we call fetch_one, and then, no matter what, we finish 0. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fetch: Slightly refactor pull()Ian Jackson2018-07-04
| | | | | | | | | | | When for_for_multisuite returns '0', meaning we are a child and should do one suite, use finish 0 rather than returning, after doing the fetch. This has no functional change because the one call site is at the end of cmd_pull, after which we finish 0 anyway. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fetch: Rename fetch_one from fetch (nfc)Ian Jackson2018-07-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Document as-yet-unwritten `dgit checkout'Ian Jackson2018-07-01
| | | | 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>
* dgit: Break out package_from_d_control (nfc)Ian Jackson2018-07-01
| | | | 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: Test -Tps tooIan Jackson2018-06-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: work properly when no expected warningsIan Jackson2018-06-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: Remove some pointless redirectsIan Jackson2018-06-30
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: Prep for other formats (nfc)Ian Jackson2018-06-30
| | | | 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: Provide DGIT_TEST_BYHAND if appropriateIan Jackson2018-06-30
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gnupg workaround: Remove a sprurious $tmpIan Jackson2018-06-30
| | | | | | | | | | | | | | This is not set here, which is just as well because it would have been quite wrong. 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>
| * | Merge remote-tracking branch 'dgit/dgit/experimental' into HEADIan Jackson2018-06-28
| |\ \ | | | | | | | | | | | | -s ours
| | * | No-change upload, for testing.debian/5.3+exp1archive/debian/5.3+exp1Ian Jackson2018-06-27
| | | | | | | | | | | | | | | | 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: --overwrite test: Be more tolerant of exact messageIan Jackson2018-06-27
| | | | | | We're about to change this, apropos of #891031. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>