summaryrefslogtreecommitdiff
path: root/dgit
Commit message (Collapse)AuthorAge
* dgit: Move clean_tree_checkIan Jackson2018-10-13
| | | | | | Code motion. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Rorganise dpkg-source[-d] clean implementationIan Jackson2018-10-13
| | | | | | | | This will make it easier to introduce new variants. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Abolish obsolete variable $clean_using_builderIan Jackson2018-10-13
| | | | | | | | Nothing ever sets this to a trueish value. Abolish it. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Reorganise cleaning in build_prepIan Jackson2018-10-13
| | | | | | | | | | | | | | | 1. Replace the open-coded $includedirty with the equivalent building_source_in_playtree(), because the latter is what we actually care about here. 2. Reformat into if blocks. 3. Introuce and call clean_tree_check (currently a no-op). Now, writing clean_tree_check will be part of fixing #910705. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Honour new .clean-mode-newer access config optionIan Jackson2018-10-13
| | | | | | | This will allow us to extend the set of clean modes without causing irresolvable compatibility problems for users. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Put (?: ) around $cleanmode_re and use qr{}.Ian Jackson2018-10-13
| | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Drop (?!\n) from a use of $cleanmode_reIan Jackson2018-10-13
| | | | | | The config machinery now defends us from newlines. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Reject all git config options containing newlinesIan Jackson2018-10-13
| | | | | | | If we find something like this our regexp-based checking approaches are likely to fail and other strange may will go wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Refuse to work if critical files have uncommitted changesIan Jackson2018-10-11
| | | | | | Notably, d/source/format and options, and the forbidden files. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Factor out debian/source/.. in check_not_dirtyIan Jackson2018-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Break out @forbid in check_not_dirtyIan Jackson2018-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Change to git toplevel dir before startingIan Jackson2018-10-11
| | | | | Closes: #910724. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Handle EXDEV when putting in place output sourceIan Jackson2018-10-11
| | | | | | | | Replace a rename call with rename_link_xf, and change the subsequent error handling to use $@ iff appropriate. Closes: #910730. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Add missing error check in single-debian-patch handlingIan Jackson2018-10-11
| | | | | | | We called rename here without checking the error at all. Handle ENOENT in case dpkg-source makes no patch. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Handle EXDEV when saving origsIan Jackson2018-10-11
| | | | | | | | | Replace two link calls with rename_link_xf, and change the subsequent error handling to use $@ iff appropriate. Part of the fix to #910730. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Forbid source building with --include-dirty non-.. bpdIan Jackson2018-10-11
| | | | | | | | Right now, this does bizarre damage to .. Fixing this is very hard without bpd support in dpkg-source. Closes: #910725. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt linearisation: Stop at debian/source/format changesIan Jackson2018-10-11
| | | | | | | Traversing a change of source format will not end well. Discovered this possibility while investigating #910687. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Replace mention of alioth by salsaIan Jackson2018-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Fix spelling errors etc. in messagesIan Jackson2018-10-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Avoid crash if branch_is_gdr finds an origin commitIan Jackson2018-10-11
| | | | | | Closes: #910687. Reported-by: Mattia Rizzolo <mattia@debian.org> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Do not sometimes crash in quilt-fixup if git-debrebase missingIan Jackson2018-10-04
| | | | | | Closes:#910221. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark final batch of messages (11)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: Split another here doc for commit messages (nfc)Ian Jackson2018-10-01
| | | | | | This will make the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: fix import-dsc missing file referenceIan Jackson2018-10-01
| | | | | | | The message used to say ../ but actually nowadays we look in bpd and next to the .dsc. Change it to say .../. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (10)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Improve some error messages about changes filesIan Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Remove a spurious space (nfc)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Replace every `die $!;' with confessIan Jackson2018-10-01
| | | | | | | | | | This may improve error messages in case of internal errors etc., at the cost of producing stack traces when it's just that the user's disk is full. This is probably a good tradeoff. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (9)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: Reorganise quilt differences message generationIan Jackson2018-10-01
| | | | | | | No functional change. This will make the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (8)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Refactor and simplify `quilt fixup cannot be linear' generationIan Jackson2018-10-01
| | | | | | | | | | | Fold $reportnot into its one call site, and make the print a simple substitution rather than a complex concatenation. No functional change. This will make the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: Split more here docs for commit messages (nfc)Ian Jackson2018-10-01
| | | | | | This will make the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (7)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Improve some error messagesIan Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (6)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (5)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rearrange some strings to prep for translationIan Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (4)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: splitbrain_pseudomerge: Introduce $arch_v (nfcIan Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (3)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (2)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: dgit: mark some messages (1)Ian Jackson2018-10-01
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Rename ___ to f_Ian Jackson2018-09-29
| | | | | | | | I have decided that's a better name. Not _f because, unlike printf (where f is done first, and then print), here the _ is done first and then f. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Flag a handful of messages for translationIan Jackson2018-09-29
| | | | | | This is just useful for testing the forthcoming machinery, so far. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Source-level framework: call setlocale, provide __ and ___Ian Jackson2018-09-29
| | | | | | | This is the general plumbing for looking up translated messages - the consumer-side. No actual messages are flagged for translation yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Pass --no-source to sbuild (always)Ian Jackson2018-08-26
| | | | | | Closes: #904966. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build-*: Cope with new-style --build= specificationsIan Jackson2018-08-26
| | | | | | Previously, we would generally bomb out. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: build: Squash $buildproductsdirIan Jackson2018-08-26
| | | | | | | | | | Things malfunction, because some things end up in .. and some in bpd. Overriding this at least makes `dgit build' produce correct results, albeit in the wrong place. Closes: #906786. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: branch_is_gdr: Add a cautionary commentIan Jackson2018-08-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>