summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* test suite: i18n-messages: Test message translationIan Jackson2018-09-29
| | | | | | | We test just one of the messages I provided for en_US.UTF-8. That's probably sufficient. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* i18n: Call po/Makefile directly from debian/rulesIan Jackson2018-09-29
| | | | | | | | This makefile likes to dirty things quite a bit, since that's how gettext seems to like to work. In our call from debian/rules, we avoid that. 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>
* i18n: Copy po/Makefile and remove-potcdate.plfrom debconfIan Jackson2018-09-28
| | | | | | | | | | | | | These are from debconf.git a326240dd50487732d8546858994d48b45bf0b20. There doesn't seem to be a common library for this kind of thing. I'm going to take debconf as a good example and nick the code. Copyright: the debian/copyright file of debconf says it's BSD-2-clause. So add that, and copyright notices based on "git log" (which does seem comprehensive). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.13Ian Jackson2018-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 6.12debian/6.12archive/debian/6.12Ian Jackson2018-09-28
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.12Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Documentation changes and finalise 6.11debian/6.11archive/debian/6.11Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.11Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 6.10debian/6.10archive/debian/6.10Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Tidy up, preparatory to releaseIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Run gbp-dchIan Jackson2018-08-26
| | | | | | Needs tidying up. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit build --build=Ian Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: break out build-modes-sourceIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: dch: Always use tstunt/debchangeIan Jackson2018-08-26
| | | | | | | | | | | | | | We are going to make this more sophisticated, so use it everywhere to avoid duplication. We need to soup up tstunt/debchange so that it does not depend on DGIT_TEST_REAL_DEBCHANGE. If it hasn't been put on the PATH by t-tstunt, that isn't set, and we can just run debchange from PATH. This makes faketime a test dependency for all the tests which don't have NO-DEFAULT. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Prepare for calling debchangeIan Jackson2018-08-26
| | | | | | | * Add it to the .deb dependencies * Add tstunt/debchange to the gdr tests Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: test-list-uptodate: Drop imports and dependenciesIan Jackson2018-08-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-fresh: Drop use of git-deborig and fix dependenciesIan Jackson2018-08-26
| | | | | | | | | | | | | | | | | | | | b765388a4cea "test suite: Test dgit calling git-debrebase on new debianisation" failed to update the test dependencies, and does not work in a formal autopkgtest run because dgit is not installed. Additionally, Because scripts in devscripts have their own individual dependencies, and the dependencies for git-deborig differ between stretch and sid, It is not reasonably possible to write a dependency which allows git-deborig to work. This is another reason why this test does not work in a formal run (this time, failing only on sid/buster). So, drop use of git-deborig, and the resulting dependency on devscripts. (dgit and git-debrebase pull in devscripts anyway, so that is academic.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit calling git-debrebase on new debianisationIan Jackson2018-08-25
| | | | | | | | | | | | | | | Now all the cases in dgit's branch_is_gdr history walker are tested: DGIT_TEST_DEBUG=-DD tests/using-intree tests/run-all cat tests/tmp/*.log |perl -ne 'next unless s/^branch_is_gdr \w+ //; print' |sort -u |less Produces the same list as: git-grep 'branch_is_gdr ' | perl -pe 's/^^dgit:\s+//' |sort |less (With the list of gdr commit annotations the same as in the source.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit branch_is_gdr walker on a merge resolutionIan Jackson2018-08-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.10Ian Jackson2018-08-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: fianlise 6.9debian/6.9archive/debian/6.9Ian Jackson2018-08-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: Remove unsubstituted $changesfile from messageIan Jackson2018-08-21
| | | | | | Closes:#906787. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document docs changesIan Jackson2018-08-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Update debian/tests/control following dependency fix.Ian Jackson2018-08-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: do not crash on push of a new gdr package. Closes:#906784.Ian Jackson2018-08-21
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.9Ian Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Fix dependencies of new gdr-merge-conflicts test.debian/6.8archive/debian/6.8Ian Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 6.8Ian Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Finalise 6.7debian/6.7archive/debian/6.7Ian Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Reorganise and tidy up the current entryIan Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt fixup: Maybe mention gitattributesIan Jackson2018-08-20
| | | | | | | | These are a potential cause of quilt linearisation failure. Closes:#906199. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(1), dgit(7): Document that we do not suppress export attributesIan Jackson2018-08-20
| | | | | | Ie, ones which affect git-archive. This is related to #906199. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: quilt fixup: Do not suggest quilt modes if we see gdrIan Jackson2018-08-20
| | | | | | | If `stopped at' is a git-debrebase commit, then a non-default quilt mode is probably not the answer. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(7): Mention bad origs as possible cause of quilt fixup failureIan Jackson2018-08-20
| | | | | | And document our error message changes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-unprocessable-hints: New testIan Jackson2018-08-20
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Provide hints for unprocessable commitsIan Jackson2018-08-20
| | | | | | | | | | Depending on the apparent branch ffq state. Closes:#905005. In particular, if it doesn't look like this branch was ever used with gdr, suggest that the user is on the wrong branch, or needs to use convert-from-*. Closes:#905279. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-from-*: leave debrebase-last refsIan Jackson2018-08-19
| | | | | | | To hint to everyone that this is now a gdr branch. This will make dgit push use gdr make-patches, for example. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Snag on repeated conversionsIan Jackson2018-08-19
| | | | | | | | | If debrebase-last says we are ahead of some previous gdr work, it is carrying on is unlikely to be helpful. It would only be sensible if the package is vacillating between branch formats, and this is reflected and visible in the branch history. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Merges: Enable with command-line option instead of env varIan Jackson2018-08-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document changes to convert-from-gbp messages.Ian Jackson2018-08-19
| | | | | | This is part of #906641. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-import-nostitch: New testIan Jackson2018-08-19
| | | | | | | Generate this situation and check it's OK. Also check that the messages contain the expected hint. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Add close note for #905400 to changelog entry for 6.5.Ian Jackson2018-08-19
| | | | | | | | The commit git-debrebase: Properly reject bare dgit dsc imports. fixed #905400. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-from-*: Snag on unused patchesIan Jackson2018-08-19
| | | | | | | | | | | Patches in d/patches which are not in series will be deleted, and not represented in the output. So call them a snag. Closes:#904997. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: On rebase, always save ffq-prevIan Jackson2018-08-19
| | | | | | | | Even if we were both stitched and laundered. Closes:#905975. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: `prepush' is now a silent no-op if unstitched.Ian Jackson2018-08-19
| | | | | | This is more friendly. Update the docs accordingly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Add perf numbersIan Jackson2018-08-19
| | | | | | | | | | | | | This is from tests on my laptop with the branch the Debian kernel folks shared with me, ie c6eb63c6ed0694b0d22fbe5aaff953d209a3fc4e. avoid new runtimes in [s] before read-tree get_differs git-debrebase 78.574 3.699 1.419 git-debrebase status 3.359 unchanged 0.818 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Rewrite get_differs in terms of trees_diff_walkIan Jackson2018-08-19
| | | | | | | | | | | As noted, git-diff-tree is quite slow. We can do much better, by stepping across the two trees ourselves. There should be no particularly significant change: the answers should be the same for reasonable inputs. Unreasonable inputs (particularly, executable files etc.) may be handled better, even. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Actually avoid read-tree in walk when not rewritingIan Jackson2018-08-19
| | | | | | | | | | | | | | | | | | | | See git-debrebase: Prep for avoid read-tree in walk when not rewriting for the motivation. Here we try to check that the commit we would make, if we were actually calling read-tree, write-tree and hash-object, would be identical to the one we are reusing. In particular, we check that the upstream files, and the debian/ directory, have the contents we would feed to read-tree. And we check that the parent list is the same. With these checks this new algorithm is, I think, safe enough to just use always. So set $opt_careful to 0. We will abolish this variable in a moment. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: unset GIT_EDITOR, so it works if user has that set.Ian Jackson2018-08-19
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 18:15:21 +0000