summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Quilt output: Normalise trailing newlines in commit messageIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt output: Include Date headerIan Jackson2016-10-10
| | | | | | Copy this from the commit's author date. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Quilt output: Produce output like git-format-patchIan Jackson2016-10-10
| | | | | | | | Do not .-convert the message and stuff it in Description. Instead, generate a normal-looking patch with From and Subject. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* README.dsc-import: Ship to /usr/share/docIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* README.dsc-import: Document actually-imported approachIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* .gitignore: Add debhelper-build-stampIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* NOTES: Remove obsolete fileIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: done from TODO.BRANCHIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: DocumentIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Manpage: Embolden some command option stringsIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Honour --gbp-pq instead of --gbpIan Jackson2016-10-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Provide --gbp-buildIan Jackson2016-10-08
| | | | | | | And, provide the sub opts_opt_multi_cmd to help with options of this kind. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* gbp options: Introduce gbp_pq function (nfc)Ian Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Tidy up output from gbp pqIan Jackson2016-10-08
| | | | | | | | | | | gbp pq import can print some warnings if it doesn't like the patches much. There is no point showing these warnings to the user of `dgit clone' or `dgit fetch'. As for the warnings in split brain mode, we will leave those, and leave them with colour enabled. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-nonnative: Enhanced and finishedIan Jackson2016-10-08
| | | | | | | | | | | Use t-git-next-date. (Our GIT_AUTHOR_DATE settings were wrong and therefore ineffective.) Add a 1.0 with diff test. Add some comments about package format. Now the test is finished. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Set GIT_COMMITTER_* and GIT_AUTHOR_*Ian Jackson2016-10-08
| | | | | | | gbp pq import generates commits which are affected by these (COMMITTER always and AUTHOR sometimes). But we need imports to be stable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Set GIT_AUTHOR_* tooIan Jackson2016-10-08
| | | | | | | Sometimes the patches don't have authorship information, in which case using the caller's is wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: .gitignore patch: Slightly better commit messageIan Jackson2016-10-08
| | | | | | Don't sort-of-imply that the dgit version is the package version. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Add dependency on git-buildpackageIan Jackson2016-10-08
| | | | | | Now we may run gbp pq import even if user is not using gbp. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-native: New testIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Make t-archive-none idempotentIan Jackson2016-10-08
| | | | | | | No overall functional change just yet, but it means we can wipe our test archives. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Fix two test cases (git-foo => git foo)Ian Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: New fetch algorithm: Fix a messageIan Jackson2016-10-08
| | | | | | This should have been debug output all along. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Get rid of some pointless outputIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Import: Add a lot of debuggingIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: import-quilt: Initial version of new test caseIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: orig files: cope with signaturesIan Jackson2016-10-08
| | | | | | | Fix up .orig detection to handle .asc's (and other signatures) of .orig components the same way as their tarballs. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: orig files: Fix .orig-comp pattern matchIan Jackson2016-10-08
| | | | | | | Fix up .orig detection to correctly allow exactly the right .orig-comp components accorging to dpkg-source(1). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: Consequences of new importIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Entirely new import algorithmIan Jackson2016-10-08
| | | | | | See README.dsc-import (which needs some updating). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: make_commit_text: Some more debugIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Introduce make_commit_text (nfc)Ian Jackson2016-10-08
| | | | | | No callers yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: stunt parsechangelog: fallbackIan Jackson2016-10-08
| | | | | | | | Fall back to system implementation if command line options are requested that we don't understand. This is a bit fiddly - we need to strip the stunt entry out of PATH and also out of PERLLIB. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Print synthesised git commit message a bit earlierIan Jackson2016-10-08
| | | | | | No significant functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix up .orig detection to be less trustful of (ambiguous) filenames.Ian Jackson2016-10-08
| | | | | | | | | | | | | | | | | We cannot simply match the filenaem because `foo_1.0.orig.tar.gz' might be the `.orig.tar.gz' of foo version 1.0, or the `.tar.gz' of foo version 1.0.orig. We need either to consider the whole .dsc (this works since the formats with no `.orig' or `.debian' or whatever are precisely ones where there is only one file anyway), or know the version number. Replace is_orig_file with two functions, one for each situation. While we're here, do not barf if we find uncompressed tarballs. (We don't expect to find any but it would be nice if they worked...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* TODO.BRANCH: a todo itemIan Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: Slightly better message in mktree_in_ud_from_only_subdirIan Jackson2016-10-08
| | | | | | | This is going to be processing .dsc's tarballs directly, so we need slightly better error reporting. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* New import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)Ian Jackson2016-10-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Fix two calls to chdir without proper error checking.Ian Jackson2016-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Do not fail to do some important quilt processing in some --quilt modes.Ian Jackson2016-09-28
| | | | | | | Make `madformat' mean precisely `is 3.0 (quilt)' and change the two call sites which wanted to check the quilt mode too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: Consolidate emails into coherent planIan Jackson2016-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Import: Copy plan from emailsIan Jackson2016-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: quilt-gbp: Test that we crash if archive doesn't do "maint" tagsIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: Check that archive supports "maint", earlierIan Jackson2016-09-26
| | | | | | Otherwise the user will be disappointed shortly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Make t-newtag specify maint tooIan Jackson2016-09-26
| | | | | | | | Since actually several tests which use t-newtag are quilty split brain ones which technically require it, although nothing checks this right now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Test suite: Test --overwrite (without VERSION)Ian Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Overwrite: Document --overwrite option (without VERSION)Ian Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Overwrite: Support --overwrite without a versionIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: getfield, parsechangelog: Fix two bugs in error reportingIan Jackson2016-09-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Overwrite: Refer to $i_arch_v->[0] twice in plain_overwrite_pseudomergeIan Jackson2016-09-26
| | | | | | | | | | | | We are going to allow $overwrite_version to be "", in which case we will have to use $i_arch_v->[0] instead. Right now both are the same because if $overwrite_version is defined (as it must be in plain_overwrite_pseudomerge), pseudomerge_version_check will call infopair_cond_equal - so, no functional change right now. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>