summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* dgit: Remove foolish uses of $b in unpack_playtree_linkorigs etc.Ian Jackson2019-01-06
| | | | | | | Evidently I had forgotten that $b is weird in Perl and should not by used for things other than sorting. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: generate_commits_from_dsc: Move up $upstreamvIan Jackson2019-01-06
| | | | | | We will want this in a moment. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: generate_commits_from_dsc: Factor out $bpd_absIan Jackson2019-01-06
| | | | | | | | And add a newline. We will want this in a moment. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test --clean-git[-ff],alwaysIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Document new --clean=git behavioursIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean: Provide -wg[f]a short aliasesIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean: Provide new --git[-ff],always clean modeIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: cleaning: Improve handling of note about ignoresIan Jackson2019-01-06
| | | | | | | | | | | | | | * Provide a new $ignmessage parameter to clean_tree_check_git and use that. This makes it a bit easier to: * Only print the additional message if the clean mode actually honoured ignores. If it didn't then the problem is not `due to missing .gitignore entries' because they would not have helped. * Change all callers other than clean_tree_check_git_wd to pass the empty string, so no other overall functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean: Do check the tree even when building in playtreeIan Jackson2019-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we might be doing quilt fixup, then the quilt fixup's attempt to merge back into master might fail if there are uncommitted debian/patches. So it is sometimes wrong to just not clean at all. We don't want the behaviour to depend on the source package format, and ideally not on the clean mode. Also, the user may have forgotten to `git add', in which case they will thank us for spotting their mistake. In the original design table in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910705#56 says this for this case /: disregarded would be fine to delete but ** better to trip ? ** ** want opt to disregard ** but this was not implemented at the time. So implement that now. I think I have concluded that with -wg and -wgf the right way to turn these new failures into successes is to have a way to have the clean actually done. If that is not wanted, one can say -wn instead. This is particularly true given that ignoring the problem can produce confusing failure, as seen in #914317. So there will be a new --clean=git[-ff],always shortly. Closes: #914317 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: exmaplegit: Do not leave the tree dirtyIan Jackson2019-01-06
| | | | | | | | This test setup facility passed a dirty working tree to all of its consumers. That was not really intended or useful, and is about to start causing trouble. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean mode: Refactor -wg parsing to prep for suffixesIan Jackson2019-01-06
| | | | | | | | This will make it convenient to add new suffix letter(s) to -wg. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean: Prepare cleanmode_re for suffixes on git and git-ffIan Jackson2019-01-06
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clean: Change matcbing of git to regexpsIan Jackson2019-01-06
| | | | | | | | | We are going to have some ,... suffixes on this, so we need more general matching. No functional change with the current set of clean modes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Fix a formatting typoIan Jackson2019-01-06
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Allow uppercase (ascii) letters in multi-orig componentsIan Jackson2019-01-06
| | | | | | | | | | | | | | We didn't recognise files like firefox-esr_60.4.0esr.orig-l10n-sv-SE.tar.bz2 as orig files. As a result, dgit would see all the things in the corresponding subdirectory as having been added in Debian changes, leading it making inaccurate complaints and bombing out. See also #918438 against policy, where I (effectively) argue that this is a design error in the `3.0 (quilt)' format. Closes: #916926 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-repos-policy-debian: Remove duplicated text from force messageIan Jackson2019-01-06
| | | | | | | | | $ovwhy is from SELECT deliberately ... WHERE ... OR deliberately = ? where ? is a key in %deliberately which came from the command line where it already contains --deliberately=. Closes: #913676 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Check that the build-products-dir is accessibleIan Jackson2019-01-05
| | | | | | | | In fetch/clone, and build. Others are less likely to be an irritating problem. Closes: #913648. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: clone: Create destination directory before using networkIan Jackson2019-01-05
| | | | | | | | | We are going to want to check the bpd (apropos of #913648), which might be a relative path. We should fail quickly in this case. No significant functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): handle DFSG-filtering for a new packageSean Whitton2019-01-05
| | | | | Closes: #915973 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* dgit: Pass --no-source-only-changes to pbuilder and cowbuilderIan Jackson2019-01-05
| | | | | | | | | | | This will break with older versions of pbuilder and cowbuilder, unfortunately. That breakage can be worked around by passing dgit one or both of the new options: --pbuilder!:--no-source-only-changes --cowbuilder!:--no-source-only-changes Closes: #904862. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Provide --program!:optionIan Jackson2019-01-05
| | | | | | Apropos of #904862. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: pretend-pbuilder: Reject unknown optionsIan Jackson2019-01-05
| | | | | | The failure to do this was simply a bug. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Fix reference to -wdn/-wddn in a message.Ian Jackson2018-11-28
| | | | | | It's not -wdu/-wddu. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1): Fix documentation of .quilt-mode configIan Jackson2018-11-20
| | | | | | | | | In 0457c2d771ef6fe6c0883344add9dd4da0c60917 dgit: Honour new .clean-mode-newer access config option this was accidentally deleted. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po/README: Fix reference to dgit-user_7.potIan Jackson2018-11-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 8.2~Ian Jackson2018-11-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: fianlise 8.1debian/8.1archive/debian/8.1Ian Jackson2018-11-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): Minor corrections to #903377 wordingIan Jackson2018-11-08
| | | | | | | | | | | Do not suggest trying without --overwrite first, since if you were going to pass it anyway you may as well do so right away. And mention that git-debrebase will normally prompt you to say dgit --overwrite. Closes: #903377 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit-maint-debrebase(7): account for case discussed in #903377Sean Whitton2018-11-08
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* git-debrebase: Provide convert-from-unapplied aa alias for -gbpIan Jackson2018-11-08
| | | | | Closes: #905433. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Document scope of convert-from-gbpIan Jackson2018-11-08
| | | | | | | In fact this works with any kind of patches-unapplied (or patchless) package. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: usage message: Mention only convert-from-*Ian Jackson2018-11-08
| | | | | | | | There is convert-from-dgit-view which was not mentioned, and we're going to make another one in a moment. We don't want to list the whole lot here. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: pairwise-pocheck: Better handling for missing tclIan Jackson2018-11-08
| | | | | | Mention in the README, and add a specific error check. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* NOTES.podchecker: Document why I'm not using podcheckerIan Jackson2018-11-08
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: manpages-format: pass --warningsIan Jackson2018-11-08
| | | | | Suggested-by: Colin Watson <cjwatson@chiark.greenend.org.uk> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Run everything with LC_CTYPE=C.UTF-8Ian Jackson2018-11-08
| | | | | | | | | Things are not likely to work otherwise. (If someone wants to try to run dgit in another ctype then I think things will mostly work...) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: Add -LUTF-8 to the configIan Jackson2018-11-08
| | | | | | | Apparently this is not the default. Suggested-by: Colin Watson <cjwatson@chiark.greenend.org.uk> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: pairwise-pocheck: Force it to be run sometimesIan Jackson2018-11-08
| | | | | | | * when building a binary package * when preparing a translation preview Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: pairwise-pocheck: Provide make targets to invoke it explicitlyIan Jackson2018-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: Fix gitignore to actually ignore right .po4a.LANG.cfgIan Jackson2018-11-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po4a: New pairwise-pocheck scriptIan Jackson2018-11-07
| | | | | | | | This currently just detects if a translator has dropped the B or I or some such from POD constructs like B<...> and I<...>. Suggested-by: Colin Watson <cjwatson@chiark.greenend.org.uk> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 8.1~Ian Jackson2018-10-14
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 8.0debian/8.0archive/debian/8.0Ian Jackson2018-10-13
| | | | | | | The not-entirely-compatible change means a bump of major version I think. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2018-10-13
|
* po/README: Give a pointer to salsa; remind the translator to commitIan Jackson2018-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po/README: Mention -k10 thresholdIan Jackson2018-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* po/list-documents: Set translation threshold to 10%Ian Jackson2018-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* README.md: Add this document for the benefit of SalsaIan Jackson2018-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n-commit - autogeneratedIan Jackson2018-10-13
|
* Makefile: Provide i18n-commit targetIan Jackson2018-10-13
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>