summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: upload 5.10~bpo9+1 to stretch-backportsdebian/5.10_bpo9+1archive/debian/5.10_bpo9+1Sean Whitton2018-07-19
|
* Merge tag 'debian/5.10' into stretch-bpoSean Whitton2018-07-19
|\ | | | | | | | | | | | | | | | | dgit release 5.10 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sun 15 Jul 2018 01:12:02 AM CST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
| * changelog: finalise 5.10debian/5.10archive/debian/5.10Ian Jackson2018-07-14
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * infrastructure: Run git gc --auto before mirroring. Closes:#841414.Ian Jackson2018-07-14
| | | | | | | | | | | | | | | | | | | | | | | | This would not have avoided the trouble reported here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841414#74 Empirically, I managed to work around the problem by running `git gc' (rather than `git gc --auto') and then rsyncing the result to the mirror. I will request that DSA increase the RAM (or swap) size on the relevant host. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Drop a couple of useless test log output lines.Ian Jackson2018-07-14
| | | | | | | | | | | | | | We don't need these (((((((((( )))))))))) now that it's just one line inside them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: rework for merging experimental tests into masterIan Jackson2018-07-14
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 5.9+exp4debian/5.9+exp4archive/debian/5.9+exp4Ian Jackson2018-07-13
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: tar up the artifacts, and name the tarball after the testIan Jackson2018-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Naming the output after the test works around #903696. tarring the whole lot up turns out to make it a lot smaller. Before: $ du -sk ; du -sk --apparent-size 1640 . 853 . After: 236 . 235 . Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: chmod a+r $AUTOPKGTEST explicitly.debian/5.9+exp3archive/debian/5.9+exp3Ian Jackson2018-07-13
| |
| * test suite: Do not save non-world-readable artifactsdebian/5.9+exp2archive/debian/5.9+exp2Ian Jackson2018-07-13
| | | | | | | | | | | | | | | | | | Save things to $AUTOPKGTEST_ARTIFACTS without preserving access control information. Works around #903680. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 5.9+exp1debian/5.9+exp1archive/debian/5.9+exp1Ian Jackson2018-07-12
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Save much stuff to $AUTOPKGTEST_ARTIFACTS.Ian Jackson2018-07-12
| | | | | | | | | | | | | | | | | | We take some care to make this of reasonable size. In particular, we delete raw tarballs (typically, IMPORT) and .git's sample hooks. And, we git gc the git trees. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Introduce playtree-save-refsIan Jackson2018-07-12
| | | | | | | | | | | | | | | | | | Arranges for all the refs in each playtree to be saved in the parent's ref namespace. This is going to be used when running git-gc when saving artifacts. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Drop t-ok from setup/*Ian Jackson2018-07-12
| | | | | | | | | | | | | | | | | | t-ok is going to save artifacts, which we don't want these to do. It is not actually needed. All it does that is useful is the fsck, which the actual tests will do. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Use dch -r -D sid '' not dch -r sid.Ian Jackson2018-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bizarrely, dch -r [-D suite] runs $EDITOR but dch -r [-D suite] weevils ignores `weevils' but does not run $EDITOR. This is #903598. Apparently, this is well known, and convention is to pass ''. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903598#8. So use that. Closes:#903441. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Factor out t-dch-commit-rIan Jackson2018-07-12
| | | | | | | | | | | | | | | | The pattern `dch -r sid' is actually wrong and we will want to change it. See #903441 and #903598. For future-proofing, factor this out before we fix it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 5.9+exp1Ian Jackson2018-07-12
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 5.9debian/5.9archive/debian/5.9Ian Jackson2018-07-12
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(5): Suggest `gitk -- :.' tooIan Jackson2018-07-09
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(5): Document best gitk options. Closes:#901927.Ian Jackson2018-07-09
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(5): Add new subsection DISCUSSIONIan Jackson2018-07-09
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * NOTES.dgit-downstream-dsc.7.pod: WIP for #810829Ian Jackson2018-07-09
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit-downstream-dsc(7): New manpage.Ian Jackson2018-07-09
| | | | | | | | | | | | Closes:#842643,#851194. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Document reorganisationsIan Jackson2018-07-09
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-convert-gbp: drop --overwriteIan Jackson2018-07-09
| | | | | | | | | | | | With #903132 properly fixed, this is no longer needed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase convert-from-gbp: Add ffq checkIan Jackson2018-07-09
| | | | | | | | | | | | | | | | | | Check that the result will not count as having diverged. This will usually turn failures to make the ff pseudomerge into -fdiverged. Related to #903132. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase convert-from-gbp: Make it ff of dgit view, if we can.Ian Jackson2018-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for dgit-generated tags so we can usually make the new branch ff of the dgit view. Specifically, we fish the most recent released version out of debian/changelog and look for a DISTRO/VSN tag and a corresponding archive/DISTRO/VSN tag. If this all looks good, we declare ff of archive/. This should avoid the need for dgit push --overwrite in most cases. We do not check the DISTRO name. In principle dgit could find the distro name from the suite name, but that makes the software layering quite complicated. (For example, we would have to provide a way to tell gdr what program to run for dgit, for the benefit of the test suite.) I think the current approach is good enough; there are not likely to be any tag pairs that look like the right kind of thing but are in fact something else entirely, so we're not likely to accidentally trash some wanted changes. Closes:#903132. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Set $|Ian Jackson2018-07-09
| | | | | | | | | | | | | | | | This will avoid pepeering everything with calls to flush. Without it some messages from ffq_check, say, can arrive after the stderr output from a subsequent snags_maybe_bail, which is quite confusing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Provide snags_maybe_bail_earlyIan Jackson2018-07-09
| | | | | | | | | | | | No callers yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Replace `die badusage' with `badusage'.Ian Jackson2018-07-09
| | | | | | | | | | | | | | | | | | badusage contains a call to finish. So the die is redundant and never gets called. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: ffq_check: Move defaults for $ff and $notff into subIan Jackson2018-07-09
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Move debinatag_maintview from dgitIan Jackson2018-07-08
| | | | | | | | | | | | | | git-debrebase is about to want this for convert-from-gbp dgit split brain fixup. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Break out parsechangelog_loop from dgitIan Jackson2018-07-08
| | | | | | | | | | | | | | | | git-debrebase is going to want this. No functional change except to some debugging messages. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Move parsecontrol etc. out of dgitIan Jackson2018-07-08
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Fix a typo in a commentIan Jackson2018-07-08
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Break out ff_check (for reuse by convert-from-gbp)Ian Jackson2018-07-08
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: record_ffq_prev_deferred: Move get_head();Ian Jackson2018-07-08
| | | | | | | | | | | | No functional change. This will make ff check easier to split out. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 5.9Ian Jackson2018-07-08
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: upload 5.8~bpo9+1 to stretch-backportsdebian/5.8_bpo9+1archive/debian/5.8_bpo9+1Sean Whitton2018-07-12
| |
* | Merge tag 'debian/5.8' into stretch-bpoSean Whitton2018-07-12
|\ \ | |/ | | | | | | | | | | | | | | dgit release 5.8 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sun 08 Jul 2018 11:43:29 BST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
| * changelog: finalise 5.8debian/5.8archive/debian/5.8Ian Jackson2018-07-08
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Improve grammar if one blocking snag.Ian Jackson2018-07-07
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-newupstream: Test adding revisionIan Jackson2018-07-07
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase new-upstream: Add a -1 revision if the user didn't supply one.Ian Jackson2018-07-07
| | | | | | | | | | | | Closes:#903127. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: status: Reorganise commit reporting.Ian Jackson2018-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the references to @_ with a hash. Using a hash is much less confusing than all this numerical indexing. Also, \@_ is wrong because there is only one @_, so by the time it is dereference, the commit being printed is the anchor. This is why in #903131 we see branch is unlaundered found mixed upstream/packaging commit (7badba627162337c7057002f37e9a1a593d07d08) abcc6260 Update to upstream 2.9.7 which appears to sugggest that the anchor is a mixed commit. Actually the mixed commit is 7badba627162 but the subsequent message is based on @_ which has different information in it by then. And, set $kcmsg from the main message, not including the commit information. We are the more sophisticated caller mentioned in the previous commmit. Closes: #903131. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: keycommits: Callbacks get separate $mainwhyIan Jackson2018-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate out the extra contextual info, naming the hash of the commit being complained about, into a separate argument to $x->(). This allows us to pass the message without that as an additional argument to the callbacks. This way we can still pass \&snag as a callback but other callers can do something more sophisticated involving $cl. No functional change for any existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: makepatches7: Add a nasty .gitignoreIan Jackson2018-07-06
| | | | | | | | | | | | | | Prior to the fix for #903130 this prevents both dgit and gdr from making patches properly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit, git-debrebase: Properly make patches with nasty .gitignores.Ian Jackson2018-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically: * When running git status --porcelain, pass --ignored so it lists ignored files, and handle the ! output that it then produces. * Add missing -f to a few git add invocations. I have done some greps ('git.*add', 'git.*status', 'porcelain', etc.) to try to find other missed cases and none turned up. git diff is OK because normally we pass two treeish arguments, in which case the ignores are ignored by git diff. When we are asking it to look at the working tree, we are expecting it to ignore untracked files (whether ignored or not), and diff tracked ones, which is what it does. Closes:#903130. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Document dgit(1) build unscramblingIan Jackson2018-07-06
| | | | | | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> squash! changelog: Document manpage fix
| * dgit(1): Unscramble push and push-source descriptionsSean Whitton2018-07-06
| | | | | | | | | | | | These got mixed up in a recent commit. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>