chiark / gitweb /
Ian Jackson [Thu, 11 Oct 2018 00:18:52 +0000 (01:18 +0100)]
changedir_git_toplevel: Special error for not in git tree
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Oct 2018 00:15:36 +0000 (01:15 +0100)]
dgit: Change to git toplevel dir before starting
Closes: #910724.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Oct 2018 00:15:08 +0000 (01:15 +0100)]
Dgit.pm: Move changedir_git_toplevel from git-debrebase
NFC other than hardcoded qw(git).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Oct 2018 23:43:45 +0000 (00:43 +0100)]
Dgit.pm: rename_link_xf: Avoid copying if src is a link to dst
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Oct 2018 23:36:08 +0000 (00:36 +0100)]
Dgit.pm: rename_link_xf: Always use cp
If we use mv on a symlink, it moves the link, not the file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Oct 2018 23:35:52 +0000 (00:35 +0100)]
Dgit.pm: rename_link_xf: Minor style fix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Oct 2018 23:28:55 +0000 (00:28 +0100)]
dgit: Handle EXDEV when putting in place output source
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>
Ian Jackson [Wed, 10 Oct 2018 23:23:17 +0000 (00:23 +0100)]
dgit: Add missing error check in single-debian-patch handling
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>
Ian Jackson [Wed, 10 Oct 2018 23:19:41 +0000 (00:19 +0100)]
dgit: Handle EXDEV when saving origs
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>
Ian Jackson [Wed, 10 Oct 2018 23:18:45 +0000 (00:18 +0100)]
Dgit.pm: Provide rename_link_xf
This will be used for cross-filesystem support. No callers yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Oct 2018 12:40:46 +0000 (13:40 +0100)]
dgit: Forbid source building with --include-dirty non-.. bpd
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>
Ian Jackson [Wed, 10 Oct 2018 11:58:50 +0000 (12:58 +0100)]
dgit: quilt linearisation: Stop at debian/source/format changes
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>
Ian Jackson [Tue, 9 Oct 2018 23:50:04 +0000 (00:50 +0100)]
dgit: Replace mention of alioth by salsa
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 23:49:52 +0000 (00:49 +0100)]
dgit: Fix spelling errors etc. in messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 23:43:32 +0000 (00:43 +0100)]
dgit-sponsorship(7): Fix spelling error
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 23:36:18 +0000 (00:36 +0100)]
dgit(7): Fix spelling errors
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 23:30:33 +0000 (00:30 +0100)]
dgit(1): Fix spelling errors
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 22:46:25 +0000 (23:46 +0100)]
dgit: Avoid crash if branch_is_gdr finds an origin commit
Closes: #910687.
Reported-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Oct 2018 22:37:28 +0000 (23:37 +0100)]
Dgit.pm: git_cat_file: When passed undef, crash with \n at end
Interpolating $objname into this string means that the crash occors
before "GCFF>| " has been "printed" - but actually sits in a stdio
buffer, waiting to appear after the output from confess.
Reported-by: Mattia Rizzolo <mattia@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 19:37:17 +0000 (20:37 +0100)]
changelog: start 7.1~
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 19:34:00 +0000 (20:34 +0100)]
changelog: changes for 7.0, and finalise
Based on output from gbp-dch.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 11:36:24 +0000 (12:36 +0100)]
make i18n
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 10:43:19 +0000 (11:43 +0100)]
i18n: Provide `i18n-update' target in toplevel Makefile
With a convenience alias `i18n'.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 10:42:21 +0000 (11:42 +0100)]
i18n: po: Rename `all-po' target to `pofiles'
I think this is more conventional.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 10:39:41 +0000 (11:39 +0100)]
i18n: po4a: Fix reference to nonexistent translated-always target
This -always suffix was replaced with the use of .PHONY during
development (and the result squashed), but this one was missed.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 01:36:20 +0000 (02:36 +0100)]
git-debrebase: merges: Make warnings of lossage less overblown
In particular, everyone's gdr (if it's new enough) should cope with
the generated merged-breakwaters commits. And there are at least a
couple of tests now, so the risks of total craziness are lower.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:49:55 +0000 (01:49 +0100)]
test suite: gdr-makepatches7: Test dgit with missing git-debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:57:19 +0000 (01:57 +0100)]
dgit: Do not sometimes crash in quilt-fixup if git-debrebase missing
Closes:#910221.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:55:36 +0000 (01:55 +0100)]
test suite: gdr-makepatches7: Fix test for broken git-debrebase
dgit should treat git-debrebase not existing the same way as it
exiting 7 (which in fact, is the same way it treats it succeeding).
We are going to fix that. But first we need to make this test case
not expect dgit to break in this situation. To test dgit with an
actually *broken* git-debrebase, we specify `false' instead.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:24:15 +0000 (01:24 +0100)]
po4a: dummy test case git-debrebase_5.en_US.po: Abolish again
Though this was a useful test, and having this in the git history is
useful, these files are, now, a distraction.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:12:28 +0000 (01:12 +0100)]
po4a: dummy test case git-debrebase_5.en_US.po: Add a string
Change just one string for testing.
I have verified that when the resulting package is installed,
LC_MESSAGES=en_US.UTF-8 man 5 git-debrebase
produces a manpage saying `reorganized' where previously it said
`reorganised', as expected. Ie the translation machinery works.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:05:57 +0000 (01:05 +0100)]
po4a: dummy test case git-debrebase_5.en_US.po: Create
This is the result of following the instructions in po4a/README on how
to start a translation. For economy I have committed only this one
new .po file, even though po4a generated loads and normally a
translator would therefore send a PR with one file per document.
This is part of testing that the machinery works. It is not practical
to make this a proper test case, but I can at least leave records in
the git history of how to do things.
This change results in that one manpage actually being generated and
installed, although it is very similar to the untranslated one.
I have verified that unless the translated manpages line in
debian/git-debrebase.install is uncommented, the package build now
fails, which is reassuring, because it means that when we get a real
translation we can't forget to actually ship it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:14:19 +0000 (01:14 +0100)]
po4a: Makefile: Honour PO4A and use i18n-common.make
No functional change unless PO4A is in the environment.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 22:58:06 +0000 (23:58 +0100)]
i18n: po4a: debian/rules: Install translated documents
XXX I have tested this by creating a git-debrebase_5.en_US.po containing
one translation, forcing -k0 (in list-documents), uncommenting the two
.install file entries, installing the resulting package, and asking
for
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:05:02 +0000 (01:05 +0100)]
po4a: Run po4a to generate .pot files and commit the result
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:03:30 +0000 (01:03 +0100)]
i18n: po4a: Add a symlink to po/README
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 23:48:24 +0000 (00:48 +0100)]
i18n: po4a: Add a test that po4a.cfg is up to date
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 21:39:12 +0000 (22:39 +0100)]
i18n: po4a: Add the translated output to the global .gitignore
Since that is where it ends up (for path convenience reasons).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 23:57:20 +0000 (00:57 +0100)]
i18n: po4a: Run `make po4a.cfg' and commit the result
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 23:56:49 +0000 (00:56 +0100)]
i18n: po4a: Introduce machinery
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 23:56:01 +0000 (00:56 +0100)]
i18n: Update po/README to discuss document translation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 22:55:36 +0000 (23:55 +0100)]
i18n: po/Makefile: Remove some obsolete comment (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 22:55:16 +0000 (23:55 +0100)]
i18n: Break out i18n-common.make (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Oct 2018 23:23:09 +0000 (00:23 +0100)]
packaging: Use dh_missing --fail-missing
This will spot if `make install' or similar installs anything that we
forgot to put anywhere.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 00:44:32 +0000 (01:44 +0100)]
test suite: Test that the binary packages can be built
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 16:15:19 +0000 (17:15 +0100)]
i18n: git-debrebase: mark final batch of messages (5)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:59:04 +0000 (16:59 +0100)]
i18n: git-debrebase: mark some messages (4)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 16:09:21 +0000 (17:09 +0100)]
i18n: i18n-diff-auditor: Handle printf => print f_
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Oct 2018 01:01:23 +0000 (02:01 +0100)]
i18n, packaging: Add missing build-dependency on xgettext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:37:12 +0000 (16:37 +0100)]
i18n: git-debrebase: mark some messages (3)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:31:14 +0000 (16:31 +0100)]
git-debrebase: anchor: Print the anchor, not the breakwater tip (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:29:11 +0000 (16:29 +0100)]
i18n: git-debrebase: mark some messages (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:48:39 +0000 (16:48 +0100)]
i18n: i18n-diff-auditor: Handle comments
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 15:29:33 +0000 (16:29 +0100)]
git-debrebase: new-upstream: Drop `sleep 2' (!)
This is leftover debugging code.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 13:10:52 +0000 (14:10 +0100)]
git-debrebase: Refactor fail_unprocessable message construction
Clearer and easier to mark up for translation.
No functional change (verified by grepping the test logs).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:45:41 +0000 (13:45 +0100)]
i18n: git-debrebase: mark some messages (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:48:27 +0000 (13:48 +0100)]
git-debrebase: Replace `git-debrebase:' with `$us:' in bad usage msg
This is a different pattern as it is in a translated message, so we
change __ to f_.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:46:02 +0000 (13:46 +0100)]
git-debrebase: Replace several `git-debrebase:' with `$us:'
In ""-strings in as-yet-untranslated messages.
This is more proper and more generic and also slightly
shorter (although more complex).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:37:15 +0000 (13:37 +0100)]
git-debrebase: Improve two error messages
Print a proper message for failure to opendir the bpd and for failure
to chdir to the toplevel.
Doing this now makes the translation markup auditable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:34:36 +0000 (13:34 +0100)]
i18n: git-debrebase: Change a lot of die to confess
These are internal errors or unexpected syscall failures. Printing a
stack trace is reasonably helpful there.
(Also, some of them are in the experimental merge resolution code.)
Audited with i18n-diff-auditor; reviewed one questionable change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:31:16 +0000 (13:31 +0100)]
Dgit.pm: reflog_cache_lookup: Replace `confess' with `die' after exec
With `confess' after `exec', perl complains
Statement unlikely to be reached at /usr/share/perl5/Debian/Dgit.pm line 770.
(Maybe you meant system() when you said exec()?)
The error message's suggestion is not right here - what is wrong is
that confess is not really appropriate in the child in this way.
Replace it with die, using a better error string.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:23:01 +0000 (13:23 +0100)]
changelog: start 7.0~pre2~
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 12:20:41 +0000 (13:20 +0100)]
changelog: Finalise 7.0~pre1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 11:27:33 +0000 (12:27 +0100)]
changelog: Bump to 7.0~pre1, document changes, send to experimental
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Oct 2018 11:23:51 +0000 (12:23 +0100)]
i18n: make -C po clean all
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 15:08:55 +0000 (16:08 +0100)]
i18n: Update README to reflect current situation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:28:52 +0000 (15:28 +0100)]
i18n: Dgit.pm: mark final batch of messages (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:37:35 +0000 (15:37 +0100)]
Dgit.pm: parsecontrol: Improve error message for failed open
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:32:47 +0000 (15:32 +0100)]
Dgit.pm: Split here doc for reflog cache commit message (nfc)
This will make the translation markup auditable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:30:20 +0000 (15:30 +0100)]
Dgit.pm: Improve message for control file parse failure
Use fail rather than die.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:27:56 +0000 (15:27 +0100)]
Dgit.pm: Improve symlink failure message
Use fail rather than die, and print a newline. This is used sometimes
to link origs etc. Hopefully if this fails the user will know why.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:24:18 +0000 (15:24 +0100)]
Dgit.pm: Replace many die calls with confess
As a rule of thumb, anything where we would end up printing the line
number in Dgit.pm is wrong. Most of these are internal errors or
unexpected syscall failures.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:19:19 +0000 (15:19 +0100)]
i18n: Dgit.pm: mark some of messages (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 14:18:31 +0000 (15:18 +0100)]
Dgit.pm: Improve getcwd failure message
Don't print the pointless line number in Dgit.pm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:57:20 +0000 (14:57 +0100)]
i18n: dgit: mark final batch of messages (11)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:58:16 +0000 (14:58 +0100)]
i18n: dgit: Split another here doc for commit messages (nfc)
This will make the translation markup auditable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:55:06 +0000 (14:55 +0100)]
dgit: fix import-dsc missing file reference
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>
Ian Jackson [Mon, 1 Oct 2018 13:36:45 +0000 (14:36 +0100)]
i18n: dgit: mark some messages (10)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:38:39 +0000 (14:38 +0100)]
dgit: Improve some error messages about changes files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:32:29 +0000 (14:32 +0100)]
dgit: Remove a spurious space (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:11:03 +0000 (14:11 +0100)]
dgit: Replace every `die $!;' with confess
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>
Ian Jackson [Mon, 1 Oct 2018 13:04:19 +0000 (14:04 +0100)]
i18n: dgit: mark some messages (9)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 13:04:58 +0000 (14:04 +0100)]
i18n: dgit: Reorganise quilt differences message generation
No functional change.
This will make the translation markup auditable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:45:57 +0000 (13:45 +0100)]
i18n: dgit: mark some messages (8)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:51:05 +0000 (13:51 +0100)]
dgit: Refactor and simplify `quilt fixup cannot be linear' generation
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>
Ian Jackson [Mon, 1 Oct 2018 12:41:43 +0000 (13:41 +0100)]
i18n: dgit: Split more here docs for commit messages (nfc)
This will make the translation markup auditable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:29:08 +0000 (13:29 +0100)]
i18n: dgit: mark some messages (7)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:30:05 +0000 (13:30 +0100)]
dgit: Improve some error messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:26:23 +0000 (13:26 +0100)]
i18n: i18n-diff-auditor: add usage message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 12:25:48 +0000 (13:25 +0100)]
i18n: i18n-diff-auditor: add copyright notice
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 30 Sep 2018 01:38:42 +0000 (02:38 +0100)]
i18n: dgit: mark some messages (6)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 01:48:06 +0000 (02:48 +0100)]
i18n: dgit: mark some messages (5)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 01:11:21 +0000 (02:11 +0100)]
dgit: rearrange some strings to prep for translation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 00:14:42 +0000 (01:14 +0100)]
i18n: dgit: mark some messages (4)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 00:13:57 +0000 (01:13 +0100)]
dgit: splitbrain_pseudomerge: Introduce $arch_v (nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 29 Sep 2018 14:56:55 +0000 (15:56 +0100)]
i18n: dgit: mark some messages (3)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 29 Sep 2018 14:26:02 +0000 (15:26 +0100)]
i18n: dgit: mark some messages (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 29 Sep 2018 10:43:19 +0000 (11:43 +0100)]
i18n: dgit: mark some messages (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 02:22:52 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: fix a message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Oct 2018 02:22:40 +0000 (03:22 +0100)]
i18n: i18n-diff-auditor: support die -> fail
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>