diff options
66 files changed, 6784 insertions, 3628 deletions
@@ -22,5 +22,6 @@ dgit-downstream-dsc.7 git-debrebase.1 git-debrebase.5 git-debpush.1 +tag2upload.5 substituted .po4a.translated-only diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 829725c..2c76263 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -55,7 +55,8 @@ BEGIN { must_getcwd executable_on_path waitstatusmsg failedcmd_waitstatus failedcmd_report_cmd failedcmd - runcmd shell_cmd cmdoutput cmdoutput_errok + runcmd runcmd_quieten + shell_cmd cmdoutput cmdoutput_errok @git git_rev_parse changedir_git_toplevel git_cat_file git_get_ref git_get_symref git_for_each_ref @@ -66,6 +67,7 @@ BEGIN { read_tree_debian read_tree_upstream make_commit hash_commit hash_commit_text reflog_cache_insert reflog_cache_lookup + $failmsg_prefix $package_re $component_re $suite_re $deliberately_re $distro_re $versiontag_re $series_filename_re $orig_f_comp_re $orig_f_sig_re @@ -82,6 +84,7 @@ BEGIN { $negate_harmful_gitattrs changedir git_slurp_config_src gdr_ffq_prev_branchinfo + tainted_objects_message parsecontrolfh parsecontrol parsechangelog getfield parsechangelog_loop playtree_setup playtree_write_gbp_conf); @@ -131,6 +134,12 @@ sub NOFFCHECK () { return 0x2; } sub FRESHREPO () { return 0x4; } sub NOCOMMITCHECK () { return 0x8; } +# Set this variable (locally) at the top of an `eval { }` when +# - general code within the eval might call fail +# - these errors are nonfatal and maybe not even errors +# This replaces `dgit: error: ` at the start of the message. +our $failmsg_prefix; + our $debugprefix; our $debuglevel = 0; @@ -150,6 +159,17 @@ sub forkcheck_mainprocess () { } sub setup_sigwarn () { + # $SIG{__WARN__} affects `warn` but not `-w` (`use warnings`). + # Ideally we would fatalise all warnings. However: + # 1. warnings(3perl) has a long discussion of why this is + # a bad idea due to bugs in, well, everything. + # 2. So maybe we would want to do that only when running the tests, + # 3. However, because it's a lexical keyword it's difficult to + # manipulate at runtime. We could use the caller's ^H + # via caller, but that would take effect only in the main + # program (which calls setup_sigwarn, eg dgit.git/dgit), + # and not in the modules. + # This is all swimming too much upstream. forkcheck_setup(); $SIG{__WARN__} = sub { confess $_[0] if forkcheck_mainprocess; @@ -295,11 +315,21 @@ sub _us () { } sub failmsg { - my $s = f_ "error: %s\n", "@_"; + my $s = "@_"; $s =~ s/\n\n$/\n/g; - my $prefix = _us().": "; + my $prefix; + my $prefixnl; + if (defined $failmsg_prefix) { + $prefixnl = ''; + $prefix = $failmsg_prefix; + $s .= "\n"; + } else { + $prefixnl = "\n"; + $s = f_ "error: %s\n", "$s"; + $prefix = _us().": "; + } $s =~ s/^/$prefix/gm; - return "\n".$s; + return $prefixnl.$s; } sub fail { @@ -396,6 +426,20 @@ sub shell_cmd { return qw(sh -ec), $first_shell.'; exec "$@"', 'x', @cmd; } +# Runs the command in @_, but capturing its stdout and stderr. +# Prints those to our stderr only if the command fails. +sub runcmd_quieten { + debugcmd "+",@_; + $!=0; $?=-1; + my @real_cmd = shell_cmd <<'END', @_; + set +e; output=$("$@" 2>&1); rc=$?; set -e + if [ $rc = 0 ]; then exit 0; fi + printf >&2 "%s\n" "$output" + exit $rc +END + failedcmd @_ if system @real_cmd; +} + sub cmdoutput_errok { confess Dumper(\@_)." ?" if grep { !defined } @_; local $printdebug_when_debuglevel = $debugcmd_when_debuglevel; @@ -951,6 +995,55 @@ sub reflog_cache_lookup ($$) { return undef; } +sub tainted_objects_message ($$$) { + my ($ti, $override_status, $hinted_dedup) = @_; + # $override_status: + # undef, not overriddeable + # '', not overridden + # $deliberately, overridden + + my $msg = ''; + + my $timeshow = defined $ti->{time} + ? strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time}) + : ""; + + my $infoshow = length $timeshow && length $ti->{package} ? + f_ "Taint recorded at time %s for package %s", $timeshow, $ti->{package}, + : length $timeshow && !length $ti->{package} ? + f_ "Taint recorded at time %s for any package", $timeshow, + : !length $timeshow && length $ti->{package} ? + f_ "Taint recorded for package %s", $ti->{package}, + : !length $timeshow && !length $ti->{package} ? + __ "Taint recorded for any package" + : confess; + + $msg .= <<END; + +History contains tainted $ti->{gitobjtype} $ti->{gitobjid} +$infoshow +Reason: $ti->{comment} +END + + $msg .= + !defined $override_status ? __ <<END +Uncorrectable error. If confused, consult administrator. +END + : !length $override_status ? __ <<END +Could perhaps be forced using --deliberately. Consult documentation. +END + : f_ <<END, $override_status; +Forcing due to %s +END + + my $hint = $ti->{hint}; + if (defined $hint and !$hinted_dedup->{$hint}++) { + $msg .= $hint; + } + + return $msg; +} + # ========== playground handling ========== # terminology: @@ -34,7 +34,7 @@ infraexamplesdir=$(prefix)/share/doc/dgit-infrastructure/examples txtdocdir=$(prefix)/share/doc/dgit absurddir=$(prefix)/share/dgit/absurd -PROGRAMS=dgit dgit-badcommit-fixup git-playtree-setup +PROGRAMS=dgit git-playtree-setup MAN1PAGES=dgit.1 MAN7PAGES=dgit.7 \ @@ -64,6 +64,7 @@ GDR_MAN5PAGES=git-debrebase.5 GDP_PROGRAMS=git-debpush GDP_MAN1PAGES=git-debpush.1 +GDP_MAN5PAGES=tag2upload.5 INFRA_PROGRAMS=dgit-repos-server dgit-ssh-dispatch dgit-mirror-ssh-wrap \ dgit-repos-policy-debian dgit-repos-admin-debian \ @@ -76,7 +77,7 @@ INFRA_PERLMODULES= \ MANPAGES=$(MAN1PAGES) $(MAN5PAGES) $(MAN7PAGES) \ $(GDR_MAN1PAGES) $(GDR_MAN5PAGES) \ - $(GDP_MAN1PAGES) + $(GDP_MAN1PAGES) $(GDP_MAN5PAGES) all: $(MANPAGES) $(addprefix substituted/,$(PROGRAMS)) @@ -107,6 +108,7 @@ installdirs: install-gdp: installdirs-gdp $(INSTALL_PROGRAM) $(GDP_PROGRAMS) $(DESTDIR)$(bindir) $(INSTALL_DATA) $(GDP_MAN1PAGES) $(DESTDIR)$(man1dir) + $(INSTALL_DATA) $(GDP_MAN5PAGES) $(DESTDIR)$(man5dir) install-gdr: installdirs-gdr $(INSTALL_PROGRAM) $(GDR_PROGRAMS) $(DESTDIR)$(bindir) @@ -126,7 +128,8 @@ install-infra: installdirs-infra done installdirs-gdp: - $(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) + $(INSTALL_DIR) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) installdirs-gdr: $(INSTALL_DIR) $(DESTDIR)$(bindir) \ @@ -172,5 +175,10 @@ git-debpush.1: git-debpush.1.pod --name git-debpush \ $^ $@ +tag2upload.5: tag2upload.5.pod + pod2man --section=5 --date="Debian Project" --center="tag2upload" \ + --name tag2upload \ + $^ $@ + %.view: % man -l $* diff --git a/debian/changelog b/debian/changelog index 8c2841f..925cd6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,236 @@ -dgit (10.1~) unstable; urgency=medium +dgit (11.8) unstable; urgency=medium + + * Fix installation of tag2upload(5). + + -- Sean Whitton <spwhitton@spwhitton.name> Sun, 14 Apr 2024 20:34:49 +0800 + +dgit (11.7) unstable; urgency=medium + + [ Ian Jackson ] + * dgit: Introduce --trust-changelog, as the new name for --overwrite, + and recommend it everywhere. As requested in #1050713; + may help with #913451 #990667 (requests for better docs). + * dgit: New --collab-non-dgit option. Closes: #1050713. + [Apropos informal reports from several people] + * dgit diff generation: Avoid breaking if user has ui.color=always. + Closes: #1067222. [Report from Rafael Laboissière] + * tag2upload(5): New manpage documenting the tag2upload protocol. + Closes: #1068231. + + [ Sean Whitton ] + * Add myself to Uploaders. + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 13 Apr 2024 21:14:43 +0800 + +dgit (11.6) unstable; urgency=medium + + Improved behaviour: + * dgit: Delete the playground on success, by default. + [Report from gregor herrmann] Closes: #1056103. + + Documentation: + * dgit(7): Don't falsely assert that *.dgit.d.o is usually `origin`. + * dgit-user(7): Deprioritise information about jessie. + + Tests: + * autopkgtests: Install locales-all for i18n-messages test. + * Stunt httpd: don't respond to HEAD with 404+body. Closes: #1063341. + * autopkgtests: Reduce primary log size when running under autopkgtest: + Save the stderr/stdout to a file which appears (compressed) in + the artifacts, and is only printed if the test fails. + * Add comment about benchmarking of the gzip -1 flag on artifacts. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Fri, 09 Feb 2024 12:05:39 +0000 + +dgit (11.5) unstable; urgency=medium + + * dgit: Fix harmless but annoying warning about rebinding $date. + [Report from Étienne Mollier] Closes: #1055528. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Fri, 10 Nov 2023 13:12:42 +0000 + +dgit (11.4) unstable; urgency=medium + + dgit dsc import fixes: + * Do not fail when source package has broken changelog for -1 upload. + Closes: #1054630. See also #1051961. [Report from Peter Green] + * Pass through the changelog timezone to the generated commit metadata. + + Documentation: + * dgit-sponsorship(7): Mention git-deborig(1) alongside git-archive(1) + [Sean Whitton]. + + Test suite: + * Fix i18n-messages test to explictly demand "locales", and set locale. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 30 Oct 2023 02:21:52 +0000 + +dgit (11.3) unstable; urgency=medium + + * Prevent pushing older versions than is in the archive. + Closes: #1050711. [Reports from Helmut Grohne and Phil Hands] + * Detect tar-ignore in d/s/options and bail early if appropriate. + Closes: #1050709. [Report from Helmut Grohne] + * dgit(1): --overwrite: Add cross reference to --split-view. + Apropos ##1050713. [Report from Helmut Grohne] + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 03 Sep 2023 00:43:36 +0100 + +dgit (11.2) unstable; urgency=high + + * Use the old /updates security map only for buster. Fixes fetching from + suites ,-security after buster. [Matthew Vernon] Closes: #1050179. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Tue, 22 Aug 2023 19:25:55 +0100 + +dgit (11.1) unstable; urgency=medium + + * dgit(1): Adjust tbl formatting to avoid warning. + [Report and suggestions from Branden Robinson] Closes: #1041317. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 20 Jul 2023 00:32:36 +0100 + +dgit (11.0) unstable; urgency=medium + + Bugfix with compatibility implications: + * Pass --no-source-only-changes to sbuild (when building binaries). + Fixes operation with SOURCE_ONLY_CHANGES locally overridden. + (Incompatible with sbuild <0.78; to work around, say + dgit --sbuild!:--no-source-only-changes.). + [Report from Sean Whitton] Closes: #904969. + + Documentation: + * dgit-maint-{merge,rebase}(7): Cross-reference to gitrevisions(7). + [Sean Whitton, Ian Jackson] Closes: #959760. + + Removal: + * Abolish dgit-badcommit-fixup (the remedial script for #849041). + If ancient repositories are found which need fixing, install + dgit.deb 10.7 or earlier (eg from Debian bookworm and earlier). + + Testing; + * Tests: work around git changes in 2.40 relating to commit verification. + Skipping tests involving now-uncreatable objects. Closes: #1033503. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 15 Jun 2023 00:53:22 +0100 + +dgit (10.7) unstable; urgency=medium + + * dgit(1), dgit-maint-merge(7): Copy-edit changes since dgit 9.16. + * dgit, dgit-maint-merge(7): Merge suggested README.source text into + --quilt=single's generated patch header. + We now have to say "a workflow similar to ... dgit-maint-merge(7)" but + this is worth it for the simplification to the workflow. + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 22 Feb 2023 15:13:06 -0700 + +dgit (10.6) unstable; urgency=medium + + Bugfix for handling some source packages: + * dgit: dsc import: Launder the series file before feeding it to gbp, + (in absurd git-apply mode) in case it contains strange things. + Closes: #1030093. [Report from Peter Green] + + Minor improvements to git-debrebase: + * git-debrebase(1): Add imprecation to call conclude or prepush, at top + * git-debrebase(1): Remove launder-v0 from documentation + * git-debrebase status: Print upstream commitid + + Supporting chnages: + * dgit: Fix confusing appending of gbp-pq-output in innards. + (Conceivably this might fix wrong messages in very unusual situations.) + * dgit: Fix a call to die to be confess, if an unexpected copy fails. + * tests: Bail on seeing "internal-only" commits, which should be invisible. + * tests: Test laundering of a deranged series file (with a form feed). + * dgit-ssh-dispatch: Apply perllib_local to policy hook, fixing a test + suite bug where the wrong Dgit.pm might be used. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sat, 04 Feb 2023 16:56:30 +0000 + +dgit (10.5) unstable; urgency=medium + + * [INTL:nl] Dutch translation for the dgit package. + [Frans Spiesschaert] Closes:#1029682. + * dgit: Add TODO about inappropriate translation of Subject + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 26 Jan 2023 14:41:05 +0000 + +dgit (10.4) unstable; urgency=medium + + * Tainted object handling: Require policy-client-query to be supported + when talking to the Debian server, so this check is now properly + implemented rather than best-effort. Closes: #944855, #1027186. + [Completes work prompted by report from Felipe Sateler.] + * git-debrebase(1): Be less scary about --experimental-merge-resolution. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 29 Dec 2022 11:51:50 +0000 + +dgit (10.3) unstable; urgency=medium + + dgit useability improvements: + * Silently tolerate mentions of debian/ in debian/source/include-binaries. + Closes:#1026918. [Report from Simon McVittie] + * Scan for duplicated orig tarballs with different names, + avoiding strange dpkg-source errors mentioning format 2.0. + Closes:#993769. [Report from Philip Hands] + * Rename auto quilt mode to try-linear (retaining compat alias), + to clarify that it won't automatically detect branch format. + Closes:#935762. [Report from David Bremner] + * dgit(1): Clarify the non-split-brain --quilt options, explicitly + stating that they expect a patched-applied (dgit view) branch. + + Tainted object handling (relevant to Debian NEW): + * dgit can now usually discover when --deliberately-* will be needed, + before making signatures and attempting the actual push. + Thus, missing a --deliberately no longer burns a version number. + * This is #944855. However, it depends new infrastructure, + which is (in this version) only queried on a best-effort basis: + * New protocol transaction (over ssh) with dgit repos server, + to allow client to make a policy enquiry, and specifically to + enquire about tainted objects. + * More of the relevant error messages are now translatable via gettext. + + Supporting changes: + * Modest refactoring to support the new functionality. + * Tests for new functionality, and improved tests in changed areas. + * tests: sbuild-gitish: Pass -v to sbuild for better debuggability. + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 29 Dec 2022 00:51:29 +0000 + +dgit (10.2) unstable; urgency=medium + + Command line change - dgit rpush vs rpush-source vs rpush-built: + * Introduce "dgit rpush-source", a new feature. + Closes:#974012. [Request from Wookey] + * Introduce "dgit rpush-built", meaning what "dgit rpush" does now. + * Make "dgit rpush" a configurable alias, which by default warns about + future incompatibility and then runs "dgit rpush-built". + (This was done for "dgit push" in dgit 10.0.) + + Bugfixes to dgit: + * Be more conservative about when to run "git-debrebase make-patches". + Closes:#1025451. [Report from Sean Whitton] + * Cope with packages using "3.0 (quilt)" "include-binaries" feature. + Closes:#1024233. [Report from Peter Green] + * Cope with certain packages where dpkg-source guesses wrong about + patch application status. (Perms-only patches may be implicated?) + Closes:#1025694. [Report from Matthew Vernon] + + Minor improvements: + * dgit(1): Promote push-source even more, rather than push-built. + * git-debrebase --noop-ok: support --no-noop-ok. + * Fix a typo "build" for "build" in the changelog entry for 10.1. + + Debugging fixes and internal changes: + * dgit: Fix a direct use of chdir, should be changedir + * git-debrebase --noop-ok: use default destination + + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 12 Dec 2022 01:15:55 +0000 + +dgit (10.1) unstable; urgency=medium Bugfixes to dgit: - * dgit push-build: Populate the split brain cache if necessary + * dgit push-built: Populate the split brain cache if necessary Closes:#1019454. [Report from Simon McVittie] Bugfixes to git-debrebase [reports from David Bremner]: @@ -29,7 +258,7 @@ dgit (10.1~) unstable; urgency=medium * changelog: Fix misindented line in entry for 9.11. * changelog: Retrospectively xref to #950612 in entry for 9.11. - -- + -- Ian Jackson <ijackson@chiark.greenend.org.uk> Fri, 11 Nov 2022 23:53:28 +0000 dgit (10.0) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4a0f611..f811a09 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: dgit Section: devel Priority: optional Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk> +Uploaders: Sean Whitton <spwhitton@spwhitton.name> Standards-Version: 4.4.0.0 Build-Depends: debhelper (>= 9), gettext, po4a, tcl Testsuite: autopkgtest @@ -60,7 +61,7 @@ Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin, libjson-perl, libdigest-sha-perl, libdbd-sqlite3-perl, sqlite3, libdpkg-perl, liblocale-gettext-perl -Recommends: dgit +Recommends: dgit (>= 11.7~) Architecture: all Description: dgit server backend infrastructure This package contains tools which are useful for setting up a dgit diff --git a/debian/dgit.lintian-overrides b/debian/dgit.lintian-overrides index 2f7a968..b6287d2 100644 --- a/debian/dgit.lintian-overrides +++ b/debian/dgit.lintian-overrides @@ -1,2 +1 @@ manpage-has-errors-from-man usr/share/man/man1/dgit.1.gz file '<standard input>', around line 51: -binary-without-manpage usr/bin/dgit-badcommit-fixup diff --git a/debian/tests/control b/debian/tests/control index 0bd86ae..ac21d77 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -36,6 +36,10 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgitv Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, git-debrebase, git-buildpackage +Tests: gdr-newupstream gdr-viagit +Tests-Directory: tests/tests +Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage + Tests: gitattributes Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, bsdgames, man-db, git-man @@ -45,9 +49,13 @@ Tests-Directory: tests/tests Depends: gnupg, patch, diffutils Restrictions: hint-testsuite-triggers -Tests: gdr-newupstream gdr-viagit i18n-messages +Tests: i18n-messages Tests-Directory: tests/tests -Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage +Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage, locales-all + +Tests: import-linkorigs +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, xz-utils Tests: manpages-format Tests-Directory: tests/tests @@ -96,7 +104,7 @@ Tests: trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl, dput-ng -Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable unrepresentable-single-dpkg unrepresentable-single-git version-opt +Tests: absurd-gitapply build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-pushold import-r1clog import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-colour quilt-gbp quilt-gbp-build-modes quilt-include-binaries quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt rpush-source sourceonlypolicy tag-updates unrepresentable unrepresentable-single-dpkg unrepresentable-single-git version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl @@ -60,6 +60,7 @@ $SIG{INT} = 'DEFAULT'; # work around #932841 our @rpushprotovsn_support = qw(6 5 4); # Reverse order! our $protovsn; +our $rpush_verb; # "push" or "push-source" our $cmd; our $subcommand; @@ -82,13 +83,14 @@ our $existing_package = 'dpkg'; our $cleanmode; our $changes_since_version; our $rmchanges; +our $keep_playground; our $overwrite_version; # undef: not specified; '': check changelog our $quilt_mode; our $quilt_upstream_commitish; our $quilt_upstream_commitish_used; our $quilt_upstream_commitish_message; our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?'; -our $quilt_modes_re = "linear|smash|auto|single|nofix|nocheck|unapplied|$quilt_options_re"; +our $quilt_modes_re = "linear|smash|try-linear|auto|single|nofix|nocheck|unapplied|$quilt_options_re"; our $splitview_mode; our $splitview_modes_re = qr{auto|always|never}; our $dodep14tag; @@ -102,8 +104,9 @@ our $chase_dsc_distro=1; our %forceopts = map { $_=>0 } qw(unrepresentable unsupported-source-format dsc-changes-mismatch changes-origs-exactly - uploading-binaries uploading-source-only + uploading-binaries uploading-old-version uploading-source-only reusing-version + push-tainted import-gitapply-absurd import-gitapply-no-absurd import-dsc-with-dgit-field); @@ -127,7 +130,7 @@ our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L)); our (@dput) = qw(dput); our (@debsign) = qw(debsign); our (@gpg) = qw(gpg); -our (@sbuild) = (qw(sbuild --no-source)); +our (@sbuild) = (qw(sbuild --no-source --no-source-only-changes)); our (@ssh) = 'ssh'; our (@dgit) = qw(dgit); our (@git_debrebase) = qw(git-debrebase); @@ -292,12 +295,15 @@ sub no_such_package () { sub deliberately ($) { my ($enquiry) = @_; - return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies; + return !!grep { + $_ eq "--deliberately-$enquiry" or + $_ eq "--deliberately-TEST-dgit-only-$enquiry" + } @deliberatelies; } sub deliberately_not_fast_forward () { foreach (qw(not-fast-forward fresh-repo)) { - return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_"); + return 1 if deliberately($_); } } @@ -443,9 +449,13 @@ sub branch_is_gdr ($) { !defined git_cat_file "$walk~:debian" and !quiltify_trees_differ "$walk~", $walk ) { - # (gdr classification of parent: BreakwaterStart - printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n"; - return 1; + # (gdr classification of parent: BreakwaterStart We cannot + # process this using git-debrebase, because this can misrecognise + # other kinds of branch contents, eg as in #1025451. Not doing + # this via gdr is OK, because the normal quilt linearisation will + # do - doing it via gdr is just an optimisation. + printdebug "branch_is_gdr $walk unmarked BreakwaterStart NO\n"; + return 0; } # (gdr classification: Upstream Packaging Mixed Changelog) printdebug "branch_is_gdr $walk plain\n" @@ -457,8 +467,12 @@ sub branch_is_gdr ($) { #---------- remote protocol support, common ---------- # remote push initiator/responder protocol: -# $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>... +# $ dgit remote-push-source-build-host <n-rargs> <rargs>... <push-args>... # where <rargs> is <push-host-dir> <supported-proto-vsn>,... ... +# < dgit-remote-push-source-ready <actual-proto-vsn> +# +# Or for push-built, +# $ dgit remote-push-build-host <n-rargs> <rargs>... <push-args>... # < dgit-remote-push-ready <actual-proto-vsn> # # occasionally: @@ -492,6 +506,7 @@ sub branch_is_gdr ($) { # # > param buildinfo-filename P_V_X.buildinfo # zero or more times # > file buildinfo # for buildinfos to sign +# # not for push-source # # > previously REFNAME=OBJNAME # if --deliberately-not-fast-forward # # goes into tag, for replay prevention @@ -739,6 +754,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit.default.sshpsql-dbname' => 'service=projectb', 'dgit.default.aptget-components' => 'main', 'dgit.default.source-only-uploads' => 'ok', + 'dgit.default.policy-query-supported-ssh' => 'unknown', 'dgit.dsc-url-proto-ok.http' => 'true', 'dgit.dsc-url-proto-ok.https' => 'true', 'dgit.dsc-url-proto-ok.git' => 'true', @@ -755,6 +771,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.git-check-suffix' => '/info/refs', 'dgit-distro.debian.new-private-pushers' => 't', 'dgit-distro.debian.source-only-uploads' => 'not-wholly-new', + 'dgit-distro.debian.policy-query-supported-ssh' => 'true', 'dgit-distro.debian/push.git-url' => '', 'dgit-distro.debian/push.git-host' => 'push.dgit.debian.org', 'dgit-distro.debian/push.git-user-force' => 'dgit', @@ -778,8 +795,8 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/', 'dgit-distro.debian-security.archive-query' => 'aptget:', 'dgit-distro.debian-security.mirror' => 'http://security.debian.org/debian-security/', - 'dgit-distro.debian-security.aptget-suite-map' => 's#-security$#/updates#', - 'dgit-distro.debian-security.aptget-suite-rmap' => 's#$#-security#', + 'dgit-distro.debian-security.aptget-suite-map' => 's#buster-security$#buster/updates#', + 'dgit-distro.debian-security.aptget-suite-rmap' => 's#buster$#buster-security#', 'dgit-distro.debian-security.nominal-distro' => 'debian', 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*', 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/', @@ -1876,6 +1893,13 @@ sub git_add_write_tree () { return git_write_tree(); } +sub git_diff_programmatic (@) { + # Ideally we would unset various git.diff config options here, + # but there doesn't seem to be a way to *unset* + # something on the command line + (@git, qw(-c color.ui=never diff --no-ext-diff), @_) +} + sub remove_stray_gits ($) { my ($what) = @_; my @gitscmd = qw(find -name .git -prune -print0); @@ -1906,7 +1930,7 @@ sub mktree_in_ud_from_only_subdir ($;$) { remove_stray_gits($what); mktree_in_ud_here(); if (!$raw) { - my ($format, $fopts) = get_source_format(); + my $format = get_source_format(); if (madformat($format)) { rmtree '.pc'; } @@ -2046,10 +2070,12 @@ sub test_source_only_changes ($) { foreach my $l (split /\n/, getfield $changes, 'Files') { $l =~ m/\S+$/ or next; # \.tar\.[a-z0-9]+ covers orig.tar and the tarballs in native packages - unless ($& =~ m/(?:\.dsc|\.diff\.gz|$tarball_f_ext_re|_source\.buildinfo)$/) { - print f_ "purportedly source-only changes polluted by %s\n", $&; - return 0; - } + $_ = $&; + next if m/(?:\.dsc|\.diff\.gz|$tarball_f_ext_re)$/; + next if m/_source\.buildinfo$/; + print STDERR + f_ "purportedly source-only changes polluted by %s\n", $&; + return 0; } return 1; } @@ -2164,8 +2190,11 @@ sub clogp_authline ($) { # are by now preceded by @ (or "). It seems safer to punt on # "..." for now rather than attempting to dequote or something. $author =~ s#,.*##ms unless $author =~ m/"/; - my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date'); - my $authline = "$author $date"; + my $date = getfield($clogp,'Date'); + # try to pass through the changelog entry's timezone offset + my $tz = $date =~ m{ ([-+]\d{4})$} ? $1 : " +0000"; + $date = cmdoutput qw(date), '+%s', qw(-d), $date; + my $authline = "$author $date $tz"; $authline =~ m/$git_authline_re/o or fail f_ "unexpected commit author line format \`%s'". " (was generated from changelog Maintainer field)", @@ -2251,11 +2280,50 @@ sub dotdot_bpd_transfer_origs ($$$) { # checks is_orig_file_of_vsn and if # calls $wanted->{$leaf} and expects boolish + my $dotdot = $maindir; + $dotdot =~ s{/[^/]+$}{}; + + my %dupes; + my $dupe_scan = sub { + my ($dir, $why_token) = @_; + + if (!opendir SD, $dir) { + return if $! == ENOENT; + fail "opendir $why_token ($dir): $!"; + } + while ($!=0, defined(my $leaf = readdir SD)) { + next unless is_orig_file_of_vsn $leaf, $upstreamversion; + next if $leaf =~ m{$orig_f_sig_re$}; + next unless $leaf =~ m{\.tar(?:\.\w+)?$}; + my $base = "$`.tar"; + push @{ $dupes{$base}{$leaf} }, [$why_token, $dir]; + } + die "$dir; $!" if $!; + }; + $dupe_scan->($dotdot, ".."); + $dupe_scan->(bpd_abs(), 'build-products-dir') if $buildproductsdir ne '..'; + + my $dupes_found = 0; + foreach my $base (sort keys %dupes) { + my $leaves = $dupes{$base}; + next if keys(%$leaves) == 1; + $dupes_found = 1; + print STDERR f_ + "%s: multiple representations of similar orig %s:\n", + $us, $base; + foreach my $leaf (keys %$leaves) { + foreach my $found (@{ $leaves->{$leaf} }) { + print STDERR f_ " %s: in %s (%s)\n", + $leaf, @$found; + } + } + } + fail __ "Duplicate/inconsistent orig tarballs. Delete the spurious ones." + if $dupes_found; + return if $buildproductsdir eq '..'; my $warned; - my $dotdot = $maindir; - $dotdot =~ s{/[^/]+$}{}; opendir DD, $dotdot or fail "opendir .. ($dotdot): $!"; while ($!=0, defined(my $leaf = readdir DD)) { { @@ -2306,6 +2374,55 @@ sub dotdot_bpd_transfer_origs ($$$) { closedir DD; } +sub import_r1authline ($$) { + my ($clogp_r, $upstreamv) = @_; + my $r1clogp; + + my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all); + + printdebug "import clog search...\n"; + parsechangelog_loop \@clogcmd, (__ "package changelog"), sub { + my ($thisstanza, $desc) = @_; + no warnings qw(exiting); + + $$clogp_r //= $thisstanza; + + printdebug "import clog $thisstanza->{version} $desc...\n"; + + # We look for the first (most recent) changelog entry whose + # version number is lower than the upstream version of this + # package. Then the last (least recent) previous changelog + # entry is treated as the one which introduced this upstream + # version and used for the synthetic commits for the upstream + # tarballs. + + # One might think that a more sophisticated algorithm would be + # necessary. But: we do not want to scan the whole changelog + # file. Stopping when we see an earlier version, which + # necessarily then is an earlier upstream version, is the only + # realistic way to do that. Then, either the earliest + # changelog entry we have seen so far is indeed the earliest + # upload of this upstream version; or there are only changelog + # entries relating to later upstream versions (which is not + # possible unless the changelog and .dsc disagree about the + # version). Then it remains to choose between the physically + # last entry in the file, and the one with the lowest version + # number. If these are not the same, we guess that the + # versions were created in a non-monotonic order rather than + # that the changelog entries have been misordered. + + printdebug "import clog $thisstanza->{version} vs $upstreamv...\n"; + + last if version_compare($thisstanza->{version}, $upstreamv) < 0; + $r1clogp = $thisstanza; + + printdebug "import clog $r1clogp->{version} becomes r1\n"; + }; + + $r1clogp //= $$clogp_r; # maybe there's only one entry; + return clogp_authline $r1clogp; +} + sub import_tarball_tartrees ($$) { my ($upstreamv, $dfi) = @_; # cwd should be the playground @@ -2426,65 +2543,33 @@ sub import_tarball_commits ($$) { my $any_orig = grep { $_->{Orig} } @$tartrees; - my @clogcmd = qw(dpkg-parsechangelog --format rfc822 --all); my $clogp; - my $r1clogp; - - printdebug "import clog search...\n"; - parsechangelog_loop \@clogcmd, (__ "package changelog"), sub { - my ($thisstanza, $desc) = @_; - no warnings qw(exiting); - - $clogp //= $thisstanza; - - printdebug "import clog $thisstanza->{version} $desc...\n"; - - last if !$any_orig; # we don't need $r1clogp - - # We look for the first (most recent) changelog entry whose - # version number is lower than the upstream version of this - # package. Then the last (least recent) previous changelog - # entry is treated as the one which introduced this upstream - # version and used for the synthetic commits for the upstream - # tarballs. - - # One might think that a more sophisticated algorithm would be - # necessary. But: we do not want to scan the whole changelog - # file. Stopping when we see an earlier version, which - # necessarily then is an earlier upstream version, is the only - # realistic way to do that. Then, either the earliest - # changelog entry we have seen so far is indeed the earliest - # upload of this upstream version; or there are only changelog - # entries relating to later upstream versions (which is not - # possible unless the changelog and .dsc disagree about the - # version). Then it remains to choose between the physically - # last entry in the file, and the one with the lowest version - # number. If these are not the same, we guess that the - # versions were created in a non-monotonic order rather than - # that the changelog entries have been misordered. - - printdebug "import clog $thisstanza->{version} vs $upstreamv...\n"; - - last if version_compare($thisstanza->{version}, $upstreamv) < 0; - $r1clogp = $thisstanza; - - printdebug "import clog $r1clogp->{version} becomes r1\n"; - }; - - $clogp or fail __ "package changelog has no entries!"; - + my $r1authline; + if ($any_orig) { + if (!eval { + local $failmsg_prefix = ' '; + $r1authline = import_r1authline(\$clogp, $upstreamv); + $clogp or fail __ "package changelog has no entries!"; + 1; + }) { + chomp $@; + print STDERR f_ <<END, $upstreamv, $@; +warning: unable to find/parse changelog entry for first import of %s: +%s +END + } + } + # Runs if $any_orig clause didn't set $clogp + $clogp //= parsechangelog(); my $authline = clogp_authline $clogp; + # Runs if $any_orig clause didn't set $r1authline + $r1authline //= $authline; + my $changes = getfield $clogp, 'Changes'; $changes =~ s/^\n//; # Changes: \n my $cversion = getfield $clogp, 'Version'; - my $r1authline; if (@$tartrees) { - $r1clogp //= $clogp; # maybe there's only one entry; - $r1authline = clogp_authline $r1clogp; - # Strictly, r1authline might now be wrong if it's going to be - # unused because !$any_orig. Whatever. - printdebug "import tartrees authline $authline\n"; printdebug "import tartrees r1authline $r1authline\n"; @@ -2689,9 +2774,42 @@ END local $ENV{DGIT_ABSURD_DEBUG} = $debuglevel if $use_absurd; local $ENV{PATH} = $path if $use_absurd; + if ($use_absurd) { + # We filter the series file, to contain only things + # that are actually requests to apply a patch. + # + # This is needed because sometimes a series file can + # contain strange things that gbp pq cannot cope with. + # Eg, form feeds. See #1030093. + rename "debian/patches/series", "../series.orig" + or confess "$!"; + open OS, "../series.orig" or confess $!; + open NS, ">debian/patches/series" or confess $!; + while (<OS>) { + s/\#.*//; + s/^\s+//; + s/\s+$//; + next unless m/\S/; + print NS "$_\n" or confess $!; + } + confess $! if OS->error; + close NS or confess $!; + runcmd @git, qw(add debian/patches/series); + # This commit is spurious, but we must commit for gbp + # pq to work. We filter it out of the branch later. + runcmd @git, qw(commit --quiet --allow-empty -m), <<END; +INTERNAL commit to launder series file + +This commit should not escape into a public branch! +If you see it, this is due to a bug in dgit. + +[dgit ($our_version) INTERNAL-quilt-fixup-series] +END + } + my @showcmd = (gbp_pq, qw(import)); my @realcmd = shell_cmd - 'exec >/dev/null 2>>../../gbp-pq-output', @showcmd; + 'exec >/dev/null 2>../../gbp-pq-output', @showcmd; gbp_pq_pc_aside(sub { debugcmd "+",@realcmd; if (system @realcmd) { @@ -2701,6 +2819,14 @@ END } }); + if ($use_absurd) { + # Perhaps we should be using git-filter-branch, + # but that's really considerably more awkward. + runcmd_quieten + @git, qw(rebase --keep-empty --allow-empty-message + --onto unpa~1 unpa); + } + my $gapplied = git_rev_parse('HEAD'); my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:); $gappliedtree eq $dappliedtree or @@ -2714,7 +2840,7 @@ END if ($use_absurd) { File::Copy::copy("../../absurd-apply-warnings", \*STDERR) - or die $!; + or confess $!; } }; last unless $@; @@ -3382,7 +3508,7 @@ END if ($lastfetch_mergeinput && !version_compare( (mergeinfo_version $lastfetch_mergeinput), (mergeinfo_version $mergeinputs[0]) )) { - @mergeinputs = ($lastfetch_mergeinput); + @mergeinputs = ($lastfetch_mergeinput); } } elsif ($lastpush_hash) { # only in git, not in the archive yet @@ -4049,19 +4175,13 @@ END } sub get_source_format () { - my %options; + my @options; if (open F, "debian/source/options") { while (<F>) { next if m/^\s*\#/; next unless m/\S/; s/\s+$//; # ignore missing final newline - if (m/\s*\#\s*/) { - my ($k, $v) = ($`, $'); #'); - $v =~ s/^"(.*)"$/$1/; - $options{$k} = $v; - } else { - $options{$_} = 1; - } + push @options, $_; } F->error and confess "$!"; close F; @@ -4077,7 +4197,7 @@ sub get_source_format () { F->error and confess "$!"; close F; chomp; - return ($_, \%options); + return wantarray ? ($_, \@options) : $_; } sub madformat_wantfixup ($) { @@ -4284,7 +4404,7 @@ sub splitbrain_pseudomerge ($$$$) { print STDERR <<END.(__ <<ENDT); $@ END -| Not fast forward; maybe --overwrite is needed ? Please see dgit(1). +| Not fast forward; maybe --trust-changelog is needed ? Please see dgit(1). ENDT finish -1; } @@ -4509,6 +4629,68 @@ sub sign_changes ($) { } } +sub tainted_objects_precheck ($$) { + my ($json, $dgithead) = @_; + my %taints; + ROW: foreach my $row (@{ decode_json $json }) { + foreach my $override (@{ $row->{overrides} }) { + if ($override =~ m{^--deliberately-} && deliberately($')) { + printdebug "overriding $row->{gitobjid} $override\n"; + next ROW; + } + } + my $objid = $row->{gitobjid}; + my ($gtype, $dummy) = git_cat_file $objid, undef; + next if $gtype eq 'missing'; + if ($row->{gitobjtype} and $gtype ne $row->{gitobjtype}) { + print STDERR f_ <<'END', $objid, $gtype, $row->{gitobjtype}; +warning: server says object %s type %s is tainted, but here it has type %s +END + } + $taints{$objid}{Type} = $gtype; + push @{ $taints{$objid}{Rows} }, $row; + } + + open GRL, "-|", + @git, qw(rev-list --objects --in-commit-order --pretty=format:), + $dgithead + or confess "$!"; + my $trouble = 0; + my %hinted; + my $found = sub { + my ($objid) = @_; + my $t = $taints{$objid}; + return unless $t; + + foreach my $row (@{ $t->{Rows} }) { + # If it was actually overridding we don't get here, asd + # don't call tainted_objects_message. Instead, the server + # will send such a message to our stderr (sadly, untranslated). + my $ovstatus = + (grep m{^--deliberately-}, @{ $row->{overrides} }) + ? '' : undef; + print STDERR tainted_objects_message $row, $ovstatus, \%hinted; + $trouble = 1; + } + }; + my $c_commit; + while (<GRL>) { + if (m{^commit (\w+)$}) { + $c_commit = $1; + $found->($1, __ 'commit'); + } elsif (m{(^\w{20}\w*) } && defined $c_commit) { + $found->($1, f_ 'object within commit %s', $c_commit); + } else { + confess "$_ ?"; + } + } + GRL->error and die $!; + close GRL or confess "$? $!"; + forceable_fail [qw(push-tainted)], + __ "pushing tainted objects (which server would reject)" + if $trouble; +} + sub dopush () { printdebug "actually entering push\n"; @@ -4520,6 +4702,7 @@ END git_fetch_us(); } my $archive_hash = fetch_from_archive(); + my $archive_dsc = $dsc; if (!$archive_hash) { $new_package or fail __ "package appears to be new in this suite;". @@ -4577,6 +4760,16 @@ END my $upstreamversion = upstreamversion $clogp->{Version}; + if (defined $archive_dsc && + version_compare($archive_dsc->{Version}, $cversion) >= 0 && + !forceing [qw(uploading-old-version)]) { + fail f_ <<'END', $archive_dsc->{Version}, $csuite, $cversion; +You seem to be trying to push an old version. +Version current in archive: %s (in suite %s) +Version you are trying to upload: %s +END + } + if (madformat_wantfixup($format)) { # user might have not used dgit build, so maybe do this now: if (do_split_brain()) { @@ -4624,7 +4817,7 @@ END fail __ "dgit push: HEAD is not a descendant". " of the archive's version.\n". "To overwrite the archive's contents,". - " pass --overwrite[=VERSION].\n". + " pass --trust-changelog, or --overwrite=VERSION.\n". "To rewrite history, if permitted by the archive,". " use --deliberately-not-fast-forward."; } @@ -4749,6 +4942,32 @@ ENDT $sourceonlypolicy; } + # Try to detect if we're about to be rejected due to tainted objects + my $pq_supported = access_cfg 'policy-query-supported-ssh'; + $pq_supported =~ m{^(?:false|true|unknown)$} or badcfg f_ + "policy-query-supported-ssh value '%s' must be false/true/unknown", + $pq_supported; + if ($pq_supported !~ m/false/) { + my @cmd = + (access_cfg_ssh, access_gituserhost(), + access_runeinfo("policy-client-query $package tainted-objects ". + join " ", $csuite). + " true"); + my $json = cmdoutput_errok @cmd; + if (!defined $json) { + # "unknown" means try the call, but don't mind if it + # fails. (This is OK, as a best effort, because then the + # server will enforce the check and this machinery is just + # to prevent late failures.) + failedcmd @cmd unless $pq_supported =~ m/unknown/; + } else { + printdebug "tainted-objects: $json\n"; + if (length $json) { + tainted_objects_precheck $json, $dgithead; + } + } + } + # Perhaps adjust .dsc to contain right set of origs changes_update_origs_from_dsc($dsc, $changes, $upstreamversion, $changesfile) @@ -4965,9 +5184,9 @@ sub cmd_fetch { sub cmd_pull { parseopts(); fetchpullargs(); - determine_whether_split_brain get_source_format(); + my $format = get_source_format(); + determine_whether_split_brain $format; if (do_split_brain()) { - my ($format, $fopts) = get_source_format(); madformat($format) and fail f_ <<END, $quilt_mode dgit pull not yet supported in split view mode (including with view-splitting quilt modes) END @@ -5099,28 +5318,45 @@ sub cmd_push_built { } sub cmd_push { - my $spec = cfg 'dgit.default.push-subcmd'; + some_push_alias('push', \&cmd_push_source, \&cmd_push_built, + [qw(dgit.default.push-subcmd)], sub { + my ($spec) = @_; + f_ 'dgit push, but dgit.default.push-subcmd set to %s', $spec + }); +} +sub cmd_rpush { + some_push_alias('rpush', \&cmd_rpush_source, \&cmd_rpush_built, + [qw(dgit.default.rpush-subcmd + dgit.default.push-subcmd)], sub { + my ($spec) = @_; + f_ 'dgit rpush, but dgit.default.[r]push-subcmd set to %s', $spec + }); +} +sub some_push_alias ($$@) { + my ($verb, $if_source, $if_built, $cfgs, $badvalue_msg) = @_; + my $spec = cfg @$cfgs; if ($spec eq 'source') { - cmd_push_source(); + $if_source->(); } elsif ($spec eq 'built') { - cmd_push_built(); + $if_built->(); } elsif ($spec eq 'warn,built') { - print STDERR __ <<'END'; -warning: "dgit push" currently means "dgit push-built" (by default) -warning: but is going to change to "dgit push-source". See dgit!(1). + print STDERR f_ <<'END', $verb,$verb,$verb; +warning: "dgit %s" currently means "dgit %s-built" (by default) +warning: but is going to change to "dgit %s-source". See dgit!(1). END - cmd_push_built(); - } elsif ($spec eq 'reject') { - fail f_ 'dgit push, but dgit.default.push-subcmd set to %s', $spec; + $if_built->(); } else { - fail f_ 'bad value for dgit.default.push-subcmd: %s', $spec; + fail $badvalue_msg->($spec); } } #---------- remote commands' implementation ---------- -sub pre_remote_push_build_host { +sub pre_remote_push_build_host { core_pre_rpush_bh('push'); } +sub pre_remote_push_source_build_host { core_pre_rpush_bh('push-source'); } +sub core_pre_rpush_bh ($) { + ($rpush_verb) = @_; my ($nrargs) = shift @ARGV; my (@rargs) = @ARGV[0..$nrargs-1]; @ARGV = @ARGV[$nrargs..$#ARGV]; @@ -5151,12 +5387,13 @@ sub pre_remote_push_build_host { unless defined $protovsn; changedir $dir; -} -sub cmd_remote_push_build_host { - responder_send_command("dgit-remote-push-ready $protovsn"); - &cmd_push_built; + + responder_send_command("dgit-remote-$rpush_verb-ready $protovsn"); } +sub cmd_remote_push_build_host { &cmd_push_built; } +sub cmd_remote_push_source_build_host { &cmd_push_source; } + sub pre_remote_push_responder { pre_remote_push_build_host(); } sub cmd_remote_push_responder { cmd_remote_push_build_host(); } # ... for compatibility with proto vsn.1 dgit (just so that user gets @@ -5193,10 +5430,16 @@ sub i_method { { no strict qw(refs); &{"${base}_${selector}"}(@args); } } -sub pre_rpush () { - not_necessarily_a_tree(); -} -sub cmd_rpush { +sub pre_rpush_source () { not_necessarily_a_tree(); } +sub pre_rpush_built () { not_necessarily_a_tree(); } +sub pre_rpush () { not_necessarily_a_tree(); } + +sub cmd_rpush_source { rpush_core('push-source'); } +sub cmd_rpush_built { rpush_core('push'); } + +sub rpush_core ($) { + ($rpush_verb) = @_; + my $host = nextarg; my $dir; if ($host =~ m/^((?:[^][]|\[[^][]*\])*)\:/) { @@ -5211,7 +5454,7 @@ sub cmd_rpush { my @rdgit; push @rdgit, @dgit; push @rdgit, @ropts; - push @rdgit, qw(remote-push-build-host), (scalar @rargs), @rargs; + push @rdgit, "remote-$rpush_verb-build-host", (scalar @rargs), @rargs; push @rdgit, @ARGV; my @cmd = (@ssh, $host, shellquote @rdgit); debugcmd "+",@cmd; @@ -5228,7 +5471,7 @@ sub cmd_rpush { } $i_child_pid = open2(\*RO, \*RI, @cmd); changedir $i_tmp; - ($protovsn) = initiator_expect { m/^dgit-remote-push-ready (\S+)/ }; + ($protovsn) = initiator_expect { m/^dgit-remote-$rpush_verb-ready (\S+)/ }; die "$protovsn ?" unless grep { $_ eq $protovsn } @rpushprotovsn_support; for (;;) { @@ -5345,6 +5588,9 @@ sub i_localname_buildinfo ($) { return $&; } sub i_file_buildinfo { + $rpush_verb eq 'push' + or badproto \*RO, "buildinfo file but verb is $rpush_verb"; + my $bi = $i_param{'buildinfo-filename'}; my $bd = parsecontrol "$i_tmp/$bi", $bi; my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes'; @@ -5367,7 +5613,12 @@ sub i_localname_changes { $i_changesfn =~ s/\.dsc$/_dgit.changes/ or die; return $i_changesfn; } -sub i_file_changes { } +sub i_file_changes { + my $ch = parsecontrol "$i_tmp/$i_changesfn", 'changes'; + unless ($rpush_verb eq 'push' || test_source_only_changes($ch)) { + fail __ "build-host-supplied changes file is not source-only"; + } +} sub i_want_signed_tag { printdebug Dumper(\%i_param, $i_dscfn); @@ -5431,7 +5682,7 @@ ${xinfo}Subject: $msg END close O or confess "$!"; - my @diffcmd = (@git, qw(diff --no-ext-diff), $oldtreeish, $newtreeish, + my @diffcmd = (git_diff_programmatic, $oldtreeish, $newtreeish, '--', ':!/debian', ':!/.pc'); runcmd qw(sh -ec), 'exec >>"$1"; shift; exec "$@"', 'x', $patchfn, @diffcmd; @@ -5634,6 +5885,7 @@ END " to record .gitignore changes", $gipatch if (stat _)[7]; + # TODO: The "Subject:" ought not to be translated print GIPATCH +(__ <<END).<<ENDU or die "$gipatch: $!"; Subject: Update .gitignore from Debian packaging branch @@ -5646,8 +5898,9 @@ END --- ENDU close GIPATCH or die "$gipatch: $!"; - runcmd shell_cmd "exec >>$gipatch", @git, qw(diff), - $unapplied, $headref, "--", sort keys %$editedignores; + runcmd shell_cmd "exec >>$gipatch", + git_diff_programmatic $unapplied, $headref, "--", + sort keys %$editedignores; open SERIES, "+>>", "debian/patches/series" or confess "$!"; defined seek SERIES, -1, 2 or $!==EINVAL or confess "$!"; my $newline; @@ -5812,7 +6065,7 @@ sub quiltify ($$$$) { fail __ "quilt history linearisation failed. Search \`quilt fixup' in dgit(7).\n"; } elsif ($quilt_mode eq 'smash') { - } elsif ($quilt_mode eq 'auto') { + } elsif ($quilt_mode eq 'try-linear') { progress __ "quilt fixup cannot be linear, smashing..."; } else { confess "$quilt_mode ?"; @@ -5978,7 +6231,7 @@ sub build_maybe_quilt_fixup () { } chdir '..'; - if ($fopts->{'single-debian-patch'}) { + if (grep m{^single-debian-patch$}, @$fopts) { fail f_ "quilt mode %s does not make sense (or is not supported) with single-debian-patch", $quilt_mode @@ -6123,11 +6376,24 @@ sub quilt_fixup_git_singlepatch ($$$) { if ($o2h) { quiltify_make_dpkg_patch $unapplied, $headref, - 'dgit-changes', '', <<'END', ''; + 'dgit-changes', '', <<END, ''; Debian changes -The Debian delta in this package is represented by this one combined patch. -The git history (e.g. from dgit clone) is the primary source representation. +The Debian packaging of $package is maintained in git, using a workflow +similar to the one described in dgit-maint-merge(7). +The Debian delta is represented by this one combined patch; there isn't a +patch queue that can be represented as a quilt series. + +A detailed breakdown of the changes is available from their canonical +representation -- git commits in the packaging repository. +For example, to see the changes made by the Debian maintainer in the first +upload of upstream version 1.2.3, you could use: + + % git clone https://git.dgit.debian.org/$package + % cd $package + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone $package`, rather than plain `git clone`.) We don't use debian/source/options single-debian-patch because it has bugs. Therefore, NMUs etc. may nevertheless have made additional patches. @@ -6173,10 +6439,63 @@ END my @files=qw(debian/source/format debian/rules debian/control debian/changelog); foreach my $maybe (qw(debian/patches debian/source/options + debian/source/include-binaries debian/tests/control)) { next unless stat_exists "$maindir/$maybe"; push @files, $maybe; } + if (open IB, "$maindir/debian/source/include-binaries") { + BFILE: while (<IB>) { + s{^[ \t]*}{}; + s{[ \t\n]*$}{}; + next if m{^\#}; + next unless length; + our $include_binaries_warning; + $include_binaries_warning++ or + print STDERR __ + "warning: package uses dpkg-source include-binaries feature - not all changes are visible in patches!\n"; + + my @bpath; + my $bfile_in = $_; + my $bpath_chk; + foreach my $ent (split m{/}, $bfile_in) { + my $wrong = sub { + no warnings qw(exiting); + print STDERR f_ + "warning: ignoring bad include-binaries file %s: %s\n", $bfile_in, $_[0]; + next BFILE; + }; + $wrong->(f_ "forbidden path component '%s'", $ent) + if grep { $_ eq $ent } '', '.', '..'; + if (!@bpath) { # check first component + # dpkg-source doesn't like files in debian/ which it + # considers binary, so the user may have listed + # them. We should silently ignore this. #1026918. + if ($ent eq 'debian') { + no warnings qw(exiting); + next BFILE; + } + $wrong->(f_ "path starts with '%s'", $ent) + if grep { $_ eq $ent } qw(.git); + } + push @bpath, $ent; + $bpath_chk = join '/', @bpath; + if (!lstat "$maindir/$bpath_chk") { + confess "$maindir/$bpath_chk" unless $!==ENOENT; + next BFILE; + } elsif (-f _ || -d _) { + } else { + $wrong->(f_ "path to '%s' not a plain file or directory", + $bpath_chk); + } + }; + push @files, $bpath_chk; + } + IB->error and confess "$!"; + close IB; + } else { + $! == ENOENT || confess "$!"; + } my $debtar= srcfn $fakeversion,'.debian.tar'; runcmd qw(tar -cf), "./$debtar", qw(-C), $maindir, @files; @@ -6376,7 +6695,7 @@ sub quilt_fixup_multipatch ($$$) { } $headref = git_rev_parse('HEAD'); - chdir '..'; + changedir '..'; } my $unapplied=quilt_fakedsc2unapplied($headref, $upstreamversion); @@ -6385,6 +6704,7 @@ sub quilt_fixup_multipatch ($$$) { my @bbcmd = (qw(sh -ec), 'exec dpkg-source --before-build . >/dev/null'); $!=0; $?=-1; + debugcmd "+",@bbcmd; if (system @bbcmd) { failedcmd @bbcmd if $? < 0; fail __ <<END; @@ -6738,13 +7058,28 @@ sub build_or_push_prep_early () { } sub build_or_push_prep_modes () { - my ($format) = get_source_format(); + my ($format, $fopts) = get_source_format(); determine_whether_split_brain($format); fail __ "dgit: --include-dirty is not supported with split view". " (including with view-splitting quilt modes)" if do_split_brain() && $includedirty; + if (grep m{^tar-ignore$}, @$fopts) { + if ((cmdoutput qw(git ls-files :.gitignore :*/.gitignore)) ne '') { + # The source package won't be faithful; bail with an explanation. + fail __ <<'END'; +tree has .gitignore(s) but debian/source/options has 'tar-ignore' +Try 'tar-ignore=.git' in d/s/options instead. (See #908747.) +END + } else { + print STDERR f_ <<'END', $us; +%s: warning: debian/source/options contains bare 'tar-ignore' +This can cause .gitignore files to be improperly omitted. See #908747. +END + } + } + if (madformat_wantfixup $format and $quilt_mode =~ m/baredebian$/) { ($quilt_upstream_commitish, $quilt_upstream_commitish_used, $quilt_upstream_commitish_message) @@ -7112,7 +7447,7 @@ sub build_source { } # confess unless !!$made_split_brain == do_split_brain(); - my @cmd = (@dpkgsource, qw(-b --include-removal --)); + my @cmd = (@dpkgsource, qw(-b --include-removal)); my $leafdir; if (building_source_in_playtree()) { $leafdir = 'work'; @@ -7128,7 +7463,14 @@ sub build_source { unpack_playtree_need_cd_work($headref); changedir '..'; } - runcmd @cmd, $leafdir; + + # We are presenting dpkg-source with a tree with no .pc directory. + # Without this option, dpkg-source tries to guess if it should + # mess about (un)applying patches. Depending on what precisely is + # in the patches, it can guess wrong. + push @cmd, qw(--no-preparation); + + runcmd @cmd, qw(--), $leafdir; } else { $leafdir = basename $maindir; @@ -7150,7 +7492,7 @@ sub build_source { } changedir '..'; - runcmd_ordryrun_local @cmd, $leafdir; + runcmd_ordryrun_local @cmd, qw(--), $leafdir; } changedir $leafdir; @@ -7736,9 +8078,13 @@ sub parseopts () { } elsif (m/^--no-chase-dsc-distro$/s) { push @ropts, $_; $chase_dsc_distro = 0; - } elsif (m/^--overwrite$/s) { + } elsif (m/^--collab-non-dgit$/s) { push @ropts, $_; $overwrite_version = ''; + $splitview_mode = 'always'; + } elsif (m/^(?:--trust-changelog|--overwrite)$/s) { + push @ropts, '--overwrite'; # TODO, eventually, change this + $overwrite_version = ''; } elsif (m/^--split-(?:view|brain)$/s) { push @ropts, $_; $splitview_mode = 'always'; @@ -7761,6 +8107,9 @@ sub parseopts () { push @ropts, $_; $v =~ s#^(?!refs/)#refs/heads/#; $internal_object_save{$k} = $v; + } elsif (m/^--(no-)?keep-playground$/s) { + push @ropts, $_; + $keep_playground = !$1; } elsif (m/^--(no-)?rm-old-changes$/s) { push @ropts, $_; $rmchanges = !$1; @@ -7925,6 +8274,7 @@ sub parseopts_late_defaults () { $quilt_mode = $1; } $quilt_mode =~ s/^(baredebian)\+git$/$1/; + $quilt_mode =~ s/^auto$/try-linear/; foreach my $moc (@modeopt_cfgs) { local $access_forpush; @@ -7968,6 +8318,7 @@ if (!@ARGV) { finish 8; } $cmd = $subcommand = shift @ARGV; +my $orig_cmd = $cmd; $cmd =~ y/-/_/; my $pre_fn = ${*::}{"pre_$cmd"}; @@ -7980,7 +8331,10 @@ if ($invoked_in_git_tree) { git_slurp_config(); my $fn = ${*::}{"cmd_$cmd"}; -$fn or badusage f_ "unknown operation %s", $cmd; +$fn or badusage f_ "unknown operation %s", $orig_cmd; $fn->(); +changedir '/'; # rmtree complains if our cwd is inside what we remove +rmtree $playground if defined($playground) && !$keep_playground; + finish 0; diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup deleted file mode 100755 index 3e4a718..0000000 --- a/dgit-badcommit-fixup +++ /dev/null @@ -1,333 +0,0 @@ -#!/usr/bin/perl -w -# -# Script to help with fallout from #849041. -# -# usage: -# dgit-badcommit-fixup --check -# dgit-badcommit-fixup --test -# dgit-badcommit-fixup --real - -# Update procedure, from server operator's point of view: -# -# 1. Test in an offline tree that this DTRT -# -# 2. Announce a transition time. Tell everyone that between -# the transition time and their next upload, they must -# run this script. -# -# 3. At the transition time, run this script in every repo. -# -# 4. Run the mirror script to push changes, if necessary. - -END { $? = $Debian::Dgit::ExitStatus::desired // -1; }; -use Debian::Dgit::ExitStatus; - -use strict; - -use POSIX; -use IPC::Open2; -use Data::Dumper; - -our $our_version = 'UNRELEASED'; ###substituted### - -my $real; - -foreach my $a (@ARGV) { - if ($a eq '--test') { - $real = 0; - } elsif ($a eq '--real') { - $real = 1; - } elsif ($a eq '--check') { - $real = -1; - } else { - die "$a ?"; - } -} - -die unless defined $real; - -my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!; - -our %count; - -no warnings qw(recursion); - -sub runcmd { - system @_ and die "@_ $! $?"; -} - -$!=0; $?=0; -my $bare = `git rev-parse --is-bare-repository`; -die "$? $!" if $?; -chomp $bare or die; - -our @configs; -foreach my $k (qw(core.sharedRepository)) { - $?=0; $!=0; my $v = `set -x; git config --local $k`; - if (defined $v && $?==0 && chomp $v) { - push @configs, [ $k, $v ]; - } elsif (defined $v && $?==256 && $v eq '') { - } else { - die "git-config --local $k => $v $? $! ?"; - } -} - -sub getobj ($$) { - my ($obj, $type) = @_; - print GCFI $obj, "\n" or die $!; - my $x = <GCFO>; - my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?"; - $gtype eq $type or die "$obj $gtype != $type ?"; - my $gdata; - (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!"; - $x = <GCFO>; - $x eq "\n" or die "$obj ($_) $!"; - $count{inspected}++; - return $gdata; -} - -sub hashobj ($$) { - my ($data,$type) = @_; - my $gwopid = open2 \*GWO, \*GWI, - "git hash-object -w -t $type --stdin" - or die $!; - print GWI $data or die $!; - close GWI or die $!; - $_ = <GWO>; - close GWO or die $!; - waitpid $gwopid,0 == $gwopid or die $!; - die $? if $?; - m/^(\w+)\n/ or die "$_ ?"; - $count{"rewritten $type"}++; - return $1; -} - -our %memo; - -sub rewrite_commit ($); -sub rewrite_commit ($) { - my ($obj) = @_; - my $m = \ $memo{$obj}; - return $$m if defined $$m; - my $olddata = getobj $obj, 'commit'; - $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?"; - my $msg = $'; - local $_ = $`; - s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme; - $count{'fix overwrite'} += s{^commiter }{committer }gm; - if (!m{^author }m && !m{^committer }m) { - m{^parent (\w+)}m or die "$obj ?"; - my $parent = getobj $1, 'commit'; - $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/; - m/\n$/ or die "$obj ?"; - $_ .= $1; - $count{'fix import'}++; - } - my $newdata = $_.$msg; - my $newobj; - if ($newdata eq $olddata) { - $newobj = $obj; - $count{unchanged}++; -#print STDERR "UNCHANGED $obj\n"; - } else { - $newobj = hashobj $newdata, 'commit'; -#print STDERR "REWRITTEN $obj $newobj\n"; - } - $$m= $newobj; - return $newobj; -} - -our @updates; - -sub filter_updates () { - @updates = grep { $_->[1] ne $_->[2] } @updates; -} - -sub rewrite_tag ($) { - my ($obj) = @_; - $_ = getobj $obj, 'tag'; - m/^type (\w+)\n/m or die "$obj ?"; - if ($1 ne 'commit') { - $count{"oddtags $1"}++; - return $obj; - } - m/^object (\w+)\n/m or die "$obj ?"; - my $oldref = $1; - my $newref = rewrite_commit $oldref; - if ($oldref eq $newref) { - return $obj; - } - s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?"; - s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm; - return hashobj $_, 'tag'; -} - -sub edit_rewrite_map ($) { - my ($old) = @_; - - filter_updates(); - return $old unless @updates; - - my $td = 'dgit-broken-fixup.tmp'; - runcmd qw(rm -rf), $td; - mkdir $td, 0700 or die "$td $!"; - chdir $td or die $!; - runcmd qw(git init -q); - runcmd qw(git config gc.auto 0); - runcmd qw(rm -rf .git/objects); - symlink "../../objects", ".git/objects" or die $!; - foreach my $c (@configs) { - runcmd qw(git config), $c->[0], $c->[1]; - } - - my %map; - - if ($old) { - runcmd qw(git checkout -q), $old; - open M, "map" or die $!; - while (<M>) { - m/^(\w+)(?:\s+(\w+))?$/ or die; - $map{$1} = $2; - $count{rewrite_map_previous}++; - } - M->error and die $!; - close M or die $!; - } - - foreach my $oldc (keys %memo) { - my $newc = $memo{$oldc}; - next if $oldc eq $newc; - $map{$oldc} = $newc; - } - foreach my $up (@updates) { # catches tags - $map{ $up->[1] } = $up->[2]; - } - - open M, ">", "map" or die $!; - printf M "%s%s\n", - $_, (defined $map{$_} ? " $map{$_}" : "") - or die $! - foreach keys %map; - close M or die $!; - - if (!$old) { - runcmd qw(git add map); - } - - runcmd qw(git commit -q), qw(-m), <<END, qw(map); -dgit-badcommit-fixup - -[dgit-badcommit-fixup $our_version] -END - - $!=0; $?=0; - my $new = `git rev-parse HEAD`; - die "$? $!" if $?; - chomp $new or die; - - chdir '..' or die $!; - runcmd qw(rm -rf), $td; - - $count{rewrite_map_updated}++; - - return $new; -} - -$!=0; $?=0; -my $refs=`git for-each-ref`; -die "$? $!" if $?; - -chomp $refs; - -our $org_rewrite_map; - -foreach my $rline (split /\n/, $refs) { - my ($obj, $type, $refname) = - $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/ - or die "$_ ?"; - if ($refname eq 'refs/dgit-rewrite/map') { - $org_rewrite_map = $obj; - next; - } - next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/}; - - $!=0; $?=0; - system qw(sh -ec), - 'exec >/dev/null git symbolic-ref -q "$1"', qw(x), - $refname; - if ($?==0) { - $count{symrefs_ignored}++; - next; - } - die "$? $!" unless $?==256; - - my $rewrite; - if ($type eq 'commit') { - $rewrite = rewrite_commit($obj); - } elsif ($type eq 'tag') { - $rewrite = rewrite_tag($obj); - } else { - warn "ref $refname refers to $type\n"; - next; - } - push @updates, [ $refname, $obj, $rewrite ]; -} - -if ($bare eq 'true') { - my $new_rewrite_map = edit_rewrite_map($org_rewrite_map); - push @updates, [ 'refs/dgit-rewrite/map', - ($org_rewrite_map // '0'x40), - ($new_rewrite_map // '0'x40), - 1 ]; -} - -filter_updates(); - -if (!@updates) { - print Dumper(\%count), "all is well - nothing to do\n"; - finish 0; -} - -#print Dumper(\@updates); - -open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $! - if $real >= 0; - -for my $up (@updates) { - my ($ref, $old, $new, $nobackup) = @$up; - my $otherref = $ref; - $otherref =~ s{^refs/}{}; - if ($real > 0) { - print U <<END or die $! unless $nobackup; -create refs/dgit-badcommit/$otherref $old -END - print U <<END or die $!; -update $ref $new $old -END - } elsif ($real==0) { - print U <<END or die $!; -update refs/dgit-badfixuptest/$otherref $new -END - } else { - print "found trouble in history of $ref\n" or die $!; - } -} - -if ($real >= 0) { - $?=0; $!=0; - close U or die "$? $!"; - die $? if $?; -} - -print Dumper(\%count); - -if ($real >= 0) { - print "old values saved in refs/dgit-badcommit/\n" or die $!; -} elsif ($real == 0) { - print "testing output saved in refs/dgit-badfixuptest/\n" or die $!; -} else { - print STDERR "found work to do, exiting status 2\n"; - finish 2; -} - -finish 0; diff --git a/dgit-maint-bpo.7.pod b/dgit-maint-bpo.7.pod index 86372dd..672751c 100644 --- a/dgit-maint-bpo.7.pod +++ b/dgit-maint-bpo.7.pod @@ -126,7 +126,7 @@ I<1.2.2-1~bpo10+1> and you have now prepared I<1.2.3-1~bpo10+1> for upload. When you B<dgit push>, you will need to pass I<--overwrite=1.2.2-1~bpo10+1>. -Alternatively, you can perform the pseudomerge that I<--overwrite> +Alternatively, you can perform the pseudomerge that I<--trust-changelog> would have done yourself: =over 4 diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 80bdf31..4d6feb6 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -491,7 +491,7 @@ I<--new> if the package is new in the target suite. In some cases where you used B<git debrebase convert-from-gbp> since the last upload, it is not possible for dgit to make your history fast-forwarding from the history on B<dgit-repos>. In such cases you -will have to pass I<--overwrite> to dgit. git-debrebase will normally +will have to pass I<--trust-changelog> to dgit. git-debrebase will normally tell you if this will be needed. If you want to upload with git-debpush(1), for the first upload you @@ -632,7 +632,7 @@ reversion from the delta queue. If you cannot rebase because you have already pushed to B<salsa.debian.org>, say, you can manually apply the NMU debdiff, commit and debrebase. The next B<dgit push> will require -I<--overwrite>. +I<--trust-changelog>. =head1 HINTS AND TIPS @@ -688,7 +688,7 @@ branches for your upstream remote, e.g. I<remotes/upstream/master>. =head2 The first ever dgit push If this is the first ever dgit push of the package, consider passing -I<--deliberately-not-fast-forward> instead of I<--overwrite>. This +I<--deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids introducing a new origin commit into your git history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your git history.) @@ -791,7 +791,7 @@ See also "ILLEGAL OPERATIONS" in git-debrebase(5). =head1 SEE ALSO -dgit(1), dgit(7), git-debrebase(1), git-debrebase(5) +dgit(1), dgit(7), git-debrebase(1), git-debrebase(5), gitrevisions(7) =head1 AUTHOR diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index 1988a31..a27a5fa 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -117,11 +117,11 @@ or if you need to include binaries, This will push your git history to the dgit-repos, but you probably want to follow it up with a push to salsa. -You will need to pass I<--overwrite> if the previous upload was not +You will need to pass I<--trust-changelog> if the previous upload was not performed with dgit. If this is first ever dgit push of the package, consider passing -I<--deliberately-not-fast-forward> instead of I<--overwrite>. This +I<--deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids introducing a new origin commit into the dgit view of your git history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your @@ -134,7 +134,7 @@ should pass the B<--gbp> quilt mode option (see git-debpush(1)). B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp branches. You can just apply the NMU diff the traditional way. The -next upload will require I<--overwrite>. +next upload will require I<--trust-changelog>. =head1 SEE ALSO diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index b60da85..1cd6491 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -278,14 +278,14 @@ To achieve this, you might need to delete I<debian/source/local-options>. One way to have dgit check your progress is to run B<dgit build-source>. -The first dgit push will require I<--overwrite>. If this is the first +The first dgit push will require I<--trust-changelog>. If this is the first ever dgit push of the package, consider passing -I<--deliberately-not-fast-forward> instead of I<--overwrite>. This +I<--deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids introducing a new origin commit into your git history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your git history.) -=head1 SOURCE PACKAGE AND GIT WORKING TREE CONFIGURATION +=head1 SOURCE PACKAGE AND GIT CONFIGURATION =head2 dgit configuration @@ -298,15 +298,9 @@ a linear queue of patches to the upstream source: =back -This affects only this one git tree; -your other git trees for this package (and co-maintainers) -will need it too. -Don't set it more globally, -because the maintainers of any other packages -you work on, or send patches for, -may be offended by its effects. - -unpleasant NMUs +This command should be executed in each git clone of this package, including +your co-maintainer's. Don't set it more globally, because it is not a good +default for working on Debian source packages in general. =head2 debian/source/options @@ -323,38 +317,6 @@ source: You don't need to create this file if you are using the version 1.0 source package format. -=head2 Sample text for debian/README.source - -It is a good idea to explain how a user can obtain a breakdown of the -changes to the upstream source: - -=over 4 - -The Debian packaging of foo is maintained in git, -using the merging workflow described in dgit-maint-merge(7). -There isn't a patch queue that can be represented as a quilt series. - -A detailed breakdown of the changes is available from their -canonical representation - -git commits in the packaging repository. -For example, to see the changes made by the Debian maintainer in the -first upload of upstream version 1.2.3, you could use: - -=over 4 - - % git clone https://git.dgit.debian.org/foo - % cd foo - % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' - -=back - -(If you have dgit, use `dgit clone foo`, -rather than plain `git clone`.) - -A single combined diff, containing all the changes, follows. - -=back - =head1 BUILDING AND UPLOADING Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit @@ -542,11 +504,11 @@ that have been forwarded, "retaining" the ones that haven't. =back Alternatively, you can apply the NMU diff to your repository. The -next push will then require I<--overwrite>. +next push will then require I<--trust-changelog>. =head1 SEE ALSO -dgit(1), dgit(7) +dgit(1), dgit(7), gitrevisions(7) =head1 AUTHOR diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 4e8b795..e08ab15 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -58,7 +58,7 @@ Simply prepare your git tree in the usual way, and then: =over 4 - % dgit -wgf --overwrite push-source + % dgit -wgf --trust-changelog push-source =back @@ -68,7 +68,7 @@ You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit sbuild>; see dgit(1) for the syntax of those subcommands. -The --overwrite option tells dgit that you are expecting +The --trust-changelog option tells dgit that you are expecting that your git history is not a descendant of the history which dgit synthesised from the previous non-dgit uploads. @@ -85,7 +85,7 @@ Alternatively, if this was the first ever dgit push of the package, you can avoid this merge commit by passing C<--deliberately-not-fast-forward> -instead of C<--overwrite>. +instead of C<--trust-changelog>. This avoids introducing a new origin commit into your git history. @@ -120,7 +120,7 @@ you can do this: =back If you do not merge the NMU into your own git history, -the next push will then require I<--overwrite>. +the next push will then require I<--trust-changelog>. =head1 SEE ALSO diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod index 91e70c7..1e070f2 100644 --- a/dgit-sponsorship.7.pod +++ b/dgit-sponsorship.7.pod @@ -72,7 +72,8 @@ The git branch. =item * Any .orig tarballs which will be needed, -or sample git-archive(1) +or sample git-deborig(1), +git-archive(1) or gbp-buildpackage(1) command(s) to generate them. @@ -120,9 +121,11 @@ in their handover email. If there are any .origs that are not in the archive already, the sponsor will need them as part of the upload. -If the sponsee generated these tarballs with git-archive(1) +If the sponsee generated these tarballs with +git-deborig(1), git-archive(1) or gbp-buildpackage(1), -they can simply include a sample invocation of git-archive(1) +they can simply include a sample invocation of +git-deborig(1) or git-archive(1) or ensure that a suitable gbp.conf is present in the source package to generate the tarball. @@ -256,13 +259,13 @@ should go on the sponsee's branch.) If this was the first upload done with dgit, you may need to pass -C<--overwrite> +C<--trust-changelog> to dgit. Alternatively, if this was the first ever dgit push of the package, you can pass C<--deliberately-not-fast-forward> -instead of C<--overwrite>. +instead of C<--trust-changelog>. This avoids introducing a new origin commit into the dgit view of the sponsee's git history @@ -311,7 +314,7 @@ dgit push-source directly from the "sponsee" branch. You will need to pass -C<--overwrite> +C<--trust-changelog> to dgit push for every successive upload. This disables a safety catch which would normally spot situations where changes are accidentally lost. diff --git a/dgit-user.7.pod b/dgit-user.7.pod index 18f06da..3b948b9 100644 --- a/dgit-user.7.pod +++ b/dgit-user.7.pod @@ -321,6 +321,14 @@ For more information see Debian bug #868527. =head1 INSTALLING +=head2 Debian Stretch or newer + +=over 4 + + % sudo apt install ../libc6_*.deb + +=back + =head2 Debian Jessie or older =over 4 @@ -336,14 +344,6 @@ If the dependencies aren't installed, you will get an error, which can usually be fixed with C<apt-get -f install>. -=head2 Debian Stretch or newer - -=over 4 - - % sudo apt install ../libc6_*.deb - -=back - =head1 Multiarch If you're working on a library package and your system has multiple @@ -21,11 +21,11 @@ dgit \- git integration with the Debian archive [\fIdebbuildopts\fP] .br .B dgit -[\fIdgit\-opts\fP] \fBpush\fP|\fBpush-source\fP [\fIdgit\-opts\fP] +[\fIdgit\-opts\fP] \fBpush\fP|\fBpush-built\fP [\fIdgit\-opts\fP] [\fIsuite\fP] .br .B dgit -[\fIdgit\-opts\fP] \fBrpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR +[\fIdgit\-opts\fP] \fBrpush\fR|\fBrpush-built\fP \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR] .br .B dgit @@ -42,7 +42,7 @@ by ordinary people. This is the command line reference. Please read the tutorial(s): .TS -lb l. +lb2 l. dgit-user(7) for users: edit, build and share packages dgit-nmu-simple(7) for DDs: do a straightforward NMU dgit-maint-native(7) for maintainers of Debian-native packages @@ -234,17 +234,18 @@ git-buildpackage style branch, not a patches-applied branch. Tagging, signing and actually uploading should be left to dgit push. .TP -\fBdgit push-built\fR [\fIsuite\fP] -Does an `upload', pushing the current HEAD to the archive (as a source -package) and to dgit-repos (as git commits). The package must already -have been built ready for upload, with the .dsc and .changes -left in the parent directory. It is normally best to do the build -with dgit too (eg with dgit sbuild): some existing build tools pass -unhelpful options to dpkg-source et al by default, which can result in -the built source package not being identical to the git tree. +\fBdgit push-source\fR [\fIsuite\fP] +Does an `upload': sends the current HEAD +to dgit-repos (as git commits), +and to the archive (as a source package, built by this command). -In more detail: dgit push checks that the current HEAD corresponds to -the .dsc. It then pushes the HEAD to the suite's dgit-repos branch, +This is the usual way to upload to Debian. It is like saying "update the +source code in the archive to match my git HEAD, and let the autobuilders do +the rest." + +In more detail: dgit push-source +builds a source package from HEAD. +It then pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to include any .origs which the archive lacks and exclude .origs which the archive has (so \-sa and \-sd are not needed when building for dgit push), @@ -261,21 +262,36 @@ When used on a git-debrebase branch, dgit calls git-debrebase to prepare the branch for source package upload and push. -.TP -\fBdgit push-source\fR [\fIsuite\fP] -Without \fB\-C\fR, builds a source package and dgit pushes it. Saying -\fBdgit push-source\fR is like saying "update the source code in the -archive to match my git HEAD, and let the autobuilders do the rest." -With \fB\-C\fR, performs a dgit push, additionally ensuring that no +With \fB\-C\fR, dgit push-source performs a dgit push-built, +additionally ensuring that no binary packages are uploaded. .TP -\fBdgit rpush\fR \fIbuild-host\fR\fB:\fR\fIbuild-dir\fR [\fIpush args...\fR] +\fBdgit push-built\fR [\fIsuite\fP] +Does an `upload' of a previously built package, +possibly including binaries. +Sends the current HEAD to dgit-repos (as git commits); +and, sends the previously built source package and binaries +to the archive. + +The package must already +have been built ready for upload, with the .dsc and .changes +left in the parent directory. It is normally best to do the build +with dgit too (e.g. with dgit sbuild): some existing build tools pass +unhelpful options to dpkg-source et al by default, which can result in +the built source package not being identical to the git tree. + +dgit will check that the .dsc corresponds exactly to the current HEAD, +ensuring that all users, whether of the dgit git view, +or of the traditional archive, +see the same source package. +.TP +\fBdgit rpush-source\fR|\fBrpush-built\fR \fIbuild-host\fR\fB:\fR\fIsrc-dir\fR [\fIpush args...\fR] Pushes the contents of the specified directory on a remote machine. -This is like running dgit push on build-host with build-dir as the +This is like running dgit push on build-host with src-dir as the current directory; however, signing operations are done on the invoking host. This allows you to do a push when the system which has -the source code and the build outputs has no access to the key: +the source code (and any built binaries) has no access to the key: .TS l l. @@ -290,7 +306,8 @@ However, the build-host must be able to ssh to the dgit repos. If this is not already the case, you must organise it separately, for example by the use of ssh agent forwarding. -The remaining arguments are treated just as dgit push would handle +The remaining arguments are treated just as dgit push-source +or dgit push-built would handle them. build-host and build\-dir can be passed as separate @@ -302,14 +319,18 @@ You will need similar enough versions of dgit on the build-host and the invocation host. The build-host needs gnupg installed, with your public key in its keyring (but not your private key, obviously). .TP -\fBdgit push\fR \fI...\fP -Configurable alias for -.BR "dgit push-built" , -which will change to mean -.BR "dgit push" , -and therefore currently generates a warning. +\fBdgit push\fR|\fBrpush\fR \fI...\fP +Configurable aliases for +.BR "dgit push-built" +and +.BR "dgit rpush-built". +These aliases will in the future change to mean +.BR "dgit push-source" +and +.BR "dgit rpush-source" , +and therefore they currently generate a warning. -The behaviour is controlled by the +The behaviour of dgit push is controlled by the .B dgit.default.push-subcmd git config option: .TS @@ -320,7 +341,16 @@ l l l . \fBreject\fR fails .TE -That setting can safely be passed to older dgit (via +For dgit rpush, the behaviour is controlled by +.BR dgit.default.rpush-subcmd , +falling back to +.BR dgit.default.push-subcmd +if that is not set. +Because dgit rpush is not typically run in a git working tree, +only global git config options +(and \fB-c\fR command line options) are relevant. + +These settings can safely be passed to older dgit (via .BR -c); the value .B built @@ -677,7 +707,32 @@ combination can fail if the untracked files are under .BR --ignore-dirty Deprecated alias for --include-dirty. .TP -.BR --overwrite [=\fIprevious-version\fR] +.BR --collab-non-dgit +Make +.BR "dgit push" , +behave more suitably for collaborating +(using shared git history) +with git-using co-developers who aren't using dgit. + +With this option, +dgit won't mind that the git history you're using +isn't necessarily fast forward from the dgit view; +instead, it will rely on the changelog +to prevent accidentally overwriting changes. + +And, the +synthetic commits needed to +make the dgit git history fast forward +will appear only on the dgit git server, +and local dgit suite branches, +not on your own main branch. +So they won't end up in the maintainer-visible history, +when you push your own branch to make a merge request. + +This is equivalent to +.BR "--split-view=always --trust-changelog" . +.TP +.BR --trust-changelog " | " --overwrite =\fIprevious-version\fR Declare that your HEAD really does contain all the (wanted) changes from all versions listed in its changelog; @@ -688,40 +743,41 @@ your git branch is not a descendant of the version in the archive according to the git revision history. -It is safer not to specify -.IR previous-version , -and usually it's not needed. -Just say -.BR \-\-overwrite , -unless you know what you are doing. +It is safer to specify +.BR \-\-trust-changelog , +than +.BR \-\-overwrite= \fIprevious-version\fR, +and usually the latter is not needed. -This option is useful if you are the maintainer, and you have +.B --trust-changelog +is useful if you are the maintainer, and you have incorporated NMU changes into your own git workflow in a way that doesn't make your branch a fast forward from the NMU. It can also be useful when there was an upload made without dgit since the most recent upload made with dgit. -This option is also usually necessary +It is also usually necessary the first time a package is pushed with dgit push to a particular suite. See .BR dgit-maint- \fI*\fR (7) . -If -.I previous-version -is not -specified, dgit will check that the version in the archive is +With +.BR \-\-trust-changelog +dgit will check that the version in the archive is mentioned in your debian/changelog. (This will avoid losing -changes, even with -.BR --overwrite , +changes, unless someone committed to git a finalised changelog entry, and then made later changes to that version.) -If -.IR previous-version -is specified, it ought to be the version currently in the archive. -dgit push --overwrite +With +.BI \-\-overwrite= previous-version +that version ought to be the version currently in the archive, +and it will be unconditionally overwritten, +regardless of what's in the changelog. + +These options will, if necessary, make a pseudo-merge (that is, something that looks like the result of git merge -s ours) to stitch the archive's version into your own @@ -730,7 +786,13 @@ git history, so that your push is a fast forward from the archive. (In quilt mode .BR gbp ", " dpm ", " unpatched " or " baredebian *, implying a split between the dgit view and the -maintainer view, the pseudo-merge will appear only in the dgit view.) +maintainer view, the pseudo-merge will appear only in the dgit view; +.B --split-view=always +can be used to force that behaviour, e.g. in other quilt modes.) + +.B \-\-overwrite +without a version number is an obsolete way of specifying +.BR \-\-trust-changelog . .TP .BR \-\-delayed =\fIdays\fR Upload to a DELAYED queue. @@ -826,12 +888,12 @@ When split view is in operation, this also prevents the construction by dgit of a pseudomerge to make the dgit view fast forwarding. Normally only one of ---overwrite (which creates a suitable pseudomerge) +\-\-trust-changelog (which creates a suitable pseudomerge) and --deliberately-not-fast-forward (which suppresses the pseudomerge and the fast forward checks) should be needed; ---overwrite is usually better. +\-\-trust-changelog is usually better. .TP .BR --deliberately-include-questionable-history Declare that you are deliberately including, in the git history of @@ -848,8 +910,8 @@ throw away the existing repo. Not relevant when pushing to Debian, as the Debian server will do this automatically when necessary. .TP .BR --quilt=linear -When fixing up source format `3.0 (quilt)' metadata, insist on -generating a linear patch stack: one new patch for each relevant +With format `3.0 (quilt)', insist on +a linear patch stack: one new patch for each relevant commit. If such a stack cannot be generated, fail. This is the default for Debian. @@ -859,9 +921,10 @@ HEAD should be a series of plain commits and pseudomerges, with as ancestor a patches-applied branch. .TP -.BR --quilt=auto -When fixing up source format `3.0 (quilt)' metadata, prefer to -generate a linear patch stack +.BR --quilt=try-linear +With format `3.0 (quilt)', +prefer +a linear patch stack (as with --quilt=linear) but if that doesn't seem possible, try to generate a single squashed patch for all the changes made in git @@ -869,7 +932,8 @@ try to generate a single squashed patch for all the changes made in git This is not a good idea for an NMU in Debian. .TP .BR --quilt=smash -When fixing up source format `3.0 (quilt)' metadata, +With format `3.0 (quilt)', +assume patches-applied (as obtained from dgit clone) and generate a single additional patch for all the changes made in git. This is not a good idea for an NMU in Debian. @@ -880,7 +944,8 @@ nor make changes in debian/patches, it will remain true.) .TP .BR --quilt=single -When fixing up source format `3.0 (quilt)' metadata, +With format `3.0 (quilt)', +assume patches-applied (as obtained from dgit clone), delete all the existing patches, and then generate a single patch for all the changes made in git. This is not a good idea for an NMU in Debian. @@ -895,17 +960,21 @@ that dpkg-source appears to accept but which become corrupted when people later try to modify them. .TP .BR --quilt=nofix -Check whether source format `3.0 (quilt)' metadata would need fixing -up, but, if it does, fail. You must then fix the metadata yourself +With format `3.0 (quilt)', +assume patches-applied (as obtained from dgit clone), and +check that the patch metadata is up to date. +If it isn't, fail; you must then fix the metadata yourself somehow before pushing. (NB that dpkg-source --commit will not work because the dgit git tree does not have a .B .pc directory.) .TP .BR --quilt=nocheck " | " --no-quilt-fixup -Do not check whether source format `3.0 (quilt)' metadata needs -fixing up. If you use this option and the metadata did in fact need -fixing up, dgit push will fail. +With format `3.0 (quilt)', +assume that the tree is patches-applied (as obtained from dgit clone), +and \fIassume\fR that the patch metadata is up to date. +If you use this option and the patch metadata is out of date, +dgit push will fail. .TP .BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +git | +tarball ] Tell dgit that you are using a nearly-dgit-compatible git branch, @@ -1120,6 +1189,15 @@ Obsolete alias for --dep14tag, retained for compatibility. Prints debugging information to stderr. Repeating the option produces more output (currently, up to -DDDD is meaningfully different). .TP +.BR \-\-keep\-playground | \-\-no\-\-keep\-playground +Controls whether to retain the "playground" working directory +.B .git/dgit/unpack +even on success, +for examination and debugging. +The default is +.B \-\-no\-keep\-playground +which deletes the directory after a successful execution. +.TP .BI -c name = value Specifies a git configuration option, to be used for this run. dgit itself is also controlled by git configuration options. @@ -1396,6 +1474,16 @@ when running gbp pq import when importing a package from a .dsc. See Debian bug #841867. .TP +.BR \-\-force-push-tainted +Go ahead and try to push even tainted git objects +hat the server says it is going to reject, +but without declaring any --deliberately. +This option is provided for testing or strange situations, +and is not the way to override the taint check: +using it will probably just fail later, +burning the version number you are using. +Use the appropriate --deliberately option instead. +.TP .BR \-\-for\-push Override the dgit-distro.distro.readonly configuration setting, to specify that we have read/write access @@ -1545,6 +1633,8 @@ or when pushing and .TP .BI dgit-distro. distro .git-check-suffix .TP +.BI dgit-distro. distro .policy-query-supported-ssh " " false | unknown | true +.TP .BR dgit-distro. \fIdistro\fR .diverts.divert " " new-distro | / \fIdistro-suffix\fR .TP .BI dgit-distro. distro .git-create " " ssh-cmd | true @@ -44,8 +44,9 @@ dgit. They are fast forwarding. Each push on this branch corresponds to an upload (or attempted upload). However, it is perfectly fine to have other branches in dgit-repos; -normally the dgit-repos repo for the package will be accessible via -the remote name `origin'. +the dgit-repos repo for the package can even be the same as the +`origin' remote, +although this is not generally the case in Debian. dgit push-* will also make signed tags called .BI archive/debian/ version diff --git a/git-debrebase b/git-debrebase index ab2c0dd..e06963b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1154,6 +1154,10 @@ sub keycommits ($;$$$$$) { return ($anchor, $breakwater); } +sub treated_anchor_msg () { + __ 'old anchor is recognised due to --anchor, cannot check upstream' +} + sub walk ($;$$$); sub walk ($;$$$) { my ($input, @@ -1747,6 +1751,16 @@ sub do_launder_head ($) { } sub cmd_launder_v0 () { + # =item git-debrebase launder-v0 + # + # Launders the branch without recording anything in ffq-prev. + # Then prints some information about the current branch. + # Do not use this operation; + # it will be withdrawn soon. + # + # (docs removed from manual and placed here in dgit 10.6; + # the code is retained for information) + badusage "no arguments to launder-v0 allowed" if @ARGV; my $old = get_head(); my ($tip,$breakwater,$last_anchor) = walk $old; @@ -2023,8 +2037,7 @@ sub cmd_new_upstream () { my $old_anchor_cl = classify $old_anchor; my $old_upstream; if (!$old_anchor_cl->{OrigParents}) { - snag 'anchor-treated', - __ 'old anchor is recognised due to --anchor, cannot check upstream'; + snag 'anchor-treated', treated_anchor_msg(); } else { $old_upstream = parsecommit $old_anchor_cl->{OrigParents}[0]{CommitId}; @@ -2273,6 +2286,16 @@ sub cmd_status () { print __ "key git-debrebase commits:\n"; $prab->($anchor, __ 'anchor'); $prab->($bw, __ 'breakwater'); + if (defined $anchor) { + print " upstream\n"; + my $cl = classify $anchor; + my $ops = $cl->{OrigParents}; + if ($ops) { + $prcommitinfo->($ops->[0]{CommitId}); + } else { + printf " %s\n", treated_anchor_msg(); + } + } my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); @@ -2561,7 +2584,7 @@ END print STDERR f_ <<END, "$@"; Cannot confirm dgit view: %s Failed to stitch in dgit view (see messages above). -dgit --overwrite will be needed on the first dgit push after conversion. +dgit --trust-changelog will be needed on the first dgit push after conversion. END } @@ -2961,7 +2984,7 @@ textdomain("git-debrebase"); getoptions_main (__ "bad options\n", "D+" => \$debuglevel, - 'noop-ok', => \$opt_noop_ok, + 'noop-ok!', 'f=s' => \@snag_force_opts, 'anchor=s' => \@opt_anchors, '--dgit=s' => \($dgit[0]), diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 17e750a..a2d6fbd 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -21,6 +21,9 @@ To add patches, or edit the packaging, just make git commits. Ignore anything that may appear in debian/patches. Avoid using "git pull" and "git merge" without "--ff-only". +When sharing branches, you should usually share a fast-forwarding branch +(ie, use C<git-debrebase conclude> (or C<prepush>) before pushing. + git-debrebase has a special branch format, so see "CONVERTING AN EXISTING PACKAGE" in L<dgit-maint-debrebase(7)>. @@ -369,13 +372,6 @@ It is an error if the ffq-prev could not be recorded. It is also an error if an ffq-prev has already been recorded, unless --noop-ok. -=item git-debrebase launder-v0 - -Launders the branch without recording anything in ffq-prev. -Then prints some information about the current branch. -Do not use this operation; -it will be withdrawn soon. - =item git-debrebase convert-to-gbp Converts a laundered branch into a @@ -554,11 +550,21 @@ Requests (more) debugging. May be repeated. Enable experimental code for handling general merges (see L<git-debrebase(5)/General merges>). -This option may generate lossage of various kinds, +If using this option succeeds, +the output is likely to be correct, +although it would be a good idea to check that it seems sane. + +If it fails, your tree should be left where it was. + +However, there may be lossage of various kinds, including misleading error messages, -references to nonexistent documentation, and -you being handed an incomprehensible pile of -multidimensional merge wreckage. +and references to nonexistent documentation. +On merge failure, +it might invite you to delve into +an incomprehensible pile of +multidimensional merge wreckage, +which is supposed to be left in special refs invented for the purpose +(so, not your working tree, or HEAD). =back diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index ad21564..f15c742 100755 --- a/infra/dgit-repos-policy-debian +++ b/infra/dgit-repos-policy-debian @@ -182,7 +182,7 @@ sub statpackage () { } sub getpackage () { - die unless @ARGV >= 1; + die "need PACKAGE" unless @ARGV >= 1; $pkg = shift @ARGV; die unless $pkg =~ m/^$package_re$/; @@ -247,6 +247,21 @@ sub add_taint_by_tag ($$) { } sub check_package () { + # This is not read-only, but it is safe to call within a + # policy-client-query, because it will do one of the following: + # + # * Do nothing much. + # * Find that the package has been ACCEPTed, make it not secret, + # and mirror it. + # * Find that the package has been REJECTed and add some taints + # to the db. This may be rolled back, but that's OK because + # future calls will discover the same. + # + # (This is a consequence of this function being idempotent, + # cron-callable, and correct in the sense that it doesn't make + # wrongly-sequenced updates to both the DB and the FS.) + # + # An (often useful) side-effect is to chdir to the package repo. return 0 unless $pkg_exists; return 0 unless $pkg_secret; @@ -312,14 +327,54 @@ sub getpushinfo () { sub deliberately ($) { return $deliberately{"--deliberately-$_[0]"}; } +sub package_questionable_head_msg () { + # This lets us reuse some of the same code, and the same message, + # for checking during actual push, and for pre-push taint check. + # + # In principle it might be nicer to unify this code, with some + # kind of super realistic dry run push function. However, that + # dry run function would have to involve sending the client's git + # objects to the server. We wouldn't want to do that twice, so it + # would have to be cached somehow, but we don't want to allow + # un-signed things to lurk about on the server. (The super dry + # run mode would have to involve the server tolerating an unsigned + # tag, or something, but that would be OK in principle.) The dry + # run mode would have to be careful about what subsets of the + # actions it took. + # + # So instead we apply ad-hoc checks, with separate implementations + # for the push path, and the pre-push checks. The tainted-objects + # policy-client-query exists to support this: it allows the + # efficient reimplementation of the tainted objects check, without + # transferring the objects to the server. + + return undef unless $pkg_exists; + return undef unless $pkg_secret; + # TODO: ideally this would be translated at the client end but + # that would involve marking it i_ here (which is part of + # dgit-intrastructure.deb) and then having the string appear in + # the po for dgit.deb. + return <<END; +Package is in NEW and has not been accepted or rejected yet. +Unfortunately, we cannot determine automatically what should happen. +You will have to pass either --deliberately-not-fast-forward or +--deliberately-include-questionable-history to specify whether you are +keeping or discarding the previously pushed history. + +The choice is important, to ensure that your git history is both +suitable for public distribution and as useful as possible. Please +see the descriptions of these options in dgit(1). +END +} + sub action_push () { getpackage(); getpushinfo(); check_package(); # might make package public, or might add taints - return 0 unless $pkg_exists; - return 0 unless $pkg_secret; + my $questionable_head_msg = package_questionable_head_msg(); + return 0 unless defined $questionable_head_msg; # we suppose that NEW has a version which is already in our # history, as otherwise the repo would have been blown away @@ -334,19 +389,7 @@ sub action_push () { if (deliberately('include-questionable-history')) { return 0; } - die <<END; - -Package is in NEW and has not been accepted or rejected yet. -Unfortunately, we cannot determine automatically what should happen. -You will have to pass either --deliberately-not-fast-forward or ---deliberately-include-questionable-history to specify whether you are -keeping or discarding the previously pushed history. - -The choice is important, to ensure that your git history is both -suitable for public distribution and as useful as possible. Please -see the descriptions of these options in dgit(1). - -END + die "\n". $questionable_head_msg. "\n"; } sub action_push_confirm () { @@ -402,6 +445,7 @@ END END my $mustreject=0; + my %hinted; while (my $taintid = shift @taintids) { $!=0; $_ = <CHKOUT>; @@ -428,46 +472,33 @@ END my $ti = $taintinfoq->fetchrow_hashref(); die "($taintid)" unless $ti; - my $timeshow = defined $ti->{time} - ? " at time ".strftime("%Y-%m-%d %H:%M:%S Z", gmtime $ti->{time}) - : ""; - my $pkgshow = length $ti->{package} - ? "package $ti->{package}" - : "any package"; - - $stderr .= <<END; - -History contains tainted $objtype $objid -Taint recorded$timeshow for $pkgshow -Reason: $ti->{comment} -END - printdebug "SQL overrides: @overridesv $taintid /\n$overridesstmt\n"; $overridesq ||= $poldbh->prepare($overridesstmt); $overridesq->execute(@overridesv, $taintid); my ($ovwhy) = $overridesq->fetchrow_array(); + my $ovstatus; if (!defined $ovwhy) { $overridesanyq ||= $poldbh->prepare(<<END); SELECT 1 FROM taintoverrides WHERE taint_id = ? LIMIT 1 END $overridesanyq->execute($taintid); my ($ovany) = $overridesanyq->fetchrow_array(); - $stderr .= $ovany ? <<END : <<END; -Could be forced using --deliberately. Consult documentation. -END -Uncorrectable error. If confused, consult administrator. -END + $ovwhy = $ovany ? '' : undef; $mustreject = 1; } else { - $stderr .= <<END; -Forcing due to $ovwhy -END $untaintq ||= $poldbh->prepare(<<END); DELETE FROM taints WHERE taint_id = ? END $untaintq->execute($taintid); } + + $stderr .= tainted_objects_message({ + %$ti, + gitobjid => $objid, + gitobjtype => $objtype, + }, $ovstatus, \%hinted); + } close CHKOUT; @@ -512,11 +543,70 @@ sub action_check_list () { return 0; } -$action =~ y/-/_/; -my $fn = ${*::}{"action_$action"}; +sub polclqu_tainted_objects () { + check_package(); + my $suite = shift @ARGV // die "need SUITE"; + + my $topq = $poldbh->selectall_arrayref(<<END, + SELECT taint_id, gitobjtype, gitobjid, time, comment + FROM taints + WHERE (package = ? OR package = '') +END + { Slice => {} }, + $pkg); + foreach my $row (@$topq) { + my $delibs = $poldbh->selectall_arrayref(<<END, + SELECT deliberately + FROM taintoverrides + WHERE taint_id = ? +END + { }, + $row->{taint_id}); + $row->{overrides} = [ map { $_->[0] } @$delibs ]; + delete $row->{taint_id}; + # remove any undef entries, for nice json + foreach my $k (keys %$row) { + defined $row->{$k} or delete $row->{$k}; + } + } + if (defined(my $questionable_head_msg = package_questionable_head_msg())) { + # We would reject this in push. We need to arrange that the + # client will detect this. The object tainting mechanism can + # be (ab)used for this: we tell the client that HEAD is tainted. + my $head = git_rev_parse(server_ref($suite).'~0'); + push @$topq, { + gitobjtype => 'commit', + gitobjid => $head, + comment => 'Package is in NEW, need a --deliberately', + hint => $questionable_head_msg, + # If the client was told -d-i-q-h, then they can go ahead - + # our push will be placated. If the client was told -d-n-f-f + # then presumably they aren't sending the old HEAD, so there + # won't be a tainted object reachable from their head - so + # -d-n-f-f isn't listed here. After all, this is for controlling + # when the client will regard this as a blocking problem, not + # for advising the user about overriding options. + overrides => [qw(--deliberately-include-questionable-history)] + }; + } + print encode_json $topq, "\n" or die $!; +} + +my $fn_name; + +if ($action eq 'policy-client-query') { + getpackage(); + my $query = shift @ARGV // die "need QUERY-OP"; + $fn_name = "polclqu_$query"; +} else { + $fn_name = "action_$action"; +} +$fn_name =~ y/-/_/; +my $fn = ${*::}{$fn_name}; + if (!$fn) { - printdebug "dgit-repos-policy-debian: unknown action $action\n"; - exit 0; + printdebug "dgit-repos-policy-debian: unknown $fn_name\n"; + _exit 0; } my $sleepy=0; @@ -543,10 +633,16 @@ for (;;) { $stderr = ''; $rcode = $fn->(); - die unless defined $rcode; - $poldbh->commit; - printdebug "poldbh commit\n"; + if ($action eq 'policy-client-query') { + close STDOUT or die $!; + _exit 0; + } else { + die unless defined $rcode; + + $poldbh->commit; + printdebug "poldbh commit\n"; + } }; last unless length $@; die $@ unless ref $@ eq $db_busy_exception; diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index fd199ca..9c7e36d 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -154,8 +154,10 @@ setup_sigwarn(); # VERSION SUITE TAGNAME DELIBERATELIES [...] # POLICY-HOOK-SCRIPT ... push-confirm PACKAGE \ # VERSION SUITE TAGNAME DELIBERATELIES FRESH-REPO|'' [...] +# POLICY-HOOK-SCRIPT ... policy-client-query PACKAGE POL-CL-QUERY [...] # # DELIBERATELIES is like this: --deliberately-foo,--deliberately-bar,... +# POL-CL-QUERY is in the syntax of a package name # # Exit status of policy hook is a bitmask. # Bit weight constants are defined in Dgit.pm. @@ -200,6 +202,26 @@ setup_sigwarn(); # package), it should use DGIT-LIVE-DIR/dgit (etc.), or if that is # ENOENT, use the installed version. # +# POL-CL-QUERY is one of the following: +# +# tainted-objects SUITE +# => [ { "gitobjid": "sha", +# "comment": $string, # in server"s native language, UTF-8 +# "overrides": [ "--deliberately-include-q-h", ... ], +# # optional (may be absent, not null): +# "gitobjtype": "commit", # as from git-cat-file -t +# "time": $time_t, +# "hint": $string, # client should translate if it can +# } } +# +# Arguments after POL-CL-QUERY cannot contain `;` or whitespace; +# they are obtained by dgit-ssh-dispatch by naive whitespace-splitting +# a string from SSH_ORIGINAL_COMMAND. +# +# (Response value is JSON unless otherwise specified.) +# If POL-CL-QUERY is not supported, the server will exit successfully +# producing no output. +# # Mirror hook scripts are invoked like this: # MIRROR-HOOK-SCRIPT DISTRO-DIR ACTION... # and currently there is only one action invoked by dgit-repos-server: @@ -1288,7 +1310,7 @@ END push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt"; } } - push @dgitcmd, qw(push-source --new --overwrite), $suite; + push @dgitcmd, qw(push-source --new --trust-changelog), $suite; runcmd @dgitcmd; diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch index c5861d2..e63d4bf 100755 --- a/infra/dgit-ssh-dispatch +++ b/infra/dgit-ssh-dispatch @@ -137,6 +137,12 @@ sub serve_up ($) { die "exec git: $!"; } +sub perllib_local () { + $ENV{'PERLLIB'} //= ''; + $ENV{'PERLLIB'} =~ s#^(?=.)#:#; + $ENV{'PERLLIB'} =~ s#^# $ENV{DGIT_TEST_INTREE} // $dgitlive #e; +} + sub dispatch () { local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'} // ''; @@ -150,9 +156,7 @@ sub dispatch () { my $cmd=$1; selectpackage $2,$3; if ($cmd eq 'receive-pack') { - $ENV{'PERLLIB'} //= ''; - $ENV{'PERLLIB'} =~ s#^(?=.)#:#; - $ENV{'PERLLIB'} =~ s#^# $ENV{DGIT_TEST_INTREE} // $dgitlive #e; + perllib_local(); my $s = "$dgitlive/infra/dgit-repos-server"; $s = "dgit-repos-server" if !stat_exists $s; exec $s, $distro, $d, $authrune, qw(--ssh); @@ -173,6 +177,16 @@ sub dispatch () { } elsif (m#^${qre}git-upload-pack\s#) { die "unknown repo to serve ($_). use dgit, or for server source ". "git clone here:/dgit/DISTRO/repos/_dgit-repos-server.git"; + } elsif (m#^: dgit ($lre) policy-client-query ($lre) ($lre) ([^;]*) ;#) { + my $query_op = $3; + my $query_args = $4; + selectpackage $1,$2; + my @cmd = ($policyhook,$distro,$repos,$dgitlive,$d, + 'policy-client-query', $pkg, $query_op, + split / /, $query_args); + perllib_local(); + exec @cmd;; + die "exec $cmd[0]: $!"; } else { die "unsupported operation ($_)"; } diff --git a/po/en_US.po b/po/en_US.po index 2436a5d..bcd7918 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-13 03:07+0000\n" "PO-Revision-Date: 2018-08-26 16:55+0100\n" "Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n" "Language-Team: dgit developrs <dgit@packages.debian.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:268 +#: ../dgit:271 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:275 +#: ../dgit:278 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:283 +#: ../dgit:286 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:288 +#: ../dgit:291 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:520 +#: ../dgit:545 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:525 ../dgit:531 +#: ../dgit:550 ../dgit:556 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:526 +#: ../dgit:551 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:534 +#: ../dgit:559 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:541 +#: ../dgit:566 msgid "protocol message" msgstr "" -#: ../dgit:549 +#: ../dgit:574 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:570 +#: ../dgit:595 msgid "bad byte count" msgstr "" -#: ../dgit:573 +#: ../dgit:598 msgid "data block" msgstr "" -#: ../dgit:652 +#: ../dgit:677 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:654 +#: ../dgit:679 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:679 +#: ../dgit:704 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:698 +#: ../dgit:723 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:702 +#: ../dgit:727 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:707 +#: ../dgit:732 msgid "too few arguments" msgstr "" -#: ../dgit:823 +#: ../dgit:851 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:826 +#: ../dgit:854 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:846 +#: ../dgit:874 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:903 +#: ../dgit:931 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:918 +#: ../dgit:946 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:934 +#: ../dgit:962 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:954 +#: ../dgit:982 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:972 +#: ../dgit:1000 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:1005 ../git-debrebase:1552 ../Debian/Dgit.pm:231 msgid "internal error" msgstr "" -#: ../dgit:979 +#: ../dgit:1007 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:983 +#: ../dgit:1011 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1006 +#: ../dgit:1034 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1169 +#: ../dgit:1197 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1237 +#: ../dgit:1265 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1244 +#: ../dgit:1272 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1265 +#: ../dgit:1293 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1283 +#: ../dgit:1311 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1287 +#: ../dgit:1315 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1317 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1291 +#: ../dgit:1319 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1321 ../dgit:1346 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1307 +#: ../dgit:1335 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1309 +#: ../dgit:1337 msgid "bad component" msgstr "" -#: ../dgit:1312 +#: ../dgit:1340 msgid "bad filename" msgstr "" -#: ../dgit:1314 +#: ../dgit:1342 msgid "bad sha256sum" msgstr "" -#: ../dgit:1365 +#: ../dgit:1393 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1449 +#: ../dgit:1477 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1473 +#: ../dgit:1501 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1499 +#: ../dgit:1527 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1500 +#: ../dgit:1528 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1605 +#: ../dgit:1633 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1744 +#: ../dgit:1772 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1747 +#: ../dgit:1775 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1777 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1769 +#: ../dgit:1797 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1775 +#: ../dgit:1803 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1802 +#: ../dgit:1830 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1825 +#: ../dgit:1853 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1868 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1877 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1923 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1934 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1980 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1989 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1993 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1999 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2039 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2052 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2065 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2081 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2086 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2094 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2101 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2129 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2137 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2140 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2159 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2182 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2194 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2225 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2227 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2229 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2234 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2259 +#: ../dgit:2312 +#, perl-format +msgid "%s: multiple representations of similar orig %s:\n" +msgstr "" + +#: ../dgit:2316 +#, perl-format +msgid " %s: in %s (%s)\n" +msgstr "" + +#: ../dgit:2321 +msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." +msgstr "" + +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2263 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2265 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2268 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2277 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2281 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2284 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2290 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2361 +#: ../dgit:2384 +msgid "package changelog" +msgstr "" + +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2423 -msgid "package changelog" +#: ../dgit:2552 +msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2463 -msgid "package changelog has no entries!" +#: ../dgit:2557 +#, perl-format +msgid "" +"warning: unable to find/parse changelog entry for first import of %s:\n" +"%s\n" msgstr "" -#: ../dgit:2532 ../dgit:2537 +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2552 ../dgit:2559 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2585 ../dgit:6078 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "" -#: ../dgit:2665 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2684 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2693 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +550,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2713 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2717 +#: ../dgit:2858 msgid "Import of source package" msgstr "" -#: ../dgit:2737 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -547,51 +568,52 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2779 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2783 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2787 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2803 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2898 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2913 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2957 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2972 +#: ../dgit:3113 +#, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" -"or using --damp-run instead of --dry-run.\n" +"or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:2977 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +623,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3124 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3129 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3134 +#: ../dgit:3275 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3144 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +649,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3164 +#: ../dgit:3305 msgid "rewrite map" msgstr "" -#: ../dgit:3171 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3175 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3177 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3184 +#: ../dgit:3325 msgid "additional commits" msgstr "" -#: ../dgit:3187 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3212 +#: ../dgit:3353 msgid "last upload to archive" msgstr "" -#: ../dgit:3216 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "" -#: ../dgit:3299 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3306 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3311 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3339 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -684,15 +706,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3352 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3355 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3376 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -700,7 +722,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3385 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -710,7 +732,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3470 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +740,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3483 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3501 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3503 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3514 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -740,30 +762,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3529 +#: ../dgit:3670 msgid "fetched source tree" msgstr "" -#: ../dgit:3565 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3630 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3644 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3659 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3686 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +793,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3708 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3716 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3755 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3787 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3789 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3828 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +824,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3842 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -811,257 +833,694 @@ msgid "" "\n" msgstr "" -#: ../dgit:3857 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3875 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3893 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3908 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3920 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "" -#: ../dgit:3923 +#: ../dgit:4064 msgid "starting new git history" msgstr "" -#: ../dgit:3948 +#: ../dgit:4089 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3953 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3965 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3967 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3975 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3986 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4005 +#: ../dgit:4146 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4025 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4029 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4073 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4078 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4088 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4094 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4120 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4123 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4140 +#: ../dgit:4275 msgid "version currently in archive" msgstr "" -#: ../dgit:4149 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4157 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4168 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4171 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4185 +#: ../dgit:4312 +#, perl-format +msgid "" +"d/changelog entry for %s is unfinalised!\n" +"Your tree seems to based on earlier (not uploaded) %s.\n" +msgstr "" + +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4241 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4250 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "" -#: ../dgit:4252 +#: ../dgit:4393 msgid "dgit view tag" msgstr "" -#: ../dgit:4253 +#: ../dgit:4394 msgid "current archive contents" msgstr "" -#: ../dgit:4266 +#: ../dgit:4407 msgid "" -"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" +"| Not fast forward; maybe --trust-changelog is needed ? Please see " +"dgit(1).\n" msgstr "" -#: ../dgit:4276 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4277 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4281 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4294 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4302 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4314 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4336 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4390 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5650 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +msgid "commit" +msgstr "" + +#: ../dgit:4682 +#, perl-format +msgid "object within commit %s" +msgstr "" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +msgid "" +"Push failed, while checking state of the archive.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, perl-format +msgid "" +"Branch is managed by git-debrebase (%s\n" +"exists), but quilt mode (%s) implies a split view.\n" +"Pass the right --quilt option or adjust your git config.\n" +"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" +msgstr "" + +#: ../dgit:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, perl-format +msgid "Tag %s already exists.\n" +msgstr "" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" + +#: ../dgit:4893 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" + +#: ../dgit:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +msgid "" +"Push failed, while updating the remote git repository - see messages above.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5057 +msgid "" +"Push failed, while obtaining signatures on the .changes and .dsc.\n" +"If it was just that the signature failed, you may try again by using\n" +"debsign by hand to sign the changes file (see the command dgit tried,\n" +"above), and then dput that changes file to complete the upload.\n" +"If you need to change the package, you must use a new version number.\n" +msgstr "" + +#: ../dgit:5073 +#, perl-format +msgid "[new .dsc left in %s.tmp]" +msgstr "" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +msgid "incorrect arguments to dgit clone" +msgstr "" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../dgit:5131 +#, perl-format +msgid "remove %s: %s\n" +msgstr "" + +#: ../dgit:5135 +#, perl-format +msgid "check whether to remove %s: %s\n" +msgstr "" + +#: ../dgit:5173 +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "" + +#: ../dgit:5191 +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, perl-format +msgid "vcs git unchanged: %s\n" +msgstr "" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, perl-format +msgid "fetching (%s)\n" +msgstr "" + +#: ../dgit:5289 +#, perl-format +msgid "incorrect arguments to dgit %s" +msgstr "" + +#: ../dgit:5300 +#, perl-format +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, perl-format +msgid "create %s: %s" +msgstr "" + +#: ../dgit:5503 +#, perl-format +msgid "build host child failed: %s" +msgstr "" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, perl-format +msgid "buildinfo mismatch in field %s" +msgstr "" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +msgid "build-host-supplied changes file is not source-only" +msgstr "" + +#: ../dgit:5648 +msgid "remote changes file" +msgstr "" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 +#, perl-format +msgid "dgit: cannot represent change: %s: %s\n" +msgstr "" + +#: ../dgit:5780 +msgid "" +"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" +msgstr "" + +#: ../dgit:5818 +#, perl-format +msgid "" +"\n" +"For full diff showing the problem(s), type:\n" +" %s\n" +msgstr "" + +#: ../dgit:5825 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-unapplied git tree\n" +" but git tree differs from orig in upstream files." +msgstr "" + +#: ../dgit:5831 +msgid "" +"\n" +" ... debian/patches is missing; perhaps this is a patch queue branch?" +msgstr "" + +#: ../dgit:5838 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-applied git tree\n" +" but git tree differs from result of applying debian/patches to upstream\n" +msgstr "" + +#: ../dgit:5852 +#, perl-format +msgid "Combine debian/ with upstream source for %s\n" +msgstr "" + +#: ../dgit:5860 +msgid "dgit view: creating patches-applied version using gbp pq" +msgstr "" + +#: ../dgit:5871 +#, perl-format +msgid "" +"--quilt=%s specified, implying that HEAD is for use with a\n" +" tool which does not create patches for changes to upstream\n" +" .gitignores: but, such patches exist in debian/patches.\n" +msgstr "" + +#: ../dgit:5879 +msgid "dgit view: creating patch to represent .gitignore changes" +msgstr "" + +#: ../dgit:5884 +#, perl-format +msgid "%s already exists; but want to create it to record .gitignore changes" +msgstr "" + +#: ../dgit:5890 +msgid "" +"Subject: Update .gitignore from Debian packaging branch\n" +"\n" +"The Debian packaging git branch contains these updates to the upstream\n" +".gitignore file(s). This patch is autogenerated, to provide these\n" +"updates to users of the official Debian archive view of the package.\n" +msgstr "" + +#: ../dgit:5913 +msgid "Commit patch to update .gitignore\n" +msgstr "" + +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5668 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5677 +#: ../dgit:6010 msgid "root commit" msgstr "" -#: ../dgit:5683 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5695 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5714 +#: ../dgit:6047 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5721 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5733 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5736 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5748 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1528,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:5755 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5789 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5790 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5791 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5792 +#: ../dgit:6127 msgid "is series file\n" msgstr "" -#: ../dgit:5793 +#: ../dgit:6128 msgid "too long\n" msgstr "" -#: ../dgit:5797 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5826 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5909 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5927 +#: ../dgit:6261 msgid "converted" msgstr "" -#: ../dgit:5928 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5982 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5992 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6102 +#: ../dgit:6362 +#, perl-format +msgid "regenerating patch using git diff (--quilt=%s)" +msgstr "" + +#: ../dgit:6456 +msgid "" +"warning: package uses dpkg-source include-binaries feature - not all changes " +"are visible in patches!\n" +msgstr "" + +#: ../dgit:6465 +#, perl-format +msgid "warning: ignoring bad include-binaries file %s: %s\n" +msgstr "" + +#: ../dgit:6468 +#, perl-format +msgid "forbidden path component '%s'" +msgstr "" + +#: ../dgit:6478 +#, perl-format +msgid "path starts with '%s'" +msgstr "" + +#: ../dgit:6488 +#, perl-format +msgid "path to '%s' not a plain file or directory" +msgstr "" + +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6134 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6139 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6174 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6288 +#: ../dgit:6711 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1154,84 +1644,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6302 -msgid "Tree already contains .pc - will use it then delete it." +#: ../dgit:6725 +msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6336 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6349 +#: ../dgit:6772 msgid "tarball" msgstr "" -#: ../dgit:6367 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6383 +#: ../dgit:6806 msgid "tarballs" msgstr "" -#: ../dgit:6397 +#: ../dgit:6820 msgid "upstream" msgstr "" -#: ../dgit:6421 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6431 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6440 -#, perl-format -msgid "dgit: cannot represent change: %s: %s\n" -msgstr "" - -#: ../dgit:6444 -msgid "" -"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" -msgstr "" - -#: ../dgit:6451 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6455 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6458 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6461 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6464 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6468 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6479 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6518 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,82 +1720,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:6530 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6559 +#: ../dgit:6972 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6571 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6574 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6577 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" -"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" +"To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:6590 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6607 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6621 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6640 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6650 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6659 +#: ../dgit:7072 +msgid "" +"tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" +"Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" +msgstr "" + +#: ../dgit:7077 +#, perl-format +msgid "" +"%s: warning: debian/source/options contains bare 'tar-ignore'\n" +"This can cause .gitignore files to be improperly omitted. See #908747.\n" +msgstr "" + +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6663 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6698 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6700 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6718 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:6725 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1323,54 +1817,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:6751 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6757 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6760 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6803 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6841 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6848 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6855 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6859 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6867 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6880 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1378,136 +1872,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6898 +#: ../dgit:7327 msgid "build successful\n" msgstr "" -#: ../dgit:6906 +#: ../dgit:7335 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:7017 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7054 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7074 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7087 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7091 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7098 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7104 +#: ../dgit:7547 msgid "source changes file" msgstr "" -#: ../dgit:7106 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7126 ../dgit:7128 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7142 +#: ../dgit:7585 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:7155 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7159 +#: ../dgit:7602 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:7189 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7210 +#: ../dgit:7653 msgid "source tree" msgstr "" -#: ../dgit:7212 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7225 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7229 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7233 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7250 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7255 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7257 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7268 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7271 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7282 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7293 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7302 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1515,21 +2009,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7309 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7311 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7316 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7321 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1537,129 +2031,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7341 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7343 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7351 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7370 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7374 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7375 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7386 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7388 +#: ../dgit:7831 msgid "Import, merging." msgstr "" -#: ../dgit:7402 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7411 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7418 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7436 +#: ../dgit:7879 msgid "need destination argument" msgstr "" -#: ../dgit:7441 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7449 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7460 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7466 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7473 ../dgit:7479 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7485 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7532 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7571 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7575 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7675 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7693 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7748 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7763 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7767 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7773 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1667,35 +2161,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7803 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7823 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7834 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7862 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7863 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7882 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1896,309 +2390,304 @@ msgstr "" msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1215 +#: ../git-debrebase:1158 +msgid "old anchor is recognised due to --anchor, cannot check upstream" +msgstr "old anchor is recognized due to --anchor, cannot check upstream" + +#: ../git-debrebase:1219 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1216 +#: ../git-debrebase:1220 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1337 +#: ../git-debrebase:1341 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1677 ../git-debrebase:1680 +#: ../git-debrebase:1681 ../git-debrebase:1684 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1683 +#: ../git-debrebase:1687 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1693 +#: ../git-debrebase:1697 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1721 +#: ../git-debrebase:1725 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1735 +#: ../git-debrebase:1739 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1761 +#: ../git-debrebase:1775 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1766 +#: ../git-debrebase:1780 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1768 +#: ../git-debrebase:1782 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1801 -#, perl-format -msgid "%s already exists" -msgstr "" - -#: ../git-debrebase:1803 +#: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1826 +#: ../git-debrebase:1840 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1830 +#: ../git-debrebase:1844 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1834 +#: ../git-debrebase:1848 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1856 +#: ../git-debrebase:1870 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1859 +#: ../git-debrebase:1873 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1887 +#: ../git-debrebase:1901 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1895 +#: ../git-debrebase:1909 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1906 +#: ../git-debrebase:1920 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1926 +#: ../git-debrebase:1940 msgid "fast forward" msgstr "" -#: ../git-debrebase:1936 +#: ../git-debrebase:1950 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1948 +#: ../git-debrebase:1962 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:1965 +#: ../git-debrebase:1979 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:1970 +#: ../git-debrebase:1984 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:1988 +#: ../git-debrebase:2002 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:1989 +#: ../git-debrebase:2003 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2009 +#: ../git-debrebase:2023 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2027 -msgid "old anchor is recognised due to --anchor, cannot check upstream" -msgstr "old anchor is recognized due to --anchor, cannot check upstream" - -#: ../git-debrebase:2043 +#: ../git-debrebase:2056 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2052 +#: ../git-debrebase:2065 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2065 +#: ../git-debrebase:2078 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2089 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2079 +#: ../git-debrebase:2092 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2082 +#: ../git-debrebase:2095 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2193 +#: ../git-debrebase:2206 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2197 +#: ../git-debrebase:2210 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 -#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 -#: ../git-debrebase:2401 +#: ../git-debrebase:2215 ../git-debrebase:2221 ../git-debrebase:2227 +#: ../git-debrebase:2327 ../git-debrebase:2336 ../git-debrebase:2360 +#: ../git-debrebase:2424 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2236 +#: ../git-debrebase:2249 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2237 +#: ../git-debrebase:2250 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2238 +#: ../git-debrebase:2251 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2239 +#: ../git-debrebase:2252 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2249 +#: ../git-debrebase:2262 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2251 +#: ../git-debrebase:2264 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2267 +#: ../git-debrebase:2280 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2273 +#: ../git-debrebase:2286 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2274 +#: ../git-debrebase:2287 msgid "anchor" msgstr "" -#: ../git-debrebase:2275 +#: ../git-debrebase:2288 msgid "breakwater" msgstr "" -#: ../git-debrebase:2280 +#: ../git-debrebase:2303 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2287 +#: ../git-debrebase:2310 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2290 +#: ../git-debrebase:2313 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2292 +#: ../git-debrebase:2315 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2294 +#: ../git-debrebase:2317 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2297 +#: ../git-debrebase:2320 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2314 ../git-debrebase:2327 +#: ../git-debrebase:2337 ../git-debrebase:2350 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2321 ../git-debrebase:2351 +#: ../git-debrebase:2344 ../git-debrebase:2374 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2390 +#: ../git-debrebase:2413 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2407 +#: ../git-debrebase:2430 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2414 +#: ../git-debrebase:2437 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2434 +#: ../git-debrebase:2457 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2439 +#: ../git-debrebase:2462 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2446 +#: ../git-debrebase:2469 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2454 +#: ../git-debrebase:2477 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2459 +#: ../git-debrebase:2482 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2475 +#: ../git-debrebase:2499 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2480 +#: ../git-debrebase:2504 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2496 +#: ../git-debrebase:2520 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2206,71 +2695,72 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2504 +#: ../git-debrebase:2528 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2511 +#: ../git-debrebase:2535 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2537 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2520 +#: ../git-debrebase:2544 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2538 +#: ../git-debrebase:2562 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2544 +#: ../git-debrebase:2568 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2571 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2550 +#: ../git-debrebase:2574 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2552 +#: ../git-debrebase:2576 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2554 +#: ../git-debrebase:2578 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2561 +#: ../git-debrebase:2585 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" "Failed to stitch in dgit view (see messages above).\n" -"dgit --overwrite will be needed on the first dgit push after conversion.\n" +"dgit --trust-changelog will be needed on the first dgit push after " +"conversion.\n" msgstr "" -#: ../git-debrebase:2607 +#: ../git-debrebase:2631 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2636 +#: ../git-debrebase:2660 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2278,16 +2768,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2657 +#: ../git-debrebase:2681 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2665 +#: ../git-debrebase:2689 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2679 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2295,175 +2785,190 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2683 +#: ../git-debrebase:2707 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2695 +#: ../git-debrebase:2719 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2727 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2708 +#: ../git-debrebase:2733 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2717 +#: ../git-debrebase:2742 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2748 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2754 +#: ../git-debrebase:2779 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2763 +#: ../git-debrebase:2788 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2800 +#: ../git-debrebase:2829 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2809 +#: ../git-debrebase:2838 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2823 +#: ../git-debrebase:2852 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2858 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2836 +#: ../git-debrebase:2863 +#, perl-format +msgid "" +"Result of applying debian/patches/ onto the upstream is not the same as " +"HEAD.\n" +"(Applying patches gave the commit %s)\n" +"Perhaps the upstream is not right, or not all of the delta is in d/patches.\n" +msgstr "" + +#: ../git-debrebase:2871 +msgid "Output of conversion does not match input!" +msgstr "" + +#: ../git-debrebase:2879 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2840 +#: ../git-debrebase:2883 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2942 +#: ../git-debrebase:2985 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2952 +#: ../git-debrebase:2995 #, perl-format -msgid "%s: no cuddling to -i for git-rebase" +msgid "" +"%s: with git-debrebase, get-rebase -i option may only be followed by more " +"options (as separate arguments)" msgstr "" -#: ../git-debrebase:2982 +#: ../git-debrebase:3025 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:298 +#: ../Debian/Dgit.pm:328 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit.pm:354 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:373 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:345 +#: ../Debian/Dgit.pm:375 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:348 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:382 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:358 +#: ../Debian/Dgit.pm:388 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:394 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:396 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:368 +#: ../Debian/Dgit.pm:398 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:459 +#: ../Debian/Dgit.pm:503 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:469 +#: ../Debian/Dgit.pm:513 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:488 +#: ../Debian/Dgit.pm:532 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:494 +#: ../Debian/Dgit.pm:538 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:515 +#: ../Debian/Dgit.pm:559 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:518 +#: ../Debian/Dgit.pm:562 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:626 +#: ../Debian/Dgit.pm:670 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:627 +#: ../Debian/Dgit.pm:671 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:649 +#: ../Debian/Dgit.pm:696 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:655 +#: ../Debian/Dgit.pm:703 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2471,66 +2976,98 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 +#: ../Debian/Dgit.pm:708 ../Debian/Dgit.pm:710 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:769 +#: ../Debian/Dgit.pm:816 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:770 +#: ../Debian/Dgit.pm:817 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:786 +#: ../Debian/Dgit.pm:833 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:795 +#: ../Debian/Dgit.pm:842 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:809 +#: ../Debian/Dgit.pm:856 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:830 +#: ../Debian/Dgit.pm:877 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:916 +#: ../Debian/Dgit.pm:963 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:937 +#: ../Debian/Dgit.pm:984 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1005 +#: ../Debian/Dgit.pm:1012 +#, perl-format +msgid "Taint recorded at time %s for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:1014 +#, perl-format +msgid "Taint recorded at time %s for any package" +msgstr "" + +#: ../Debian/Dgit.pm:1016 +#, perl-format +msgid "Taint recorded for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:1018 +msgid "Taint recorded for any package" +msgstr "" + +#: ../Debian/Dgit.pm:1030 +msgid "Uncorrectable error. If confused, consult administrator.\n" +msgstr "" + +#: ../Debian/Dgit.pm:1033 +msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" +msgstr "" + +#: ../Debian/Dgit.pm:1036 +#, perl-format +msgid "Forcing due to %s\n" +msgstr "" + +#: ../Debian/Dgit.pm:1101 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1028 +#: ../Debian/Dgit.pm:1124 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1132 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1045 +#: ../Debian/Dgit.pm:1141 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" diff --git a/po/messages.pot b/po/messages.pot index f81c3ef..c8413c6 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit ongoing\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-13 03:07+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,73 +17,73 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../dgit:268 +#: ../dgit:271 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "" -#: ../dgit:275 +#: ../dgit:278 msgid "warning: overriding problem due to --force:\n" msgstr "" -#: ../dgit:283 +#: ../dgit:286 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" -#: ../dgit:288 +#: ../dgit:291 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "" -#: ../dgit:520 +#: ../dgit:545 #, perl-format msgid "build host child %s" msgstr "" -#: ../dgit:525 ../dgit:531 +#: ../dgit:550 ../dgit:556 #, perl-format msgid "connection lost: %s" msgstr "" -#: ../dgit:526 +#: ../dgit:551 #, perl-format msgid "protocol violation; %s not expected" msgstr "" -#: ../dgit:534 +#: ../dgit:559 #, perl-format msgid "eof (reading %s)" msgstr "" -#: ../dgit:541 +#: ../dgit:566 msgid "protocol message" msgstr "" -#: ../dgit:549 +#: ../dgit:574 #, perl-format msgid "`%s'" msgstr "" -#: ../dgit:570 +#: ../dgit:595 msgid "bad byte count" msgstr "" -#: ../dgit:573 +#: ../dgit:598 msgid "data block" msgstr "" -#: ../dgit:652 +#: ../dgit:677 #, perl-format msgid "%s ok: %s" msgstr "" -#: ../dgit:654 +#: ../dgit:679 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "" -#: ../dgit:679 +#: ../dgit:704 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -104,147 +104,147 @@ msgid "" " -c<name>=<value> set git config option (used directly by dgit too)\n" msgstr "" -#: ../dgit:698 +#: ../dgit:723 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" -#: ../dgit:702 +#: ../dgit:727 #, perl-format msgid "" "%s: %s\n" "%s" msgstr "" -#: ../dgit:707 +#: ../dgit:732 msgid "too few arguments" msgstr "" -#: ../dgit:823 +#: ../dgit:851 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "" -#: ../dgit:826 +#: ../dgit:854 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" -#: ../dgit:846 +#: ../dgit:874 #, perl-format msgid "" "need value for one of: %s\n" "%s: distro or suite appears not to be (properly) supported" msgstr "" -#: ../dgit:903 +#: ../dgit:931 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" -#: ../dgit:918 +#: ../dgit:946 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "" -#: ../dgit:934 +#: ../dgit:962 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "" -#: ../dgit:954 +#: ../dgit:982 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" -#: ../dgit:972 +#: ../dgit:1000 #, perl-format msgid "unknown %s `%s'" msgstr "" -#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:1005 ../git-debrebase:1552 ../Debian/Dgit.pm:231 msgid "internal error" msgstr "" -#: ../dgit:979 +#: ../dgit:1007 msgid "pushing but distro is configured readonly" msgstr "" -#: ../dgit:983 +#: ../dgit:1011 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" msgstr "" -#: ../dgit:1006 +#: ../dgit:1034 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " "set to `%s'" msgstr "" -#: ../dgit:1169 +#: ../dgit:1197 msgid "this operation does not support multiple comma-separated suites" msgstr "" -#: ../dgit:1237 +#: ../dgit:1265 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "" -#: ../dgit:1244 +#: ../dgit:1272 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "" -#: ../dgit:1265 +#: ../dgit:1293 msgid "ftpmasterapi archive query method takes no data part" msgstr "" -#: ../dgit:1283 +#: ../dgit:1311 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "" -#: ../dgit:1287 +#: ../dgit:1315 #, perl-format msgid "multiple matches for suite %s\n" msgstr "" -#: ../dgit:1289 +#: ../dgit:1317 #, perl-format msgid "suite %s info has no codename\n" msgstr "" -#: ../dgit:1291 +#: ../dgit:1319 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1321 ../dgit:1346 msgid "bad ftpmaster api response: " msgstr "" -#: ../dgit:1307 +#: ../dgit:1335 #, perl-format msgid "bad version: %s\n" msgstr "" -#: ../dgit:1309 +#: ../dgit:1337 msgid "bad component" msgstr "" -#: ../dgit:1312 +#: ../dgit:1340 msgid "bad filename" msgstr "" -#: ../dgit:1314 +#: ../dgit:1342 msgid "bad sha256sum" msgstr "" -#: ../dgit:1365 +#: ../dgit:1393 msgid "aptget archive query method takes no data part" msgstr "" -#: ../dgit:1449 +#: ../dgit:1477 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -252,159 +252,159 @@ msgid "" " is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n" msgstr "" -#: ../dgit:1473 +#: ../dgit:1501 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "" -#: ../dgit:1499 +#: ../dgit:1527 msgid "apt-get source did not produce a .dsc" msgstr "" -#: ../dgit:1500 +#: ../dgit:1528 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "" -#: ../dgit:1605 +#: ../dgit:1633 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " "in suite %s; --existing-package may help" msgstr "" -#: ../dgit:1744 +#: ../dgit:1772 #, perl-format msgid "cannot operate on %s suite" msgstr "" -#: ../dgit:1747 +#: ../dgit:1775 #, perl-format msgid "canonical suite name for %s is %s" msgstr "" -#: ../dgit:1749 +#: ../dgit:1777 #, perl-format msgid "canonical suite name is %s" msgstr "" -#: ../dgit:1769 +#: ../dgit:1797 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "" -#: ../dgit:1775 +#: ../dgit:1803 #, perl-format msgid "unsupported source format %s, sorry" msgstr "" -#: ../dgit:1802 +#: ../dgit:1830 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "" -#: ../dgit:1825 +#: ../dgit:1853 #, perl-format msgid "unknown git-check `%s'" msgstr "" -#: ../dgit:1840 +#: ../dgit:1868 #, perl-format msgid "unknown git-create `%s'" msgstr "" -#: ../dgit:1877 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "" -#: ../dgit:1923 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "" -#: ../dgit:1934 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "" -#: ../dgit:1980 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "" -#: ../dgit:1989 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "" -#: ../dgit:1993 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "" -#: ../dgit:1999 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "" -#: ../dgit:2039 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "" -#: ../dgit:2052 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" -#: ../dgit:2065 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" -#: ../dgit:2081 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr "" -#: ../dgit:2086 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "" -#: ../dgit:2094 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "" -#: ../dgit:2101 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "" -#: ../dgit:2129 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "" -#: ../dgit:2137 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "" -#: ../dgit:2140 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "" -#: ../dgit:2159 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " "Maintainer field)" msgstr "" -#: ../dgit:2182 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -419,108 +419,129 @@ msgid "" "\n" msgstr "" -#: ../dgit:2194 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" msgstr "" -#: ../dgit:2225 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "" -#: ../dgit:2227 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "" -#: ../dgit:2229 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "" -#: ../dgit:2234 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "" -#: ../dgit:2259 +#: ../dgit:2312 +#, perl-format +msgid "%s: multiple representations of similar orig %s:\n" +msgstr "" + +#: ../dgit:2316 +#, perl-format +msgid " %s: in %s (%s)\n" +msgstr "" + +#: ../dgit:2321 +msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." +msgstr "" + +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -#: ../dgit:2263 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "" -#: ../dgit:2265 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "" -#: ../dgit:2268 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "" -#: ../dgit:2277 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "" -#: ../dgit:2281 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "" -#: ../dgit:2284 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "" -#: ../dgit:2290 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" -#: ../dgit:2361 +#: ../dgit:2384 +msgid "package changelog" +msgstr "" + +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "" -#: ../dgit:2423 -msgid "package changelog" +#: ../dgit:2552 +msgid "package changelog has no entries!" msgstr "" -#: ../dgit:2463 -msgid "package changelog has no entries!" +#: ../dgit:2557 +#, perl-format +msgid "" +"warning: unable to find/parse changelog entry for first import of %s:\n" +"%s\n" msgstr "" -#: ../dgit:2532 ../dgit:2537 +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" msgstr "" -#: ../dgit:2552 ../dgit:2559 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" msgstr "" -#: ../dgit:2585 ../dgit:6078 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "" -#: ../dgit:2665 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "" -#: ../dgit:2684 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "" -#: ../dgit:2693 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -529,16 +550,16 @@ msgid "" " dpkg-source --before-build gave tree %s\n" msgstr "" -#: ../dgit:2713 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "" -#: ../dgit:2717 +#: ../dgit:2858 msgid "Import of source package" msgstr "" -#: ../dgit:2737 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -547,51 +568,52 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:2779 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "" -#: ../dgit:2783 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " "file?)" msgstr "" -#: ../dgit:2787 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "" -#: ../dgit:2803 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" msgstr "" -#: ../dgit:2898 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "" -#: ../dgit:2913 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" -#: ../dgit:2957 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" -#: ../dgit:2972 +#: ../dgit:3113 +#, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" -"or using --damp-run instead of --dry-run.\n" +"or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" -#: ../dgit:2977 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -601,24 +623,24 @@ msgid "" "warning: Will try again...\n" msgstr "" -#: ../dgit:3124 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" -#: ../dgit:3129 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr "" -#: ../dgit:3134 +#: ../dgit:3275 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" "for which we have no configured url and .dsc provides no hint\n" msgstr "" -#: ../dgit:3144 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -627,54 +649,54 @@ msgid "" "(can be overridden by config - consult documentation)\n" msgstr "" -#: ../dgit:3164 +#: ../dgit:3305 msgid "rewrite map" msgstr "" -#: ../dgit:3171 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" -#: ../dgit:3175 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "" -#: ../dgit:3177 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" -#: ../dgit:3184 +#: ../dgit:3325 msgid "additional commits" msgstr "" -#: ../dgit:3187 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" "but we could not obtain that object anywhere.\n" msgstr "" -#: ../dgit:3212 +#: ../dgit:3353 msgid "last upload to archive" msgstr "" -#: ../dgit:3216 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "" -#: ../dgit:3299 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "" -#: ../dgit:3306 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "" -#: ../dgit:3311 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "" -#: ../dgit:3339 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -684,15 +706,15 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3352 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr "" -#: ../dgit:3355 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr "" -#: ../dgit:3376 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -700,7 +722,7 @@ msgid "" "%s\n" msgstr "" -#: ../dgit:3385 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -710,7 +732,7 @@ msgid "" "\n" msgstr "" -#: ../dgit:3470 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -718,19 +740,19 @@ msgid "" "Record that\n" msgstr "" -#: ../dgit:3483 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "" -#: ../dgit:3501 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "" -#: ../dgit:3503 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "" -#: ../dgit:3514 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -740,30 +762,30 @@ msgid "" "\n" msgstr "" -#: ../dgit:3529 +#: ../dgit:3670 msgid "fetched source tree" msgstr "" -#: ../dgit:3565 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "" -#: ../dgit:3630 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" msgstr "" -#: ../dgit:3644 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "" -#: ../dgit:3659 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "" -#: ../dgit:3686 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -771,30 +793,30 @@ msgid "" "tree.\n" msgstr "" -#: ../dgit:3708 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "" -#: ../dgit:3716 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "" -#: ../dgit:3755 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "" -#: ../dgit:3787 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "" -#: ../dgit:3789 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" -#: ../dgit:3828 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -802,7 +824,7 @@ msgid "" "Input branches:\n" msgstr "" -#: ../dgit:3842 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -811,257 +833,694 @@ msgid "" "\n" msgstr "" -#: ../dgit:3857 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "" -#: ../dgit:3875 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "" -#: ../dgit:3893 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "" -#: ../dgit:3908 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "" -#: ../dgit:3920 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "" -#: ../dgit:3923 +#: ../dgit:4064 msgid "starting new git history" msgstr "" -#: ../dgit:3948 +#: ../dgit:4089 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" " Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n" msgstr "" -#: ../dgit:3953 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "" -#: ../dgit:3965 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "" -#: ../dgit:3967 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "" -#: ../dgit:3975 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "" -#: ../dgit:3986 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" -#: ../dgit:4005 +#: ../dgit:4146 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" "HEAD commit%s differs from tree implied by debian/patches%s" msgstr "" -#: ../dgit:4022 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "" -#: ../dgit:4025 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr "" -#: ../dgit:4029 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" msgstr "" -#: ../dgit:4073 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" msgstr "" -#: ../dgit:4078 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "" -#: ../dgit:4088 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "" -#: ../dgit:4094 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "" -#: ../dgit:4120 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4123 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "" -#: ../dgit:4131 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" -#: ../dgit:4140 +#: ../dgit:4275 msgid "version currently in archive" msgstr "" -#: ../dgit:4149 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" -#: ../dgit:4157 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "" -#: ../dgit:4168 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "" -#: ../dgit:4171 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" "Your tree seems to based on earlier (not uploaded) %s.\n" msgstr "" -#: ../dgit:4185 +#: ../dgit:4312 +#, perl-format +msgid "" +"d/changelog entry for %s is unfinalised!\n" +"Your tree seems to based on earlier (not uploaded) %s.\n" +msgstr "" + +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." msgstr "" -#: ../dgit:4241 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." msgstr "" -#: ../dgit:4250 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "" -#: ../dgit:4252 +#: ../dgit:4393 msgid "dgit view tag" msgstr "" -#: ../dgit:4253 +#: ../dgit:4394 msgid "current archive contents" msgstr "" -#: ../dgit:4266 +#: ../dgit:4407 msgid "" -"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" +"| Not fast forward; maybe --trust-changelog is needed ? Please see " +"dgit(1).\n" msgstr "" -#: ../dgit:4276 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "" -#: ../dgit:4277 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "" -#: ../dgit:4281 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "" -#: ../dgit:4294 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "" -#: ../dgit:4302 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "" -#: ../dgit:4314 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "" -#: ../dgit:4336 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "" -#: ../dgit:4390 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "" -#: ../dgit:5650 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +msgid "commit" +msgstr "" + +#: ../dgit:4682 +#, perl-format +msgid "object within commit %s" +msgstr "" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +msgid "" +"Push failed, while checking state of the archive.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, perl-format +msgid "" +"Branch is managed by git-debrebase (%s\n" +"exists), but quilt mode (%s) implies a split view.\n" +"Pass the right --quilt option or adjust your git config.\n" +"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" +msgstr "" + +#: ../dgit:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, perl-format +msgid "Tag %s already exists.\n" +msgstr "" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" + +#: ../dgit:4893 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" + +#: ../dgit:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +msgid "" +"Push failed, while updating the remote git repository - see messages above.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5057 +msgid "" +"Push failed, while obtaining signatures on the .changes and .dsc.\n" +"If it was just that the signature failed, you may try again by using\n" +"debsign by hand to sign the changes file (see the command dgit tried,\n" +"above), and then dput that changes file to complete the upload.\n" +"If you need to change the package, you must use a new version number.\n" +msgstr "" + +#: ../dgit:5073 +#, perl-format +msgid "[new .dsc left in %s.tmp]" +msgstr "" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +msgid "incorrect arguments to dgit clone" +msgstr "" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../dgit:5131 +#, perl-format +msgid "remove %s: %s\n" +msgstr "" + +#: ../dgit:5135 +#, perl-format +msgid "check whether to remove %s: %s\n" +msgstr "" + +#: ../dgit:5173 +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "" + +#: ../dgit:5191 +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, perl-format +msgid "vcs git unchanged: %s\n" +msgstr "" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, perl-format +msgid "fetching (%s)\n" +msgstr "" + +#: ../dgit:5289 +#, perl-format +msgid "incorrect arguments to dgit %s" +msgstr "" + +#: ../dgit:5300 +#, perl-format +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, perl-format +msgid "create %s: %s" +msgstr "" + +#: ../dgit:5503 +#, perl-format +msgid "build host child failed: %s" +msgstr "" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, perl-format +msgid "buildinfo mismatch in field %s" +msgstr "" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +msgid "build-host-supplied changes file is not source-only" +msgstr "" + +#: ../dgit:5648 +msgid "remote changes file" +msgstr "" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 +#, perl-format +msgid "dgit: cannot represent change: %s: %s\n" +msgstr "" + +#: ../dgit:5780 +msgid "" +"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" +msgstr "" + +#: ../dgit:5818 +#, perl-format +msgid "" +"\n" +"For full diff showing the problem(s), type:\n" +" %s\n" +msgstr "" + +#: ../dgit:5825 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-unapplied git tree\n" +" but git tree differs from orig in upstream files." +msgstr "" + +#: ../dgit:5831 +msgid "" +"\n" +" ... debian/patches is missing; perhaps this is a patch queue branch?" +msgstr "" + +#: ../dgit:5838 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-applied git tree\n" +" but git tree differs from result of applying debian/patches to upstream\n" +msgstr "" + +#: ../dgit:5852 +#, perl-format +msgid "Combine debian/ with upstream source for %s\n" +msgstr "" + +#: ../dgit:5860 +msgid "dgit view: creating patches-applied version using gbp pq" +msgstr "" + +#: ../dgit:5871 +#, perl-format +msgid "" +"--quilt=%s specified, implying that HEAD is for use with a\n" +" tool which does not create patches for changes to upstream\n" +" .gitignores: but, such patches exist in debian/patches.\n" +msgstr "" + +#: ../dgit:5879 +msgid "dgit view: creating patch to represent .gitignore changes" +msgstr "" + +#: ../dgit:5884 +#, perl-format +msgid "%s already exists; but want to create it to record .gitignore changes" +msgstr "" + +#: ../dgit:5890 +msgid "" +"Subject: Update .gitignore from Debian packaging branch\n" +"\n" +"The Debian packaging git branch contains these updates to the upstream\n" +".gitignore file(s). This patch is autogenerated, to provide these\n" +"updates to users of the official Debian archive view of the package.\n" +msgstr "" + +#: ../dgit:5913 +msgid "Commit patch to update .gitignore\n" +msgstr "" + +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "" -#: ../dgit:5668 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "" -#: ../dgit:5677 +#: ../dgit:6010 msgid "root commit" msgstr "" -#: ../dgit:5683 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "" -#: ../dgit:5695 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "" -#: ../dgit:5714 +#: ../dgit:6047 #, perl-format msgid "" "\n" "%s: error: quilt fixup cannot be linear. Stopped at:\n" msgstr "" -#: ../dgit:5721 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "" -#: ../dgit:5733 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" -#: ../dgit:5736 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" -#: ../dgit:5748 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1069,84 +1528,115 @@ msgid "" "\n" msgstr "" -#: ../dgit:5755 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "" -#: ../dgit:5789 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "" -#: ../dgit:5790 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "" -#: ../dgit:5791 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "" -#: ../dgit:5792 +#: ../dgit:6127 msgid "is series file\n" msgstr "" -#: ../dgit:5793 +#: ../dgit:6128 msgid "too long\n" msgstr "" -#: ../dgit:5797 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" -#: ../dgit:5826 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "" -#: ../dgit:5909 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" "patch" msgstr "" -#: ../dgit:5927 +#: ../dgit:6261 msgid "converted" msgstr "" -#: ../dgit:5928 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "" -#: ../dgit:5982 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" -#: ../dgit:5992 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "" -#: ../dgit:6102 +#: ../dgit:6362 +#, perl-format +msgid "regenerating patch using git diff (--quilt=%s)" +msgstr "" + +#: ../dgit:6456 +msgid "" +"warning: package uses dpkg-source include-binaries feature - not all changes " +"are visible in patches!\n" +msgstr "" + +#: ../dgit:6465 +#, perl-format +msgid "warning: ignoring bad include-binaries file %s: %s\n" +msgstr "" + +#: ../dgit:6468 +#, perl-format +msgid "forbidden path component '%s'" +msgstr "" + +#: ../dgit:6478 +#, perl-format +msgid "path starts with '%s'" +msgstr "" + +#: ../dgit:6488 +#, perl-format +msgid "path to '%s' not a plain file or directory" +msgstr "" + +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" -#: ../dgit:6134 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "" -#: ../dgit:6139 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "" -#: ../dgit:6174 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "" -#: ../dgit:6288 +#: ../dgit:6711 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1154,84 +1644,74 @@ msgid "" " anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n" msgstr "" -#: ../dgit:6302 -msgid "Tree already contains .pc - will use it then delete it." +#: ../dgit:6725 +msgid "Tree already contains .pc - will delete it." msgstr "" -#: ../dgit:6336 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "" -#: ../dgit:6349 +#: ../dgit:6772 msgid "tarball" msgstr "" -#: ../dgit:6367 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr "" -#: ../dgit:6383 +#: ../dgit:6806 msgid "tarballs" msgstr "" -#: ../dgit:6397 +#: ../dgit:6820 msgid "upstream" msgstr "" -#: ../dgit:6421 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "" -#: ../dgit:6431 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p" msgstr "" -#: ../dgit:6440 -#, perl-format -msgid "dgit: cannot represent change: %s: %s\n" -msgstr "" - -#: ../dgit:6444 -msgid "" -"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" -msgstr "" - -#: ../dgit:6451 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "" -#: ../dgit:6455 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "" -#: ../dgit:6458 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "" -#: ../dgit:6461 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" -#: ../dgit:6464 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" -#: ../dgit:6468 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" -#: ../dgit:6479 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "" -#: ../dgit:6518 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1240,82 +1720,96 @@ msgid "" "\n" msgstr "" -#: ../dgit:6530 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -#: ../dgit:6559 +#: ../dgit:6972 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" "or --clean=git (-wg/-wgf) to use `git clean' instead.\n" msgstr "" -#: ../dgit:6571 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" -#: ../dgit:6574 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" -#: ../dgit:6577 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" -"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" +"To include them in the build, it is usually best to just commit them." msgstr "" -#: ../dgit:6590 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" "contradicts clean mode %s (which would delete them)\n" msgstr "" -#: ../dgit:6607 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" -#: ../dgit:6621 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "" -#: ../dgit:6640 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "" -#: ../dgit:6650 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" msgstr "" -#: ../dgit:6659 +#: ../dgit:7072 +msgid "" +"tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" +"Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" +msgstr "" + +#: ../dgit:7077 +#, perl-format +msgid "" +"%s: warning: debian/source/options contains bare 'tar-ignore'\n" +"This can cause .gitignore files to be improperly omitted. See #908747.\n" +msgstr "" + +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "" -#: ../dgit:6663 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "" -#: ../dgit:6698 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "" -#: ../dgit:6700 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "" -#: ../dgit:6718 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" -#: ../dgit:6725 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1323,54 +1817,54 @@ msgid "" "to %s\n" msgstr "" -#: ../dgit:6751 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" -#: ../dgit:6757 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "" -#: ../dgit:6760 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "" -#: ../dgit:6803 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "" -#: ../dgit:6841 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "" -#: ../dgit:6848 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "" -#: ../dgit:6855 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "" -#: ../dgit:6859 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "" -#: ../dgit:6864 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "" -#: ../dgit:6867 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "" -#: ../dgit:6880 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1378,136 +1872,136 @@ msgid "" "Suggest you delete %s.\n" msgstr "" -#: ../dgit:6898 +#: ../dgit:7327 msgid "build successful\n" msgstr "" -#: ../dgit:6906 +#: ../dgit:7335 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" "%s: warning: build-products-dir will be ignored; files will go to ..\n" msgstr "" -#: ../dgit:7017 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "" -#: ../dgit:7054 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "" -#: ../dgit:7074 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "" -#: ../dgit:7087 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "" -#: ../dgit:7091 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "" -#: ../dgit:7098 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" msgstr "" -#: ../dgit:7104 +#: ../dgit:7547 msgid "source changes file" msgstr "" -#: ../dgit:7106 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" -#: ../dgit:7126 ../dgit:7128 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "" -#: ../dgit:7142 +#: ../dgit:7585 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" msgstr "" -#: ../dgit:7155 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" msgstr "" -#: ../dgit:7159 +#: ../dgit:7602 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" msgstr "" -#: ../dgit:7189 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "" -#: ../dgit:7210 +#: ../dgit:7653 msgid "source tree" msgstr "" -#: ../dgit:7212 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "" -#: ../dgit:7225 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "" -#: ../dgit:7229 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "" -#: ../dgit:7233 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "" -#: ../dgit:7250 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "" -#: ../dgit:7255 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "" -#: ../dgit:7257 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "" -#: ../dgit:7268 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "" -#: ../dgit:7271 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "" -#: ../dgit:7282 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "" -#: ../dgit:7293 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "" -#: ../dgit:7302 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1515,21 +2009,21 @@ msgid "" "plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n" msgstr "" -#: ../dgit:7309 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "" -#: ../dgit:7311 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "" -#: ../dgit:7316 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "" -#: ../dgit:7321 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1537,129 +2031,129 @@ msgid "" "Specify +%s to overwrite, discarding existing history\n" msgstr "" -#: ../dgit:7341 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "" -#: ../dgit:7343 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "" -#: ../dgit:7351 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "" -#: ../dgit:7370 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "" -#: ../dgit:7374 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "" -#: ../dgit:7375 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "" -#: ../dgit:7386 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." msgstr "" -#: ../dgit:7388 +#: ../dgit:7831 msgid "Import, merging." msgstr "" -#: ../dgit:7402 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "" -#: ../dgit:7411 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "" -#: ../dgit:7418 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "" -#: ../dgit:7436 +#: ../dgit:7879 msgid "need destination argument" msgstr "" -#: ../dgit:7441 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "" -#: ../dgit:7449 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "" -#: ../dgit:7460 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "" -#: ../dgit:7466 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "" -#: ../dgit:7473 ../dgit:7479 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "" -#: ../dgit:7485 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "" -#: ../dgit:7532 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." msgstr "" -#: ../dgit:7571 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "" -#: ../dgit:7575 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "" -#: ../dgit:7675 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "" -#: ../dgit:7693 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "" -#: ../dgit:7748 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "" -#: ../dgit:7763 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "" -#: ../dgit:7767 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "" -#: ../dgit:7773 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1667,35 +2161,35 @@ msgid "" "Giving up.\n" msgstr "" -#: ../dgit:7790 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "" -#: ../dgit:7803 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "" -#: ../dgit:7823 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "" -#: ../dgit:7834 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "" -#: ../dgit:7862 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "" -#: ../dgit:7863 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" -#: ../dgit:7882 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "" @@ -1896,309 +2390,304 @@ msgstr "" msgid "found unprocessable commit, cannot cope: %s" msgstr "" -#: ../git-debrebase:1215 +#: ../git-debrebase:1158 +msgid "old anchor is recognised due to --anchor, cannot check upstream" +msgstr "" + +#: ../git-debrebase:1219 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1216 +#: ../git-debrebase:1220 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" -#: ../git-debrebase:1337 +#: ../git-debrebase:1341 msgid "bare dgit dsc import" msgstr "" -#: ../git-debrebase:1677 ../git-debrebase:1680 +#: ../git-debrebase:1681 ../git-debrebase:1684 #, perl-format msgid "mismatch %s ?" msgstr "" -#: ../git-debrebase:1683 +#: ../git-debrebase:1687 #, perl-format msgid "mismatch %s != %s ?" msgstr "" -#: ../git-debrebase:1693 +#: ../git-debrebase:1697 #, perl-format msgid "internal error %#x %s %s" msgstr "" -#: ../git-debrebase:1721 +#: ../git-debrebase:1725 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "" -#: ../git-debrebase:1735 +#: ../git-debrebase:1739 msgid "you are in the middle of a git-rebase already" msgstr "" -#: ../git-debrebase:1761 +#: ../git-debrebase:1775 msgid "launder for rebase" msgstr "" -#: ../git-debrebase:1766 +#: ../git-debrebase:1780 msgid "analyse does not support any options" msgstr "" -#: ../git-debrebase:1768 +#: ../git-debrebase:1782 msgid "too many arguments to analyse" msgstr "" -#: ../git-debrebase:1801 -#, perl-format -msgid "%s already exists" -msgstr "" - -#: ../git-debrebase:1803 +#: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "" -#: ../git-debrebase:1826 +#: ../git-debrebase:1840 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "" -#: ../git-debrebase:1830 +#: ../git-debrebase:1844 #, perl-format msgid "you are behind %s, divergence risk" msgstr "" -#: ../git-debrebase:1834 +#: ../git-debrebase:1848 #, perl-format msgid "you have diverged from %s" msgstr "" -#: ../git-debrebase:1856 +#: ../git-debrebase:1870 msgid "remote dgit branch" msgstr "" -#: ../git-debrebase:1859 +#: ../git-debrebase:1873 msgid "remote dgit branch for sid" msgstr "" -#: ../git-debrebase:1887 +#: ../git-debrebase:1901 msgid "Recorded previous head for preservation" msgstr "" -#: ../git-debrebase:1895 +#: ../git-debrebase:1909 #, perl-format msgid "could not record ffq-prev: %s" msgstr "" -#: ../git-debrebase:1906 +#: ../git-debrebase:1920 #, perl-format msgid "could not check ffq-prev: %s" msgstr "" -#: ../git-debrebase:1926 +#: ../git-debrebase:1940 msgid "fast forward" msgstr "" -#: ../git-debrebase:1936 +#: ../git-debrebase:1950 msgid "Declare fast forward / record previous work" msgstr "" -#: ../git-debrebase:1948 +#: ../git-debrebase:1962 msgid "No ffq-prev to stitch." msgstr "" -#: ../git-debrebase:1965 +#: ../git-debrebase:1979 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "" -#: ../git-debrebase:1970 +#: ../git-debrebase:1984 #, perl-format msgid "bad version number `%s'" msgstr "" -#: ../git-debrebase:1988 +#: ../git-debrebase:2002 #, perl-format msgid "upstream piece `%s'" msgstr "" -#: ../git-debrebase:1989 +#: ../git-debrebase:2003 msgid "upstream (main piece" msgstr "" -#: ../git-debrebase:2009 +#: ../git-debrebase:2023 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "" -#: ../git-debrebase:2027 -msgid "old anchor is recognised due to --anchor, cannot check upstream" -msgstr "" - -#: ../git-debrebase:2043 +#: ../git-debrebase:2056 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -#: ../git-debrebase:2052 +#: ../git-debrebase:2065 #, perl-format msgid "previous upstream combine %s first piece is not `.'" msgstr "" -#: ../git-debrebase:2065 +#: ../git-debrebase:2078 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " "commit" msgstr "" -#: ../git-debrebase:2076 +#: ../git-debrebase:2089 #, perl-format msgid "introducing upstream piece `%s'" msgstr "" -#: ../git-debrebase:2079 +#: ../git-debrebase:2092 #, perl-format msgid "dropping upstream piece `%s'" msgstr "" -#: ../git-debrebase:2082 +#: ../git-debrebase:2095 #, perl-format msgid "not fast forward: %s %s" msgstr "" -#: ../git-debrebase:2193 +#: ../git-debrebase:2206 msgid "Previous head already recorded\n" msgstr "" -#: ../git-debrebase:2197 +#: ../git-debrebase:2210 #, perl-format msgid "Could not preserve: %s" msgstr "" -#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 -#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 -#: ../git-debrebase:2401 +#: ../git-debrebase:2215 ../git-debrebase:2221 ../git-debrebase:2227 +#: ../git-debrebase:2327 ../git-debrebase:2336 ../git-debrebase:2360 +#: ../git-debrebase:2424 msgid "no arguments allowed" msgstr "" -#: ../git-debrebase:2236 +#: ../git-debrebase:2249 msgid "branch contains furniture (not laundered)" msgstr "" -#: ../git-debrebase:2237 +#: ../git-debrebase:2250 msgid "branch is unlaundered" msgstr "" -#: ../git-debrebase:2238 +#: ../git-debrebase:2251 msgid "branch needs laundering" msgstr "" -#: ../git-debrebase:2239 +#: ../git-debrebase:2252 msgid "branch not in git-debrebase form" msgstr "" -#: ../git-debrebase:2249 +#: ../git-debrebase:2262 msgid "current branch contents, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2251 +#: ../git-debrebase:2264 msgid " branch is laundered\n" msgstr "" -#: ../git-debrebase:2267 +#: ../git-debrebase:2280 #, perl-format msgid " %s is not well-defined\n" msgstr "" -#: ../git-debrebase:2273 +#: ../git-debrebase:2286 msgid "key git-debrebase commits:\n" msgstr "" -#: ../git-debrebase:2274 +#: ../git-debrebase:2287 msgid "anchor" msgstr "" -#: ../git-debrebase:2275 +#: ../git-debrebase:2288 msgid "breakwater" msgstr "" -#: ../git-debrebase:2280 +#: ../git-debrebase:2303 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "" -#: ../git-debrebase:2287 +#: ../git-debrebase:2310 msgid " unstitched; previous tip was:\n" msgstr "" -#: ../git-debrebase:2290 +#: ../git-debrebase:2313 msgid " stitched? (no record of git-debrebase work)\n" msgstr "" -#: ../git-debrebase:2292 +#: ../git-debrebase:2315 msgid " stitched\n" msgstr "" -#: ../git-debrebase:2294 +#: ../git-debrebase:2317 msgid " not git-debrebase (diverged since last stitch)\n" msgstr "" -#: ../git-debrebase:2297 +#: ../git-debrebase:2320 msgid "you are currently rebasing\n" msgstr "" -#: ../git-debrebase:2314 ../git-debrebase:2327 +#: ../git-debrebase:2337 ../git-debrebase:2350 msgid "launder for git-debrebase quick" msgstr "" -#: ../git-debrebase:2321 ../git-debrebase:2351 +#: ../git-debrebase:2344 ../git-debrebase:2374 msgid "No ongoing git-debrebase session." msgstr "" -#: ../git-debrebase:2390 +#: ../git-debrebase:2413 msgid "Commit patch queue (exported by git-debrebase)" msgstr "" -#: ../git-debrebase:2407 +#: ../git-debrebase:2430 msgid "No (more) patches to export." msgstr "" -#: ../git-debrebase:2414 +#: ../git-debrebase:2437 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " "laundering first." msgstr "" -#: ../git-debrebase:2434 +#: ../git-debrebase:2457 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "" -#: ../git-debrebase:2439 +#: ../git-debrebase:2462 #, perl-format msgid "patch %s repeated in %s !" msgstr "" -#: ../git-debrebase:2446 +#: ../git-debrebase:2469 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "" -#: ../git-debrebase:2454 +#: ../git-debrebase:2477 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2459 +#: ../git-debrebase:2482 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "" -#: ../git-debrebase:2475 +#: ../git-debrebase:2499 msgid "want only 1 optional argument, the upstream git commitish" msgstr "" -#: ../git-debrebase:2480 +#: ../git-debrebase:2504 msgid "missing Version from changelog\n" msgstr "" -#: ../git-debrebase:2496 +#: ../git-debrebase:2520 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" @@ -2206,71 +2695,72 @@ msgid "" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -#: ../git-debrebase:2504 +#: ../git-debrebase:2528 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" msgstr "" -#: ../git-debrebase:2511 +#: ../git-debrebase:2535 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -#: ../git-debrebase:2513 +#: ../git-debrebase:2537 #, perl-format msgid "list expected changes with: %s\n" msgstr "" -#: ../git-debrebase:2520 +#: ../git-debrebase:2544 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "" -#: ../git-debrebase:2538 +#: ../git-debrebase:2562 msgid "neither of the first two changelog entries are released\n" msgstr "" -#: ../git-debrebase:2544 +#: ../git-debrebase:2568 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "" -#: ../git-debrebase:2547 +#: ../git-debrebase:2571 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "" -#: ../git-debrebase:2550 +#: ../git-debrebase:2574 #, perl-format msgid "dgit view tag %s not found\n" msgstr "" -#: ../git-debrebase:2552 +#: ../git-debrebase:2576 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "" -#: ../git-debrebase:2554 +#: ../git-debrebase:2578 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "" -#: ../git-debrebase:2561 +#: ../git-debrebase:2585 #, perl-format msgid "" "Cannot confirm dgit view: %s\n" "Failed to stitch in dgit view (see messages above).\n" -"dgit --overwrite will be needed on the first dgit push after conversion.\n" +"dgit --trust-changelog will be needed on the first dgit push after " +"conversion.\n" msgstr "" -#: ../git-debrebase:2607 +#: ../git-debrebase:2631 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" -#: ../git-debrebase:2636 +#: ../git-debrebase:2660 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2278,16 +2768,16 @@ msgid "" "%s: WARNING: doing so would drop all upstream patches!\n" msgstr "" -#: ../git-debrebase:2657 +#: ../git-debrebase:2681 msgid "takes 1 optional argument, the upstream commitish" msgstr "" -#: ../git-debrebase:2665 +#: ../git-debrebase:2689 #, perl-format msgid "%s, from command line" msgstr "" -#: ../git-debrebase:2679 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2295,175 +2785,190 @@ msgid "" "%s: but is probably a bad idea. Probably, you wanted to do nothing.\n" msgstr "" -#: ../git-debrebase:2683 +#: ../git-debrebase:2707 msgid "Branch already in git-debrebase format." msgstr "" -#: ../git-debrebase:2695 +#: ../git-debrebase:2719 msgid "Considering possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2702 +#: ../git-debrebase:2727 #, perl-format msgid "git tag %s" msgstr "" -#: ../git-debrebase:2708 +#: ../git-debrebase:2733 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr "" -#: ../git-debrebase:2717 +#: ../git-debrebase:2742 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "" -#: ../git-debrebase:2723 +#: ../git-debrebase:2748 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr "" -#: ../git-debrebase:2754 +#: ../git-debrebase:2779 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr "" -#: ../git-debrebase:2763 +#: ../git-debrebase:2788 msgid "Evaluating possible commits corresponding to upstream:\n" msgstr "" -#: ../git-debrebase:2800 +#: ../git-debrebase:2829 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr "" -#: ../git-debrebase:2809 +#: ../git-debrebase:2838 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr "" -#: ../git-debrebase:2823 +#: ../git-debrebase:2852 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -#: ../git-debrebase:2829 +#: ../git-debrebase:2858 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "" -#: ../git-debrebase:2836 +#: ../git-debrebase:2863 +#, perl-format +msgid "" +"Result of applying debian/patches/ onto the upstream is not the same as " +"HEAD.\n" +"(Applying patches gave the commit %s)\n" +"Perhaps the upstream is not right, or not all of the delta is in d/patches.\n" +msgstr "" + +#: ../git-debrebase:2871 +msgid "Output of conversion does not match input!" +msgstr "" + +#: ../git-debrebase:2879 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "" -#: ../git-debrebase:2840 +#: ../git-debrebase:2883 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" -#: ../git-debrebase:2942 +#: ../git-debrebase:2985 msgid "bad options\n" msgstr "" -#: ../git-debrebase:2952 +#: ../git-debrebase:2995 #, perl-format -msgid "%s: no cuddling to -i for git-rebase" +msgid "" +"%s: with git-debrebase, get-rebase -i option may only be followed by more " +"options (as separate arguments)" msgstr "" -#: ../git-debrebase:2982 +#: ../git-debrebase:3025 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "" -#: ../Debian/Dgit.pm:298 +#: ../Debian/Dgit.pm:328 #, perl-format msgid "error: %s\n" msgstr "" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit.pm:354 #, perl-format msgid "getcwd failed: %s\n" msgstr "" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:373 msgid "terminated, reporting successful completion" msgstr "" -#: ../Debian/Dgit.pm:345 +#: ../Debian/Dgit.pm:375 #, perl-format msgid "failed with error exit status %s" msgstr "" -#: ../Debian/Dgit.pm:348 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "died due to fatal signal %s" msgstr "" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:382 #, perl-format msgid "failed with unknown wait status %s" msgstr "" -#: ../Debian/Dgit.pm:358 +#: ../Debian/Dgit.pm:388 msgid "failed command" msgstr "" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:394 #, perl-format msgid "failed to fork/exec: %s" msgstr "" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:396 #, perl-format msgid "subprocess %s" msgstr "" -#: ../Debian/Dgit.pm:368 +#: ../Debian/Dgit.pm:398 msgid "subprocess produced invalid output" msgstr "" -#: ../Debian/Dgit.pm:459 +#: ../Debian/Dgit.pm:503 msgid "stat source file: %S" msgstr "" -#: ../Debian/Dgit.pm:469 +#: ../Debian/Dgit.pm:513 msgid "stat destination file: %S" msgstr "" -#: ../Debian/Dgit.pm:488 +#: ../Debian/Dgit.pm:532 msgid "finally install file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:494 +#: ../Debian/Dgit.pm:538 msgid "delete old file after cp: %S" msgstr "" -#: ../Debian/Dgit.pm:515 +#: ../Debian/Dgit.pm:559 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" msgstr "" -#: ../Debian/Dgit.pm:518 +#: ../Debian/Dgit.pm:562 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:626 +#: ../Debian/Dgit.pm:670 msgid "git index contains changes (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:627 +#: ../Debian/Dgit.pm:671 msgid "working tree is dirty (does not match HEAD)" msgstr "" -#: ../Debian/Dgit.pm:649 +#: ../Debian/Dgit.pm:696 msgid "using specified upstream commitish" msgstr "" -#: ../Debian/Dgit.pm:655 +#: ../Debian/Dgit.pm:703 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" @@ -2471,66 +2976,98 @@ msgid "" " Check version, and specify upstream commitish explicitly." msgstr "" -#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 +#: ../Debian/Dgit.pm:708 ../Debian/Dgit.pm:710 #, perl-format msgid "using upstream from git tag %s" msgstr "" -#: ../Debian/Dgit.pm:769 +#: ../Debian/Dgit.pm:816 msgid "detached HEAD" msgstr "" -#: ../Debian/Dgit.pm:770 +#: ../Debian/Dgit.pm:817 msgid "HEAD symref is not to refs/" msgstr "" -#: ../Debian/Dgit.pm:786 +#: ../Debian/Dgit.pm:833 #, perl-format msgid "parsing of %s failed" msgstr "" -#: ../Debian/Dgit.pm:795 +#: ../Debian/Dgit.pm:842 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " "modify the .dsc and then do the signature itself" msgstr "" -#: ../Debian/Dgit.pm:809 +#: ../Debian/Dgit.pm:856 #, perl-format msgid "open %s (%s): %s" msgstr "" -#: ../Debian/Dgit.pm:830 +#: ../Debian/Dgit.pm:877 #, perl-format msgid "missing field %s in %s" msgstr "" -#: ../Debian/Dgit.pm:916 +#: ../Debian/Dgit.pm:963 msgid "Dummy commit - do not use\n" msgstr "" -#: ../Debian/Dgit.pm:937 +#: ../Debian/Dgit.pm:984 #, perl-format msgid "exec %s: %s\n" msgstr "" -#: ../Debian/Dgit.pm:1005 +#: ../Debian/Dgit.pm:1012 +#, perl-format +msgid "Taint recorded at time %s for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:1014 +#, perl-format +msgid "Taint recorded at time %s for any package" +msgstr "" + +#: ../Debian/Dgit.pm:1016 +#, perl-format +msgid "Taint recorded for package %s" +msgstr "" + +#: ../Debian/Dgit.pm:1018 +msgid "Taint recorded for any package" +msgstr "" + +#: ../Debian/Dgit.pm:1030 +msgid "Uncorrectable error. If confused, consult administrator.\n" +msgstr "" + +#: ../Debian/Dgit.pm:1033 +msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" +msgstr "" + +#: ../Debian/Dgit.pm:1036 +#, perl-format +msgid "Forcing due to %s\n" +msgstr "" + +#: ../Debian/Dgit.pm:1101 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "" -#: ../Debian/Dgit.pm:1028 +#: ../Debian/Dgit.pm:1124 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1132 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "" -#: ../Debian/Dgit.pm:1045 +#: ../Debian/Dgit.pm:1141 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "" @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the dgit package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018, 2019. +# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2018, 2019, 2023. # msgid "" msgstr "" -"Project-Id-Version: dgit_9.9\n" +"Project-Id-Version: dgit_10.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" -"PO-Revision-Date: 2019-11-10 22:17+0100\n" +"POT-Creation-Date: 2024-04-13 03:07+0000\n" +"PO-Revision-Date: 2023-01-17 17:24+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" @@ -17,76 +17,76 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.2.1\n" -#: ../dgit:268 +#: ../dgit:271 #, perl-format msgid "%s: invalid configuration: %s\n" msgstr "%s: ongeldige configuratie: %s\n" -#: ../dgit:275 +#: ../dgit:278 msgid "warning: overriding problem due to --force:\n" msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n" -#: ../dgit:283 +#: ../dgit:286 #, perl-format msgid "warning: skipping checks or functionality due to --force-%s\n" msgstr "" "waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n" -#: ../dgit:288 +#: ../dgit:291 #, perl-format msgid "%s: source package %s does not exist in suite %s\n" msgstr "%s: broncodepakket %s bestaat niet in suite %s\n" -#: ../dgit:520 +#: ../dgit:545 #, perl-format msgid "build host child %s" msgstr "bouwcomputer-dochter %s" -#: ../dgit:525 ../dgit:531 +#: ../dgit:550 ../dgit:556 #, perl-format msgid "connection lost: %s" msgstr "verbinding verbroken: %s" -#: ../dgit:526 +#: ../dgit:551 #, perl-format msgid "protocol violation; %s not expected" msgstr "protocolschending; %s werd niet verwacht" -#: ../dgit:534 +#: ../dgit:559 #, perl-format msgid "eof (reading %s)" msgstr "eof (bij het lezen van %s)" -#: ../dgit:541 +#: ../dgit:566 msgid "protocol message" msgstr "protocolbericht" -#: ../dgit:549 +#: ../dgit:574 #, perl-format msgid "`%s'" msgstr "`%s'" -#: ../dgit:570 +#: ../dgit:595 msgid "bad byte count" msgstr "aantal slechte bytes" -#: ../dgit:573 +#: ../dgit:598 msgid "data block" msgstr "gegevensblok" -#: ../dgit:652 +#: ../dgit:677 #, perl-format msgid "%s ok: %s" msgstr "%s oké: %s" -#: ../dgit:654 +#: ../dgit:679 #, perl-format msgid "would be ok: %s (but dry run only)" msgstr "zou oké zijn: %s (maar slechts een testuitvoering)" -#: ../dgit:679 +#: ../dgit:704 msgid "" "main usages:\n" " dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n" @@ -126,13 +126,13 @@ msgstr "" " -c<naam>=<waarde> configuratieoptie instellen voor git\n" " (ook rechtstreeks gebruikt door dgit)\n" -#: ../dgit:698 +#: ../dgit:723 msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n" msgstr "" "Misschien zit de upload vast in incoming. De versie van git wordt " "gebruikt.\n" -#: ../dgit:702 +#: ../dgit:727 #, perl-format msgid "" "%s: %s\n" @@ -141,22 +141,22 @@ msgstr "" "%s: %s\n" "%s" -#: ../dgit:707 +#: ../dgit:732 msgid "too few arguments" msgstr "te weinig argumenten" -#: ../dgit:823 +#: ../dgit:851 #, perl-format msgid "multiple values for %s (in %s git config)" msgstr "verschillende waarden voor %s (in %s git config)" -#: ../dgit:826 +#: ../dgit:854 #, perl-format msgid "value for config option %s (in %s git config) contains newline(s)!" msgstr "" "waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!" -#: ../dgit:846 +#: ../dgit:874 #, perl-format msgid "" "need value for one of: %s\n" @@ -165,44 +165,44 @@ msgstr "" "heb waarde nodig voor één van: %s\n" "%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden" -#: ../dgit:903 +#: ../dgit:931 #, perl-format msgid "bad syntax for (nominal) distro `%s' (does not match %s)" msgstr "" "slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)" -#: ../dgit:918 +#: ../dgit:946 #, perl-format msgid "backports-quirk needs % or ( )" msgstr "backports-spitsvondigheid vereist % of ( )" -#: ../dgit:934 +#: ../dgit:962 #, perl-format msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'" msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'" -#: ../dgit:954 +#: ../dgit:982 msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)" msgstr "" "alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een " "(auto)" -#: ../dgit:972 +#: ../dgit:1000 #, perl-format msgid "unknown %s `%s'" msgstr "onbekend %s `%s'" -#: ../dgit:977 ../git-debrebase:1548 ../Debian/Dgit.pm:211 +#: ../dgit:1005 ../git-debrebase:1552 ../Debian/Dgit.pm:231 msgid "internal error" msgstr "interne fout" -#: ../dgit:979 +#: ../dgit:1007 msgid "pushing but distro is configured readonly" msgstr "" -"bezig een push uit te voeren, maar de distributie is voor alleen-lezen " +"een push aan het uitvoeren, maar de distributie is voor alleen-lezen " "geconfigureerd" -#: ../dgit:983 +#: ../dgit:1011 msgid "" "Push failed, before we got started.\n" "You can retry the push, after fixing the problem, if you like.\n" @@ -211,7 +211,7 @@ msgstr "" "Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " "werd.\n" -#: ../dgit:1006 +#: ../dgit:1034 #, perl-format msgid "" "dgit: quilt mode `%s' (for format `%s') implies split view, but split-view " @@ -220,75 +220,75 @@ msgstr "" "dgit: quilt modus `%s' (voor indeling `%s') impliceert gesplitste weergave, " "maar gesplitste weergave staat ingesteld op `%s'" -#: ../dgit:1169 +#: ../dgit:1197 msgid "this operation does not support multiple comma-separated suites" msgstr "" "meerdere met een komma van elkaar gescheiden suites worden door deze " "bewerking niet ondersteund" -#: ../dgit:1237 +#: ../dgit:1265 #, perl-format msgid "fetch of %s failed (%s): %s" msgstr "ophalen (fetch) van %s mislukte (%s): %s" -#: ../dgit:1244 +#: ../dgit:1272 #, perl-format msgid "fetch of %s gave HTTP code %s" msgstr "een fetch van %s gaf HTTP-code %s" -#: ../dgit:1265 +#: ../dgit:1293 msgid "ftpmasterapi archive query method takes no data part" msgstr "" "de methode ftpmasterapi voor een verzoek aan het archief kent geen data-" "onderdeel" -#: ../dgit:1283 +#: ../dgit:1311 #, perl-format msgid "unknown suite %s, maybe -d would help" msgstr "onbekende suite %s, misschien is -d nuttig" -#: ../dgit:1287 +#: ../dgit:1315 #, perl-format msgid "multiple matches for suite %s\n" msgstr "meerdere overeenkomsten met suite %s\n" -#: ../dgit:1289 +#: ../dgit:1317 #, perl-format msgid "suite %s info has no codename\n" msgstr "info over suite %s bevat geen codenaam\n" -#: ../dgit:1291 +#: ../dgit:1319 #, perl-format msgid "suite %s maps to bad codename\n" msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n" -#: ../dgit:1293 ../dgit:1318 +#: ../dgit:1321 ../dgit:1346 msgid "bad ftpmaster api response: " msgstr "verkeerd antwoord van de ftpmaster api:" -#: ../dgit:1307 +#: ../dgit:1335 #, perl-format msgid "bad version: %s\n" msgstr "verkeerde versie: %s\n" -#: ../dgit:1309 +#: ../dgit:1337 msgid "bad component" msgstr "verkeerde component" -#: ../dgit:1312 +#: ../dgit:1340 msgid "bad filename" msgstr "verkeerde bestandsnaam" -#: ../dgit:1314 +#: ../dgit:1342 msgid "bad sha256sum" msgstr "verkeerde sha256sum" -#: ../dgit:1365 +#: ../dgit:1393 msgid "aptget archive query method takes no data part" msgstr "" "de methode aptget voor een verzoek aan het archief kent geen data-onderdeel" -#: ../dgit:1449 +#: ../dgit:1477 #, perl-format msgid "" "apt seemed to not to update dgit's cached Release files for %s.\n" @@ -301,21 +301,21 @@ msgstr "" " zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit " "het geval zijn, gebruik dan `relatime'.)\n" -#: ../dgit:1473 +#: ../dgit:1501 #, perl-format msgid "Release file (%s) specifies intolerable %s" msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s" -#: ../dgit:1499 +#: ../dgit:1527 msgid "apt-get source did not produce a .dsc" msgstr "apt-get source produceerde geen .dsc-bestand" -#: ../dgit:1500 +#: ../dgit:1528 #, perl-format msgid "apt-get source produced several .dscs (%s)" msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)" -#: ../dgit:1605 +#: ../dgit:1633 #, perl-format msgid "" "unable to canonicalise suite using package %s which does not appear to exist " @@ -324,134 +324,134 @@ msgstr "" "niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar " "niet bestaat in suite %s; --existing-package kan behulpzaam zijn" -#: ../dgit:1744 +#: ../dgit:1772 #, perl-format msgid "cannot operate on %s suite" msgstr "kan geen acties uitvoeren op suite %s" -#: ../dgit:1747 +#: ../dgit:1775 #, perl-format msgid "canonical suite name for %s is %s" msgstr "de gebruikelijke suitenaam voor %s is %s" -#: ../dgit:1749 +#: ../dgit:1777 #, perl-format msgid "canonical suite name is %s" msgstr "de gebruikelijke suitenaam is %s" -#: ../dgit:1769 +#: ../dgit:1797 #, perl-format msgid "%s has hash %s but archive told us to expect %s" msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten" -#: ../dgit:1775 +#: ../dgit:1803 #, perl-format msgid "unsupported source format %s, sorry" msgstr "niet-ondersteunde broncode-indeling %s, sorry" -#: ../dgit:1802 +#: ../dgit:1830 #, perl-format msgid "diverting to %s (using config for %s)" msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)" -#: ../dgit:1825 +#: ../dgit:1853 #, perl-format msgid "unknown git-check `%s'" msgstr "onbekende git-check `%s'" -#: ../dgit:1840 +#: ../dgit:1868 #, perl-format msgid "unknown git-create `%s'" msgstr "onbekende git-create `%s'" -#: ../dgit:1877 +#: ../dgit:1912 #, perl-format msgid "%s: warning: removing from %s: %s\n" msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n" -#: ../dgit:1923 +#: ../dgit:1958 #, perl-format msgid "could not parse .dsc %s line `%s'" msgstr "kon .dsc %s regel `%s' niet ontleden" -#: ../dgit:1934 +#: ../dgit:1969 #, perl-format msgid "missing any supported Checksums-* or Files field in %s" msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s" -#: ../dgit:1980 +#: ../dgit:2015 #, perl-format msgid "hash or size of %s varies in %s fields (between: %s)" msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)" -#: ../dgit:1989 +#: ../dgit:2024 #, perl-format msgid "file list in %s varies between hash fields!" msgstr "bestandenlijst in %s varieert tussen hash-velden!" -#: ../dgit:1993 +#: ../dgit:2028 #, perl-format msgid "%s has no files list field(s)" msgstr "%s bevat geen veld(en) met een bestandenlijst" -#: ../dgit:1999 +#: ../dgit:2034 #, perl-format msgid "no file appears in all file lists (looked in: %s)" msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)" -#: ../dgit:2039 +#: ../dgit:2077 #, perl-format msgid "purportedly source-only changes polluted by %s\n" msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n" -#: ../dgit:2052 +#: ../dgit:2089 msgid "cannot find section/priority from .changes Files field" msgstr "" "kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand" -#: ../dgit:2065 +#: ../dgit:2102 msgid "" "archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n" msgstr "" "archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --" "ch:--sa/-sd\n" -#: ../dgit:2081 +#: ../dgit:2118 #, perl-format msgid ".dsc %s missing entry for %s" msgstr ".dsc %s mist een item voor %s" -#: ../dgit:2086 +#: ../dgit:2123 #, perl-format msgid "%s: %s (archive) != %s (local .dsc)" msgstr "%s: %s (archief) != %s (lokale .dsc)" -#: ../dgit:2094 +#: ../dgit:2131 #, perl-format msgid "archive %s: %s" msgstr "archief %s: %s" -#: ../dgit:2101 +#: ../dgit:2138 #, perl-format msgid "archive contains %s with different checksum" msgstr "archief bevat %s met een andere checksum" -#: ../dgit:2129 +#: ../dgit:2166 #, perl-format msgid "edited .changes for archive .orig contents: %s %s" msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s" -#: ../dgit:2137 +#: ../dgit:2174 #, perl-format msgid "[new .changes left in %s]" msgstr "[nieuwe .changes achtergelaten in %s]" -#: ../dgit:2140 +#: ../dgit:2177 #, perl-format msgid "%s already has appropriate .orig(s) (if any)" msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)" -#: ../dgit:2159 +#: ../dgit:2199 #, perl-format msgid "" "unexpected commit author line format `%s' (was generated from changelog " @@ -460,7 +460,7 @@ msgstr "" "onverwachte indeling `%s' van de auteursregel van de commit (werd " "gegenereerd uit het Maintainer-veld in changelog)" -#: ../dgit:2182 +#: ../dgit:2222 msgid "" "\n" "Unfortunately, this source package uses a feature of dpkg-source where\n" @@ -487,7 +487,7 @@ msgstr "" "dat verschillende distributies andere broncode hebben).\n" "\n" -#: ../dgit:2194 +#: ../dgit:2234 #, perl-format msgid "" "Found active distro-specific series file for %s (%s): %s, cannot continue" @@ -495,105 +495,126 @@ msgstr "" "Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan " "niet voortgaan" -#: ../dgit:2225 +#: ../dgit:2265 msgid "Dpkg::Vendor `current vendor'" msgstr "Dpkg::Vendor `current vendor'" -#: ../dgit:2227 +#: ../dgit:2267 msgid "(base) distro being accessed" msgstr "(basis)-distributie wordt benaderd" -#: ../dgit:2229 +#: ../dgit:2269 msgid "(nominal) distro being accessed" msgstr "(nominale) distributie wordt benaderd" -#: ../dgit:2234 +#: ../dgit:2274 #, perl-format msgid "build-products-dir %s is not accessible: %s\n" msgstr "build-products-dir %s is niet toegankelijk: %s\n" -#: ../dgit:2259 +#: ../dgit:2312 +#, perl-format +msgid "%s: multiple representations of similar orig %s:\n" +msgstr "%s: meerdere weergaven van soortgelijke oorsprong %s:\n" + +#: ../dgit:2316 +#, perl-format +msgid " %s: in %s (%s)\n" +msgstr " %s: in %s (%s)\n" + +#: ../dgit:2321 +msgid "Duplicate/inconsistent orig tarballs. Delete the spurious ones." +msgstr "Dubbele/inconsistente orig-tar-archieven. Verwijder de ongewenste." + +#: ../dgit:2338 #, perl-format msgid "" "%s: found orig(s) in .. missing from build-products-dir, transferring:\n" msgstr "" -"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met " +"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, aan het " "overbrengen:\n" -#: ../dgit:2263 +#: ../dgit:2342 #, perl-format msgid "check orig file %s in bpd %s: %s" msgstr "controleer orig-bestand %s in bpd %s: %s" -#: ../dgit:2265 +#: ../dgit:2344 #, perl-format msgid "check orig file %s in ..: %s" msgstr "controleer orig-bestand %s in ..: %s" -#: ../dgit:2268 +#: ../dgit:2347 #, perl-format msgid "check target of orig symlink %s in ..: %s" msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s" -#: ../dgit:2277 +#: ../dgit:2356 #, perl-format msgid "%s: cloned orig symlink from ..: %s\n" msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n" -#: ../dgit:2281 +#: ../dgit:2360 #, perl-format msgid "%s: hardlinked orig from ..: %s\n" msgstr "%s: vast gekoppelde orig van ..: %s\n" -#: ../dgit:2284 +#: ../dgit:2363 #, perl-format msgid "failed to make %s a hardlink to %s: %s" msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s" -#: ../dgit:2290 +#: ../dgit:2369 #, perl-format msgid "%s: symmlinked orig from .. on other filesystem: %s\n" msgstr "" "%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n" -#: ../dgit:2361 +#: ../dgit:2384 +msgid "package changelog" +msgstr "changelog van het pakket" + +#: ../dgit:2489 #, perl-format msgid "dgit (child): exec %s: %s" msgstr "dgit (dochter): exec %s: %s" -#: ../dgit:2423 -msgid "package changelog" -msgstr "changelog van het pakket" - -#: ../dgit:2463 +#: ../dgit:2552 msgid "package changelog has no entries!" msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!" -#: ../dgit:2532 ../dgit:2537 +#: ../dgit:2557 +#, perl-format +msgid "" +"warning: unable to find/parse changelog entry for first import of %s:\n" +"%s\n" +msgstr "" + +#: ../dgit:2628 ../dgit:2633 #, perl-format msgid "accessing %s: %s" -msgstr "bezig met benaderen van %s: %s" +msgstr "benaderen van %s: %s" -#: ../dgit:2552 ../dgit:2559 +#: ../dgit:2650 ../dgit:2657 #, perl-format msgid "saving %s: %s" -msgstr "bezig met opslaan van %s: %s" +msgstr "opslaan van %s: %s" -#: ../dgit:2585 ../dgit:6078 +#: ../dgit:2683 ../dgit:6522 msgid "source package" msgstr "broncodepakket" -#: ../dgit:2665 +#: ../dgit:2763 #, perl-format msgid "%s: trying slow absurd-git-apply..." msgstr "%s: langzame absurd-git-apply wordt gebruikt..." -#: ../dgit:2684 +#: ../dgit:2816 #, perl-format msgid "%s failed: %s\n" msgstr "%s mislukte: %s\n" -#: ../dgit:2693 +#: ../dgit:2834 #, perl-format msgid "" "gbp-pq import and dpkg-source disagree!\n" @@ -606,16 +627,16 @@ msgstr "" " gbp-pq import gaf boom %s\n" " dpkg-source --before-build gaf boom %s\n" -#: ../dgit:2713 +#: ../dgit:2854 #, perl-format msgid "synthesised git commit from .dsc %s" msgstr "git commit samengesteld vanuit .dsc %s" -#: ../dgit:2717 +#: ../dgit:2858 msgid "Import of source package" msgstr "Importeren van broncodepakket" -#: ../dgit:2737 +#: ../dgit:2878 #, perl-format msgid "" "\n" @@ -628,12 +649,12 @@ msgstr "" "Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n" "%s\n" -#: ../dgit:2779 +#: ../dgit:2920 #, perl-format msgid "using existing %s" msgstr "bestaande %s wordt gebruikt" -#: ../dgit:2783 +#: ../dgit:2924 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (perhaps you should delete this " @@ -642,12 +663,12 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit " "bestand verwijderen?)" -#: ../dgit:2787 +#: ../dgit:2928 #, perl-format msgid "need to fetch correct version of %s" msgstr "moet de juiste versie van %s ophalen met fetch" -#: ../dgit:2803 +#: ../dgit:2944 #, perl-format msgid "" "file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)" @@ -655,34 +676,35 @@ msgstr "" "bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd " "bestand van het archief!)" -#: ../dgit:2898 +#: ../dgit:3039 msgid "too many iterations trying to get sane fetch!" msgstr "te veel pogingen om een foutloze fetch te bekomen!" -#: ../dgit:2913 +#: ../dgit:3054 #, perl-format msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n" msgstr "" "waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt " "genegeerd.\n" -#: ../dgit:2957 +#: ../dgit:3098 #, perl-format msgid "warning: git fetch %s created %s; this is silly, deleting it.\n" msgstr "" "waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n" -#: ../dgit:2972 +#: ../dgit:3113 +#, perl-format msgid "" "--dry-run specified but we actually wanted the results of git fetch,\n" "so this is not going to work. Try running dgit fetch first,\n" -"or using --damp-run instead of --dry-run.\n" +"or using --damp-run instead of --dry-run. (Wanted: %s.)\n" msgstr "" "--dry-run werd opgegeven, maar we wilden eigenlijk het resultaat van\n" "git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n" -"of --damp-run te gebruiken in plaats van --dry-run.\n" +"of --damp-run te gebruiken in plaats van --dry-run. (Gewenst: %s.)\n" -#: ../dgit:2977 +#: ../dgit:3118 #, perl-format msgid "" "warning: git ls-remote suggests we want %s\n" @@ -698,19 +720,19 @@ msgstr "" "waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n" "waarschuwing: bijwerkt. Zal later opnieuw proberen...\n" -#: ../dgit:3124 +#: ../dgit:3265 #, perl-format msgid "not chasing .dsc distro %s: not fetching %s" msgstr "" "ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet " "gehaald" -#: ../dgit:3129 +#: ../dgit:3270 #, perl-format msgid ".dsc names distro %s: fetching %s" msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald" -#: ../dgit:3134 +#: ../dgit:3275 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -719,7 +741,7 @@ msgstr "" "De Dgit-metadata van .dsc zijn in de context van distributie %s\n" "waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n" -#: ../dgit:3144 +#: ../dgit:3285 #, perl-format msgid "" ".dsc Dgit metadata is in context of distro %s\n" @@ -732,30 +754,30 @@ msgstr "" ".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n" "(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n" -#: ../dgit:3164 +#: ../dgit:3305 msgid "rewrite map" msgstr "modificatieplan (rewrite map)" -#: ../dgit:3171 +#: ../dgit:3312 msgid "server's git history rewrite map contains a relevant entry!" msgstr "" "het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat " "een relevant element!" -#: ../dgit:3175 +#: ../dgit:3316 msgid "using rewritten git hash in place of .dsc value" msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde" -#: ../dgit:3177 +#: ../dgit:3318 msgid "server data says .dsc hash is to be disregarded" msgstr "" "de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden" -#: ../dgit:3184 +#: ../dgit:3325 msgid "additional commits" msgstr "extra vastleggingen (commits)" -#: ../dgit:3187 +#: ../dgit:3328 #, perl-format msgid "" ".dsc Dgit metadata requires commit %s\n" @@ -764,27 +786,27 @@ msgstr "" "De Dgit-metadata uit .dsc vereist commit %s\n" "maar we konden dat object nergens bekomen.\n" -#: ../dgit:3212 +#: ../dgit:3353 msgid "last upload to archive" msgstr "laatste upload naar het archief" -#: ../dgit:3216 +#: ../dgit:3357 msgid "no version available from the archive" msgstr "geen versie beschikbaar uit het archief" -#: ../dgit:3299 +#: ../dgit:3440 msgid "dgit suite branch on dgit git server" msgstr "dgit suite-tak op dgit git-server" -#: ../dgit:3306 +#: ../dgit:3447 msgid "dgit client's archive history view" msgstr "dgit - weergave geschiedenis van cliëntarchief" -#: ../dgit:3311 +#: ../dgit:3452 msgid "Dgit field in .dsc from archive" msgstr "Dgit-veld in het .dsc uit het archief" -#: ../dgit:3339 +#: ../dgit:3480 #, perl-format msgid "" "\n" @@ -800,15 +822,15 @@ msgstr "" "Laatste versie die met dgit gepusht werd: %s\n" "%s\n" -#: ../dgit:3352 +#: ../dgit:3493 msgid "archive .dsc names newer git commit" msgstr ".dsc van het archief vermeldt een recentere git commit" -#: ../dgit:3355 +#: ../dgit:3496 msgid "archive .dsc names other git commit, fixing up" msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd" -#: ../dgit:3376 +#: ../dgit:3517 #, perl-format msgid "" "\n" @@ -820,7 +842,7 @@ msgstr "" "dgit.\n" "%s\n" -#: ../dgit:3385 +#: ../dgit:3526 #, perl-format msgid "" "\n" @@ -835,7 +857,7 @@ msgstr "" "Maar we konden geen enkele versie bekomen uit het archief of uit git.\n" "\n" -#: ../dgit:3470 +#: ../dgit:3611 #, perl-format msgid "" "Record %s (%s) in archive suite %s\n" @@ -846,19 +868,19 @@ msgstr "" "\n" "Gegeven dat\n" -#: ../dgit:3483 +#: ../dgit:3624 msgid "should be treated as descended from\n" msgstr "behandeld zou moeten worden als afstammend van\n" -#: ../dgit:3501 +#: ../dgit:3642 msgid "dgit repo server tip (last push)" msgstr "tip van de dgit-opslagplaats op de server (laatste push)" -#: ../dgit:3503 +#: ../dgit:3644 msgid "local tracking tip (last fetch)" msgstr "tip van de lokale kopie (laatste fetch)" -#: ../dgit:3514 +#: ../dgit:3655 #, perl-format msgid "" "\n" @@ -874,15 +896,15 @@ msgstr "" "We waren slechts in staat om %s te bekomen\n" "\n" -#: ../dgit:3529 +#: ../dgit:3670 msgid "fetched source tree" msgstr "broncodeboom opgehaald" -#: ../dgit:3565 +#: ../dgit:3706 msgid "debian/changelog merge driver" msgstr "stuurprogramma voor samenvoeging van debian/changelog" -#: ../dgit:3630 +#: ../dgit:3771 msgid "" "[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n" " not doing further gitattributes setup\n" @@ -890,16 +912,16 @@ msgstr "" "[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n" " gitattributes wordt niet verder ingesteld\n" -#: ../dgit:3644 +#: ../dgit:3785 msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n" msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n" -#: ../dgit:3659 +#: ../dgit:3800 #, perl-format msgid "install %s: %s" msgstr "installeren van %s: %s" -#: ../dgit:3686 +#: ../dgit:3827 #, perl-format msgid "" "dgit: warning: %s contains .gitattributes\n" @@ -910,32 +932,32 @@ msgstr "" "dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit " "setup-new-tree.\n" -#: ../dgit:3708 +#: ../dgit:3849 #, perl-format msgid "fetching %s..." msgstr "ophalen van %s..." -#: ../dgit:3716 +#: ../dgit:3857 #, perl-format msgid "failed to obtain %s: %s" msgstr "verkrijgen van %s mislukte: %s" -#: ../dgit:3755 +#: ../dgit:3896 #, perl-format msgid "package %s missing in (base suite) %s" msgstr "pakket %s ontbreekt in (basissuite) %s" -#: ../dgit:3787 +#: ../dgit:3928 msgid "local combined tracking branch" msgstr "lokale gecombineerde navolgende tak (tracking branch)" -#: ../dgit:3789 +#: ../dgit:3930 msgid "archive seems to have rewound: local tracking branch is ahead!" msgstr "" "het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt " "voorop!" -#: ../dgit:3828 +#: ../dgit:3969 #, perl-format msgid "" "Combine archive branches %s [dgit]\n" @@ -946,7 +968,7 @@ msgstr "" "\n" "Invoertakken:\n" -#: ../dgit:3842 +#: ../dgit:3983 msgid "" "\n" "Key\n" @@ -960,34 +982,34 @@ msgstr "" " + markeert elke tak die niet reeds een voorouder was\n" "\n" -#: ../dgit:3857 +#: ../dgit:3998 #, perl-format msgid "calculated combined tracking suite %s" msgstr "berekende gecombineerde navolgende suite %s" -#: ../dgit:3875 +#: ../dgit:4016 #, perl-format msgid "ready for work in %s" msgstr "klaar om te werken in %s" -#: ../dgit:3893 +#: ../dgit:4034 msgid "dry run makes no sense with clone" msgstr "dry run is zinloos met clone" -#: ../dgit:3908 +#: ../dgit:4049 #, perl-format msgid "create `%s': %s" msgstr "creëren van `%s': %s" -#: ../dgit:3920 +#: ../dgit:4061 msgid "fetching existing git history" msgstr "ophalen van bestaande git-geschiedenis" -#: ../dgit:3923 +#: ../dgit:4064 msgid "starting new git history" msgstr "starten van een nieuwe git-geschiedenis" -#: ../dgit:3948 +#: ../dgit:4089 #, perl-format msgid "" "FYI: Vcs-Git in %s has different url to your vcs-git remote.\n" @@ -997,33 +1019,33 @@ msgstr "" " De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit " "update-vcs-git gebruiken?\n" -#: ../dgit:3953 +#: ../dgit:4094 #, perl-format msgid "fetched into %s" msgstr "opgehaald naar %s" -#: ../dgit:3965 +#: ../dgit:4106 #, perl-format msgid "Merge from %s [dgit]" msgstr "Samenvoegen vanuit %s [dgit]" -#: ../dgit:3967 +#: ../dgit:4108 #, perl-format msgid "fetched to %s and merged into HEAD" msgstr "opgehaald naar %s samengevoegd naar HEAD" -#: ../dgit:3975 +#: ../dgit:4116 #, perl-format msgid "git tree contains %s" msgstr "git-boom bevat %s" -#: ../dgit:3986 +#: ../dgit:4127 msgid "you have uncommitted changes to critical files, cannot continue:\n" msgstr "" "u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet " "voortgaan:\n" -#: ../dgit:4005 +#: ../dgit:4146 #, perl-format msgid "" "quilt fixup required but quilt mode is `nofix'\n" @@ -1032,15 +1054,15 @@ msgstr "" "er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n" "HEAD commit%s verschilt van de boom die uit debian/patches%s volgt" -#: ../dgit:4022 +#: ../dgit:4163 msgid "nothing quilty to commit, ok." msgstr "niets quilt-achtig vast te leggen, oké." -#: ../dgit:4025 +#: ../dgit:4166 msgid " (wanted to commit patch update)" msgstr " (wilde een patch-update vastleggen)" -#: ../dgit:4029 +#: ../dgit:4170 msgid "" "Commit Debian 3.0 (quilt) metadata\n" "\n" @@ -1048,7 +1070,7 @@ msgstr "" "Vastleggen van (commit) Debian 3.0 (quilt) metadata\n" "\n" -#: ../dgit:4073 +#: ../dgit:4208 #, perl-format msgid "" "Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck" @@ -1056,60 +1078,60 @@ msgstr "" "Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --" "quilt=nocheck" -#: ../dgit:4078 +#: ../dgit:4213 #, perl-format msgid "Format `%s', need to check/update patch stack" msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken" -#: ../dgit:4088 +#: ../dgit:4223 #, perl-format msgid "commit id %s" msgstr "vastleggings-id (commit id) %s" -#: ../dgit:4094 +#: ../dgit:4229 #, perl-format msgid "and left in %s" msgstr "en achtergelaten in %s" -#: ../dgit:4120 +#: ../dgit:4255 #, perl-format msgid "Wanted tag %s (%s) on dgit server, but not found\n" msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4123 +#: ../dgit:4258 #, perl-format msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n" msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n" -#: ../dgit:4131 +#: ../dgit:4266 #, perl-format msgid "%s (%s) .. %s (%s) is not fast forward\n" msgstr "" "%s (%s) .. %s (%s) is niet fast forward (geen lineaire " "veranderingsgeschiedenis)\n" -#: ../dgit:4140 +#: ../dgit:4275 msgid "version currently in archive" msgstr "momenteel in het archief aanwezige versie" -#: ../dgit:4149 +#: ../dgit:4284 #, perl-format msgid "Checking package changelog for archive version %s ..." msgstr "" "Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie " "%s ..." -#: ../dgit:4157 +#: ../dgit:4293 #, perl-format msgid "%s field from dpkg-parsechangelog %s" msgstr "veld %s van dpkg-parsechangelog %s" -#: ../dgit:4168 +#: ../dgit:4304 #, perl-format msgid "Perhaps debian/changelog does not mention %s ?" msgstr "Vermeldt debian/changelog misschien %s niet?" -#: ../dgit:4171 +#: ../dgit:4307 #, perl-format msgid "" "%s is %s\n" @@ -1118,99 +1140,612 @@ msgstr "" "%s is %s\n" "Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" -#: ../dgit:4185 +#: ../dgit:4312 +#, perl-format +msgid "" +"d/changelog entry for %s is unfinalised!\n" +"Your tree seems to based on earlier (not uploaded) %s.\n" +msgstr "" +"d/changelog-item voor %s is niet afgerond!\n" +"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n" + +#: ../dgit:4326 #, perl-format msgid "Declaring that HEAD includes all changes in %s..." -msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..." +msgstr "Verklaren dat HEAD alle wijzigingen uit %s omvat..." -#: ../dgit:4241 +#: ../dgit:4382 msgid "Checking that HEAD includes all changes in archive..." -msgstr "" -"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..." +msgstr "Controleren dat HEAD alle wijzigingen uit het archief omvat..." -#: ../dgit:4250 +#: ../dgit:4391 msgid "maintainer view tag" msgstr "tag weergave pakketonderhouder" -#: ../dgit:4252 +#: ../dgit:4393 msgid "dgit view tag" msgstr "tag weergave dgit" -#: ../dgit:4253 +#: ../dgit:4394 msgid "current archive contents" msgstr "huidige inhoud van het archief" -#: ../dgit:4266 +#: ../dgit:4407 +#, fuzzy +#| msgid "" +#| "| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" msgid "" -"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n" +"| Not fast forward; maybe --trust-changelog is needed ? Please see " +"dgit(1).\n" msgstr "" "| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite " "nodig? Raadpleeg dgit(1).\n" -#: ../dgit:4276 +#: ../dgit:4417 #, perl-format msgid "Declare fast forward from %s\n" msgstr "Lineair (fast forward) declareren vanuit %s\n" -#: ../dgit:4277 +#: ../dgit:4418 #, perl-format msgid "Make fast forward from %s\n" msgstr "Lineair (fast forward) maken vanuit %s\n" -#: ../dgit:4281 +#: ../dgit:4422 #, perl-format msgid "Made pseudo-merge of %s into dgit view." msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave." -#: ../dgit:4294 +#: ../dgit:4435 #, perl-format msgid "Declare fast forward from %s" msgstr "Lineair (fast forward) declareren vanuit %s" -#: ../dgit:4302 +#: ../dgit:4443 #, perl-format msgid "Make pseudo-merge of %s into your HEAD." msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD." -#: ../dgit:4314 +#: ../dgit:4455 #, perl-format msgid "-p specified %s but changelog specified %s" msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" -#: ../dgit:4336 +#: ../dgit:4477 #, perl-format msgid "%s is for %s %s but debian/changelog is for %s %s" msgstr "%s is voor %s %s maar debian/changelog is voor %s %s" -#: ../dgit:4390 +#: ../dgit:4531 #, perl-format msgid "changes field %s `%s' does not match changelog `%s'" msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog" -#: ../dgit:5650 +#: ../dgit:4584 +#, perl-format +msgid "(maintainer view tag generated by dgit --quilt=%s)\n" +msgstr "" + +#: ../dgit:4647 +#, perl-format +msgid "" +"warning: server says object %s type %s is tainted, but here it has type %s\n" +msgstr "" + +#: ../dgit:4680 +#, fuzzy +#| msgid "root commit" +msgid "commit" +msgstr "beginvastlegging (root commit)" + +#: ../dgit:4682 +#, fuzzy, perl-format +#| msgid "origin commit" +msgid "object within commit %s" +msgstr "externe vastlegging (origin commit)" + +#: ../dgit:4690 +msgid "pushing tainted objects (which server would reject)" +msgstr "" + +#: ../dgit:4698 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while checking state of the archive.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:4708 +msgid "" +"package appears to be new in this suite; if this is intentional, use --new" +msgstr "" + +#: ../dgit:4713 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while preparing your push.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:4732 +#, perl-format +msgid "looked for .dsc %s, but %s; maybe you forgot to build" +msgstr "" + +#: ../dgit:4748 +#, perl-format +msgid "" +"Branch is managed by git-debrebase (%s\n" +"exists), but quilt mode (%s) implies a split view.\n" +"Pass the right --quilt option or adjust your git config.\n" +"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n" +msgstr "" + +#: ../dgit:4767 +#, perl-format +msgid "" +"You seem to be trying to push an old version.\n" +"Version current in archive: %s (in suite %s)\n" +"Version you are trying to upload: %s\n" +msgstr "" + +#: ../dgit:4781 +#, perl-format +msgid "" +"--quilt=%s but no cached dgit view:\n" +" perhaps HEAD changed since dgit build[-source] ?" +msgstr "" + +#: ../dgit:4817 +msgid "" +"dgit push: HEAD is not a descendant of the archive's version.\n" +"To overwrite the archive's contents, pass --trust-changelog, or --" +"overwrite=VERSION.\n" +"To rewrite history, if permitted by the archive, use --deliberately-not-fast-" +"forward." +msgstr "" + +#: ../dgit:4832 +#, perl-format +msgid "" +"\n" +"Version %s has already been tagged (pushed?)\n" +"If this was a failed (or incomplete or rejected) upload by you, just\n" +"add a new changelog stanza for a new version number and try again.\n" +msgstr "" + +#: ../dgit:4838 +#, fuzzy, perl-format +#| msgid "%s already exists" +msgid "Tag %s already exists.\n" +msgstr "%s bestaat reeds" + +#: ../dgit:4843 +#, perl-format +msgid "checking that %s corresponds to HEAD" +msgstr "" + +#: ../dgit:4877 ../dgit:4889 +#, perl-format +msgid "HEAD specifies a different tree to %s:\n" +msgstr "" + +#: ../dgit:4883 +#, perl-format +msgid "" +"There is a problem with your source tree (see dgit(7) for some hints).\n" +"To see a full diff, run git diff %s %s\n" +msgstr "" + +#: ../dgit:4893 +#, perl-format +msgid "" +"Perhaps you forgot to build. Or perhaps there is a problem with your\n" +" source tree (see dgit(7) for some hints). To see a full diff, run\n" +" git diff %s %s\n" +msgstr "" + +#: ../dgit:4904 +#, perl-format +msgid "" +"failed to find unique changes file (looked for %s in %s); perhaps you need " +"to use dgit -C" +msgstr "" + +#: ../dgit:4926 +msgid "uploading binaries, although distro policy is source only" +msgstr "" + +#: ../dgit:4930 +msgid "source-only upload, although distro policy requires .debs" +msgstr "" + +#: ../dgit:4934 +#, perl-format +msgid "" +"source-only upload, though package appears entirely NEW\n" +"(this is probably contrary to policy in %s)" +msgstr "" + +#: ../dgit:4941 +#, perl-format +msgid "unknown source-only-uploads policy `%s'" +msgstr "" + +#: ../dgit:4948 +#, perl-format +msgid "policy-query-supported-ssh value '%s' must be false/true/unknown" +msgstr "" + +#: ../dgit:5010 +#, fuzzy +#| msgid "" +#| "Push failed, before we got started.\n" +#| "You can retry the push, after fixing the problem, if you like.\n" +msgid "" +"Push failed, while signing the tag.\n" +"You can retry the push, after fixing the problem, if you like.\n" +msgstr "" +"Push mislukte vooraleer we nog maar gestart waren.\n" +"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost " +"werd.\n" + +#: ../dgit:5023 +msgid "" +"Push failed, *after* signing the tag.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5040 +msgid "" +"Push failed, while updating the remote git repository - see messages above.\n" +"If you want to try again, you should use a new version number.\n" +msgstr "" + +#: ../dgit:5057 +msgid "" +"Push failed, while obtaining signatures on the .changes and .dsc.\n" +"If it was just that the signature failed, you may try again by using\n" +"debsign by hand to sign the changes file (see the command dgit tried,\n" +"above), and then dput that changes file to complete the upload.\n" +"If you need to change the package, you must use a new version number.\n" +msgstr "" + +#: ../dgit:5073 +#, fuzzy, perl-format +#| msgid "[new .changes left in %s]" +msgid "[new .dsc left in %s.tmp]" +msgstr "[nieuwe .changes achtergelaten in %s]" + +#: ../dgit:5079 +#, perl-format +msgid "" +"Push failed, while uploading package(s) to the archive server.\n" +"You can retry the upload of exactly these same files with dput of:\n" +" %s\n" +"If that .changes file is broken, you will need to use a new version\n" +"number for your next attempt at the upload.\n" +msgstr "" + +#: ../dgit:5088 +#, perl-format +msgid "pushed and uploaded %s" +msgstr "" + +#: ../dgit:5100 +msgid "-p is not allowed with clone; specify as argument instead" +msgstr "" + +#: ../dgit:5111 +#, fuzzy +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit clone" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5117 ../git-debrebase:1815 +#, perl-format +msgid "%s already exists" +msgstr "%s bestaat reeds" + +#: ../dgit:5131 +#, fuzzy, perl-format +#| msgid "remove %s: %s" +msgid "remove %s: %s\n" +msgstr "verwijder %s: %s" + +#: ../dgit:5135 +#, fuzzy, perl-format +#| msgid "chdir toplevel %s: %s\n" +msgid "check whether to remove %s: %s\n" +msgstr "chdir naar hoogste niveau %s: %s\n" + +#: ../dgit:5173 +#, fuzzy +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit fetch or dgit pull" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5191 +#, fuzzy +#| msgid "" +#| "dgit: --include-dirty is not supported with split view (including with " +#| "view-splitting quilt modes)" +msgid "" +"dgit pull not yet supported in split view mode (including with view-" +"splitting quilt modes)\n" +msgstr "" +"dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " +"inbegrip van quilt-modi welke de weergave splitsen)" + +#: ../dgit:5200 +msgid "dgit checkout needs a suite argument" +msgstr "" + +#: ../dgit:5263 +#, perl-format +msgid "setting up vcs-git: %s\n" +msgstr "" + +#: ../dgit:5266 +#, fuzzy, perl-format +#| msgid "exec git clone: %s\n" +msgid "vcs git unchanged: %s\n" +msgstr "exec git clone: %s\n" + +#: ../dgit:5268 +#, perl-format +msgid "changing vcs-git url to: %s\n" +msgstr "" + +#: ../dgit:5273 +#, fuzzy, perl-format +#| msgid "fetching %s..." +msgid "fetching (%s)\n" +msgstr "ophalen van %s..." + +#: ../dgit:5289 +#, fuzzy, perl-format +#| msgid "incorrect arguments to dgit print-unapplied-treeish" +msgid "incorrect arguments to dgit %s" +msgstr "foutieve argumenten voor dgit print-unapplied-treeish" + +#: ../dgit:5300 +#, fuzzy, perl-format +#| msgid "-p specified %s but changelog specified %s" +msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s" +msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s" + +#: ../dgit:5324 +#, perl-format +msgid "dgit push, but dgit.default.push-subcmd set to %s" +msgstr "" + +#: ../dgit:5332 +#, perl-format +msgid "dgit rpush, but dgit.default.[r]push-subcmd set to %s" +msgstr "" + +#: ../dgit:5345 +#, perl-format +msgid "" +"warning: \"dgit %s\" currently means \"dgit %s-built\" (by default)\n" +"warning: but is going to change to \"dgit %s-source\". See dgit!(1).\n" +msgstr "" + +#: ../dgit:5384 +#, perl-format +msgid "" +"build host has dgit rpush protocol versions %s but invocation host has %s" +msgstr "" + +#: ../dgit:5467 +#, fuzzy, perl-format +#| msgid "create `%s': %s" +msgid "create %s: %s" +msgstr "creëren van `%s': %s" + +#: ../dgit:5503 +#, fuzzy, perl-format +#| msgid "build host child %s" +msgid "build host child failed: %s" +msgstr "bouwcomputer-dochter %s" + +#: ../dgit:5506 +msgid "all done\n" +msgstr "" + +#: ../dgit:5515 +#, perl-format +msgid "file %s (%s) twice" +msgstr "" + +#: ../dgit:5523 +msgid "bad param spec" +msgstr "" + +#: ../dgit:5529 +msgid "bad previously spec" +msgstr "" + +#: ../dgit:5600 +#, fuzzy, perl-format +#| msgid "build host child %s" +msgid "buildinfo mismatch in field %s" +msgstr "bouwcomputer-dochter %s" + +#: ../dgit:5603 +#, perl-format +msgid "buildinfo contains forbidden field %s" +msgstr "" + +#: ../dgit:5619 +#, fuzzy +#| msgid "user-specified changes file is not source-only" +msgid "build-host-supplied changes file is not source-only" +msgstr "" +"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" + +#: ../dgit:5648 +#, fuzzy +#| msgid "source changes file" +msgid "remote changes file" +msgstr "broncode-changes-bestand" + +#: ../dgit:5731 +msgid "not a plain file\n" +msgstr "" + +#: ../dgit:5737 +msgid "mode or type changed in unsupported way\n" +msgstr "" + +#: ../dgit:5740 +msgid "modified symlink\n" +msgstr "" + +#: ../dgit:5743 +msgid "deletion of symlink\n" +msgstr "" + +#: ../dgit:5747 +msgid "creation with non-default mode, or symlink\n" +msgstr "" + +#: ../dgit:5775 +#, perl-format +msgid "dgit: cannot represent change: %s: %s\n" +msgstr "dgit: kan wijziging niet representeren: %s: %s\n" + +#: ../dgit:5780 +msgid "" +"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" +msgstr "" +"HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " +"kunnen worden\n" + +#: ../dgit:5818 +#, perl-format +msgid "" +"\n" +"For full diff showing the problem(s), type:\n" +" %s\n" +msgstr "" +"\n" +"Voor een volledig diff met de problemen, typ::\n" +" %s\n" + +#: ../dgit:5825 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-unapplied git tree\n" +" but git tree differs from orig in upstream files." +msgstr "" +"--quilt=%s opgegeven, wat een patches-unapplied git boom impliceert\n" +" maar de git boom verschilt van orig in bovenstroomse bestanden." + +#: ../dgit:5831 +msgid "" +"\n" +" ... debian/patches is missing; perhaps this is a patch queue branch?" +msgstr "" +"\n" +" ... debian/patches ontbreekt; is dit misschien een patchwachtrijtak?" + +#: ../dgit:5838 +#, perl-format +msgid "" +"--quilt=%s specified, implying patches-applied git tree\n" +" but git tree differs from result of applying debian/patches to upstream\n" +msgstr "" +"--quilt=%s opgegeven, wat een patches-applied git boom impliceert\n" +" maar de git-boom verschilt van wat het toepassen van debian/patches op " +"bovenstroom oplevert\n" + +#: ../dgit:5852 +#, perl-format +msgid "Combine debian/ with upstream source for %s\n" +msgstr "debian/ met bovenstroomse bron van %s combineren\n" + +#: ../dgit:5860 +msgid "dgit view: creating patches-applied version using gbp pq" +msgstr "dgit view: een patches-applied versie creëren met gbp pq" + +#: ../dgit:5871 +#, perl-format +msgid "" +"--quilt=%s specified, implying that HEAD is for use with a\n" +" tool which does not create patches for changes to upstream\n" +" .gitignores: but, such patches exist in debian/patches.\n" +msgstr "" +"--quilt=%s opgegeven, wat impliceert dat HEAD bedoeld is voor\n" +" gebruik met gereedschap dat geen patches maakt voor wijzigingen in\n" +" bovenstroomse .gitignores: maar zulke patches bestaan in debian/patches.\n" + +#: ../dgit:5879 +msgid "dgit view: creating patch to represent .gitignore changes" +msgstr "dgit view: patch maken om .gitignore-wijzigingen weer te geven" + +#: ../dgit:5884 +#, perl-format +msgid "%s already exists; but want to create it to record .gitignore changes" +msgstr "" +"%s bestaat reeds; maar wil het maken om .gitignore-wijzigingen op te nemen" + +#: ../dgit:5890 +msgid "" +"Subject: Update .gitignore from Debian packaging branch\n" +"\n" +"The Debian packaging git branch contains these updates to the upstream\n" +".gitignore file(s). This patch is autogenerated, to provide these\n" +"updates to users of the official Debian archive view of the package.\n" +msgstr "" +"Subject: Bijwerken van .gitignore vanuit de Debian verpakkingstak\n" +"\n" +"De Debian verpakkingstak bevat deze bijwerkingen van bovenstrooms\n" +".gitignore bestand(en). Deze patch wordt automatisch gemaakt, om deze\n" +"bijwerkingen te verstrekken aan gebruikers van de weergave van het pakket\n" +"in het officiële Debian-archief.\n" + +#: ../dgit:5913 +msgid "Commit patch to update .gitignore\n" +msgstr "Patch om .gitignore bij te werken vastleggen\n" + +#: ../dgit:5983 msgid "maximum search space exceeded" msgstr "maximale zoekruimte overschreden" -#: ../dgit:5668 +#: ../dgit:6001 #, perl-format msgid "has %s not %s" msgstr "bevat %s, niet %s" -#: ../dgit:5677 +#: ../dgit:6010 msgid "root commit" msgstr "beginvastlegging (root commit)" -#: ../dgit:5683 +#: ../dgit:6016 #, perl-format msgid "merge (%s nontrivial parents)" msgstr "samenvoeging (merge) (%s niet-triviale ouders)" -#: ../dgit:5695 +#: ../dgit:6028 #, perl-format msgid "changed %s" msgstr "gewijzigd: %s" -#: ../dgit:5714 +#: ../dgit:6047 #, perl-format msgid "" "\n" @@ -1219,23 +1754,23 @@ msgstr "" "\n" "%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n" -#: ../dgit:5721 +#: ../dgit:6054 #, perl-format msgid "%s: %s: %s\n" msgstr "%s: %s: %s\n" -#: ../dgit:5733 +#: ../dgit:6066 msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n" msgstr "" "lineair maken van de quilt-geschiedenis mislukte. Zoek naar `quilt fixup' in " "dgit(7).\n" -#: ../dgit:5736 +#: ../dgit:6069 msgid "quilt fixup cannot be linear, smashing..." msgstr "" "de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..." -#: ../dgit:5748 +#: ../dgit:6083 #, perl-format msgid "" "Automatically generated patch (%s)\n" @@ -1246,43 +1781,43 @@ msgstr "" "Laatste (tot en met) %s git-wijzigingen, ter informatie:\n" "\n" -#: ../dgit:5755 +#: ../dgit:6090 msgid "quiltify linearisation planning successful, executing..." msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..." -#: ../dgit:5789 +#: ../dgit:6124 msgid "contains unexpected slashes\n" msgstr "bevat onverwachte slashes\n" -#: ../dgit:5790 +#: ../dgit:6125 msgid "contains leading punctuation\n" msgstr "bevat leestekens aan het begin\n" -#: ../dgit:5791 +#: ../dgit:6126 msgid "contains bad character(s)\n" msgstr "bevat foutieve teken(s)\n" -#: ../dgit:5792 +#: ../dgit:6127 msgid "is series file\n" msgstr "is een series-bestand\n" -#: ../dgit:5793 +#: ../dgit:6128 msgid "too long\n" msgstr "te lang\n" -#: ../dgit:5797 +#: ../dgit:6132 #, perl-format msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s" msgstr "" "quiltifying commit (quiltificerende vastlegging) %s: Gbp-Pq %s wordt " "genegeerd/weggelaten: %s" -#: ../dgit:5826 +#: ../dgit:6161 #, perl-format msgid "dgit: patch title transliteration error: %s" msgstr "dgit: fout bij de transliteratie van de patch-titel: %s" -#: ../dgit:5909 +#: ../dgit:6236 #, perl-format msgid "" "quilt mode %s does not make sense (or is not supported) with single-debian-" @@ -1290,45 +1825,78 @@ msgid "" msgstr "" "quilt modus %s is zinloos (of wordt niet ondersteund) met single-debian-patch" -#: ../dgit:5927 +#: ../dgit:6261 msgid "converted" msgstr "omgezet" -#: ../dgit:5928 +#: ../dgit:6262 #, perl-format msgid "dgit view: created (%s)" msgstr "dgit-weergave: gecreëerd: (%s)" -#: ../dgit:5982 +#: ../dgit:6316 msgid "Commit removal of .pc (quilt series tracking data)\n" msgstr "" "Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n" -#: ../dgit:5992 +#: ../dgit:6326 msgid "starting quiltify (single-debian-patch)" msgstr "quiltify wordt gestart (één enkele debian-patch)" -#: ../dgit:6102 +#: ../dgit:6362 +#, perl-format +msgid "regenerating patch using git diff (--quilt=%s)" +msgstr "patch opnieuw genereren met git diff (--quilt=%s)" + +#: ../dgit:6456 +msgid "" +"warning: package uses dpkg-source include-binaries feature - not all changes " +"are visible in patches!\n" +msgstr "" +"opgelet: pakket gebruikt de functie include-binaries van dpkg-source - niet " +"alle wijzigingen zijn zichtbaar in patches!\n" + +#: ../dgit:6465 +#, perl-format +msgid "warning: ignoring bad include-binaries file %s: %s\n" +msgstr "opgelet: slecht nclude-binaries-bestand %s wordt genegeerd: %s\n" + +#: ../dgit:6468 +#, perl-format +msgid "forbidden path component '%s'" +msgstr "niet toegelaten pad-component '%s'" + +#: ../dgit:6478 +#, perl-format +msgid "path starts with '%s'" +msgstr "pad begint met '%s'" + +#: ../dgit:6488 +#, perl-format +msgid "path to '%s' not a plain file or directory" +msgstr "pad naar '%s' geen gewoon bestand of map" + +#: ../dgit:6546 #, perl-format msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)." msgstr "" "dgit: gespleten brein (aparte dgit-weergave) is mogelijk nodig (--quilt=%s)." -#: ../dgit:6134 +#: ../dgit:6578 #, perl-format msgid "dgit view: found cached (%s)" msgstr "dgit-weergave: gecachete (%s) aangetroffen" -#: ../dgit:6139 +#: ../dgit:6583 msgid "dgit view: found cached, no changes required" msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist" -#: ../dgit:6174 +#: ../dgit:6618 #, perl-format msgid "examining quilt state (multiple patches, %s mode)" msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)" -#: ../dgit:6288 +#: ../dgit:6711 msgid "" "failed to apply your git tree's patch stack (from debian/patches/) to\n" " the corresponding upstream tarball(s). Your source tree and .orig\n" @@ -1337,43 +1905,42 @@ msgid "" msgstr "" "toepassen van de patch-stapel (uit debian/patches/) van uw git-boom op het/" "de\n" -" overeenkomstig(e) tararchie(f)(ven) van de bovenstroomse toeleveraar " -"mislukte.\n" +" overeenkomstig(e) bovenstroomse tar-archie(f)(ven) mislukte.\n" " Uw broncodeboom en .orig zijn wellicht te inconsistent.\n" " dgit can enkel bepaalde soorten anomalieën repareren\n" " (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n" -#: ../dgit:6302 -msgid "Tree already contains .pc - will use it then delete it." -msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen." +#: ../dgit:6725 +msgid "Tree already contains .pc - will delete it." +msgstr "Boom bevat reeds een .pc - zal dit verwijderen." -#: ../dgit:6336 +#: ../dgit:6759 msgid "baredebian quilt fixup: could not find any origs" msgstr "baredebian quilt reparatie: kon geen origs vinden" -#: ../dgit:6349 +#: ../dgit:6772 msgid "tarball" msgstr "tar-archief" -#: ../dgit:6367 +#: ../dgit:6790 #, perl-format msgid "Combine orig tarballs for %s %s" msgstr " Combineren van orig tar-archieven voor %s %s" -#: ../dgit:6383 +#: ../dgit:6806 msgid "tarballs" msgstr "tar-archieven" -#: ../dgit:6397 +#: ../dgit:6820 msgid "upstream" -msgstr "bovenstrooms" +msgstr "bovenstroom" -#: ../dgit:6421 +#: ../dgit:6844 #, perl-format msgid "%s: base trees orig=%.20s o+d/p=%.20s" msgstr "%s: van de basisbomen zijn orig=%.20s en o+d/p=%.20s" -#: ../dgit:6431 +#: ../dgit:6854 #, perl-format msgid "" "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n" @@ -1382,54 +1949,42 @@ msgstr "" "%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n" "%s: quilt-verschillen: %9.00009s %s o+d/p %9.00009s %s o+d/p" -#: ../dgit:6440 -#, perl-format -msgid "dgit: cannot represent change: %s: %s\n" -msgstr "dgit: kan wijziging niet representeren: %s: %s\n" - -#: ../dgit:6444 -msgid "" -"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n" -msgstr "" -"HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt " -"kunnen worden\n" - -#: ../dgit:6451 +#: ../dgit:6864 msgid "" "This has only a debian/ directory; you probably want --quilt=bare debian." msgstr "Dit bevat enkel een map debian/; wellicht wilt u --quilt=bare debian." -#: ../dgit:6455 +#: ../dgit:6868 msgid "This might be a patches-unapplied branch." msgstr "Dit is mogelijk een tak zonder toepassing van patches." -#: ../dgit:6458 +#: ../dgit:6871 msgid "This might be a patches-applied branch." msgstr "Dit is mogelijk een tak met toegepaste patches." -#: ../dgit:6461 +#: ../dgit:6874 msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" msgstr "" "Heeft u mogelijk een van de volgende opties nodig: --[quilt=]gbp --" "[quilt=]dpm --quilt=unapplied ?" -#: ../dgit:6464 +#: ../dgit:6877 msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)." msgstr "" "Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)." -#: ../dgit:6468 +#: ../dgit:6881 msgid "Maybe orig tarball(s) are not identical to git representation?" msgstr "" "Is/zijn het/de orig-tararchie(f)(ven) misschien niet identiek aan de " "representatie ervan door git?" -#: ../dgit:6479 +#: ../dgit:6892 #, perl-format msgid "starting quiltify (multiple patches, %s mode)" msgstr "quiltify wordt gestart (meerdere patches, %s-modus)" -#: ../dgit:6518 +#: ../dgit:6931 msgid "" "\n" "dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n" @@ -1438,19 +1993,17 @@ msgid "" "\n" msgstr "" "\n" -"dgit: Bezig met bouwen of opruimen met het target rules\n" -" in de tak patches-niet-toepassen.\n" +"dgit: Bouwen of opruimen met het rules-target in de tak patches-unapplied.\n" "dgit: Moet de patches toepassen - hetgeen de boom vervuilt.\n" "dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n" "\n" -#: ../dgit:6530 +#: ../dgit:6943 msgid "dgit: Unapplying patches again to tidy up the tree." msgstr "" -"dgit: Bezig toepassen van patches terug ongedaan te maken om de boom op te " -"schonen." +"dgit: Toepassen van patches terug ongedaan maken om de boom op te schonen." -#: ../dgit:6559 +#: ../dgit:6972 msgid "" "If this is just missing .gitignore entries, use a different clean\n" "mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n" @@ -1462,26 +2015,29 @@ msgstr "" "negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te " "gebruiken.\n" -#: ../dgit:6571 +#: ../dgit:6984 msgid "tree contains uncommitted files and --clean=check specified" msgstr "" "de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven" -#: ../dgit:6574 +#: ../dgit:6987 msgid "tree contains uncommitted files (NB dgit didn't run rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (NB dgit voerde geen rules clean " "uit)" -#: ../dgit:6577 +#: ../dgit:6990 msgid "" "tree contains uncommited, untracked, unignored files\n" -"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them." +"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.\n" +"To include them in the build, it is usually best to just commit them." msgstr "" "de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n" -"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen." +"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen.\n" +"Om ze in de bouw op te nemen, is het gewoonlijk best om ze gewoon vast te " +"leggen." -#: ../dgit:6590 +#: ../dgit:7004 #, perl-format msgid "" "quilt mode %s (generally needs untracked upstream files)\n" @@ -1490,21 +2046,21 @@ msgstr "" "quilt modus %s (heeft meestal niet gevolgde bovenstroomse bestanden nodig)\n" "is in strijd met clean modus %s (welke deze zou verwijderen)\n" -#: ../dgit:6607 +#: ../dgit:7021 msgid "tree contains uncommitted files (after running rules clean)" msgstr "" "de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)" -#: ../dgit:6621 +#: ../dgit:7035 msgid "clean takes no additional arguments" msgstr "met clean kunnen geen extra argumenten opgegeven worden" -#: ../dgit:6640 +#: ../dgit:7054 #, perl-format msgid "-p specified package %s, but changelog says %s" msgstr "-p specificeerde pakket %s, maar het changelog-bestand vermeldt %s" -#: ../dgit:6650 +#: ../dgit:7064 msgid "" "dgit: --include-dirty is not supported with split view (including with view-" "splitting quilt modes)" @@ -1512,33 +2068,46 @@ msgstr "" "dgit: --include-dirty wordt niet ondersteund bij gesplitste weergave (met " "inbegrip van quilt-modi welke de weergave splitsen)" -#: ../dgit:6659 +#: ../dgit:7072 +msgid "" +"tree has .gitignore(s) but debian/source/options has 'tar-ignore'\n" +"Try 'tar-ignore=.git' in d/s/options instead. (See #908747.)\n" +msgstr "" + +#: ../dgit:7077 +#, perl-format +msgid "" +"%s: warning: debian/source/options contains bare 'tar-ignore'\n" +"This can cause .gitignore files to be improperly omitted. See #908747.\n" +msgstr "" + +#: ../dgit:7088 #, perl-format msgid "dgit: --quilt=%s, %s" msgstr "dgit: --quilt=%s, %s" -#: ../dgit:6663 +#: ../dgit:7092 msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian" msgstr "dgit: --upstream-commitish is enkel zinvol met --quilt=baredebian" -#: ../dgit:6698 +#: ../dgit:7127 #, perl-format msgid "remove old changes file %s: %s" msgstr "verwijder oud changes-bestand %s: %s" -#: ../dgit:6700 +#: ../dgit:7129 #, perl-format msgid "would remove %s" msgstr "zou %s verwijderen" -#: ../dgit:6718 +#: ../dgit:7147 #, perl-format msgid "warning: dgit option %s must be passed before %s on dgit command line\n" msgstr "" "waarschuwing: aan de commandoregel van dgit moet de optie %s van dgit " "opgegeven worden voor %s\n" -#: ../dgit:6725 +#: ../dgit:7154 #, perl-format msgid "" "warning: option %s should probably be passed to dgit before %s sub-command " @@ -1549,56 +2118,56 @@ msgstr "" "worden aan dgit voor het sub-commando %s, zodat het door dgit gezien wordt " "en niet enkel meegegeven wordt aan %s\n" -#: ../dgit:6751 +#: ../dgit:7180 msgid "archive query failed (queried because --since-version not specified)" msgstr "" "mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet " "opgegeven werd)" -#: ../dgit:6757 +#: ../dgit:7186 #, perl-format msgid "changelog will contain changes since %s" msgstr "changelog zal wijzigingen sinds %s bevatten" -#: ../dgit:6760 +#: ../dgit:7189 msgid "package seems new, not specifying -v<version>" msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>" -#: ../dgit:6803 +#: ../dgit:7232 msgid "Wanted to build nothing!" msgstr "Wilde niets bouwen!" -#: ../dgit:6841 +#: ../dgit:7270 #, perl-format msgid "only one changes file from build (%s)\n" msgstr "slechts één changes-bestand van bouw (%s)\n" -#: ../dgit:6848 +#: ../dgit:7277 #, perl-format msgid "%s found in binaries changes file %s" msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten" -#: ../dgit:6855 +#: ../dgit:7284 #, perl-format msgid "%s unexpectedly not created by build" msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw" -#: ../dgit:6859 +#: ../dgit:7288 #, perl-format msgid "install new changes %s{,.inmulti}: %s" msgstr "installeer nieuw changes %s{,.inmulti}: %s" -#: ../dgit:6864 +#: ../dgit:7293 #, perl-format msgid "wrong number of different changes files (%s)" msgstr "fout nummer van verschillende changes-bestanden (%s)" -#: ../dgit:6867 +#: ../dgit:7296 #, perl-format msgid "build successful, results in %s\n" msgstr "bouw was succesvol, resultaten in %s\n" -#: ../dgit:6880 +#: ../dgit:7309 #, perl-format msgid "" "changes files other than source matching %s already present; building would " @@ -1610,11 +2179,11 @@ msgstr "" "resultaat.\n" "De suggestie is dat u %s verwijdert.\n" -#: ../dgit:6898 +#: ../dgit:7327 msgid "build successful\n" msgstr "de bouw was succesvol\n" -#: ../dgit:6906 +#: ../dgit:7335 #, perl-format msgid "" "%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n" @@ -1625,30 +2194,30 @@ msgstr "" "%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen " "gaan naar ..\n" -#: ../dgit:7017 +#: ../dgit:7446 #, perl-format msgid "remove %s: %s" msgstr "verwijder %s: %s" -#: ../dgit:7054 +#: ../dgit:7491 msgid "--include-dirty not supported with --build-products-dir, sorry" msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry" -#: ../dgit:7074 +#: ../dgit:7517 #, perl-format msgid "put in place new built file (%s): %s" msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s" -#: ../dgit:7087 +#: ../dgit:7530 msgid "build-source takes no additional arguments" msgstr "build-source moet zonder bijkomende argumenten gebruikt worden" -#: ../dgit:7091 +#: ../dgit:7534 #, perl-format msgid "source built, results in %s and %s" msgstr "broncodepakket is gebouwd, resultaten in %s en %s" -#: ../dgit:7098 +#: ../dgit:7541 msgid "" "dgit push-source: --include-dirty/--ignore-dirty does not makesense with " "push-source!" @@ -1656,21 +2225,21 @@ msgstr "" "dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-" "source!" -#: ../dgit:7104 +#: ../dgit:7547 msgid "source changes file" msgstr "broncode-changes-bestand" -#: ../dgit:7106 +#: ../dgit:7549 msgid "user-specified changes file is not source-only" msgstr "" "door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'" -#: ../dgit:7126 ../dgit:7128 +#: ../dgit:7569 ../dgit:7571 #, perl-format msgid "%s (in build products dir): %s" msgstr "%s (in bouwproductenmap): %s" -#: ../dgit:7142 +#: ../dgit:7585 msgid "" "perhaps you need to pass -A ? (sbuild's default is to build only\n" "arch-specific binaries; dgit 1.4 used to override that.)\n" @@ -1679,7 +2248,7 @@ msgstr "" "specifieke\n" "binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n" -#: ../dgit:7155 +#: ../dgit:7598 msgid "" "you asked for a builder but your debbuildopts didn't ask for any binaries -- " "is this really what you meant?" @@ -1687,7 +2256,7 @@ msgstr "" "u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair " "pakket - is dit echt wat u bedoelde?" -#: ../dgit:7159 +#: ../dgit:7602 msgid "" "we must build a .dsc to pass to the builder but your debbuiltopts forbids " "the building of a source package; cannot continue" @@ -1696,65 +2265,65 @@ msgstr "" "debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is " "onmogelijk" -#: ../dgit:7189 +#: ../dgit:7632 msgid "incorrect arguments to dgit print-unapplied-treeish" msgstr "foutieve argumenten voor dgit print-unapplied-treeish" -#: ../dgit:7210 +#: ../dgit:7653 msgid "source tree" msgstr "broncodeboom" -#: ../dgit:7212 +#: ../dgit:7655 #, perl-format msgid "dgit: import-dsc: %s" msgstr "dgit: import-dsc: %s" -#: ../dgit:7225 +#: ../dgit:7668 #, perl-format msgid "unknown dgit import-dsc sub-option `%s'" msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc" -#: ../dgit:7229 +#: ../dgit:7672 msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK" -#: ../dgit:7233 +#: ../dgit:7676 msgid "dry run makes no sense with import-dsc" msgstr "testuitvoering (dry run) is zinloos met import-dsc" -#: ../dgit:7250 +#: ../dgit:7693 #, perl-format msgid "%s is checked out - will not update it" msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken" -#: ../dgit:7255 +#: ../dgit:7698 #, perl-format msgid "open import .dsc (%s): %s" msgstr "open import-.dsc (%s): %s" -#: ../dgit:7257 +#: ../dgit:7700 #, perl-format msgid "read %s: %s" msgstr "lees %s: %s" -#: ../dgit:7268 +#: ../dgit:7711 msgid "import-dsc signature check failed" msgstr "controle ondertekening van import-dsc mislukte" -#: ../dgit:7271 +#: ../dgit:7714 #, perl-format msgid "%s: warning: importing unsigned .dsc\n" msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n" -#: ../dgit:7282 +#: ../dgit:7725 msgid "Dgit metadata in .dsc" msgstr "Dgit-metadata in .dsc" -#: ../dgit:7293 +#: ../dgit:7736 msgid "dgit: import-dsc of .dsc with Dgit field, using git hash" msgstr "dgit: import-dsc van .dsc met Dgit-veld, met behulp van git hash" -#: ../dgit:7302 +#: ../dgit:7745 #, perl-format msgid "" ".dsc contains Dgit field referring to object %s\n" @@ -1765,21 +2334,21 @@ msgstr "" "Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n" "server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n" -#: ../dgit:7309 +#: ../dgit:7752 msgid "Not fast forward, forced update." msgstr "Niet lineair (fast forward), gedwongen update." -#: ../dgit:7311 +#: ../dgit:7754 #, perl-format msgid "Not fast forward to %s" msgstr "Niet lineair (fast forward) naar %s" -#: ../dgit:7316 +#: ../dgit:7759 #, perl-format msgid "updated git ref %s" msgstr "git ref %s geüpdatet" -#: ../dgit:7321 +#: ../dgit:7764 #, perl-format msgid "" "Branch %s already exists\n" @@ -1791,88 +2360,88 @@ msgstr "" "geschiedenis\n" "Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n" -#: ../dgit:7341 +#: ../dgit:7784 #, perl-format msgid "lstat %s works but stat gives %s !" msgstr "lstat %s werkt maar stat geeft %s !" -#: ../dgit:7343 +#: ../dgit:7786 #, perl-format msgid "stat %s: %s" msgstr "stat %s: %s" -#: ../dgit:7351 +#: ../dgit:7794 #, perl-format msgid "import %s requires %s, but: %s" msgstr "importeren van %s vereist %s, maar: %s" -#: ../dgit:7370 +#: ../dgit:7813 #, perl-format msgid "cannot import %s which seems to be inside working tree!" msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!" -#: ../dgit:7374 +#: ../dgit:7817 #, perl-format msgid "symlink %s to %s: %s" msgstr "symbolische koppeling %s naar %s: %s" -#: ../dgit:7375 +#: ../dgit:7818 #, perl-format msgid "made symlink %s -> %s" msgstr "maakte symbolische koppeling %s -> %s" -#: ../dgit:7386 +#: ../dgit:7829 msgid "Import, forced update - synthetic orphan git history." -msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis." +msgstr "Importeren, gedwongen update - kunstmatige verweesde git-geschiedenis." -#: ../dgit:7388 +#: ../dgit:7831 msgid "Import, merging." -msgstr "Import, bezig met samenvoegen." +msgstr "Importeren, samenvoegen." -#: ../dgit:7402 +#: ../dgit:7845 #, perl-format msgid "Merge %s (%s) import into %s\n" msgstr "Invoegen van import %s (%s) in %s\n" -#: ../dgit:7411 +#: ../dgit:7854 #, perl-format msgid "results are in git ref %s" msgstr "resultaten staan in git ref %s" -#: ../dgit:7418 +#: ../dgit:7861 msgid "need only 1 subpath argument" msgstr "slechts 1 argument met een onderliggend pad nodig" -#: ../dgit:7436 +#: ../dgit:7879 msgid "need destination argument" msgstr "bestemmingsargument nodig" -#: ../dgit:7441 +#: ../dgit:7884 #, perl-format msgid "exec git clone: %s\n" msgstr "exec git clone: %s\n" -#: ../dgit:7449 +#: ../dgit:7892 msgid "no arguments allowed to dgit print-dgit-repos-server-source-url" msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url" -#: ../dgit:7460 +#: ../dgit:7903 msgid "no arguments allowed to dgit print-dpkg-source-ignores" msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores" -#: ../dgit:7466 +#: ../dgit:7909 msgid "no arguments allowed to dgit setup-mergechangelogs" msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs" -#: ../dgit:7473 ../dgit:7479 +#: ../dgit:7916 ../dgit:7922 msgid "no arguments allowed to dgit setup-useremail" msgstr "geen argumenten toegelaten bij dgit setup-useremail" -#: ../dgit:7485 +#: ../dgit:7928 msgid "no arguments allowed to dgit setup-tree" msgstr "geen argumenten toegelaten bij dgit setup-tree" -#: ../dgit:7532 +#: ../dgit:7975 msgid "" "--initiator-tempdir must be used specify an absolute, not relative, " "directory." @@ -1880,42 +2449,42 @@ msgstr "" "--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map " "op te geven." -#: ../dgit:7571 +#: ../dgit:8014 #, perl-format msgid "%s needs a value" msgstr "%s moet een waarde hebben" -#: ../dgit:7575 +#: ../dgit:8018 #, perl-format msgid "bad value `%s' for %s" msgstr "foute waarde `%s' voor %s" -#: ../dgit:7675 +#: ../dgit:8125 #, perl-format msgid "%s: warning: ignoring unknown force option %s\n" msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n" -#: ../dgit:7693 +#: ../dgit:8143 #, perl-format msgid "unknown long option `%s'" msgstr "onbekende lange optie `%s'" -#: ../dgit:7748 +#: ../dgit:8198 #, perl-format msgid "unknown short option `%s'" msgstr "onbekende korte optie `%s'" -#: ../dgit:7763 +#: ../dgit:8213 #, perl-format msgid "%s is set to something other than SIG_DFL\n" msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n" -#: ../dgit:7767 +#: ../dgit:8217 #, perl-format msgid "%s is blocked\n" msgstr "%s is geblokkeerd\n" -#: ../dgit:7773 +#: ../dgit:8223 #, perl-format msgid "" "On entry to dgit, %s\n" @@ -1926,37 +2495,37 @@ msgstr "" "Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n" "Er wordt opgegeven.\n" -#: ../dgit:7790 +#: ../dgit:8240 #, perl-format msgid "cannot set command for %s" msgstr "kan commando voor %s niet instellen" -#: ../dgit:7803 +#: ../dgit:8253 #, perl-format msgid "cannot configure options for %s" msgstr "kan opties voor %s niet configureren" -#: ../dgit:7823 +#: ../dgit:8273 #, perl-format msgid "unknown quilt-mode `%s'" msgstr "onbekende quilt-modus `%s'" -#: ../dgit:7834 +#: ../dgit:8285 #, perl-format msgid "unknown %s setting `%s'" msgstr "onbekende %s dat `%s' instelt" -#: ../dgit:7862 +#: ../dgit:8313 msgid "DRY RUN ONLY\n" msgstr "ENKEL TESTUITVOERING (DRY RUN)\n" -#: ../dgit:7863 +#: ../dgit:8314 msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" msgstr "" "GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) " "WIJZIGINGEN MAKEN\n" -#: ../dgit:7882 +#: ../dgit:8334 #, perl-format msgid "unknown operation %s" msgstr "onbekende bewerking %s" @@ -2096,8 +2665,7 @@ msgstr "is een externe vastlegging (origin commit)" #: ../git-debrebase:928 msgid "upstream files differ from left parent" -msgstr "" -"bestanden van de bovenstroomse toeleveraar verschillen van de linkerouder" +msgstr "bovenstroomse bestanden verschillen van resterende ouder" #: ../git-debrebase:930 msgid "debian/ differs from right parent" @@ -2145,9 +2713,7 @@ msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s" #: ../git-debrebase:1109 #, perl-format msgid "packaging change (%s) follows upstream change" -msgstr "" -"wijziging (%s) bij het verpakken volgt de wijziging van de bovenstroomse " -"toeleveraar" +msgstr "wijziging (%s) bij het verpakken volgt de bovenstroomse wijziging" #: ../git-debrebase:1110 #, perl-format @@ -2187,164 +2753,156 @@ msgstr "standaardsamenvoeging (vanilla merge) aangetroffen" msgid "found unprocessable commit, cannot cope: %s" msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s" -#: ../git-debrebase:1215 +#: ../git-debrebase:1158 +msgid "old anchor is recognised due to --anchor, cannot check upstream" +msgstr "" +"oud anker werd herkend omwille van --anchor, kan bovenstroom niet controleren" + +#: ../git-debrebase:1219 #, perl-format msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)" msgstr "" "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om; %3$s: " "(vastlegging %1$s) (d.%2$s)" -#: ../git-debrebase:1216 +#: ../git-debrebase:1220 #, perl-format msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)" msgstr "" "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: (vastlegging " "%1$s) (d.%2$s)" -#: ../git-debrebase:1337 +#: ../git-debrebase:1341 msgid "bare dgit dsc import" msgstr "kale dsc-import door dgit" -#: ../git-debrebase:1677 ../git-debrebase:1680 +#: ../git-debrebase:1681 ../git-debrebase:1684 #, perl-format msgid "mismatch %s ?" msgstr "discrepantie %s ?" -#: ../git-debrebase:1683 +#: ../git-debrebase:1687 #, perl-format msgid "mismatch %s != %s ?" msgstr "discrepantie %s != %s ?" -#: ../git-debrebase:1693 +#: ../git-debrebase:1697 #, perl-format msgid "internal error %#x %s %s" msgstr "interne fout %#x %s %s" -#: ../git-debrebase:1721 +#: ../git-debrebase:1725 #, perl-format msgid "%s: laundered (head was %s)\n" msgstr "%s: gewassen (laundered) (head was %s)\n" -#: ../git-debrebase:1735 +#: ../git-debrebase:1739 msgid "you are in the middle of a git-rebase already" msgstr "u bent reeds middenin een git-rebase" -#: ../git-debrebase:1761 +#: ../git-debrebase:1775 msgid "launder for rebase" msgstr "wassen (launder) voor rebase" -#: ../git-debrebase:1766 +#: ../git-debrebase:1780 msgid "analyse does not support any options" msgstr "analyse ondersteunt geen opties" -#: ../git-debrebase:1768 +#: ../git-debrebase:1782 msgid "too many arguments to analyse" msgstr "te veel argumenten om te analyseren" -#: ../git-debrebase:1801 -#, perl-format -msgid "%s already exists" -msgstr "%s bestaat reeds" - -#: ../git-debrebase:1803 +#: ../git-debrebase:1817 msgid "HEAD symref is not to refs/heads/" msgstr "HEAD symref wijst niet naar refs/heads/" -#: ../git-debrebase:1826 +#: ../git-debrebase:1840 #, perl-format msgid "OK, you are ahead of %s\n" msgstr "Oké, u bent voor op %s\n" -#: ../git-debrebase:1830 +#: ../git-debrebase:1844 #, perl-format msgid "you are behind %s, divergence risk" msgstr "u bent achter op %s, gevaar voor uiteenlopen" -#: ../git-debrebase:1834 +#: ../git-debrebase:1848 #, perl-format msgid "you have diverged from %s" msgstr "u bent uiteengelopen van %s" -#: ../git-debrebase:1856 +#: ../git-debrebase:1870 msgid "remote dgit branch" msgstr "externe dgit-tak" -#: ../git-debrebase:1859 +#: ../git-debrebase:1873 msgid "remote dgit branch for sid" msgstr "externe dgit-tak voor sid" -#: ../git-debrebase:1887 +#: ../git-debrebase:1901 msgid "Recorded previous head for preservation" msgstr "Vorige head voor behoud opgetekend" -#: ../git-debrebase:1895 +#: ../git-debrebase:1909 #, perl-format msgid "could not record ffq-prev: %s" msgstr "kon ffq-prev niet optekenen: %s" -#: ../git-debrebase:1906 +#: ../git-debrebase:1920 #, perl-format msgid "could not check ffq-prev: %s" msgstr "kon ffq-prev niet controleren: %s" -#: ../git-debrebase:1926 +#: ../git-debrebase:1940 msgid "fast forward" msgstr "lineair (fast forward)" -#: ../git-debrebase:1936 +#: ../git-debrebase:1950 msgid "Declare fast forward / record previous work" msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk" -#: ../git-debrebase:1948 +#: ../git-debrebase:1962 msgid "No ffq-prev to stitch." msgstr "Geen ffq-prev om te borduren." -#: ../git-debrebase:1965 +#: ../git-debrebase:1979 msgid "need NEW-VERSION [UPS-COMMITTISH]" msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig" -#: ../git-debrebase:1970 +#: ../git-debrebase:1984 #, perl-format msgid "bad version number `%s'" msgstr "fout versienummer `%s'" -#: ../git-debrebase:1988 +#: ../git-debrebase:2002 #, perl-format msgid "upstream piece `%s'" msgstr "bovenstrooms stuk `%s'" -#: ../git-debrebase:1989 +#: ../git-debrebase:2003 msgid "upstream (main piece" -msgstr "van de bovenstroomse toeleveraar (belangrijkste stuk" +msgstr "bovenstrooms (belangrijkste stuk" -#: ../git-debrebase:2009 +#: ../git-debrebase:2023 msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig" -#: ../git-debrebase:2027 -msgid "old anchor is recognised due to --anchor, cannot check upstream" -msgstr "" -"oud anker werd herkend omwille van --anchor, kan niet controleren bij " -"bovenstroomse toeleveraar" - -#: ../git-debrebase:2043 +#: ../git-debrebase:2056 #, perl-format msgid "" "previous upstream combine %s mentions %d pieces (each implying one parent) " "but has %d parents (one per piece plus maybe a previous combine)" msgstr "" -"vorige bovenstroom-bijeenvoeging (upstream combine) %s vermeldt %d stukken " -"(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per " -"stuk plus misschien een eerdere bijeenvoeging)" +"vorige bovenstroom-bijeenvoeging %s vermeldt %d stukken (hetgeen voor elk " +"ervan één ouder impliceert) maar heeft %d ouders (één per stuk plus " +"misschien een eerdere bijeenvoeging)" -#: ../git-debrebase:2052 +#: ../git-debrebase:2065 #, perl-format msgid "previous upstream combine %s first piece is not `.'" -msgstr "" -"eerste stuk van vorige bovenstroom-bijeenvoeging (upstream combine) %s is " -"niet `.'" +msgstr "eerste stuk van vorige bovenstroom-bijeenvoeging %s is niet `.'" -#: ../git-debrebase:2065 +#: ../git-debrebase:2078 #, perl-format msgid "" "previous upstream %s is from git-debrebase but not an `upstream-combine' " @@ -2353,118 +2911,118 @@ msgstr "" "vorige bovenstroomse %s is van git-debrebase maar geen `upstream-combine'-" "vastlegging" -#: ../git-debrebase:2076 +#: ../git-debrebase:2089 #, perl-format msgid "introducing upstream piece `%s'" msgstr "bovenstrooms stuk `%s' wordt ingevoerd" -#: ../git-debrebase:2079 +#: ../git-debrebase:2092 #, perl-format msgid "dropping upstream piece `%s'" msgstr "bovenstrooms stuk `%s' wordt weggelaten" -#: ../git-debrebase:2082 +#: ../git-debrebase:2095 #, perl-format msgid "not fast forward: %s %s" msgstr "niet lineair (fast forward): %s %s" -#: ../git-debrebase:2193 +#: ../git-debrebase:2206 msgid "Previous head already recorded\n" msgstr "Vorige head reeds opgenomen\n" -#: ../git-debrebase:2197 +#: ../git-debrebase:2210 #, perl-format msgid "Could not preserve: %s" msgstr "Niet in staat te behouden: %s" -#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214 -#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337 -#: ../git-debrebase:2401 +#: ../git-debrebase:2215 ../git-debrebase:2221 ../git-debrebase:2227 +#: ../git-debrebase:2327 ../git-debrebase:2336 ../git-debrebase:2360 +#: ../git-debrebase:2424 msgid "no arguments allowed" msgstr "geen argumenten toegelaten" -#: ../git-debrebase:2236 +#: ../git-debrebase:2249 msgid "branch contains furniture (not laundered)" msgstr "tak bevat stoffering (niet gewassen)" -#: ../git-debrebase:2237 +#: ../git-debrebase:2250 msgid "branch is unlaundered" msgstr "tak is ongewassen (unlaundered)" -#: ../git-debrebase:2238 +#: ../git-debrebase:2251 msgid "branch needs laundering" msgstr "tak heeft wasbeurt nodig" -#: ../git-debrebase:2239 +#: ../git-debrebase:2252 msgid "branch not in git-debrebase form" msgstr "tak is niet in git-debrebase-indeling" -#: ../git-debrebase:2249 +#: ../git-debrebase:2262 msgid "current branch contents, in git-debrebase terms:\n" msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2251 +#: ../git-debrebase:2264 msgid " branch is laundered\n" msgstr " tak is gewassen\n" -#: ../git-debrebase:2267 +#: ../git-debrebase:2280 #, perl-format msgid " %s is not well-defined\n" msgstr " %s is niet goed gedefinieerd\n" -#: ../git-debrebase:2273 +#: ../git-debrebase:2286 msgid "key git-debrebase commits:\n" msgstr "kern-git-debrebase-vastleggingen:\n" -#: ../git-debrebase:2274 +#: ../git-debrebase:2287 msgid "anchor" msgstr "anker" -#: ../git-debrebase:2275 +#: ../git-debrebase:2288 msgid "breakwater" msgstr "golfbreker (breakwater)" -#: ../git-debrebase:2280 +#: ../git-debrebase:2303 msgid "branch and ref status, in git-debrebase terms:\n" msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n" -#: ../git-debrebase:2287 +#: ../git-debrebase:2310 msgid " unstitched; previous tip was:\n" msgstr " borduursel losgemaakt; vorige tip was:\n" -#: ../git-debrebase:2290 +#: ../git-debrebase:2313 msgid " stitched? (no record of git-debrebase work)\n" msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n" -#: ../git-debrebase:2292 +#: ../git-debrebase:2315 msgid " stitched\n" msgstr " geborduurd\n" -#: ../git-debrebase:2294 +#: ../git-debrebase:2317 msgid " not git-debrebase (diverged since last stitch)\n" msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n" -#: ../git-debrebase:2297 +#: ../git-debrebase:2320 msgid "you are currently rebasing\n" msgstr "u bent momenteel aan het rebasen\n" -#: ../git-debrebase:2314 ../git-debrebase:2327 +#: ../git-debrebase:2337 ../git-debrebase:2350 msgid "launder for git-debrebase quick" msgstr "wassen voor git-debrebase quick" -#: ../git-debrebase:2321 ../git-debrebase:2351 +#: ../git-debrebase:2344 ../git-debrebase:2374 msgid "No ongoing git-debrebase session." msgstr "Geen lopende git-debrebase-sessie." -#: ../git-debrebase:2390 +#: ../git-debrebase:2413 msgid "Commit patch queue (exported by git-debrebase)" msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)" -#: ../git-debrebase:2407 +#: ../git-debrebase:2430 msgid "No (more) patches to export." msgstr "Geen (andere) patches die geëxporteerd moeten worden." -#: ../git-debrebase:2414 +#: ../git-debrebase:2437 #, perl-format msgid "" "Patch export produced patch amendments (abandoned output commit %s). Try " @@ -2473,125 +3031,128 @@ msgstr "" "De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s " "gestaakt). Probeer eerst een wasbeurt te doen." -#: ../git-debrebase:2434 +#: ../git-debrebase:2457 #, perl-format msgid "%s contains comments, which will be discarded" msgstr "%s bevat commentaar die verwijderd zal worden" -#: ../git-debrebase:2439 +#: ../git-debrebase:2462 #, perl-format msgid "patch %s repeated in %s !" msgstr "patch %s herhaald in %s !" -#: ../git-debrebase:2446 +#: ../git-debrebase:2469 #, perl-format msgid "Unused patch file %s will be discarded" msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden" -#: ../git-debrebase:2454 +#: ../git-debrebase:2477 msgid "ffq-prev exists, this is already managed by git-debrebase!" msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2459 +#: ../git-debrebase:2482 msgid "ahead of debrebase-last, this is already managed by git-debrebase!" msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!" -#: ../git-debrebase:2475 +#: ../git-debrebase:2499 msgid "want only 1 optional argument, the upstream git commitish" -msgstr "" -"wil slechts 1 facultatief argument, de git commitish van de bovenstroomse " -"toeleveraar" +msgstr "wil slechts 1 facultatief argument, de bovenstroomse git commitish" -#: ../git-debrebase:2480 +#: ../git-debrebase:2504 msgid "missing Version from changelog\n" msgstr "Version vanuit de changelog wordt gemist\n" -#: ../git-debrebase:2496 +#: ../git-debrebase:2520 #, perl-format msgid "" "upstream (%s) and HEAD are not\n" "identical in upstream files. See diffstat above, or run\n" " git diff %s HEAD -- :!/debian :/\n" msgstr "" -"upstream (%s) en HEAD zijn niet\n" +"bovenstroom (%s) en HEAD zijn niet\n" "identiek in de bovenstroomse bestanden. Zie diffstat hierboven, of voer dit " "commando uit:\n" " git diff %s HEAD -- :!/debian :/\n" -#: ../git-debrebase:2504 +#: ../git-debrebase:2528 #, perl-format msgid "upstream (%s) is not an ancestor of HEAD" -msgstr "upstream (%s) is geen voorouder van HEAD" +msgstr "bovenstroom (%s) is geen voorouder van HEAD" -#: ../git-debrebase:2511 +#: ../git-debrebase:2535 #, perl-format msgid "" "history between upstream (%s) and HEAD contains direct changes to upstream " "files - are you sure this is a gbp (patches-unapplied) branch?" msgstr "" -"de geschiedenis tussen upstream (%s) en HEAD bevat rechtstreekse wijzigingen " -"aan bovenstroomse bestanden - bent u zeker dat dit een gbp-tak (patches-" -"unapplied) (geen toepassing van patches) is?" +"de geschiedenis tussen bovenstroom (%s) en HEAD bevat rechtstreekse " +"wijzigingen aan bovenstroomse bestanden - bent u zeker dat dit een gbp-tak " +"(patches-unapplied) is?" -#: ../git-debrebase:2513 +#: ../git-debrebase:2537 #, perl-format msgid "list expected changes with: %s\n" msgstr "toon verwachte wijzigingen met: %s\n" -#: ../git-debrebase:2520 +#: ../git-debrebase:2544 #, perl-format msgid "upstream (%s) contains debian/ directory" msgstr "upstream (%s) bevat een map debian/" -#: ../git-debrebase:2538 +#: ../git-debrebase:2562 msgid "neither of the first two changelog entries are released\n" msgstr "" "geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n" -#: ../git-debrebase:2544 +#: ../git-debrebase:2568 #, perl-format msgid "could not find suitable maintainer view tag %s\n" msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n" -#: ../git-debrebase:2547 +#: ../git-debrebase:2571 #, perl-format msgid "HEAD is not FF from maintainer tag %s!" msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!" -#: ../git-debrebase:2550 +#: ../git-debrebase:2574 #, perl-format msgid "dgit view tag %s not found\n" msgstr "dgit-weergavetag %s niet gevonden\n" -#: ../git-debrebase:2552 +#: ../git-debrebase:2576 #, perl-format msgid "dgit view tag %s is not FF from maintainer tag %s\n" msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n" -#: ../git-debrebase:2554 +#: ../git-debrebase:2578 #, perl-format msgid "will stitch in dgit view, %s\n" msgstr "zal borduren in de dgit-weergave, %s\n" -#: ../git-debrebase:2561 -#, perl-format +#: ../git-debrebase:2585 +#, fuzzy, perl-format +#| msgid "" +#| "Cannot confirm dgit view: %s\n" +#| "Failed to stitch in dgit view (see messages above).\n" +#| "dgit --overwrite will be needed on the first dgit push after conversion.\n" msgid "" "Cannot confirm dgit view: %s\n" "Failed to stitch in dgit view (see messages above).\n" -"dgit --overwrite will be needed on the first dgit push after conversion.\n" +"dgit --trust-changelog will be needed on the first dgit push after " +"conversion.\n" msgstr "" "Kan de dgit-weergave niet bevestigen: %s\n" "Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n" "dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n" -#: ../git-debrebase:2607 +#: ../git-debrebase:2631 #, perl-format msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n" msgstr "" "%s: omgezet vanuit de indeling van de tak zonder toepassing van patches " "(patched-unapplied) (gbp), Oké\n" -#: ../git-debrebase:2636 +#: ../git-debrebase:2660 #, perl-format msgid "" "%s: converted to git-buildpackage branch format\n" @@ -2602,17 +3163,16 @@ msgstr "" "%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n" "%s: WAARSCHUWING: dat doen zou alle bovenstroomse patches doen wegvallen!\n" -#: ../git-debrebase:2657 +#: ../git-debrebase:2681 msgid "takes 1 optional argument, the upstream commitish" -msgstr "" -"heeft 1 facultatief argument, de bovenstroomse commitish (upstream commitish)" +msgstr "heeft 1 facultatief argument, de bovenstroomse commitish" -#: ../git-debrebase:2665 +#: ../git-debrebase:2689 #, perl-format msgid "%s, from command line" msgstr "%s, van de commandoregel" -#: ../git-debrebase:2679 +#: ../git-debrebase:2703 #, perl-format msgid "" "%s: Branch already seems to be in git-debrebase format!\n" @@ -2623,162 +3183,178 @@ msgstr "" "%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n" "%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n" -#: ../git-debrebase:2683 +#: ../git-debrebase:2707 msgid "Branch already in git-debrebase format." msgstr "Tak is reeds in git-debrebase-indeling." -#: ../git-debrebase:2695 +#: ../git-debrebase:2719 msgid "Considering possible commits corresponding to upstream:\n" -msgstr "" -"Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de " -"bovenstroomse toeleveraar:\n" +msgstr "Mogelijke vastleggingen nagaan die met bovenstroom overeenkomen:\n" -#: ../git-debrebase:2702 +#: ../git-debrebase:2727 #, perl-format msgid "git tag %s" msgstr "git tag %s" -#: ../git-debrebase:2708 +#: ../git-debrebase:2733 #, perl-format msgid " git tag: no suitable tag found (tried %s)\n" msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n" -#: ../git-debrebase:2717 +#: ../git-debrebase:2742 #, perl-format msgid "opendir build-products-dir %s: %s" msgstr "opendir build-products-dir %s: %s" -#: ../git-debrebase:2723 +#: ../git-debrebase:2748 #, perl-format msgid " orig: found what looks like a .orig, %s\n" msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n" -#: ../git-debrebase:2754 +#: ../git-debrebase:2779 #, perl-format msgid " orig: no suitable origs found (looked for %s in %s)\n" msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n" -#: ../git-debrebase:2763 +#: ../git-debrebase:2788 msgid "Evaluating possible commits corresponding to upstream:\n" -msgstr "" -"Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de " -"bovenstroomse toeleveraar:\n" +msgstr "Mogelijke vastleggingen evalueren die met bovenstroom overeenkomen:\n" -#: ../git-debrebase:2800 +#: ../git-debrebase:2829 #, perl-format msgid " %s: couldn't apply patches: gbp pq %s" msgstr " %s: kon patches niet toepassen: gbp pq %s" -#: ../git-debrebase:2809 +#: ../git-debrebase:2838 #, perl-format msgid " %s: applying patches gives different tree\n" msgstr " %s: patches toepassen geeft een afwijkende boom\n" -#: ../git-debrebase:2823 +#: ../git-debrebase:2852 msgid "" "Could not find or construct a suitable upstream commit.\n" "Rerun adding --diagnose after convert-from-dgit-view, or pass a\n" "upstream commmit explicitly or provide suitable origs.\n" msgstr "" -"Kon geen geschikte vastlegging van de bovenstroomse toeleveraar vinden of " -"construeren.\n" +"Kon geen geschikte bovenstroomse vastlegging vinden of construeren.\n" "Voer convert-from-dgit-view opnieuw uit met toevoeging van --diagnose,\n" -"of geef expliciet een vastlegging van de bovenstroomse toeleveraar op,\n" +"of geef expliciet een bovenstroomse vastlegging op,\n" "of bezorg geschikte origs.\n" -#: ../git-debrebase:2829 +#: ../git-debrebase:2858 #, perl-format msgid "Yes, will base new branch on %s\n" msgstr "Ja, zal nieuwe tak baseren op %s\n" -#: ../git-debrebase:2836 +#: ../git-debrebase:2863 +#, perl-format +msgid "" +"Result of applying debian/patches/ onto the upstream is not the same as " +"HEAD.\n" +"(Applying patches gave the commit %s)\n" +"Perhaps the upstream is not right, or not all of the delta is in d/patches.\n" +msgstr "" +"Resultaat van toepassen van debian/patches/ op bovenstroom is niet gelijk " +"met HEAD.\n" +"(Toepassen van patches gaf vastlegging %s)\n" +"Misschien klopt bovenstroom niet, of zit niet de hele delta in d/patches.\n" + +#: ../git-debrebase:2871 +msgid "Output of conversion does not match input!" +msgstr "Uitvoer van conversie komt niet net invoer overeen!" + +#: ../git-debrebase:2879 msgid "forget-was-ever-debrebase takes no further arguments" msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt" -#: ../git-debrebase:2840 +#: ../git-debrebase:2883 #, perl-format msgid "Not suitable for recording git-debrebaseness anyway: %s" msgstr "" "Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s" -#: ../git-debrebase:2942 +#: ../git-debrebase:2985 msgid "bad options\n" msgstr "foute opties\n" -#: ../git-debrebase:2952 +#: ../git-debrebase:2995 #, perl-format -msgid "%s: no cuddling to -i for git-rebase" -msgstr "%s: niet gek van -i voor git-rebase" +msgid "" +"%s: with git-debrebase, get-rebase -i option may only be followed by more " +"options (as separate arguments)" +msgstr "" +"%s: met git-debrebase, mag de optie -i van get-rebase enkel door meer opties " +"gevolgd worden (als aparte argumenten)" -#: ../git-debrebase:2982 +#: ../git-debrebase:3025 #, perl-format msgid "unknown git-debrebase sub-operation %s" msgstr "onbekende onderliggende bewerking van git-debrebase: %s" -#: ../Debian/Dgit.pm:298 +#: ../Debian/Dgit.pm:328 #, perl-format msgid "error: %s\n" msgstr "fout: %s\n" -#: ../Debian/Dgit.pm:324 +#: ../Debian/Dgit.pm:354 #, perl-format msgid "getcwd failed: %s\n" msgstr "getcwd mislukte: %s\n" -#: ../Debian/Dgit.pm:343 +#: ../Debian/Dgit.pm:373 msgid "terminated, reporting successful completion" msgstr "beëindigd, met de melding van een succesvolle voltooiing" -#: ../Debian/Dgit.pm:345 +#: ../Debian/Dgit.pm:375 #, perl-format msgid "failed with error exit status %s" msgstr "mislukt met de foutmelding %s" -#: ../Debian/Dgit.pm:348 +#: ../Debian/Dgit.pm:378 #, perl-format msgid "died due to fatal signal %s" msgstr "gestorven vanwege fataal signaal %s" -#: ../Debian/Dgit.pm:352 +#: ../Debian/Dgit.pm:382 #, perl-format msgid "failed with unknown wait status %s" msgstr "mislukt met ongekende wachttoestand %s" -#: ../Debian/Dgit.pm:358 +#: ../Debian/Dgit.pm:388 msgid "failed command" msgstr "mislukt commando" -#: ../Debian/Dgit.pm:364 +#: ../Debian/Dgit.pm:394 #, perl-format msgid "failed to fork/exec: %s" msgstr "fork/exec is mislukt: %s" -#: ../Debian/Dgit.pm:366 +#: ../Debian/Dgit.pm:396 #, perl-format msgid "subprocess %s" msgstr "onderliggend proces %s" -#: ../Debian/Dgit.pm:368 +#: ../Debian/Dgit.pm:398 msgid "subprocess produced invalid output" msgstr "onderliggend proces produceerde ongeldige uitvoer" -#: ../Debian/Dgit.pm:459 +#: ../Debian/Dgit.pm:503 msgid "stat source file: %S" msgstr "stat bronbestand: %S" -#: ../Debian/Dgit.pm:469 +#: ../Debian/Dgit.pm:513 msgid "stat destination file: %S" msgstr "stat doelbestand: %S" -#: ../Debian/Dgit.pm:488 +#: ../Debian/Dgit.pm:532 msgid "finally install file after cp: %S" msgstr "tot slot, installeer bestand na cp: %S" -#: ../Debian/Dgit.pm:494 +#: ../Debian/Dgit.pm:538 msgid "delete old file after cp: %S" msgstr "verwijder oud bestand na cp: %S" -#: ../Debian/Dgit.pm:515 +#: ../Debian/Dgit.pm:559 msgid "" "not in a git working tree?\n" "(git rev-parse --show-toplevel produced no output)\n" @@ -2786,53 +3362,53 @@ msgstr "" "niet in een git werkboom?\n" "(git rev-parse --show-toplevel gaf geen uitvoer)\n" -#: ../Debian/Dgit.pm:518 +#: ../Debian/Dgit.pm:562 #, perl-format msgid "chdir toplevel %s: %s\n" msgstr "chdir naar hoogste niveau %s: %s\n" -#: ../Debian/Dgit.pm:626 +#: ../Debian/Dgit.pm:670 msgid "git index contains changes (does not match HEAD)" msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:627 +#: ../Debian/Dgit.pm:671 msgid "working tree is dirty (does not match HEAD)" msgstr "werkboom is bevuild (komt niet overeen met HEAD)" -#: ../Debian/Dgit.pm:649 +#: ../Debian/Dgit.pm:696 msgid "using specified upstream commitish" msgstr "opgegeven bovenstroomse commitish wordt gebruikt" -#: ../Debian/Dgit.pm:655 +#: ../Debian/Dgit.pm:703 #, perl-format msgid "" "Could not determine appropriate upstream commitish.\n" " (Tried these tags: %s)\n" " Check version, and specify upstream commitish explicitly." msgstr "" -"Kon geen passende bovenstroomse commitish bepalen.\n" +"Kon geen passende bovenstroomse commitish vaststellen.\n" " (Probeerde deze tags: %s)\n" " Controleer versie en geef bovenstroomse commitish expliciet op." -#: ../Debian/Dgit.pm:661 ../Debian/Dgit.pm:663 +#: ../Debian/Dgit.pm:708 ../Debian/Dgit.pm:710 #, perl-format msgid "using upstream from git tag %s" msgstr "bovenstroom van git tag %s wordt gebruikt" -#: ../Debian/Dgit.pm:769 +#: ../Debian/Dgit.pm:816 msgid "detached HEAD" msgstr "vrijstaande HEAD (detached HEAD)" -#: ../Debian/Dgit.pm:770 +#: ../Debian/Dgit.pm:817 msgid "HEAD symref is not to refs/" msgstr "symbolische referentie HEAD is geen referentie naar refs/" -#: ../Debian/Dgit.pm:786 +#: ../Debian/Dgit.pm:833 #, perl-format msgid "parsing of %s failed" msgstr "ontleden van %s mislukte" -#: ../Debian/Dgit.pm:795 +#: ../Debian/Dgit.pm:842 #, perl-format msgid "" "control file %s is (already) PGP-signed. Note that dgit push needs to " @@ -2841,41 +3417,76 @@ msgstr "" "controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit " "push het .dsc moet aanpassen en het dan zelf moet ondertekenen" -#: ../Debian/Dgit.pm:809 +#: ../Debian/Dgit.pm:856 #, perl-format msgid "open %s (%s): %s" msgstr "open %s (%s): %s" -#: ../Debian/Dgit.pm:830 +#: ../Debian/Dgit.pm:877 #, perl-format msgid "missing field %s in %s" msgstr "ontbrekend veld %s in %s" -#: ../Debian/Dgit.pm:916 +#: ../Debian/Dgit.pm:963 msgid "Dummy commit - do not use\n" msgstr "Voorbeeldvastlegging - niet gebruiken\n" -#: ../Debian/Dgit.pm:937 +#: ../Debian/Dgit.pm:984 #, perl-format msgid "exec %s: %s\n" msgstr "exec %s: %s\n" -#: ../Debian/Dgit.pm:1005 +#: ../Debian/Dgit.pm:1012 +#, perl-format +msgid "Taint recorded at time %s for package %s" +msgstr "Bezoedeling geregistreerd op tijdstip %s voor pakket %s" + +#: ../Debian/Dgit.pm:1014 +#, perl-format +msgid "Taint recorded at time %s for any package" +msgstr "Bezoedeling geregistreerd op tijdstip %s voor willekeurig pakket" + +#: ../Debian/Dgit.pm:1016 +#, perl-format +msgid "Taint recorded for package %s" +msgstr "Bezoedeling geregistreerd voor pakket %s" + +#: ../Debian/Dgit.pm:1018 +msgid "Taint recorded for any package" +msgstr "Bezoedeling geregistreerd voor willekeurig pakket" + +#: ../Debian/Dgit.pm:1030 +msgid "Uncorrectable error. If confused, consult administrator.\n" +msgstr "" +"Niet-corrigeerbare fout. Neem bij verwarring contact op met de beheerder.\n" + +#: ../Debian/Dgit.pm:1033 +msgid "Could perhaps be forced using --deliberately. Consult documentation.\n" +msgstr "" +"Kan misschien geforceerd worden door --deliberately te gebruiken. Raadpleeg " +"de documentatie.\n" + +#: ../Debian/Dgit.pm:1036 +#, perl-format +msgid "Forcing due to %s\n" +msgstr "Forceren vanwege %s\n" + +#: ../Debian/Dgit.pm:1101 #, perl-format msgid "cannot stat %s/.git: %s" msgstr "kan status van %s/.git niet verkrijgen: %s" -#: ../Debian/Dgit.pm:1028 +#: ../Debian/Dgit.pm:1124 #, perl-format msgid "failed to mkdir playground parent %s: %s" msgstr "mkdir van speelplaatsouder %s mislukte: %s" -#: ../Debian/Dgit.pm:1036 +#: ../Debian/Dgit.pm:1132 #, perl-format msgid "failed to mkdir a playground %s: %s" msgstr "mkdir van een speelplaats %s mislukte: %s" -#: ../Debian/Dgit.pm:1045 +#: ../Debian/Dgit.pm:1141 #, perl-format msgid "failed to mkdir the playground %s: %s" msgstr "mkdir van de speelplaats %s mislukte: %s" diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 3410d8b..8bf1199 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,12 +28,12 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -68,9 +68,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 -#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:354 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -108,8 +108,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -165,15 +165,23 @@ msgstr "" msgid "to obtain a release tag, and then proceed as above." msgstr "" +#. type: verbatim +#: ../dgit-maint-merge.7.pod:151 ../dgit-maint-debrebase.7.pod:165 +#, no-wrap +msgid "" +" % git tag -s upstream/$(git show --date=format:%Y%m%d --pretty=format:\"1.2.2+git%cd.%h\" --quiet upstream/main) upstream/main\n" +"\n" +msgstr "" + #. type: =head3 -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 -#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 -#: ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" @@ -184,7 +192,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -194,7 +202,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -203,19 +211,19 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:223 ../dgit-maint-debrebase.7.pod:243 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 +#: ../dgit-maint-merge.7.pod:225 ../dgit-maint-debrebase.7.pod:245 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-merge.7.pod:264 ../dgit-maint-debrebase.7.pod:276 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -223,24 +231,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 +#: ../dgit-maint-merge.7.pod:277 ../dgit-maint-debrebase.7.pod:330 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -248,7 +256,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 msgid "" "If you want to package an untagged upstream commit (because upstream does " "not tag releases or because you want to package an upstream development " @@ -256,7 +264,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -265,12 +273,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -278,12 +286,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -291,7 +299,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -299,12 +307,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -313,20 +321,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -334,7 +342,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:326 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:334 msgid "GIT CONFIGURATION" msgstr "" @@ -467,14 +475,20 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:165 +#: ../dgit-maint-debrebase.7.pod:161 +msgid "" +"One can generate such a versioned tag using git show's --pretty option. e.g.:" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:173 msgid "" "Because we want to work in git, we need a virtual upstream branch with " "virtual release tags. gbp-import-orig(1) can manage this for us. To begin" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:179 #, no-wrap msgid "" " % mkdir foo\n" @@ -491,7 +505,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:184 +#: ../dgit-maint-debrebase.7.pod:192 msgid "" "This should leave you on the master branch. Next, our upstream branch " "cannot be pushed to B<dgit-repos>, but since we will need it whenever we " @@ -500,7 +514,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:196 +#: ../dgit-maint-debrebase.7.pod:204 msgid "" "You are now ready to proceed as above, making commits to the I<debian/> " "directory and to the upstream source. As above, for technical reasons, B<it " @@ -510,14 +524,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:203 +#: ../dgit-maint-debrebase.7.pod:211 msgid "" "A convenient way to ensure this requirement is satisfied is to start by " "creating I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:217 +#: ../dgit-maint-debrebase.7.pod:225 #, no-wrap msgid "" " [import-orig]\n" @@ -526,12 +540,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:222 +#: ../dgit-maint-debrebase.7.pod:230 msgid "and commit that:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:226 +#: ../dgit-maint-debrebase.7.pod:234 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -539,7 +553,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:230 +#: ../dgit-maint-debrebase.7.pod:238 msgid "" "Note that we couldn't create I<debian/gbp.conf> before now for the same " "technical reasons which require our first commit to introduce I<debian/> " @@ -548,7 +562,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-debrebase.7.pod:248 msgid "" "If you have an existing git history that you have pushed to an ordinary git " "server like B<salsa.debian.org>, we start with that. If you don't already " @@ -557,7 +571,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:247 +#: ../dgit-maint-debrebase.7.pod:255 #, no-wrap msgid "" " % git clone salsa.debian.org:Debian/foo\n" @@ -568,14 +582,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:254 +#: ../dgit-maint-debrebase.7.pod:262 msgid "" "If you don't have any existing git history, or you have history only on the " "special B<dgit-repos> server, we start with B<dgit clone>:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:259 +#: ../dgit-maint-debrebase.7.pod:267 #, no-wrap msgid "" " % dgit clone foo\n" @@ -584,12 +598,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:264 +#: ../dgit-maint-debrebase.7.pod:272 msgid "Then we make new upstream tags available:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:272 +#: ../dgit-maint-debrebase.7.pod:280 msgid "" "We now use a B<git debrebase convert-from-*> command to convert your " "existing history to the git-debrebase(5) data model. Which command you " @@ -597,17 +611,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:278 +#: ../dgit-maint-debrebase.7.pod:286 msgid "(A) There is no delta queue." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:280 +#: ../dgit-maint-debrebase.7.pod:288 msgid "If there do not exist any Debian patches, use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:284 ../dgit-maint-debrebase.7.pod:296 +#: ../dgit-maint-debrebase.7.pod:292 ../dgit-maint-debrebase.7.pod:304 #, no-wrap msgid "" " % git debrebase convert-from-gbp\n" @@ -615,12 +629,12 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:288 +#: ../dgit-maint-debrebase.7.pod:296 msgid "(B) There is a delta queue, and patches are unapplied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:290 +#: ../dgit-maint-debrebase.7.pod:298 msgid "" "This is the standard git-buildpackage(1) workflow: there are Debian patches, " "but the upstream source is committed to git without those patches applied. " @@ -628,7 +642,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:300 +#: ../dgit-maint-debrebase.7.pod:308 msgid "" "If you were not previously using dgit to upload your package (i.e. you were " "not using the workflow described in dgit-maint-gbp(7)), and you happen to " @@ -637,17 +651,17 @@ msgid "" msgstr "" #. type: =item -#: ../dgit-maint-debrebase.7.pod:305 +#: ../dgit-maint-debrebase.7.pod:313 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:307 +#: ../dgit-maint-debrebase.7.pod:315 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:311 +#: ../dgit-maint-debrebase.7.pod:319 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -655,7 +669,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:317 +#: ../dgit-maint-debrebase.7.pod:325 msgid "" "Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it " "is exactly what you would get if you deleted .git, invoked B<dpkg-" @@ -663,7 +677,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:328 +#: ../dgit-maint-debrebase.7.pod:336 msgid "" "git-debrebase(1) does not yet support using B<git merge> to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -671,7 +685,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:335 +#: ../dgit-maint-debrebase.7.pod:343 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -679,14 +693,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:339 +#: ../dgit-maint-debrebase.7.pod:347 msgid "" "Now when you pull work from other Debian contributors, git will rebase your " "work on top of theirs." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:342 +#: ../dgit-maint-debrebase.7.pod:350 msgid "" "If you use this clone for upstream development in addition to Debian " "packaging work, you may not want to set this global setting. Instead, see " @@ -695,24 +709,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:347 +#: ../dgit-maint-debrebase.7.pod:355 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:349 +#: ../dgit-maint-debrebase.7.pod:357 msgid "" "There are two steps: obtaining git refs that correspond to the new release, " "and importing that release using git-debrebase(1)." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-debrebase.7.pod:397 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-debrebase.7.pod:401 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -720,12 +734,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:397 -msgid "replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball." -msgstr "" - -#. type: textblock -#: ../dgit-maint-debrebase.7.pod:399 +#: ../dgit-maint-debrebase.7.pod:405 msgid "" "This invocation of git-debrebase(1) involves a git rebase. You may need to " "resolve conflicts if the Debian delta queue does not apply cleanly to the " @@ -733,13 +742,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:403 +#: ../dgit-maint-debrebase.7.pod:409 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:408 +#: ../dgit-maint-debrebase.7.pod:414 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -747,7 +756,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:412 +#: ../dgit-maint-debrebase.7.pod:418 msgid "" "Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the " "list of added or removed files, which is useful to determine whether there " @@ -756,27 +765,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:427 +#: ../dgit-maint-debrebase.7.pod:433 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:429 +#: ../dgit-maint-debrebase.7.pod:435 msgid "Just make commits on master that change the contents of I<debian/>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:431 +#: ../dgit-maint-debrebase.7.pod:437 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:433 +#: ../dgit-maint-debrebase.7.pod:439 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:441 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I<debian/> directory. You can also use tools like git-" @@ -784,19 +793,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:439 +#: ../dgit-maint-debrebase.7.pod:445 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:441 +#: ../dgit-maint-debrebase.7.pod:447 msgid "" "git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, " "re-order and delete patches. Run" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:446 ../dgit-maint-debrebase.7.pod:749 +#: ../dgit-maint-debrebase.7.pod:452 ../dgit-maint-debrebase.7.pod:759 #, no-wrap msgid "" " % git debrebase -i\n" @@ -804,35 +813,35 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:450 +#: ../dgit-maint-debrebase.7.pod:456 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B<git rebase -i>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:453 +#: ../dgit-maint-debrebase.7.pod:459 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:455 +#: ../dgit-maint-debrebase.7.pod:461 msgid "" "After completing the git rebase, your branch will not be a fast-forward of " "the git HEAD you had before the rebase. This means that we cannot push the " -"branch anywhere. If you are ready to upload, B<dgit push> or B<dgit push-" -"source> will take care of fixing this up for you." +"branch anywhere. If you are ready to upload, B<dgit push-source> (or B<dgit " +"push-built>) will take care of fixing this up for you." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-debrebase.7.pod:467 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B<salsa.debian.org>," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:466 +#: ../dgit-maint-debrebase.7.pod:472 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -840,7 +849,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:470 +#: ../dgit-maint-debrebase.7.pod:476 msgid "" "Note that each time you conclude a debrebase you introduce a pseudomerge " "into your git history, which may make it harder to read. Try to do all of " @@ -850,7 +859,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:478 +#: ../dgit-maint-debrebase.7.pod:484 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit " @@ -858,24 +867,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:482 +#: ../dgit-maint-debrebase.7.pod:488 msgid "" -"Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> " -"if the package is new in the target suite." +"Upload with B<dgit push-source> or B<dgit push-built>. Remember to pass I<--" +"new> if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:485 +#: ../dgit-maint-debrebase.7.pod:491 msgid "" "In some cases where you used B<git debrebase convert-from-gbp> since the " "last upload, it is not possible for dgit to make your history fast-" "forwarding from the history on B<dgit-repos>. In such cases you will have " -"to pass I<--overwrite> to dgit. git-debrebase will normally tell you if " -"this will be needed." +"to pass I<--trust-changelog> to dgit. git-debrebase will normally tell you " +"if this will be needed." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:491 +#: ../dgit-maint-debrebase.7.pod:497 +msgid "" +"If you want to upload with git-debpush(1), for the first upload you should " +"pass the B<--quilt=linear> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:501 msgid "" "Right before uploading, if you did not just already do so, you might want to " "have git-debrebase(1) shuffle your branch such that the Debian delta queue " @@ -883,7 +899,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:497 +#: ../dgit-maint-debrebase.7.pod:507 #, no-wrap msgid "" " % git debrebase\n" @@ -892,24 +908,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:502 +#: ../dgit-maint-debrebase.7.pod:512 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:504 +#: ../dgit-maint-debrebase.7.pod:514 msgid "" "After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:509 +#: ../dgit-maint-debrebase.7.pod:519 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:511 +#: ../dgit-maint-debrebase.7.pod:521 msgid "" "Here we explain how to handle material that is merely DFSG-non-free. " "Material which is legally dangerous (for example, files which are actually " @@ -917,7 +933,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:515 +#: ../dgit-maint-debrebase.7.pod:525 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -929,12 +945,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-debrebase.7.pod:531 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:523 +#: ../dgit-maint-debrebase.7.pod:533 msgid "" "Our approach is to maintain a DFSG-clean upstream branch, and create tags on " "this branch for each release that we want to import. We then import those " @@ -943,12 +959,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:529 +#: ../dgit-maint-debrebase.7.pod:539 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:533 +#: ../dgit-maint-debrebase.7.pod:543 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -960,14 +976,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:541 +#: ../dgit-maint-debrebase.7.pod:551 msgid "" "Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or " "in the case of a new package," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:546 +#: ../dgit-maint-debrebase.7.pod:556 #, no-wrap msgid "" " % git branch --unset-upstream\n" @@ -976,18 +992,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:551 +#: ../dgit-maint-debrebase.7.pod:561 msgid "and proceed with \"INITIAL DEBIANISATION\"." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:563 msgid "" "For subsequent releases (whether or not they require additional filtering):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:558 +#: ../dgit-maint-debrebase.7.pod:568 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -1001,7 +1017,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:568 +#: ../dgit-maint-debrebase.7.pod:578 msgid "" "Our upstream-dfsg branch cannot be pushed to B<dgit-repos>, but since we " "will need it whenever we import a new upstream version, we must push it " @@ -1010,7 +1026,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:575 +#: ../dgit-maint-debrebase.7.pod:585 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -1018,17 +1034,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:579 +#: ../dgit-maint-debrebase.7.pod:589 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:588 +#: ../dgit-maint-debrebase.7.pod:598 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:592 +#: ../dgit-maint-debrebase.7.pod:602 #, no-wrap msgid "" " % dgit fetch\n" @@ -1037,7 +1053,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:597 +#: ../dgit-maint-debrebase.7.pod:607 msgid "" "If that fails, because your branch and the NMUers' work represent divergent " "branches of development, you have a number of options. Here we describe the " @@ -1045,7 +1061,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:601 +#: ../dgit-maint-debrebase.7.pod:611 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I<debian/patches>. Changes there would either cause trouble, or be " @@ -1053,12 +1069,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:605 +#: ../dgit-maint-debrebase.7.pod:615 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:609 +#: ../dgit-maint-debrebase.7.pod:619 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -1066,14 +1082,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:613 +#: ../dgit-maint-debrebase.7.pod:623 msgid "" "If the NMUer added new commits modifying the upstream source, you will " "probably want to debrebase before your next upload to tidy those up." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:616 +#: ../dgit-maint-debrebase.7.pod:626 msgid "" "For example, the NMUer might have used git-revert(1) to unapply one of your " "patches. A debrebase can be used to strip both the patch and the reversion " @@ -1081,37 +1097,37 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:620 +#: ../dgit-maint-debrebase.7.pod:630 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:622 +#: ../dgit-maint-debrebase.7.pod:632 msgid "" "If you cannot rebase because you have already pushed to B<salsa.debian.org>, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " -"B<dgit push> will require I<--overwrite>." +"B<dgit push> will require I<--trust-changelog>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:627 +#: ../dgit-maint-debrebase.7.pod:637 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:629 +#: ../dgit-maint-debrebase.7.pod:639 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:631 +#: ../dgit-maint-debrebase.7.pod:641 msgid "" "Above we noted that each time you conclude a debrebase, you introduce a " "pseudomerge into your git history, which may make it harder to read." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:634 +#: ../dgit-maint-debrebase.7.pod:644 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B<git debrebase conclude> only right before you upload or push to B<salsa." @@ -1119,7 +1135,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:638 +#: ../dgit-maint-debrebase.7.pod:648 msgid "" "It is possible, though much less convenient, to reduce the number of " "pseudomerges yet further. We debrebase only (i) when importing a new " @@ -1131,12 +1147,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:646 +#: ../dgit-maint-debrebase.7.pod:656 msgid "The debian/patches directory" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:648 +#: ../dgit-maint-debrebase.7.pod:658 msgid "" "In this workflow, I<debian/patches> is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1144,7 +1160,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:653 +#: ../dgit-maint-debrebase.7.pod:663 msgid "" "I<debian/patches> will often be out-of-date because git-debrebase(1) will " "only regenerate it when it needs to. So you should not rely on the " @@ -1154,17 +1170,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:659 +#: ../dgit-maint-debrebase.7.pod:669 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:661 +#: ../dgit-maint-debrebase.7.pod:671 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:673 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1173,7 +1189,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:679 msgid "" "The idea here is that from Debian's point of view, upstream releases are " "immutable points in history. We want to make sure that we are basing our " @@ -1182,34 +1198,34 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:685 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I<remotes/upstream/master>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:678 +#: ../dgit-maint-debrebase.7.pod:688 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:680 +#: ../dgit-maint-debrebase.7.pod:690 msgid "" "If this is the first ever dgit push of the package, consider passing I<--" -"deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " +"deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids " "introducing a new origin commit into your git history. (This origin commit " "would represent the most recent non-dgit upload of the package, but this " "should already be represented in your git history.)" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:686 +#: ../dgit-maint-debrebase.7.pod:696 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:688 +#: ../dgit-maint-debrebase.7.pod:698 msgid "" "The git history made by git-debrebase can seem complicated. Here are some " "suggestions for helpful invocations of gitk and git. They can be adapted " @@ -1217,12 +1233,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:692 +#: ../dgit-maint-debrebase.7.pod:702 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:696 +#: ../dgit-maint-debrebase.7.pod:706 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1230,17 +1246,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:698 +#: ../dgit-maint-debrebase.7.pod:708 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:702 +#: ../dgit-maint-debrebase.7.pod:712 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:704 +#: ../dgit-maint-debrebase.7.pod:714 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1248,12 +1264,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:706 +#: ../dgit-maint-debrebase.7.pod:716 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:708 +#: ../dgit-maint-debrebase.7.pod:718 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1261,12 +1277,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:710 +#: ../dgit-maint-debrebase.7.pod:720 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:714 +#: ../dgit-maint-debrebase.7.pod:724 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1274,7 +1290,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:716 +#: ../dgit-maint-debrebase.7.pod:726 msgid "" "The \"Declare fast forward\" commits you see have an older history (usually, " "an older delta queue) as one parent, and a newer history as the other. --" @@ -1282,12 +1298,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:723 +#: ../dgit-maint-debrebase.7.pod:733 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:727 +#: ../dgit-maint-debrebase.7.pod:737 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1295,17 +1311,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:729 +#: ../dgit-maint-debrebase.7.pod:739 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:733 +#: ../dgit-maint-debrebase.7.pod:743 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:735 +#: ../dgit-maint-debrebase.7.pod:745 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1314,12 +1330,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:738 +#: ../dgit-maint-debrebase.7.pod:748 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:740 +#: ../dgit-maint-debrebase.7.pod:750 #, no-wrap msgid "" " % git debrebase status\n" @@ -1327,24 +1343,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:742 +#: ../dgit-maint-debrebase.7.pod:752 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:744 +#: ../dgit-maint-debrebase.7.pod:754 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:753 +#: ../dgit-maint-debrebase.7.pod:763 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:757 +#: ../dgit-maint-debrebase.7.pod:767 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1352,7 +1368,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:762 +#: ../dgit-maint-debrebase.7.pod:772 msgid "" "A third alternative is to have git-debrebase(1) shuffle all the Debian " "changes to the end of your branch, and then manipulate them yourself using " @@ -1360,7 +1376,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:768 +#: ../dgit-maint-debrebase.7.pod:778 #, no-wrap msgid "" " % git debrebase\n" @@ -1369,7 +1385,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:773 +#: ../dgit-maint-debrebase.7.pod:783 msgid "" "If you take this approach, you should be very careful not to start the " "rebase too early, including before the most recent pseudomerge. git-rebase " @@ -1379,6 +1395,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:784 -msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" +#: ../dgit-maint-debrebase.7.pod:794 +msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5), gitrevisions(7)" msgstr "" diff --git a/po4a/dgit-maint-gbp_7.pot b/po4a/dgit-maint-gbp_7.pot index d1daa27..06cacfa 100644 --- a/po4a/dgit-maint-gbp_7.pot +++ b/po4a/dgit-maint-gbp_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,7 +43,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -51,8 +53,8 @@ msgid "BUILDING" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" @@ -65,14 +67,15 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" @@ -108,7 +111,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:334 msgid "GIT CONFIGURATION" msgstr "" @@ -235,7 +238,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:105 +#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:176 #, no-wrap msgid "" " % dgit --gbp push-source\n" @@ -248,7 +251,7 @@ msgid "or if you need to include binaries," msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#: ../dgit-maint-gbp.7.pod:113 #, no-wrap msgid "" " % dgit --gbp push\n" @@ -265,7 +268,7 @@ msgstr "" #. type: textblock #: ../dgit-maint-gbp.7.pod:120 msgid "" -"You will need to pass I<--overwrite> if the previous upload was not " +"You will need to pass I<--trust-changelog> if the previous upload was not " "performed with dgit." msgstr "" @@ -273,22 +276,29 @@ msgstr "" #: ../dgit-maint-gbp.7.pod:123 msgid "" "If this is first ever dgit push of the package, consider passing I<--" -"deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " +"deliberately-not-fast-forward> instead of I<--trust-changelog>. This avoids " "introducing a new origin commit into the dgit view of your git history. " "(This origin commit would represent the most recent non-dgit upload of the " "package, but this should already be represented in your git history.)" msgstr "" #. type: textblock -#: ../dgit-maint-gbp.7.pod:132 +#: ../dgit-maint-gbp.7.pod:130 +msgid "" +"Alternatively, you can use git-debpush(1). For the first upload you should " +"pass the B<--gbp> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-gbp.7.pod:135 msgid "" "B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp " "branches. You can just apply the NMU diff the traditional way. The next " -"upload will require I<--overwrite>." +"upload will require I<--trust-changelog>." msgstr "" #. type: textblock -#: ../dgit-maint-gbp.7.pod:142 +#: ../dgit-maint-gbp.7.pod:145 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>." diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index b973a7a..295e820 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,30 +28,30 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -65,14 +65,8 @@ msgstr "" msgid "INTRODUCTION" msgstr "" -#. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:526 ../dgit-maint-gbp.7.pod:138 -msgid "dgit(1), dgit(7)" -msgstr "" - #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:517 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "" " % dgit pull\n" @@ -149,9 +143,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 -#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:354 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -218,8 +212,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -299,22 +293,37 @@ msgstr "" msgid "to obtain a release tag, and then proceed as above." msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:147 +msgid "" +"One can generate such a versioned tag using git show's --pretty option. e." +"g.:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:151 ../dgit-maint-debrebase.7.pod:165 +#, no-wrap +msgid "" +" % git tag -s upstream/$(git show --date=format:%Y%m%d --pretty=format:\"1.2.2+git%cd.%h\" --quiet upstream/main) upstream/main\n" +"\n" +msgstr "" + #. type: =head3 -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 -#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 -#: ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:151 +#: ../dgit-maint-merge.7.pod:159 msgid "" "We need a virtual upstream branch with virtual release tags. gbp-import-" "orig(1) can manage this for us. To begin" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:156 +#: ../dgit-maint-merge.7.pod:164 #, no-wrap msgid "" " % mkdir foo\n" @@ -324,12 +333,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:162 +#: ../dgit-maint-merge.7.pod:170 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" @@ -340,7 +349,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -350,7 +359,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 +#: ../dgit-maint-merge.7.pod:183 #, no-wrap msgid "" " [import-orig]\n" @@ -360,12 +369,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:181 +#: ../dgit-maint-merge.7.pod:189 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:185 +#: ../dgit-maint-merge.7.pod:193 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -377,12 +386,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:201 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:205 #, no-wrap msgid "" " % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -390,7 +399,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:201 +#: ../dgit-maint-merge.7.pod:209 msgid "" "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -398,7 +407,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -407,31 +416,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:212 +#: ../dgit-maint-merge.7.pod:220 msgid "" "You are now ready to proceed as above, making commits to both the upstream " "source and the I<debian/> directory." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:223 ../dgit-maint-debrebase.7.pod:243 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 +#: ../dgit-maint-merge.7.pod:225 ../dgit-maint-debrebase.7.pod:245 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:220 +#: ../dgit-maint-merge.7.pod:228 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:224 +#: ../dgit-maint-merge.7.pod:232 #, no-wrap msgid "" " % dgit clone foo\n" @@ -441,19 +450,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:230 +#: ../dgit-maint-merge.7.pod:238 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:232 +#: ../dgit-maint-merge.7.pod:240 msgid "" "First, if you don't already have the git history locally, clone it, and " "obtain the corresponding orig.tar from the archive:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:237 +#: ../dgit-maint-merge.7.pod:245 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -463,12 +472,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:243 +#: ../dgit-maint-merge.7.pod:251 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:247 +#: ../dgit-maint-merge.7.pod:255 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -477,12 +486,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:252 +#: ../dgit-maint-merge.7.pod:260 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../dgit-maint-merge.7.pod:264 ../dgit-maint-debrebase.7.pod:276 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -490,12 +499,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:260 +#: ../dgit-maint-merge.7.pod:268 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:262 +#: ../dgit-maint-merge.7.pod:270 msgid "" "Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., " "it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\." @@ -503,155 +512,123 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:267 +#: ../dgit-maint-merge.7.pod:275 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 +#: ../dgit-maint-merge.7.pod:277 ../dgit-maint-debrebase.7.pod:330 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:273 +#: ../dgit-maint-merge.7.pod:281 msgid "" -"The first dgit push will require I<--overwrite>. If this is the first ever " -"dgit push of the package, consider passing I<--deliberately-not-fast-" -"forward> instead of I<--overwrite>. This avoids introducing a new origin " -"commit into your git history. (This origin commit would represent the most " -"recent non-dgit upload of the package, but this should already be " +"The first dgit push will require I<--trust-changelog>. If this is the first " +"ever dgit push of the package, consider passing I<--deliberately-not-fast-" +"forward> instead of I<--trust-changelog>. This avoids introducing a new " +"origin commit into your git history. (This origin commit would represent " +"the most recent non-dgit upload of the package, but this should already be " "represented in your git history.)" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:280 -msgid "SOURCE PACKAGE CONFIGURATION" +#: ../dgit-maint-merge.7.pod:288 +msgid "SOURCE PACKAGE AND GIT CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:282 -msgid "debian/source/options" +#: ../dgit-maint-merge.7.pod:290 +msgid "dgit configuration" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:284 +#: ../dgit-maint-merge.7.pod:292 msgid "" -"We set some source package options such that dgit can transparently handle " -"the \"dropping\" and \"refreshing\" of changes to the upstream source:" +"We must tell dgit not to try to maintain a linear queue of patches to the " +"upstream source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:290 +#: ../dgit-maint-merge.7.pod:297 #, no-wrap msgid "" -" single-debian-patch\n" -" auto-commit\n" +" git config dgit.default.quilt-mode single\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:295 +#: ../dgit-maint-merge.7.pod:301 msgid "" -"You don't need to create this file if you are using the version 1.0 source " -"package format." +"This command should be executed in each git clone of this package, including " +"your co-maintainer's. Don't set it more globally, because it is not a good " +"default for working on Debian source packages in general." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:298 -msgid "Sample text for debian/source/patch-header" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:300 -msgid "" -"It is a good idea to explain how a user can obtain a breakdown of the " -"changes to the upstream source:" -msgstr "" - -#. type: textblock #: ../dgit-maint-merge.7.pod:305 -msgid "" -"The Debian packaging of foo is maintained in git, using the merging workflow " -"described in dgit-maint-merge(7). There isn't a patch queue that can be " -"represented as a quilt series." +msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:309 +#: ../dgit-maint-merge.7.pod:307 msgid "" -"A detailed breakdown of the changes is available from their canonical " -"representation - git commits in the packaging repository. For example, to " -"see the changes made by the Debian maintainer in the first upload of " -"upstream version 1.2.3, you could use:" +"We set a source package option to help dpkg handle changes to the upstream " +"source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:317 +#: ../dgit-maint-merge.7.pod:313 #, no-wrap msgid "" -" % git clone https://git.dgit.debian.org/foo\n" -" % cd foo\n" -" % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'\n" +" auto-commit\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:323 -msgid "" -"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:326 -msgid "A single combined diff, containing all the changes, follows." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:330 -msgid "" -"If you are using the version 1.0 source package format, this text should be " -"added to README.source instead. The version 1.0 source package format " -"ignores debian/source/patch-header." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:334 +#: ../dgit-maint-merge.7.pod:317 msgid "" -"If you're using the version 3.0 (quilt) source package format, you could add " -"this text to README.source instead of debian/source/patch-header, but this " -"might distract from more important information present in README.source." +"You don't need to create this file if you are using the version 1.0 source " +"package format." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:341 +#: ../dgit-maint-merge.7.pod:322 msgid "" "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, " -"B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any " +"B<dgit push-source>, and B<dgit push-built> as detailed in dgit(1). If any " "command fails, dgit will provide a carefully-worded error message explaining " "what you should do. If it's not clear, file a bug against dgit. Remember " "to pass I<--new> for the first upload." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:328 +msgid "" +"If you want to upload with git-debpush(1), for the first upload you should " +"pass the B<--quilt=single> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:332 msgid "" -"As an alternative to B<dgit build> and friends, you can use a tool like " +"As another alternative to B<dgit build> and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " -"exactly the contents of the source package. gitpkg(1) is highly " +"exactly the contents of the source package. gitpkg(1) is highly " "configurable, and one dgit user reports using it to produce and test " "multiple source packages, from different branches corresponding to each of " "the current Debian suites." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:354 +#: ../dgit-maint-merge.7.pod:339 msgid "" "If you want to skip dgit's checks while iterating on a problem with the " "package build (for example, you don't want to commit your changes to git), " @@ -659,17 +636,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 +#: ../dgit-maint-merge.7.pod:343 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -677,7 +654,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 msgid "" "If you want to package an untagged upstream commit (because upstream does " "not tag releases or because you want to package an upstream development " @@ -685,7 +662,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -694,12 +671,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -707,12 +684,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -720,17 +697,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:382 msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:399 +#: ../dgit-maint-merge.7.pod:384 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:401 +#: ../dgit-maint-merge.7.pod:386 msgid "" "It's a good idea to preview the merge of the new upstream release. First, " "just check for any new or deleted files that may need accounting for in your " @@ -738,7 +715,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:407 +#: ../dgit-maint-merge.7.pod:392 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -746,12 +723,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:411 +#: ../dgit-maint-merge.7.pod:396 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:415 +#: ../dgit-maint-merge.7.pod:400 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -759,12 +736,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:419 +#: ../dgit-maint-merge.7.pod:404 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:408 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -774,7 +751,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -782,17 +759,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:443 +#: ../dgit-maint-merge.7.pod:428 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:447 +#: ../dgit-maint-merge.7.pod:432 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -805,7 +782,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:456 +#: ../dgit-maint-merge.7.pod:441 msgid "" "Before merging the new 1.2.3+dfsg tag to master, you should first determine " "whether it would be legally dangerous for the non-free material to be " @@ -813,7 +790,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:461 +#: ../dgit-maint-merge.7.pod:446 msgid "" "If it would be dangerous, there is a big problem; in this case please " "consult your archive administrators (for Debian this is the dgit " @@ -822,7 +799,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -831,40 +808,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:473 +#: ../dgit-maint-merge.7.pod:458 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:475 +#: ../dgit-maint-merge.7.pod:460 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:481 +#: ../dgit-maint-merge.7.pod:466 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:485 +#: ../dgit-maint-merge.7.pod:470 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:490 +#: ../dgit-maint-merge.7.pod:475 msgid "" "Push the branch somewhere and ask upstream to merge it, or use git-format-" "patch(1) or git-request-pull(1)." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:495 +#: ../dgit-maint-merge.7.pod:480 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:499 +#: ../dgit-maint-merge.7.pod:484 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -878,7 +855,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:509 +#: ../dgit-maint-merge.7.pod:494 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -886,27 +863,32 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:521 +#: ../dgit-maint-merge.7.pod:506 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " -"will then require I<--overwrite>." +"will then require I<--trust-changelog>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:511 +msgid "dgit(1), dgit(7), gitrevisions(7)" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " diff --git a/po4a/dgit-maint-native_7.pot b/po4a/dgit-maint-native_7.pot index 43d7d51..1257039 100644 --- a/po4a/dgit-maint-native_7.pot +++ b/po4a/dgit-maint-native_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -41,13 +43,13 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" @@ -126,33 +128,32 @@ msgstr "" #: ../dgit-maint-native.7.pod:61 #, no-wrap msgid "" -" % dgit -wgf sbuild -A -c sid\n" -" % dgit -wgf --overwrite push\n" +" % dgit -wgf --trust-changelog push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:66 +#: ../dgit-maint-native.7.pod:65 msgid "(Do not make any tags yourself: dgit push will do that.)" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:68 +#: ../dgit-maint-native.7.pod:67 msgid "" "You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit " "sbuild>; see dgit(1) for the syntax of those subcommands." msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:72 +#: ../dgit-maint-native.7.pod:71 msgid "" -"The --overwrite option tells dgit that you are expecting that your git " +"The --trust-changelog option tells dgit that you are expecting that your git " "history is not a descendant of the history which dgit synthesised from the " "previous non-dgit uploads." msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:77 +#: ../dgit-maint-native.7.pod:76 msgid "" "dgit will make a merge commit on your branch but without making any code " "changes (ie, a pseudo-merge) so that your history, which will be pushed to " @@ -160,39 +161,39 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:85 +#: ../dgit-maint-native.7.pod:84 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " "avoid this merge commit by passing C<--deliberately-not-fast-forward> " -"instead of C<--overwrite>. This avoids introducing a new origin commit into " -"your git history." +"instead of C<--trust-changelog>. This avoids introducing a new origin " +"commit into your git history." msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:93 +#: ../dgit-maint-native.7.pod:92 msgid "SUBSEQUENT PUSHES" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:97 +#: ../dgit-maint-native.7.pod:96 #, no-wrap msgid "" -" % dgit -wgf push\n" +" % dgit -wgf push-source\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:101 ../dgit-maint-native.7.pod:111 +#: ../dgit-maint-native.7.pod:100 ../dgit-maint-native.7.pod:110 msgid "That's it." msgstr "" #. type: =head1 -#: ../dgit-maint-native.7.pod:103 +#: ../dgit-maint-native.7.pod:102 msgid "INCORPORATING AN NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "" " % dgit pull\n" @@ -200,12 +201,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:113 +#: ../dgit-maint-native.7.pod:112 msgid "Or, if you would prefer to review the changes, you can do this:" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:118 +#: ../dgit-maint-native.7.pod:117 #, no-wrap msgid "" " % dgit fetch\n" @@ -214,8 +215,8 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-native.7.pod:123 +#: ../dgit-maint-native.7.pod:122 msgid "" "If you do not merge the NMU into your own git history, the next push will " -"then require I<--overwrite>." +"then require I<--trust-changelog>." msgstr "" diff --git a/po4a/dgit-nmu-simple_7.pot b/po4a/dgit-nmu-simple_7.pot index 691d136..cba52ed 100644 --- a/po4a/dgit-nmu-simple_7.pot +++ b/po4a/dgit-nmu-simple_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2022-12-29 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -107,8 +109,8 @@ msgid "" " [ run your tests ]\n" " % dch -r && git add debian/changelog && git commit -m\"Finalise NMU\"\n" " % dgit -wgf sbuild -A -c jessie\n" -" [ final tests on generated .debs ]\n" -" % dgit -wgf [--delayed=5] push jessie\n" +" [ any final tests on generated .debs ]\n" +" % dgit -wgf [--delayed=5] push-source jessie\n" " [ enter your gnupg passphrase as prompted ]\n" " [ see that push and upload are successful ]\n" " [ prepare and email NMU diff (git-diff, git-format-patch) ]\n" diff --git a/po4a/dgit-sponsorship_7.pot b/po4a/dgit-sponsorship_7.pot index 08bc8f7..d50bc95 100644 --- a/po4a/dgit-sponsorship_7.pot +++ b/po4a/dgit-sponsorship_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -43,10 +45,10 @@ msgid "INTRODUCTION AND SCOPE" msgstr "" #. type: verbatim -#: ../dgit-maint-gbp.7.pod:113 ../dgit-sponsorship.7.pod:173 +#: ../dgit-maint-gbp.7.pod:105 ../dgit-sponsorship.7.pod:176 #, no-wrap msgid "" -" % dgit --gbp push\n" +" % dgit --gbp push-source\n" "\n" msgstr "" @@ -105,7 +107,7 @@ msgstr "" #: ../dgit-sponsorship.7.pod:32 msgid "" "You should prepare the package as if you were going to upload it with C<dgit " -"push-source> or C<dgit push> yourself." +"push-source> or C<dgit push-built> yourself." msgstr "" #. type: textblock @@ -162,7 +164,7 @@ msgstr "" #. type: =item #: ../dgit-sponsorship.7.pod:68 ../dgit-sponsorship.7.pod:72 -#: ../dgit-sponsorship.7.pod:79 ../dgit-sponsorship.7.pod:84 +#: ../dgit-sponsorship.7.pod:80 ../dgit-sponsorship.7.pod:85 msgid "*" msgstr "" @@ -174,19 +176,19 @@ msgstr "" #. type: textblock #: ../dgit-sponsorship.7.pod:74 msgid "" -"Any .orig tarballs which will be needed, or sample git-archive(1) or gbp-" -"buildpackage(1) command(s) to generate them." +"Any .orig tarballs which will be needed, or sample git-deborig(1), git-" +"archive(1) or gbp-buildpackage(1) command(s) to generate them." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:81 +#: ../dgit-sponsorship.7.pod:82 msgid "" -"A sample dgit push command, containing any dgit --quilt=, --gbp or --dpm " -"option needed" +"A sample dgit push-source command, containing any dgit --quilt=, --gbp or --" +"dpm option needed" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:86 +#: ../dgit-sponsorship.7.pod:87 msgid "" "Plus of course all the usual information about the state of the package, any " "caveats or areas you would like the sponsor to focus their review, " @@ -194,7 +196,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:93 +#: ../dgit-sponsorship.7.pod:94 msgid "" "If the handoff is done by email, the elements above should be a in a single, " "signed, message. This could be an RFS submission against the sponsorship-" @@ -202,61 +204,61 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-sponsorship.7.pod:98 +#: ../dgit-sponsorship.7.pod:99 msgid "git branch" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:102 +#: ../dgit-sponsorship.7.pod:103 msgid "" "The sponsee should push their HEAD as a git branch to any suitable git " "server. They can use their own git server; salsa is another possibility." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:107 +#: ../dgit-sponsorship.7.pod:108 msgid "" "The branch names used by the sponsee on their local machine, and on the " "server, do not matter." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:110 +#: ../dgit-sponsorship.7.pod:111 msgid "" "Instead, the sponsee should include the git commit id of their HEAD in their " "handover email." msgstr "" #. type: =head3 -#: ../dgit-sponsorship.7.pod:116 +#: ../dgit-sponsorship.7.pod:117 msgid "orig tarballs" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:120 +#: ../dgit-sponsorship.7.pod:121 msgid "" "If there are any .origs that are not in the archive already, the sponsor " "will need them as part of the upload." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:123 +#: ../dgit-sponsorship.7.pod:124 msgid "" -"If the sponsee generated these tarballs with git-archive(1) or gbp-" -"buildpackage(1), they can simply include a sample invocation of git-" -"archive(1) or ensure that a suitable gbp.conf is present in the source " -"package to generate the tarball." +"If the sponsee generated these tarballs with git-deborig(1), git-archive(1) " +"or gbp-buildpackage(1), they can simply include a sample invocation of git-" +"deborig(1) or git-archive(1) or ensure that a suitable gbp.conf is present " +"in the source package to generate the tarball." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:130 +#: ../dgit-sponsorship.7.pod:133 msgid "" "Otherwise, the simplest approach is to commit the orig tarballs with " "pristine-tar(1), e.g." msgstr "" #. type: verbatim -#: ../dgit-sponsorship.7.pod:136 +#: ../dgit-sponsorship.7.pod:139 #, no-wrap msgid "" " % pristine-tar commit ../foo_1.2.3.orig.tar.xz upstream/1.2.3\n" @@ -264,7 +266,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:140 +#: ../dgit-sponsorship.7.pod:143 msgid "" "and be sure to push the pristine-tar branch. If you are using git-" "buildpackage(1), just pass I<--git-pristine-tar> and I<--git-pristine-tar-" @@ -272,61 +274,61 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:144 +#: ../dgit-sponsorship.7.pod:147 msgid "" "Alternatively, the sponsee can put them on a suitable webserver, or attach " "to the e-mail, if they are small." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:149 +#: ../dgit-sponsorship.7.pod:152 msgid "" "The sponsee should quote sha256sums of the .origs in their handoff email, " "unless they supplied commands to generate them." msgstr "" #. type: =head3 -#: ../dgit-sponsorship.7.pod:155 +#: ../dgit-sponsorship.7.pod:158 msgid "quilt options" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:159 +#: ../dgit-sponsorship.7.pod:162 msgid "" "Some workflows involve git branches which are not natively dgit-compatible. " "Normally dgit will convert them as needed, during push." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:163 +#: ../dgit-sponsorship.7.pod:166 msgid "" -"Supply a sample \"dgit push\" command including any C<--gbp> (aka C<--" +"Supply a sample \"dgit push-source\" command including any C<--gbp> (aka C<--" "quilt=gbp>), C<--dpm> (aka C<--quilt=dpm>), or other C<--quilt=> option they " "need to use. e.g." msgstr "" #. type: =head1 -#: ../dgit-sponsorship.7.pod:179 +#: ../dgit-sponsorship.7.pod:182 msgid "SPONSOR WORKFLOW" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:181 ../dgit-sponsorship.7.pod:273 +#: ../dgit-sponsorship.7.pod:184 ../dgit-sponsorship.7.pod:276 msgid "This part is addressed to the sponsor:" msgstr "" #. type: =head2 -#: ../dgit-sponsorship.7.pod:183 +#: ../dgit-sponsorship.7.pod:186 msgid "Receiving and validating the sponsorship request" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:185 +#: ../dgit-sponsorship.7.pod:188 msgid "You should check the signature on the email." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:187 +#: ../dgit-sponsorship.7.pod:190 msgid "" "Use C<git fetch> or C<git clone> to obtain the git branch prepared by your " "sponsee, and obtain any .origs mentioned by the sponsee (to extract .origs " @@ -335,24 +337,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:194 +#: ../dgit-sponsorship.7.pod:197 msgid "" "Check the git commit ID of the sponsee's branch tip, and the sha256sums of " "the .origs, against the handoff email." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:198 +#: ../dgit-sponsorship.7.pod:201 msgid "Now you can check out the branch tip, and do your substantive review." msgstr "" #. type: =head2 -#: ../dgit-sponsorship.7.pod:201 +#: ../dgit-sponsorship.7.pod:204 msgid "Dealing with branches that want --quilt=" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:203 +#: ../dgit-sponsorship.7.pod:206 msgid "" "If your sponsee mentioned a C<--quilt> option, and you don't want to grapple " "with their preferred tree format, you can convert their tree into the " @@ -360,7 +362,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-sponsorship.7.pod:209 +#: ../dgit-sponsorship.7.pod:212 #, no-wrap msgid "" " % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup\n" @@ -369,33 +371,33 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:214 +#: ../dgit-sponsorship.7.pod:217 msgid "" "You should check that what you're looking at is a descendant of the " "sponsee's branch." msgstr "" #. type: =head2 -#: ../dgit-sponsorship.7.pod:217 +#: ../dgit-sponsorship.7.pod:220 msgid "Some hints which may help the review" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:219 +#: ../dgit-sponsorship.7.pod:222 msgid "" "C<dgit fetch sid> will get you an up-to-date C<refs/remotes/dgit/dgit/sid> " "showing what's in the archive already." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:223 +#: ../dgit-sponsorship.7.pod:226 msgid "" "C<dgit -wgf --damp-run push-source> will check that dgit can build an " "appropriate source package." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:226 +#: ../dgit-sponsorship.7.pod:229 msgid "" "There is no need to run debdiff. dgit will not upload anything that doesn't " "unpack to exactly the git commit you are pushing, so you can rely on what " @@ -403,21 +405,21 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-sponsorship.7.pod:231 +#: ../dgit-sponsorship.7.pod:234 msgid "Doing the upload" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:233 +#: ../dgit-sponsorship.7.pod:236 msgid "" "When you have completed your source review, and use C<dgit -wgf [--" "quilt=...] sbuild -A -C> or similar, to to the build, and then C<dgit -wgf " -"[--quilt=...] push-source> or C<dgit -wgf [--quilt=...] push> to do the " -"upload." +"[--quilt=...] push-source> or C<dgit -wgf [--quilt=...] push-built> to do " +"the upload." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:242 +#: ../dgit-sponsorship.7.pod:245 msgid "" "Check whether the sponsee made a debian/I<version> tag. If they did, ensure " "you have their tag in the repository you are pushing from, or pass C<--no-" @@ -426,7 +428,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:249 +#: ../dgit-sponsorship.7.pod:252 msgid "" "(It is possible to upload from the quilt-cache dgit view. If you want to do " "this, B<do not> pass the C<--quilt> or C<--gbp> or C<--dpm> options again, " @@ -435,35 +437,35 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:257 +#: ../dgit-sponsorship.7.pod:260 msgid "" -"If this was the first upload done with dgit, you may need to pass C<--" -"overwrite> to dgit." +"If this was the first upload done with dgit, you may need to pass C<--trust-" +"changelog> to dgit." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:262 +#: ../dgit-sponsorship.7.pod:265 msgid "" "Alternatively, if this was the first ever dgit push of the package, you can " -"pass C<--deliberately-not-fast-forward> instead of C<--overwrite>. This " -"avoids introducing a new origin commit into the dgit view of the sponsee's " -"git history which is unnecessary and could be confusing." +"pass C<--deliberately-not-fast-forward> instead of C<--trust-changelog>. " +"This avoids introducing a new origin commit into the dgit view of the " +"sponsee's git history which is unnecessary and could be confusing." msgstr "" #. type: =head1 -#: ../dgit-sponsorship.7.pod:271 +#: ../dgit-sponsorship.7.pod:274 msgid "SPONSORING A NON-GIT-USING SPONSEE" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:275 +#: ../dgit-sponsorship.7.pod:278 msgid "" "If your sponsee does not use git, you can still do your review with git, and " "use dgit for the upload." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:279 +#: ../dgit-sponsorship.7.pod:282 msgid "" "Your sponsee will provide you with a source package: that is, a .dsc and the " "files it refers to. Obtain these files, and check signatures as " @@ -471,7 +473,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-sponsorship.7.pod:286 +#: ../dgit-sponsorship.7.pod:289 #, no-wrap msgid "" " % dgit clone PACKAGE\n" @@ -482,12 +484,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:293 +#: ../dgit-sponsorship.7.pod:296 msgid "Or for an entirely new package:" msgstr "" #. type: verbatim -#: ../dgit-sponsorship.7.pod:297 +#: ../dgit-sponsorship.7.pod:300 #, no-wrap msgid "" " % mkdir PACKAGE\n" @@ -498,23 +500,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:304 +#: ../dgit-sponsorship.7.pod:307 msgid "" "This will leave you looking at the sponsee's package, formatted as a dgit " "branch." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:307 +#: ../dgit-sponsorship.7.pod:310 msgid "" -"When you have finished your review and your tests, you can do the dgit " -"sbuild and dgit push directly from the \"sponsee\" branch." +"When you have finished your review and your tests, you can do the dgit push-" +"source (or dgit sbuild and dgit push-built) directly from the \"sponsee\" " +"branch." msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:312 +#: ../dgit-sponsorship.7.pod:316 msgid "" -"You will need to pass C<--overwrite> to dgit push for every successive " +"You will need to pass C<--trust-changelog> to dgit push for every successive " "upload. This disables a safety catch which would normally spot situations " "where changes are accidentally lost. When your sponsee is sending you " "source packages - perhaps multiple source packages with the same version " @@ -522,6 +525,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-sponsorship.7.pod:323 +#: ../dgit-sponsorship.7.pod:327 msgid "dgit(1), dgit(7), dgit-nmu-simple(7), dgit-maint-*(7)" msgstr "" diff --git a/po4a/dgit-user_7.nl.po b/po4a/dgit-user_7.nl.po index 7ecf7f1..21a4a5b 100644 --- a/po4a/dgit-user_7.nl.po +++ b/po4a/dgit-user_7.nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dgit-user_7\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: 2018-11-14 21:22+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -23,18 +23,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "NAAM" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "ZIE OOK" @@ -55,7 +57,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "INLEIDING" @@ -690,11 +692,26 @@ msgstr "INSTALLEREN" #. type: =head2 #: ../dgit-user.7.pod:324 +msgid "Debian Stretch or newer" +msgstr "Debian Stretch of later" + +#. type: verbatim +#: ../dgit-user.7.pod:328 +#, no-wrap +msgid "" +" % sudo apt install ../libc6_*.deb\n" +"\n" +msgstr "" +" % sudo apt install ../libc6_*.deb\n" +"\n" + +#. type: =head2 +#: ../dgit-user.7.pod:332 msgid "Debian Jessie or older" msgstr "Debian Jessie of eerder" #. type: verbatim -#: ../dgit-user.7.pod:328 +#: ../dgit-user.7.pod:336 #, no-wrap msgid "" " % sudo dpkg -i ../libc6_*.deb\n" @@ -704,7 +721,7 @@ msgstr "" "\n" #. type: textblock -#: ../dgit-user.7.pod:332 +#: ../dgit-user.7.pod:340 msgid "" "You can use C<dpkg -i> to install the .debs that came out of your package." msgstr "" @@ -712,7 +729,7 @@ msgstr "" "pakket voortkwamen." #. type: textblock -#: ../dgit-user.7.pod:335 +#: ../dgit-user.7.pod:343 msgid "" "If the dependencies aren't installed, you will get an error, which can " "usually be fixed with C<apt-get -f install>." @@ -720,21 +737,6 @@ msgstr "" "Indien de vereisten niet geïnstalleerd zijn, zult u een foutmelding krijgen " "die gewoonlijk gerepareerd kan worden met C<apt-get -f install>." -#. type: =head2 -#: ../dgit-user.7.pod:339 -msgid "Debian Stretch or newer" -msgstr "Debian Stretch of later" - -#. type: verbatim -#: ../dgit-user.7.pod:343 -#, no-wrap -msgid "" -" % sudo apt install ../libc6_*.deb\n" -"\n" -msgstr "" -" % sudo apt install ../libc6_*.deb\n" -"\n" - #. type: =head1 #: ../dgit-user.7.pod:347 msgid "Multiarch" @@ -938,7 +940,7 @@ msgstr "" "sponsorship(7)> of L<dgit-maint-*(7)>" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "dgit(1), dgit(7)" diff --git a/po4a/dgit-user_7.pot b/po4a/dgit-user_7.pot index d5a8fef..092d719 100644 --- a/po4a/dgit-user_7.pot +++ b/po4a/dgit-user_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-03-01 16:59+0000\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,18 +21,20 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -52,7 +54,7 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" @@ -513,41 +515,41 @@ msgstr "" #. type: =head2 #: ../dgit-user.7.pod:324 -msgid "Debian Jessie or older" +msgid "Debian Stretch or newer" msgstr "" #. type: verbatim #: ../dgit-user.7.pod:328 #, no-wrap msgid "" -" % sudo dpkg -i ../libc6_*.deb\n" +" % sudo apt install ../libc6_*.deb\n" "\n" msgstr "" -#. type: textblock +#. type: =head2 #: ../dgit-user.7.pod:332 -msgid "" -"You can use C<dpkg -i> to install the .debs that came out of your package." +msgid "Debian Jessie or older" msgstr "" -#. type: textblock -#: ../dgit-user.7.pod:335 +#. type: verbatim +#: ../dgit-user.7.pod:336 +#, no-wrap msgid "" -"If the dependencies aren't installed, you will get an error, which can " -"usually be fixed with C<apt-get -f install>." +" % sudo dpkg -i ../libc6_*.deb\n" +"\n" msgstr "" -#. type: =head2 -#: ../dgit-user.7.pod:339 -msgid "Debian Stretch or newer" +#. type: textblock +#: ../dgit-user.7.pod:340 +msgid "" +"You can use C<dpkg -i> to install the .debs that came out of your package." msgstr "" -#. type: verbatim +#. type: textblock #: ../dgit-user.7.pod:343 -#, no-wrap msgid "" -" % sudo apt install ../libc6_*.deb\n" -"\n" +"If the dependencies aren't installed, you will get an error, which can " +"usually be fixed with C<apt-get -f install>." msgstr "" #. type: =head1 @@ -697,7 +699,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index c7d489b..ff8b8e0 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-13 21:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -75,14 +75,14 @@ msgstr "" #. type: Plain text #: ../dgit.1:26 -msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-source> [I<dgit-opts>] [I<suite>]" +msgid "B<dgit> [I<dgit-opts>] B<push>|B<push-built> [I<dgit-opts>] [I<suite>]" msgstr "" #. type: Plain text #: ../dgit.1:30 msgid "" -"B<dgit> [I<dgit-opts>] B<rpush> I<build-host>B<:>I<build-dir> [I<push args..." -">]" +"B<dgit> [I<dgit-opts>] B<rpush>|B<rpush-built> I<build-host>B<:>I<build-dir> " +"[I<push args...>]" msgstr "" #. type: Plain text @@ -339,7 +339,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:148 ../dgit.1:200 ../dgit.1:240 +#: ../dgit.1:148 ../dgit.1:196 ../dgit.1:236 msgid "Tagging, signing and actually uploading should be left to dgit push." msgstr "" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1278 +#: ../dgit.1:185 ../dgit.1:1389 msgid "Print a usage summary." msgstr "" @@ -437,21 +437,14 @@ msgid "" "I<package>B<_>I<version>B<_multi.changes>." msgstr "" -#. type: Plain text -#: ../dgit.1:198 -msgid "" -"Note that by default sbuild does not build arch-independent packages. You " -"probably want to pass -A, to request those." -msgstr "" - #. type: TP -#: ../dgit.1:200 +#: ../dgit.1:196 #, no-wrap msgid "B<dgit pbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:208 +#: ../dgit.1:204 msgid "" "Constructs the source package, uses B<pbuilder> to do a binary build, and " "uses mergechanges to merge the source and binary changes files. The output " @@ -459,14 +452,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:211 +#: ../dgit.1:207 msgid "" "You should ensure that your dgit --build-products-dir setting matches your " "pbuilder --buildresult." msgstr "" #. type: Plain text -#: ../dgit.1:217 +#: ../dgit.1:213 msgid "" "The I<debbuildopts> are passed to pbuilder using its --debbuildopts option. " "If you want to pass other options to pbuilder, use the B<--pbuilder:> dgit " @@ -475,75 +468,78 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:223 +#: ../dgit.1:219 msgid "" "You should ensure that in your pbuilderrc you do B<not> have the setting " "B<SOURCE_ONLY_CHANGES=yes> as this may cause trouble." msgstr "" #. type: TP -#: ../dgit.1:223 +#: ../dgit.1:219 #, no-wrap msgid "B<dgit cowbuilder> [I<debbuildopts>]" msgstr "" #. type: Plain text -#: ../dgit.1:229 +#: ../dgit.1:225 msgid "Like B<dgit pbuilder>, but uses B<cowbuilder> instead of B<pbuilder.>" msgstr "" #. type: TP -#: ../dgit.1:229 +#: ../dgit.1:225 #, no-wrap msgid "B<dgit gbp-build> ..." msgstr "" #. type: Plain text -#: ../dgit.1:235 +#: ../dgit.1:231 msgid "" "Runs B<git-buildpackage> with some suitable options. Options and arguments " "after gbp-build will be passed on to git-buildpackage." msgstr "" #. type: Plain text -#: ../dgit.1:238 +#: ../dgit.1:234 msgid "" "By default this uses --quilt=gbp, so HEAD should be a git-buildpackage style " "branch, not a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:240 +#: ../dgit.1:236 #, no-wrap -msgid "B<dgit push> [I<suite>]" +msgid "B<dgit push-source> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:249 +#: ../dgit.1:241 msgid "" -"Does an `upload', pushing the current HEAD to the archive (as a source " -"package) and to dgit-repos (as git commits). The package must already have " -"been built ready for upload, with the .dsc and .changes left in the parent " -"directory. It is normally best to do the build with dgit too (eg with dgit " -"sbuild): some existing build tools pass unhelpful options to dpkg-source et " -"al by default, which can result in the built source package not being " -"identical to the git tree." +"Does an `upload': sends the current HEAD to dgit-repos (as git commits), and " +"to the archive (as a source package, built by this command)." msgstr "" #. type: Plain text -#: ../dgit.1:259 +#: ../dgit.1:245 msgid "" -"In more detail: dgit push checks that the current HEAD corresponds to the ." -"dsc. It then pushes the HEAD to the suite's dgit-repos branch, adjusts the ." -"changes to include any .origs which the archive lacks and exclude .origs " -"which the archive has (so -sa and -sd are not needed when building for dgit " -"push), makes a signed git tag, edits the .dsc to contain the dgit metadata " -"field, runs debsign to sign the upload (.dsc and .changes), pushes the " -"signed tag, and finally uses dput to upload the .changes to the archive." +"This is the usual way to upload to Debian. It is like saying \"update the " +"source code in the archive to match my git HEAD, and let the autobuilders do " +"the rest.\"" msgstr "" #. type: Plain text -#: ../dgit.1:263 +#: ../dgit.1:256 +msgid "" +"In more detail: dgit push-source builds a source package from HEAD. It then " +"pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to " +"include any .origs which the archive lacks and exclude .origs which the " +"archive has (so -sa and -sd are not needed when building for dgit push), " +"makes a signed git tag, edits the .dsc to contain the dgit metadata field, " +"runs debsign to sign the upload (.dsc and .changes), pushes the signed tag, " +"and finally uses dput to upload the .changes to the archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:260 msgid "" "dgit push always uses the package, suite and version specified in the debian/" "changelog and the .dsc, which must agree. If the command line specifies a " @@ -551,111 +547,129 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:268 +#: ../dgit.1:265 msgid "" "When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " "branch for source package upload and push." msgstr "" +#. type: Plain text +#: ../dgit.1:269 +msgid "" +"With B<-C>, dgit push-source performs a dgit push-built, additionally " +"ensuring that no binary packages are uploaded." +msgstr "" + #. type: TP -#: ../dgit.1:268 +#: ../dgit.1:269 #, no-wrap -msgid "B<dgit push-source> [I<suite>]" +msgid "B<dgit push-built> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:273 +#: ../dgit.1:276 msgid "" -"Without B<-C>, builds a source package and dgit pushes it. Saying B<dgit " -"push-source> is like saying \"update the source code in the archive to match " -"my git HEAD, and let the autobuilders do the rest.\"" +"Does an `upload' of a previously built package, possibly including " +"binaries. Sends the current HEAD to dgit-repos (as git commits); and, sends " +"the previously built source package and binaries to the archive." msgstr "" #. type: Plain text -#: ../dgit.1:276 +#: ../dgit.1:283 +msgid "" +"The package must already have been built ready for upload, with the .dsc " +"and .changes left in the parent directory. It is normally best to do the " +"build with dgit too (e.g. with dgit sbuild): some existing build tools pass " +"unhelpful options to dpkg-source et al by default, which can result in the " +"built source package not being identical to the git tree." +msgstr "" + +#. type: Plain text +#: ../dgit.1:288 msgid "" -"With B<-C>, performs a dgit push, additionally ensuring that no binary " -"packages are uploaded." +"dgit will check that the .dsc corresponds exactly to the current HEAD, " +"ensuring that all users, whether of the dgit git view, or of the traditional " +"archive, see the same source package." msgstr "" #. type: TP -#: ../dgit.1:276 +#: ../dgit.1:288 #, no-wrap -msgid "B<dgit rpush> I<build-host>B<:>I<build-dir> [I<push args...>]" +msgid "B<dgit rpush-source>|B<rpush-built> I<build-host>B<:>I<src-dir> [I<push args...>]" msgstr "" #. type: Plain text -#: ../dgit.1:283 +#: ../dgit.1:295 msgid "" "Pushes the contents of the specified directory on a remote machine. This is " -"like running dgit push on build-host with build-dir as the current " -"directory; however, signing operations are done on the invoking host. This " -"allows you to do a push when the system which has the source code and the " -"build outputs has no access to the key:" +"like running dgit push on build-host with src-dir as the current directory; " +"however, signing operations are done on the invoking host. This allows you " +"to do a push when the system which has the source code (and any built " +"binaries) has no access to the key:" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: tbl table -#: ../dgit.1:286 +#: ../dgit.1:298 #, no-wrap msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: tbl table -#: ../dgit.1:287 +#: ../dgit.1:299 #, no-wrap msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: tbl table -#: ../dgit.1:288 +#: ../dgit.1:300 #, no-wrap msgid "Build package on build host (dgit build)" msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:301 #, no-wrap msgid "4." msgstr "" #. type: tbl table -#: ../dgit.1:289 +#: ../dgit.1:301 #, no-wrap msgid "Test package on build host or elsewhere (dpkg -i, test)" msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:302 #, no-wrap msgid "5." msgstr "" #. type: tbl table -#: ../dgit.1:290 +#: ../dgit.1:302 #, no-wrap msgid "Upload by invoking dgit rpush on host with your GPG key." msgstr "" #. type: Plain text -#: ../dgit.1:296 +#: ../dgit.1:308 msgid "" "However, the build-host must be able to ssh to the dgit repos. If this is " "not already the case, you must organise it separately, for example by the " @@ -663,13 +677,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:299 +#: ../dgit.1:312 msgid "" -"The remaining arguments are treated just as dgit push would handle them." +"The remaining arguments are treated just as dgit push-source or dgit push-" +"built would handle them." msgstr "" #. type: Plain text -#: ../dgit.1:304 +#: ../dgit.1:317 msgid "" "build-host and build-dir can be passed as separate arguments; this is " "assumed to be the case if the first argument contains no : (except perhaps " @@ -677,7 +692,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:308 +#: ../dgit.1:321 msgid "" "You will need similar enough versions of dgit on the build-host and the " "invocation host. The build-host needs gnupg installed, with your public key " @@ -685,13 +700,112 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:308 +#: ../dgit.1:321 +#, no-wrap +msgid "B<dgit push>|B<rpush> I<...>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:332 +msgid "" +"Configurable aliases for B<dgit push-built> and B<dgit rpush-built>. These " +"aliases will in the future change to mean B<dgit push-source> and B<dgit " +"rpush-source>, and therefore they currently generate a warning." +msgstr "" + +#. type: Plain text +#: ../dgit.1:336 +msgid "" +"The behaviour of dgit push is controlled by the B<dgit.default.push-subcmd> " +"git config option:" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "B<source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "runs B<dgit push-source>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:338 +#, no-wrap +msgid "future default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "B<built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:339 +#, no-wrap +msgid "and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:340 +#, no-wrap +msgid "B<built,warn>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:340 +#, no-wrap +msgid "warns, and runs B<dgit push-built>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:340 +#, no-wrap +msgid "current default" +msgstr "" + +#. type: tbl table +#: ../dgit.1:341 +#, no-wrap +msgid "B<reject>" +msgstr "" + +#. type: tbl table +#: ../dgit.1:341 +#, no-wrap +msgid "fails" +msgstr "" + +#. type: Plain text +#: ../dgit.1:352 +msgid "" +"For dgit rpush, the behaviour is controlled by B<dgit.default.rpush-subcmd>, " +"falling back to B<dgit.default.push-subcmd> if that is not set. Because " +"dgit rpush is not typically run in a git working tree, only global git " +"config options (and B<-c> command line options) are relevant." +msgstr "" + +#. type: Plain text +#: ../dgit.1:362 +msgid "" +"These settings can safely be passed to older dgit (via B<-c);> the value " +"B<built> will be supported indefinitely. This should be used in scripts " +"that need to work with both old versions of dgit (that don't have B<push-" +"built>) and new versions (where B<push-source> is the default)." +msgstr "" + +#. type: TP +#: ../dgit.1:362 #, no-wrap msgid "B<dgit setup-new-tree>" msgstr "" #. type: Plain text -#: ../dgit.1:324 +#: ../dgit.1:378 msgid "" "Configure the current working tree the way that dgit clone would have set it " "up. Like running B<dgit setup-useremail>, B<setup-mergechangelogs> and " @@ -702,13 +816,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:324 +#: ../dgit.1:378 #, no-wrap msgid "B<dgit setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:330 +#: ../dgit.1:384 msgid "" "Set the working tree's user.name and user.email from the distro-specific " "dgit configuration (B<dgit-distro.>I<distro>B<.user-name> and B<.user-" @@ -716,26 +830,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:330 +#: ../dgit.1:384 #, no-wrap msgid "B<dgit setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:336 +#: ../dgit.1:390 msgid "" "Configures a git merge helper for the file B<debian/changelog> which uses " "B<dpkg-mergechangelogs>." msgstr "" #. type: TP -#: ../dgit.1:336 +#: ../dgit.1:390 #, no-wrap msgid "B<dgit setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:351 +#: ../dgit.1:405 msgid "" "Set up the working tree's B<.git/info/attributes> to disable all " "transforming attributes for all files. This is done by defining a macro " @@ -745,7 +859,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:359 +#: ../dgit.1:413 msgid "" "If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes, but it is insufficient, because it was made by an " @@ -754,7 +868,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:370 +#: ../dgit.1:424 msgid "" "(If there is already a macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes which does what dgit requires (whatever files it " @@ -764,13 +878,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:370 +#: ../dgit.1:424 #, no-wrap msgid "B<dgit quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:377 +#: ../dgit.1:431 msgid "" "`3.0 (quilt)' format source packages need changes representing not only in-" "tree but also as patches in debian/patches. dgit quilt-fixup checks whether " @@ -779,12 +893,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:379 +#: ../dgit.1:433 msgid "This is normally done automatically by dgit build and dgit push." msgstr "" #. type: Plain text -#: ../dgit.1:385 +#: ../dgit.1:439 msgid "" "dgit will try to turn each relevant commit in your git history into a new " "quilt patch. dgit cannot convert nontrivial merges, or certain other kinds " @@ -794,7 +908,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:394 +#: ../dgit.1:448 msgid "" "When used with a git-debrebase branch, dgit will ask git-debrebase to " "prepare patches. However, dgit can make patches in some situations where " @@ -804,25 +918,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:399 +#: ../dgit.1:453 msgid "See B<FORMAT 3.0 (QUILT)> in B<dgit(7)>." msgstr "" #. type: TP -#: ../dgit.1:399 +#: ../dgit.1:453 #, no-wrap msgid "B<dgit import-dsc> [I<sub-options>] I<../path/to/.dsc> [B<+>|B<..>]branch" msgstr "" #. type: Plain text -#: ../dgit.1:405 +#: ../dgit.1:459 msgid "" "Import a Debian-format source package, specified by its .dsc, into git, the " "way dgit fetch would do." msgstr "" #. type: Plain text -#: ../dgit.1:416 +#: ../dgit.1:470 msgid "" "This does about half the work of dgit fetch: it will convert the .dsc into a " "new, orphan git branch. Since dgit has no access to a corresponding source " @@ -833,7 +947,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:426 +#: ../dgit.1:480 msgid "" "Because a .dsc can contain a Dgit field naming a git commit (which you might " "not have), and specifying where to find that commit (and any history rewrite " @@ -843,12 +957,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:428 +#: ../dgit.1:482 msgid "There is only one sub-option:" msgstr "" #. type: Plain text -#: ../dgit.1:434 +#: ../dgit.1:488 msgid "" "B<--require-valid-signature> causes dgit to insist that the signature on " "the .dsc is valid (using the same criteria as dpkg-source -x). Otherwise, " @@ -857,7 +971,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:453 +#: ../dgit.1:507 msgid "" "If I<branch> is prefixed with B<+> then if it already exists, it will be " "simply overwritten, no matter its existing contents. If I<branch> is " @@ -869,55 +983,55 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:457 +#: ../dgit.1:511 msgid "If I<branch> does not start with refs/, refs/heads/ is prepended." msgstr "" #. type: TP -#: ../dgit.1:457 +#: ../dgit.1:511 #, no-wrap msgid "B<dgit version>" msgstr "" #. type: Plain text -#: ../dgit.1:460 +#: ../dgit.1:514 msgid "Prints version information and exits." msgstr "" #. type: TP -#: ../dgit.1:460 +#: ../dgit.1:514 #, no-wrap msgid "B<dgit clone-dgit-repos-server>I< destdir>" msgstr "" #. type: Plain text -#: ../dgit.1:464 +#: ../dgit.1:518 msgid "" "Tries to fetch a copy of the source code for the dgit-repos-server, as " "actually being used on the dgit git server, as a git tree." msgstr "" #. type: TP -#: ../dgit.1:464 +#: ../dgit.1:518 #, no-wrap msgid "B<dgit print-dgit-repos-server-source-url>" msgstr "" #. type: Plain text -#: ../dgit.1:469 +#: ../dgit.1:523 msgid "" "Prints the url used by dgit clone-dgit-repos-server. This is hopefully " "suitable for use as a git remote url. It may not be useable in a browser." msgstr "" #. type: TP -#: ../dgit.1:469 +#: ../dgit.1:523 #, no-wrap msgid "B<dgit print-dpkg-source-ignores>" msgstr "" #. type: Plain text -#: ../dgit.1:476 +#: ../dgit.1:530 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " "it to exclude exactly the .git directory and nothing else. The separate " @@ -925,13 +1039,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:476 +#: ../dgit.1:530 #, no-wrap msgid "B<dgit print-unapplied-treeish>" msgstr "" #. type: Plain text -#: ../dgit.1:487 +#: ../dgit.1:541 msgid "" "Constructs a tree-ish approximating the patches-unapplied state of your 3.0 " "(quilt) package, and prints the git object name to stdout. This requires " @@ -942,7 +1056,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:494 +#: ../dgit.1:548 msgid "" "To make this operate off-line, the access configuration key which is used to " "determine the build-products-dir is the uncanonicalised version of the suite " @@ -951,51 +1065,24 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:496 +#: ../dgit.1:550 msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:550 ../git-debrebase.1.pod:473 #, no-wrap msgid "OPTIONS" msgstr "" #. type: TP -#: ../dgit.1:497 -#, no-wrap -msgid "B<--dry-run> | B<-n>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:503 -msgid "" -"Go through the motions, fetching all information needed, but do not actually " -"update the output(s). For push, dgit does the required checks and leaves " -"the new .dsc in a temporary file, but does not sign, tag, push or upload." -msgstr "" - -#. type: TP -#: ../dgit.1:503 -#, no-wrap -msgid "B<--damp-run> | B<-L>" -msgstr "" - -#. type: Plain text -#: ../dgit.1:508 -msgid "" -"Go through many more of the motions: do everything that doesn't involve " -"either signing things, or making changes on the public servers." -msgstr "" - -#. type: TP -#: ../dgit.1:508 +#: ../dgit.1:551 #, no-wrap msgid "B<-k>I<keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:517 +#: ../dgit.1:560 msgid "" "Use I<keyid> for signing the tag and the upload. The default comes from the " "distro's B<keyid> config setting (see CONFIGURATION, below), or failing " @@ -1003,24 +1090,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:517 +#: ../dgit.1:560 #, no-wrap msgid "B<--no-sign>" msgstr "" #. type: Plain text -#: ../dgit.1:520 +#: ../dgit.1:563 msgid "does not sign tags or uploads (meaningful only with push)." msgstr "" #. type: TP -#: ../dgit.1:521 +#: ../dgit.1:564 #, no-wrap msgid "B<-p>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:527 +#: ../dgit.1:570 msgid "" "Specifies that we should process source package I<package> rather than " "looking in debian/control or debian/changelog. Valid with dgit fetch and " @@ -1028,27 +1115,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:527 +#: ../dgit.1:570 #, no-wrap msgid "B<--clean=git> | B<-wg>" msgstr "" #. type: Plain text -#: ../dgit.1:533 +#: ../dgit.1:576 msgid "" "Use B<git clean -xdf> to clean the working tree, rather than running the " "package's rules clean target." msgstr "" #. type: Plain text -#: ../dgit.1:536 +#: ../dgit.1:579 msgid "" "This will delete all files which are not tracked by git. (Including any " "files you forgot to git add.)" msgstr "" #. type: Plain text -#: ../dgit.1:541 +#: ../dgit.1:584 msgid "" "B<--clean=>I<...> options other than dpkg-source are useful when the " "package's clean target is troublesome, or to avoid needing the build-" @@ -1056,7 +1143,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:548 +#: ../dgit.1:591 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " "build the source package or binaries from your working tree). Otherwise it " @@ -1065,13 +1152,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:548 +#: ../dgit.1:591 #, no-wrap msgid "B<--clean=git-ff> | B<-wgf>" msgstr "" #. type: Plain text -#: ../dgit.1:557 +#: ../dgit.1:600 msgid "" "Use B<git clean -xdff> to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " @@ -1079,33 +1166,33 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:557 +#: ../dgit.1:600 #, no-wrap msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text -#: ../dgit.1:561 +#: ../dgit.1:604 msgid "" "Like --clean=git, but always does the clean and not just a check, deleting " "any untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:561 +#: ../dgit.1:604 #, no-wrap msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:567 +#: ../dgit.1:610 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:578 +#: ../dgit.1:621 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B<?> in git status (ie, ones you " @@ -1113,13 +1200,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:578 +#: ../dgit.1:621 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:586 +#: ../dgit.1:629 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1128,13 +1215,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:586 +#: ../dgit.1:629 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:591 +#: ../dgit.1:634 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1142,12 +1229,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:595 +#: ../dgit.1:638 msgid "Without the extra B<d>, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:605 +#: ../dgit.1:648 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1155,7 +1242,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:612 +#: ../dgit.1:655 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1164,7 +1251,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:622 +#: ../dgit.1:665 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1175,52 +1262,60 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:622 +#: ../dgit.1:665 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:626 +#: ../dgit.1:669 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:626 +#: ../dgit.1:669 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:631 +#: ../dgit.1:674 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:631 +#: ../dgit.1:674 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:638 +#: ../dgit.1:680 msgid "" -"The package is or may be new in this suite. Without this, dgit will refuse " -"to push. It may (for Debian, will) be unable to access the git history for " -"any packages which have been newly pushed and have not yet been published." +"The package is, or may be, new in this suite. Without this, dgit will " +"refuse to push. Needing --new is not unusual; for example, it is frequently " +"needed for uploading to Debian experimental." +msgstr "" + +#. type: Plain text +#: ../dgit.1:686 +msgid "" +"Note that dgit may be unable to access the git history for an entirely new " +"package which has not been accepted by the archive. So for an entirely new " +"package you need to properly coordinate with anyone else who might upload." msgstr "" #. type: TP -#: ../dgit.1:638 +#: ../dgit.1:686 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:646 +#: ../dgit.1:694 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1230,7 +1325,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:658 +#: ../dgit.1:706 msgid "" "Note that this does B<not> prevent dgit from cleaning your tree, so if the " "changes in your working tree are in the form of untracked files, those might " @@ -1241,24 +1336,59 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:658 +#: ../dgit.1:706 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:661 +#: ../dgit.1:709 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:661 +#: ../dgit.1:709 #, no-wrap -msgid "B<--overwrite>[=I<previous-version>]" +msgid "B<--collab-non-dgit>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:716 +msgid "" +"Make B<dgit push>, behave more suitably for collaborating (using shared git " +"history) with git-using co-developers who aren't using dgit." msgstr "" #. type: Plain text -#: ../dgit.1:672 +#: ../dgit.1:722 +msgid "" +"With this option, dgit won't mind that the git history you're using isn't " +"necessarily fast forward from the dgit view; instead, it will rely on the " +"changelog to prevent accidentally overwriting changes." +msgstr "" + +#. type: Plain text +#: ../dgit.1:731 +msgid "" +"And, the synthetic commits needed to make the dgit git history fast forward " +"will appear only on the dgit git server, and local dgit suite branches, not " +"on your own main branch. So they won't end up in the maintainer-visible " +"history, when you push your own branch to make a merge request." +msgstr "" + +#. type: Plain text +#: ../dgit.1:734 +msgid "This is equivalent to B<--split-view=always --trust-changelog>." +msgstr "" + +#. type: TP +#: ../dgit.1:734 +#, no-wrap +msgid "B<--trust-changelog> | B<--overwrite>=I<previous-version>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:745 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1267,69 +1397,84 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:679 +#: ../dgit.1:751 msgid "" -"It is safer not to specify I<previous-version>, and usually it's not " -"needed. Just say B<--overwrite>, unless you know what you are doing." +"It is safer to specify B<--trust-changelog>, than B<--overwrite=>I<previous-" +"version>, and usually the latter is not needed." msgstr "" #. type: Plain text -#: ../dgit.1:685 +#: ../dgit.1:758 msgid "" -"This option is useful if you are the maintainer, and you have incorporated " -"NMU changes into your own git workflow in a way that doesn't make your " -"branch a fast forward from the NMU. It can also be useful when there was an " -"upload made without dgit since the most recent upload made with dgit." +"B<--trust-changelog> is useful if you are the maintainer, and you have " +"incorporated NMU changes into your own git workflow in a way that doesn't " +"make your branch a fast forward from the NMU. It can also be useful when " +"there was an upload made without dgit since the most recent upload made with " +"dgit." msgstr "" #. type: Plain text -#: ../dgit.1:691 +#: ../dgit.1:764 msgid "" -"This option is also usually necessary the first time a package is pushed " -"with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." +"It is also usually necessary the first time a package is pushed with dgit " +"push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:705 +#: ../dgit.1:773 msgid "" -"If I<previous-version> is not specified, dgit will check that the version in " -"the archive is mentioned in your debian/changelog. (This will avoid losing " -"changes, even with B<--overwrite>, unless someone committed to git a " -"finalised changelog entry, and then made later changes to that version.) If " -"I<previous-version> is specified, it ought to be the version currently in " -"the archive." +"With B<--trust-changelog> dgit will check that the version in the archive is " +"mentioned in your debian/changelog. (This will avoid losing changes, unless " +"someone committed to git a finalised changelog entry, and then made later " +"changes to that version.)" msgstr "" #. type: Plain text -#: ../dgit.1:711 +#: ../dgit.1:779 msgid "" -"dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " -"something that looks like the result of git merge -s ours) to stitch the " -"archive's version into your own git history, so that your push is a fast " -"forward from the archive." +"With B<--overwrite=>I<previous-version> that version ought to be the version " +"currently in the archive, and it will be unconditionally overwritten, " +"regardless of what's in the changelog." msgstr "" #. type: Plain text -#: ../dgit.1:716 +#: ../dgit.1:785 +msgid "" +"These options will, if necessary, make a pseudo-merge (that is, something " +"that looks like the result of git merge -s ours) to stitch the archive's " +"version into your own git history, so that your push is a fast forward from " +"the archive." +msgstr "" + +#. type: Plain text +#: ../dgit.1:792 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " -"appear only in the dgit view.)" +"appear only in the dgit view; B<--split-view=always> can be used to force " +"that behaviour, e.g. in other quilt modes.)" +msgstr "" + +#. type: Plain text +#: ../dgit.1:796 +msgid "" +"B<--overwrite> without a version number is an obsolete way of specifying B<--" +"trust-changelog>." msgstr "" #. type: TP -#: ../dgit.1:716 +#: ../dgit.1:796 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:799 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:729 +#: ../dgit.1:809 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1339,27 +1484,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:734 +#: ../dgit.1:814 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:734 +#: ../dgit.1:814 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:740 +#: ../dgit.1:820 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:750 +#: ../dgit.1:830 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1368,7 +1513,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:758 +#: ../dgit.1:838 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1377,13 +1522,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:758 +#: ../dgit.1:838 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:768 +#: ../dgit.1:848 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1392,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:772 +#: ../dgit.1:852 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1400,25 +1545,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:776 +#: ../dgit.1:856 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:780 +#: ../dgit.1:860 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:780 +#: ../dgit.1:860 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:874 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1430,13 +1575,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:794 +#: ../dgit.1:874 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:800 +#: ../dgit.1:880 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1444,7 +1589,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:806 +#: ../dgit.1:886 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1453,23 +1598,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:817 +#: ../dgit.1:897 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " -"of --overwrite (which creates a suitable pseudomerge) and --deliberately-" -"not-fast-forward (which suppresses the pseudomerge and the fast forward " -"checks) should be needed; --overwrite is usually better." +"of --trust-changelog (which creates a suitable pseudomerge) and --" +"deliberately-not-fast-forward (which suppresses the pseudomerge and the fast " +"forward checks) should be needed; --trust-changelog is usually better." msgstr "" #. type: TP -#: ../dgit.1:817 +#: ../dgit.1:897 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:826 +#: ../dgit.1:906 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1481,13 +1626,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:826 +#: ../dgit.1:906 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:911 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1495,58 +1640,57 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:831 ../git-debpush.1.pod:114 +#: ../dgit.1:911 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:838 +#: ../dgit.1:918 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, insist on generating a " -"linear patch stack: one new patch for each relevant commit. If such a stack " -"cannot be generated, fail. This is the default for Debian." +"With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " +"each relevant commit. If such a stack cannot be generated, fail. This is " +"the default for Debian." msgstr "" #. type: Plain text -#: ../dgit.1:843 +#: ../dgit.1:923 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" -#. type: =item -#: ../dgit.1:843 ../git-debpush.1.pod:126 +#. type: TP +#: ../dgit.1:923 #, no-wrap -msgid "B<--quilt=auto>" +msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../dgit.1:933 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " -"linear patch stack (as with --quilt=linear) but if that doesn't seem " -"possible, try to generate a single squashed patch for all the changes made " -"in git (as with --quilt=smash). This is not a good idea for an NMU in " -"Debian." +"With format `3.0 (quilt)', prefer a linear patch stack (as with --" +"quilt=linear) but if that doesn't seem possible, try to generate a single " +"squashed patch for all the changes made in git (as with --quilt=smash). " +"This is not a good idea for an NMU in Debian." msgstr "" #. type: =item -#: ../dgit.1:852 ../git-debpush.1.pod:120 +#: ../dgit.1:933 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:857 +#: ../dgit.1:939 msgid "" -"When fixing up source format `3.0 (quilt)' metadata, generate a single " -"additional patch for all the changes made in git. This is not a good idea " -"for an NMU in Debian." +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone) and generate a single additional patch for all the changes made in " +"git. This is not a good idea for an NMU in Debian." msgstr "" #. type: Plain text -#: ../dgit.1:863 +#: ../dgit.1:945 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1554,57 +1698,84 @@ msgid "" "remain true.)" msgstr "" +#. type: TP +#: ../dgit.1:945 +#, no-wrap +msgid "B<--quilt=single>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:952 +msgid "" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), delete all the existing patches, and then generate a single patch " +"for all the changes made in git. This is not a good idea for an NMU in " +"Debian." +msgstr "" + +#. type: Plain text +#: ../dgit.1:961 +msgid "" +"Use this instead of the B<single-debian-patch> dpkg-source format option. " +"That dpkg-source option cannot handle certain changes to the tree that dpkg-" +"source otherwise permits, and in some cases it can generate strange source " +"packages that dpkg-source appears to accept but which become corrupted when " +"people later try to modify them." +msgstr "" + #. type: =item -#: ../dgit.1:863 ../git-debpush.1.pod:131 +#: ../dgit.1:961 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:871 +#: ../dgit.1:971 msgid "" -"Check whether source format `3.0 (quilt)' metadata would need fixing up, " -"but, if it does, fail. You must then fix the metadata yourself somehow " -"before pushing. (NB that dpkg-source --commit will not work because the " -"dgit git tree does not have a B<.pc> directory.)" +"With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " +"clone), and check that the patch metadata is up to date. If it isn't, fail; " +"you must then fix the metadata yourself somehow before pushing. (NB that " +"dpkg-source --commit will not work because the dgit git tree does not have a " +"B<.pc> directory.)" msgstr "" #. type: TP -#: ../dgit.1:871 +#: ../dgit.1:971 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:876 +#: ../dgit.1:978 msgid "" -"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " -"If you use this option and the metadata did in fact need fixing up, dgit " +"With format `3.0 (quilt)', assume that the tree is patches-applied (as " +"obtained from dgit clone), and I<assume> that the patch metadata is up to " +"date. If you use this option and the patch metadata is out of date, dgit " "push will fail." msgstr "" #. type: TP -#: ../dgit.1:876 +#: ../dgit.1:978 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:883 +#: ../dgit.1:985 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:887 +#: ../dgit.1:989 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:895 +#: ../dgit.1:997 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1613,7 +1784,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:903 +#: ../dgit.1:1005 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1621,7 +1792,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:1010 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1629,7 +1800,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:1024 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1641,7 +1812,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:933 +#: ../dgit.1:1035 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1652,7 +1823,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:951 +#: ../dgit.1:1053 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1666,7 +1837,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:1062 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1678,13 +1849,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:960 +#: ../dgit.1:1062 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1071 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1694,7 +1865,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:975 +#: ../dgit.1:1077 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1703,7 +1874,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:980 +#: ../dgit.1:1082 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1711,20 +1882,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:980 +#: ../dgit.1:1082 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:985 +#: ../dgit.1:1087 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:993 +#: ../dgit.1:1095 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1734,7 +1905,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:999 +#: ../dgit.1:1101 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1742,18 +1913,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1002 +#: ../dgit.1:1104 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1005 +#: ../dgit.1:1107 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1013 +#: ../dgit.1:1115 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1761,20 +1932,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1118 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1016 +#: ../dgit.1:1118 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1021 +#: ../dgit.1:1123 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1782,7 +1953,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1030 +#: ../dgit.1:1132 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1790,13 +1961,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1030 +#: ../dgit.1:1132 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1038 +#: ../dgit.1:1140 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1805,13 +1976,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1038 +#: ../dgit.1:1140 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1050 +#: ../dgit.1:1152 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1823,32 +1994,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1155 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1053 +#: ../dgit.1:1155 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1057 +#: ../dgit.1:1159 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1162 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1069 +#: ../dgit.1:1171 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1857,85 +2028,99 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1069 +#: ../dgit.1:1171 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1072 +#: ../dgit.1:1174 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1072 +#: ../dgit.1:1174 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1181 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1079 +#: ../dgit.1:1181 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1184 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1082 +#: ../dgit.1:1184 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1085 +#: ../dgit.1:1187 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1085 +#: ../dgit.1:1187 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1089 +#: ../dgit.1:1191 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1089 +#: ../dgit.1:1191 +#, no-wrap +msgid "B<--keep-playground>|B<--no--keep-playground>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1200 +msgid "" +"Controls whether to retain the \"playground\" working directory B<.git/dgit/" +"unpack> even on success, for examination and debugging. The default is B<--" +"no-keep-playground> which deletes the directory after a successful execution." +msgstr "" + +#. type: TP +#: ../dgit.1:1200 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1204 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1093 +#: ../dgit.1:1204 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1102 +#: ../dgit.1:1213 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1945,7 +2130,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1108 +#: ../dgit.1:1219 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1953,30 +2138,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1108 +#: ../dgit.1:1219 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1111 +#: ../dgit.1:1222 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1111 +#: ../dgit.1:1222 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1226 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1122 +#: ../dgit.1:1233 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1984,18 +2169,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1124 +#: ../dgit.1:1235 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1124 +#: ../dgit.1:1235 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1146 +#: ../dgit.1:1257 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2005,7 +2190,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1265 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2014,7 +2199,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1159 +#: ../dgit.1:1270 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2022,7 +2207,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1163 +#: ../dgit.1:1274 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2030,39 +2215,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1165 +#: ../dgit.1:1276 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1173 +#: ../dgit.1:1284 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1173 +#: ../dgit.1:1284 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1290 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1184 +#: ../dgit.1:1295 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1191 +#: ../dgit.1:1302 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2070,13 +2255,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1191 +#: ../dgit.1:1302 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1214 +#: ../dgit.1:1325 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2086,14 +2271,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1333 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1229 +#: ../dgit.1:1340 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2102,7 +2287,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1351 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2112,7 +2297,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1248 +#: ../dgit.1:1359 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2120,7 +2305,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1265 +#: ../dgit.1:1376 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2132,13 +2317,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1265 +#: ../dgit.1:1376 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1275 +#: ../dgit.1:1386 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2149,19 +2334,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1275 +#: ../dgit.1:1386 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1389 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1287 +#: ../dgit.1:1398 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2171,13 +2356,55 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1287 +#: ../dgit.1:1398 +#, no-wrap +msgid "B<--dry-run> | B<-n>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1404 +msgid "" +"Go through the motions, fetching all information needed, but do not actually " +"update the output(s). For push, dgit does the required checks and leaves " +"the new .dsc in a temporary file, but does not sign, tag, push or upload." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1407 +msgid "" +"This is not a very good simulation. It can easily go wrong in ways that a " +"for-real push wouldn't." +msgstr "" + +#. type: TP +#: ../dgit.1:1407 +#, no-wrap +msgid "B<--damp-run> | B<-L>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1412 +msgid "" +"Go through many more of the motions: do everything that doesn't involve " +"either signing things, or making changes on the public servers." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1417 +msgid "" +"Using this will make unsigned tags, and possibly other local changes, that " +"will get in the way of a for-real push. So be prepared to burn the version " +"number you're using." +msgstr "" + +#. type: TP +#: ../dgit.1:1417 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1295 +#: ../dgit.1:1425 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2186,13 +2413,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1295 +#: ../dgit.1:1425 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1432 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2200,13 +2427,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1302 +#: ../dgit.1:1432 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1309 +#: ../dgit.1:1439 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2215,26 +2442,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1309 +#: ../dgit.1:1439 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1314 +#: ../dgit.1:1444 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1314 +#: ../dgit.1:1444 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1450 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2242,13 +2469,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1450 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1327 +#: ../dgit.1:1457 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2256,65 +2483,81 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1327 +#: ../dgit.1:1457 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1332 +#: ../dgit.1:1462 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1332 +#: ../dgit.1:1462 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1466 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1336 +#: ../dgit.1:1466 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1340 +#: ../dgit.1:1470 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1340 +#: ../dgit.1:1470 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1346 +#: ../dgit.1:1476 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1346 +#: ../dgit.1:1476 +#, no-wrap +msgid "B<--force-push-tainted>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1486 +msgid "" +"Go ahead and try to push even tainted git objects hat the server says it is " +"going to reject, but without declaring any --deliberately. This option is " +"provided for testing or strange situations, and is not the way to override " +"the taint check: using it will probably just fail later, burning the version " +"number you are using. Use the appropriate --deliberately option instead." +msgstr "" + +#. type: TP +#: ../dgit.1:1486 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1352 +#: ../dgit.1:1492 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2322,13 +2565,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1352 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1492 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1358 +#: ../dgit.1:1498 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2336,31 +2579,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1360 +#: ../dgit.1:1500 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1360 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1506 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1366 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1506 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1511 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2368,73 +2611,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1514 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1514 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1517 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1381 +#: ../dgit.1:1521 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1521 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1384 +#: ../dgit.1:1524 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1384 +#: ../dgit.1:1524 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1529 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1529 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1393 +#: ../dgit.1:1533 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1533 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1399 +#: ../dgit.1:1539 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2442,45 +2685,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1539 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1403 +#: ../dgit.1:1543 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1403 +#: ../dgit.1:1543 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1405 +#: ../dgit.1:1545 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1409 +#: ../dgit.1:1549 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1549 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1416 +#: ../dgit.1:1556 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2489,52 +2732,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1556 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1420 +#: ../dgit.1:1560 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1420 +#: ../dgit.1:1560 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1562 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1425 +#: ../dgit.1:1565 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1425 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1565 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1428 +#: ../dgit.1:1568 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1428 +#: ../dgit.1:1568 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1433 +#: ../dgit.1:1573 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2542,26 +2785,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1433 +#: ../dgit.1:1573 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1437 +#: ../dgit.1:1577 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1437 +#: ../dgit.1:1577 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1442 +#: ../dgit.1:1582 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2569,13 +2812,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1442 +#: ../dgit.1:1582 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1448 +#: ../dgit.1:1588 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2583,24 +2826,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1448 +#: ../dgit.1:1588 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1594 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1454 +#: ../dgit.1:1594 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1466 +#: ../dgit.1:1606 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2610,13 +2853,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1466 +#: ../dgit.1:1606 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1471 +#: ../dgit.1:1611 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2625,204 +2868,215 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1611 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1474 +#: ../dgit.1:1614 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1474 +#: ../dgit.1:1614 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1477 +#: ../dgit.1:1617 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1477 +#: ../dgit.1:1617 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1483 +#: ../dgit.1:1623 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1483 +#: ../dgit.1:1623 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1485 +#: ../dgit.1:1625 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1487 +#: ../dgit.1:1627 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1489 +#: ../dgit.1:1629 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1491 +#: ../dgit.1:1631 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1493 +#: ../dgit.1:1633 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1495 +#: ../dgit.1:1635 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.policy-query-supported-ssh>I< >B<false>I<|>B<unknown>I<|>B<true>" +msgstr "" + +#. type: TP +#: ../dgit.1:1637 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1497 +#: ../dgit.1:1639 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1499 +#: ../dgit.1:1641 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1501 +#: ../dgit.1:1643 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1503 +#: ../dgit.1:1645 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1505 +#: ../dgit.1:1647 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1507 -#, no-wrap -msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" -msgstr "" - -#. type: TP -#: ../dgit.1:1509 +#: ../dgit.1:1649 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1511 +#: ../dgit.1:1651 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1513 +#: ../dgit.1:1653 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1515 +#: ../dgit.1:1655 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1517 +#: ../dgit.1:1657 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1519 +#: ../dgit.1:1659 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1521 +#: ../dgit.1:1661 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1523 +#: ../dgit.1:1663 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1525 +#: ../dgit.1:1665 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1667 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1529 +#: ../dgit.1:1669 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1531 +#: ../dgit.1:1671 +#, no-wrap +msgid "B<dgit.default.push-subcmd>I< >B<source>I<|>B<built>I<|>B<warn,built>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1675 +msgid "Controls the behaviour of B<dgit push>." +msgstr "" + +#. type: TP +#: ../dgit.1:1675 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1533 +#: ../dgit.1:1677 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1534 +#: ../dgit.1:1678 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1543 +#: ../dgit.1:1687 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2832,26 +3086,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1543 +#: ../dgit.1:1687 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1547 +#: ../dgit.1:1691 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1547 +#: ../dgit.1:1691 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1696 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2859,13 +3113,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1552 +#: ../dgit.1:1696 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1559 +#: ../dgit.1:1703 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2873,7 +3127,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1565 +#: ../dgit.1:1709 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2881,7 +3135,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1570 +#: ../dgit.1:1714 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2890,7 +3144,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1575 +#: ../dgit.1:1719 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2898,25 +3152,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1719 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1584 +#: ../dgit.1:1728 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1585 +#: ../dgit.1:1729 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot index f41a2b8..0dfa5b9 100644 --- a/po4a/dgit_7.pot +++ b/po4a/dgit_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-21 01:37+0100\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -40,13 +40,13 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1549 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:223 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -135,26 +135,26 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:49 +#: ../dgit.7:50 msgid "" -"However, it is perfectly fine to have other branches in dgit-repos; normally " -"the dgit-repos repo for the package will be accessible via the remote name " -"`origin'." +"However, it is perfectly fine to have other branches in dgit-repos; the dgit-" +"repos repo for the package can even be the same as the `origin' remote, " +"although this is not generally the case in Debian." msgstr "" #. type: Plain text -#: ../dgit.7:55 +#: ../dgit.7:56 msgid "" -"dgit push will also make signed tags called B<archive/debian/>I<version> " +"dgit push-* will also make signed tags called B<archive/debian/>I<version> " "(with version encoded a la DEP-14) and push them to dgit-repos. These are " "used at the server to authenticate pushes." msgstr "" #. type: Plain text -#: ../dgit.7:65 +#: ../dgit.7:66 msgid "" "Uploads made by dgit contain an additional field B<Dgit> in the source " -"package .dsc. (This is added by dgit push.) This specifies: a commit (an " +"package .dsc. (This is added by dgit push-*.) This specifies: a commit (an " "ancestor of the dgit/suite branch) whose tree is identical to the unpacked " "source upload; the distro to which the upload was made; a tag name which can " "be used to fetch the git commits; and a url to use as a hint for the dgit " @@ -162,7 +162,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:77 +#: ../dgit.7:78 msgid "" "Uploads not made by dgit are represented in git by commits which are " "synthesised by dgit. The tree of each such commit corresponds to the " @@ -175,14 +175,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:82 +#: ../dgit.7:83 msgid "" "dgit expects trees that it works with to have a B<dgit> (pseudo) remote. " "This refers to the dgit-created git view of the corresponding archive." msgstr "" #. type: Plain text -#: ../dgit.7:91 +#: ../dgit.7:92 msgid "" "The dgit archive tracking view is synthesised locally, on demand, by each " "copy of dgit. The tracking view is always a descendant of the dgit-repos " @@ -192,25 +192,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:94 +#: ../dgit.7:95 msgid "" -"dgit push can operate on any commit which is a descendant of the suite " +"dgit push-* can operate on any commit which is a descendant of the suite " "tracking branch." msgstr "" #. type: Plain text -#: ../dgit.7:105 +#: ../dgit.7:106 msgid "" "dgit does not make a systematic record of its imports of orig tarball(s). " "So it does not work by finding git tags or branches referring to orig " "tarball(s). The orig tarballs are downloaded (by dgit clone) into the " "parent directory, as with a traditional (non-gitish) dpkg-source workflow. " "You need to retain these tarballs in the parent directory for dgit build and " -"dgit push. (They are not needed for purely-git-based workflows.)" +"dgit push-*. (They are not needed for purely-git-based workflows.)" msgstr "" #. type: Plain text -#: ../dgit.7:112 +#: ../dgit.7:113 msgid "" "dgit repositories could be cloned with standard (git) methods. However, the " "dgit repositories do not contain uploads not made with dgit. And for " @@ -219,7 +219,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:119 +#: ../dgit.7:120 msgid "" "To a user looking at the archive, changes pushed in a simple NMU using dgit " "look like reasonable changes made in an NMU: in a `3.0 (quilt)' package the " @@ -228,30 +228,30 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:119 +#: ../dgit.7:120 #, no-wrap msgid "COMBINED SUITES" msgstr "" #. type: Plain text -#: ../dgit.7:124 +#: ../dgit.7:125 msgid "" "dgit can synthesize a combined view of several underlying suites. This is " "requested by specifying, for I<suite,> a comma-separated list:" msgstr "" #. type: Plain text -#: ../dgit.7:126 +#: ../dgit.7:127 msgid "I<mainsuite>B<,>I<subsuite>..." msgstr "" #. type: Plain text -#: ../dgit.7:128 +#: ../dgit.7:129 msgid "This facility is available with dgit clone, fetch and pull, only." msgstr "" #. type: Plain text -#: ../dgit.7:138 +#: ../dgit.7:139 msgid "" "dgit will fetch the same package from each specified underlying suite, " "separately (as if with dgit fetch). dgit will then generate a pseudomerge " @@ -261,18 +261,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:141 +#: ../dgit.7:142 msgid "" "The package must exist in mainsuite, but need not exist in the subsuites." msgstr "" #. type: Plain text -#: ../dgit.7:145 +#: ../dgit.7:146 msgid "If a specified subsuite starts with B<-> then mainsuite is prepended." msgstr "" #. type: Plain text -#: ../dgit.7:153 +#: ../dgit.7:154 msgid "" "So, for example, B<stable,-security> means to look for the package in " "stable, and stable-security, taking whichever is newer. If stable is " @@ -281,7 +281,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:161 +#: ../dgit.7:162 msgid "" "Combined suites are not supported by the dgit build operations. This is " "because those options are intended for building for uploading source " @@ -291,7 +291,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:166 +#: ../dgit.7:167 msgid "" "When using this facility, it is important to always specify the same suites " "in the same order: dgit will not make a coherent fast-forwarding history " @@ -299,20 +299,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:170 +#: ../dgit.7:171 msgid "" "The history generated by this feature is not normally suitable for merging " "back into upstreams, as it necessarily contains unattractive pseudomerges." msgstr "" #. type: SH -#: ../dgit.7:170 +#: ../dgit.7:171 #, no-wrap msgid "LIMITATIONS" msgstr "" #. type: Plain text -#: ../dgit.7:183 +#: ../dgit.7:184 msgid "" "Because the synthesis of the suite tracking branches is done locally based " "only on the current archive state, it will not necessarily see every upload " @@ -324,7 +324,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:192 +#: ../dgit.7:193 msgid "" "There is no uniform linkage between the tracking branches for different " "suites. The Debian infrastructure does not do any automatic import of " @@ -334,7 +334,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:200 +#: ../dgit.7:201 msgid "" "There has been no bulk import of historical uploads into Debian's dgit " "infrastructure. To do this it would be necessary to decide whether to " @@ -344,7 +344,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:211 +#: ../dgit.7:212 msgid "" "git represents only file executability. git does not represent empty " "directories, or any leaf objects other than plain files and symlinks. The " @@ -356,13 +356,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:211 +#: ../dgit.7:212 #, no-wrap msgid "READ-ONLY DISTROS" msgstr "" #. type: Plain text -#: ../dgit.7:215 +#: ../dgit.7:216 msgid "" "Distros which do not maintain a set of dgit history git repositories can " "still be used in a read-only mode with dgit. Currently Ubuntu is configured " @@ -370,13 +370,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:215 +#: ../dgit.7:216 #, no-wrap msgid "GITATTRIBUTES" msgstr "" #. type: Plain text -#: ../dgit.7:223 +#: ../dgit.7:224 msgid "" "git has features which can automatically transform files as they are being " "copied between the working tree and the git history. The attributes can be " @@ -385,7 +385,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:232 +#: ../dgit.7:233 msgid "" "These transformations are context-sensitive and not, in general, reversible, " "so dgit operates on the principle that the dgit git history contains the " @@ -395,7 +395,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:241 +#: ../dgit.7:242 msgid "" "If transforming gitattributes are used, they can cause trouble, because the " "working tree files can differ from the git revision history (and therefore " @@ -405,7 +405,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:252 +#: ../dgit.7:253 msgid "" "dgit clone and dgit setup-new-tree disable transforming gitattributes by " "default, by creating a suitable .git/info/attributes. See B<dgit setup-new-" @@ -413,7 +413,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:262 +#: ../dgit.7:263 msgid "" "Note that dgit does not disable gitattributes unless they would actually " "interfere with your work on dgit branches. In particular, gitattributes " @@ -423,13 +423,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:262 +#: ../dgit.7:263 #, no-wrap msgid "PACKAGE SOURCE FORMATS" msgstr "" #. type: Plain text -#: ../dgit.7:267 +#: ../dgit.7:268 msgid "" "If you are not the maintainer, you do not need to worry about the source " "format of the package. You can just make changes as you like in git. If " @@ -438,13 +438,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:267 +#: ../dgit.7:268 #, no-wrap msgid "FILE EXECUTABILITY" msgstr "" #. type: Plain text -#: ../dgit.7:274 +#: ../dgit.7:275 msgid "" "Debian source package formats do not always faithfully reproduce changes to " "executability. But dgit insists that the result of dgit clone is identical " @@ -453,7 +453,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:280 +#: ../dgit.7:281 msgid "" "So files that are executable in your git tree must be executable in the " "result of dpkg-source -x (but often aren't). If a package has such " @@ -462,20 +462,20 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:280 +#: ../dgit.7:281 #, no-wrap msgid "FORMAT 3.0 (QUILT)" msgstr "" #. type: Plain text -#: ../dgit.7:284 +#: ../dgit.7:285 msgid "" "For a format `3.0 (quilt)' source package, dgit may have to make a commit on " "your current branch to contain metadata used by quilt and dpkg-source." msgstr "" #. type: Plain text -#: ../dgit.7:291 +#: ../dgit.7:292 msgid "" "This is because `3.0 (quilt)' source format represents the patch stack as " "files in debian/patches/ actually inside the source tree. This means that, " @@ -485,7 +485,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:296 +#: ../dgit.7:297 msgid "" "dgit will automatically work around this for you when building and pushing. " "The only thing you need to know is that dgit build, sbuild, etc., may make " @@ -494,7 +494,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:303 +#: ../dgit.7:304 msgid "" "Simply committing to source files (whether in debian/ or not, but not to " "patches) will result in a branch that dgit quilt-fixup can linearise. " @@ -503,14 +503,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:306 +#: ../dgit.7:307 msgid "" "You can explicitly request that dgit do just this fixup, by running dgit " "quilt-fixup." msgstr "" #. type: Plain text -#: ../dgit.7:313 +#: ../dgit.7:314 msgid "" "If you are a quilt user you need to know that dgit's git trees are `patches " "applied packaging branches' and do not contain the .pc directory (which is " @@ -520,18 +520,18 @@ msgid "" msgstr "" #. type: SS -#: ../dgit.7:314 +#: ../dgit.7:315 #, no-wrap msgid "quilt fixup error messages" msgstr "" #. type: Plain text -#: ../dgit.7:316 +#: ../dgit.7:317 msgid "When dgit's quilt fixup fails, it prints messages like this:" msgstr "" #. type: Plain text -#: ../dgit.7:322 +#: ../dgit.7:323 #, no-wrap msgid "" "dgit: base trees orig=5531f03d8456b702eab6 o+d/p=135338e9cc253cc85f84\n" @@ -541,7 +541,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:325 +#: ../dgit.7:326 #, no-wrap msgid "" "dgit: error: quilt fixup cannot be linear. Stopped at:\n" @@ -549,13 +549,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.7:327 +#: ../dgit.7:328 #, no-wrap msgid "B<orig>" msgstr "" #. type: Plain text -#: ../dgit.7:333 +#: ../dgit.7:334 msgid "" "is an import of the .orig tarballs dgit found, with the debian/ directory " "from your HEAD substituted. This is a git tree object, not a commit: you " @@ -563,37 +563,37 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.7:334 +#: ../dgit.7:335 #, no-wrap msgid "B<o+d/p>" msgstr "" #. type: Plain text -#: ../dgit.7:339 +#: ../dgit.7:340 msgid "" "is another tree object, which is the same as orig but with the patches from " "debian/patches applied." msgstr "" #. type: TP -#: ../dgit.7:340 +#: ../dgit.7:341 #, no-wrap msgid "B<HEAD>" msgstr "" #. type: Plain text -#: ../dgit.7:343 +#: ../dgit.7:344 msgid "is of course your own git HEAD." msgstr "" #. type: TP -#: ../dgit.7:344 +#: ../dgit.7:345 #, no-wrap msgid "B<quilt differences>" msgstr "" #. type: Plain text -#: ../dgit.7:353 +#: ../dgit.7:354 msgid "" "shows whether each of the these trees differs from the others (i) in " "upstream files excluding .gitignore files; (ii) in upstream .gitignore " @@ -601,7 +601,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:360 +#: ../dgit.7:361 msgid "" "dgit quilt-fixup --quilt=linear walks commits backwards from your HEAD " "trying to construct a linear set of additional patches, starting at the " @@ -610,7 +610,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:371 +#: ../dgit.7:372 msgid "" "In the error message, 696c9bd5..84ae8f96 is the first commit child-parent " "edge which cannot sensibly be either ignored, or turned into a patch in " @@ -621,20 +621,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:390 +#: ../dgit.7:391 msgid "" "Your appropriate response depends on the cause and the context. If you have " "been freely merging your git branch and do not need need a pretty linear " -"patch queue, you can use B<--quilt=smash> (or use the B<1.0> or B<single-" -"debian-patch> source formats; see B<dpkg-source(1)>.) If you want a pretty " -"linear series, and this message is unexpected, it can mean that you have " -"unwittingly committed changes that are not representable by dpkg-source " -"(such as some mode changes). Or maybe you just forgot a necessary B<--" -"quilt=> option." +"patch queue, you can use B<--quilt=single> or B<--quilt=smash>. (Don't use " +"the B<single-debian-patch> dpkg source format option; it has strange " +"properties.) If you want a pretty linear series, and this message is " +"unexpected, it can mean that you have unwittingly committed changes that are " +"not representable by dpkg-source (such as some mode changes). Or maybe you " +"just forgot a necessary B<--quilt=> option." msgstr "" #. type: Plain text -#: ../dgit.7:396 +#: ../dgit.7:397 msgid "" "Finally, this problem can occur if you have provided Debian git tooling such " "as git-debrebase, git-dpm or git-buildpackage with upstream git commit(s) or " @@ -642,13 +642,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:396 +#: ../dgit.7:397 #, no-wrap msgid "SPLIT VIEW AND SPLITTING QUILT MODES" msgstr "" #. type: Plain text -#: ../dgit.7:403 +#: ../dgit.7:404 msgid "" "When working with git branches intended for use with the `3.0 (quilt)' " "source format dgit can automatically convert a suitable maintainer-provided " @@ -656,33 +656,33 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:410 +#: ../dgit.7:411 msgid "" -"When a splitting quilt mode is selected dgit build commands and dgit push " +"When a splitting quilt mode is selected dgit build commands and dgit push-* " "will, on each invocation, convert the user's HEAD into the dgit view, so " "that it can be built and/or uploaded." msgstr "" #. type: Plain text -#: ../dgit.7:416 +#: ../dgit.7:417 msgid "" "Split view mode can also be enabled explicitly with the --split-view command " "line option and the .split-view access configuration key." msgstr "" #. type: Plain text -#: ../dgit.7:429 +#: ../dgit.7:430 msgid "" "When split view is in operation, regardless of the quilt mode, any dgit-" "generated pseudomerges and any quilt fixup commits will appear only in the " -"dgit view. dgit push will push the dgit view to the dgit git server. The " -"dgit view is always a descendant of the maintainer view. dgit push will " +"dgit view. dgit push-* will push the dgit view to the dgit git server. The " +"dgit view is always a descendant of the maintainer view. dgit push-* will " "also make a maintainer view tag according to DEP-14 and push that to the " "dgit git server." msgstr "" #. type: Plain text -#: ../dgit.7:437 +#: ../dgit.7:438 msgid "" "Splitting quilt modes must be enabled explicitly (by the use of the " "applicable command line options, subcommands, or configuration). This is " @@ -692,27 +692,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:441 +#: ../dgit.7:442 msgid "" "Split view conversions are cached in the ref dgit-intern/quilt-cache. This " "should not be manipulated directly." msgstr "" #. type: SH -#: ../dgit.7:441 +#: ../dgit.7:442 #, no-wrap msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:444 +#: ../dgit.7:445 msgid "" "This section is mainly of interest to maintainers who want to use dgit with " "their existing git history for the Debian package." msgstr "" #. type: Plain text -#: ../dgit.7:450 +#: ../dgit.7:451 msgid "" "Some developers like to have an extra-clean git tree which lacks files which " "are normally found in source tarballs and therefore in Debian source " @@ -722,26 +722,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:455 +#: ../dgit.7:457 msgid "" "dgit requires that the source package unpacks to exactly the same files as " -"are in the git commit on which dgit push operates. So if you just try to " -"dgit push directly from one of these extra-clean git branches, it will fail." +"are in the git commit on which dgit push-* operates. So if you just try to " +"dgit push-* directly from one of these extra-clean git branches, it will " +"fail." msgstr "" #. type: Plain text -#: ../dgit.7:457 +#: ../dgit.7:459 msgid "As the maintainer you therefore have the following options:" msgstr "" #. type: TP -#: ../dgit.7:457 ../dgit.7:468 ../dgit.7:517 ../dgit.7:525 +#: ../dgit.7:459 ../dgit.7:470 ../dgit.7:519 ../dgit.7:527 #, no-wrap msgid "\\(bu" msgstr "" #. type: Plain text -#: ../dgit.7:468 +#: ../dgit.7:470 msgid "" "Delete the files from your git branches, and your Debian source packages, " "and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this " @@ -752,7 +753,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:474 +#: ../dgit.7:476 msgid "" "Persuade upstream that the source code in their git history and the source " "they ship as tarballs should be identical. Of course simply removing the " @@ -760,7 +761,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:480 +#: ../dgit.7:482 msgid "" "One answer is to commit the (maybe autogenerated) files, perhaps with some " "simple automation to deal with conflicts and spurious changes. This has the " @@ -769,7 +770,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:485 +#: ../dgit.7:487 msgid "" "Of course it may also be that the differences are due to build system bugs, " "which cause unintended files to end up in the source package. dgit will " @@ -778,13 +779,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:486 +#: ../dgit.7:488 #, no-wrap msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC." msgstr "" #. type: Plain text -#: ../dgit.7:490 +#: ../dgit.7:492 msgid "" "Some upstream tarballs contain build artifacts which upstream expects some " "users not to want to rebuild (or indeed to find hard to rebuild), but which " @@ -792,7 +793,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:500 +#: ../dgit.7:502 msgid "" "Examples sometimes include crossbuild firmware binaries and documentation. " "To avoid problems when building updated source packages (in particular, to " @@ -802,7 +803,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:508 +#: ../dgit.7:510 msgid "" "dpkg-source does not (with any of the commonly used source formats) " "represent deletion of binaries (outside debian/) present in upstream. Thus " @@ -812,7 +813,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:514 +#: ../dgit.7:516 msgid "" "However, git does always properly record file deletion. Since dgit's " "principle is that the dgit git tree is the same of dpkg-source -x, that " @@ -820,14 +821,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:517 +#: ../dgit.7:519 msgid "" "For the non-maintainer, this can be observed in the following suboptimal " "occurrences:" msgstr "" #. type: Plain text -#: ../dgit.7:525 +#: ../dgit.7:527 msgid "" "The package clean target often deletes these files, making the git tree " "dirty trying to build the source package, etc. This can be fixed by using " @@ -836,7 +837,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:532 +#: ../dgit.7:534 msgid "" "The package build modifies these files, so that builds make the git tree " "dirty. This can be worked around by using `git reset --hard' after each " @@ -844,7 +845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:542 +#: ../dgit.7:544 msgid "" "From the maintainer's point of view, the main consequence is that to make a " "dgit-compatible git branch it is necessary to commit these files to git. " @@ -855,13 +856,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.7:542 +#: ../dgit.7:544 #, no-wrap msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC." msgstr "" #. type: Plain text -#: ../dgit.7:550 +#: ../dgit.7:552 msgid "" "A related problem is other unexpected behaviour by a package's B<clean> " "target. If a package's rules modify files which are distributed in the " @@ -870,7 +871,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:558 +#: ../dgit.7:560 msgid "" "Again, the solution is to use B<dgit -wg> aka B<--clean=git>, which " "instructs dgit to use git clean instead of the package's build target, along " @@ -878,7 +879,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.7:562 +#: ../dgit.7:564 msgid "" "This is 100% reliable, but has the downside that if you forget to git add or " "to commit, and then use B<dgit -wg> or B<git reset --hard>, your changes may " diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 46aa9f4..e0941c5 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2024-04-13 21:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,18 +28,18 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:550 ../git-debrebase.1.pod:473 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../dgit.1:1719 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -82,7 +82,7 @@ msgid "" " git debrebase -i # edit the patch queue\n" " git debrebase conclude && git push # push to eg salsa\n" " git debrebase conclude && dgit push-source # source-only upload\n" -" git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n" +" git debrebase new-upstream 1.2.3-1 [-i] # uses tag, eg \"v1.2.3\"\n" " dpkg-buildpackage -uc -b # get test debs, at any time\n" "\n" msgstr "" @@ -98,62 +98,69 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:24 msgid "" +"When sharing branches, you should usually share a fast-forwarding branch " +"(ie, use C<git-debrebase conclude> (or C<prepush>) before pushing." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:27 +msgid "" "git-debrebase has a special branch format, so see \"CONVERTING AN EXISTING " "PACKAGE\" in L<dgit-maint-debrebase(7)>." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:27 +#: ../git-debrebase.1.pod:30 msgid "GUIDE TO DOCUMENTATION" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:29 +#: ../git-debrebase.1.pod:32 msgid "" "This is the command line reference. There is also a detailed workflow " -"tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK REFERENCE" -"\" is based). For background, theory of operation, and definitions see " -"L<git-debrebase(5)>." +"tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK " +"REFERENCE\" is based). For background, theory of operation, and definitions " +"see L<git-debrebase(5)>." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:36 +#: ../git-debrebase.1.pod:39 msgid "" "You should read this manpage in conjunction with L<git-debrebase(5)/" "TERMINOLOGY>, which defines many important terms used here." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:40 +#: ../git-debrebase.1.pod:43 msgid "PRINCIPAL OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:44 +#: ../git-debrebase.1.pod:47 msgid "git-debrebase [-- <git-rebase options...>]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:46 +#: ../git-debrebase.1.pod:49 msgid "git-debrebase [-i <further git-rebase options...>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:48 +#: ../git-debrebase.1.pod:51 msgid "" "Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> " "below.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:51 +#: ../git-debrebase.1.pod:54 msgid "" "Then, if any git-rebase options were supplied, edits the Debian delta queue, " "using git-rebase, by running" msgstr "" #. type: verbatim -#: ../git-debrebase.1.pod:55 +#: ../git-debrebase.1.pod:58 #, no-wrap msgid "" " git rebase <git-rebase options> <breakwater-tip>\n" @@ -161,7 +168,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:57 +#: ../git-debrebase.1.pod:60 msgid "" "Do not pass a base branch argument: git-debrebase will supply that. Do not " "use --onto, or --fork-point. Useful git-rebase options include -i and --" @@ -169,7 +176,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:62 +#: ../git-debrebase.1.pod:65 msgid "" "If git-rebase stops for any reason, you may git-rebase --abort, --continue, " "or --skip, as usual. If you abort the git-rebase, the branch will still " @@ -177,14 +184,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:68 +#: ../git-debrebase.1.pod:71 msgid "" "The options for git-rebase must either start with C<-i>, or be prececded by " "C<-->, to distinguish them from options for git-debrebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:72 +#: ../git-debrebase.1.pod:75 msgid "" "It is hazardous to use plain git-rebase on a git-debrebase branch, because " "git-rebase has a tendency to start the rebase too far back in history, and " @@ -192,19 +199,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:78 +#: ../git-debrebase.1.pod:81 msgid "git-debrebase status" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:80 +#: ../git-debrebase.1.pod:83 msgid "" "Analyses the current branch, both in terms of its contents, and the refs " "which are relevant to git-debrebase, and prints a human-readable summary." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:85 +#: ../git-debrebase.1.pod:88 msgid "" "Please do not attempt to parse the output; it may be reformatted or " "reorganised in the future. Instead, use one of the L<UNDERLYING AND " @@ -212,107 +219,109 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:91 +#: ../git-debrebase.1.pod:94 msgid "git-debrebase conclude" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:93 +#: ../git-debrebase.1.pod:96 msgid "" "Finishes a git-debrebase session, tidying up the branch and making it fast " "forward again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:96 +#: ../git-debrebase.1.pod:99 msgid "" "Specifically: if the branch is unstitched, launders and restitches it, " "making a new pseudomerge. Otherwise, it is an error, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:102 +#: ../git-debrebase.1.pod:105 msgid "git-debrebase quick" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:104 +#: ../git-debrebase.1.pod:107 msgid "" "Unconditionally launders and restitches the branch, consuming any ffq-prev " "and making a new pseudomerge." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:108 +#: ../git-debrebase.1.pod:111 msgid "If the branch is already laundered and stitched, does nothing." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:110 +#: ../git-debrebase.1.pod:113 msgid "git-debrebase prepush [--prose=<for commit message>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:112 +#: ../git-debrebase.1.pod:115 msgid "If the branch is unstitched, stitches it, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:116 +#: ../git-debrebase.1.pod:119 msgid "" "This is a good command to run before pushing to a git server. You should " "consider using B<conclude> instead, because that launders the branch too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:120 +#: ../git-debrebase.1.pod:123 msgid "git-debrebase stitch [--prose=<for commit message>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:122 +#: ../git-debrebase.1.pod:125 msgid "Stitches the branch, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:125 +#: ../git-debrebase.1.pod:128 msgid "If there is no ffq-prev, it is an error, unless --noop-ok." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:127 +#: ../git-debrebase.1.pod:130 msgid "You should consider using B<prepush> or B<conclude> instead." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:129 +#: ../git-debrebase.1.pod:132 msgid "git-debrebase scrap" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:131 +#: ../git-debrebase.1.pod:134 msgid "" "Throws away all the work since the branch was last stitched. This is done " "by resetting you to ffq-prev and discarding all working tree changes." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:135 +#: ../git-debrebase.1.pod:138 msgid "If you are in the middle of a git-rebase, will abort that too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:137 -msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]" +#: ../git-debrebase.1.pod:140 +msgid "" +"git-debrebase new-upstream <new-version> [<upstream-details>...] [--|-i <git-" +"rebase options...>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:139 +#: ../git-debrebase.1.pod:142 msgid "Rebases the delta queue onto a new upstream version. In detail:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:142 +#: ../git-debrebase.1.pod:145 msgid "" "Firstly, checks that the proposed rebase seems to make sense: It is a snag " "unless the new upstream(s) are fast forward from the previous upstream(s) " @@ -322,12 +331,12 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:150 +#: ../git-debrebase.1.pod:153 msgid "If all seems well, unstitches and launders the branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:152 +#: ../git-debrebase.1.pod:155 msgid "" "Then, generates (in a private working area) a new anchor merge commit, on " "top of the breakwater tip, and on top of that a commit to update the version " @@ -335,26 +344,26 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:160 +#: ../git-debrebase.1.pod:163 msgid "Finally, starts a git-rebase of the delta queue onto these new commits." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:164 +#: ../git-debrebase.1.pod:167 msgid "" "That git-rebase may complete successfully, or it may require your " "assistance, just like a normal git-rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:168 +#: ../git-debrebase.1.pod:171 msgid "" "If you git-rebase --abort, the whole new upstream operation is aborted, " "except for the laundering." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:172 +#: ../git-debrebase.1.pod:175 msgid "" "<new-version> may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " @@ -362,17 +371,17 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:178 +#: ../git-debrebase.1.pod:181 msgid "The <upstream-details> are, optionally, in order:" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:182 +#: ../git-debrebase.1.pod:185 msgid "<upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:184 +#: ../git-debrebase.1.pod:187 msgid "" "The new upstream branch (or commit-ish). The default is to look for one of " "these tags, in this order: U vU upstream/U; where U is the new upstream " @@ -380,7 +389,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:190 +#: ../git-debrebase.1.pod:193 msgid "" "It is a snag if the upstream contains a debian/ directory; if forced to " "proceed, git-debrebase will disregard the upstream's debian/ and take (only) " @@ -388,17 +397,17 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:195 +#: ../git-debrebase.1.pod:198 msgid "<piece-name> <piece-upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:197 +#: ../git-debrebase.1.pod:200 msgid "Specifies that this is a multi-piece upstream. May be repeated." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:200 +#: ../git-debrebase.1.pod:203 msgid "" "When such a pair is specified, git-debrebase will first combine the pieces " "of the upstream together, and then use the result as the combined new " @@ -406,7 +415,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:205 +#: ../git-debrebase.1.pod:208 msgid "" "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes " "the subdirectory <piece-name> in the combined new upstream (supplanting any " @@ -414,14 +423,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:212 +#: ../git-debrebase.1.pod:215 msgid "" "<piece-name> has a restricted syntax: it may contain only ASCII " "alphanumerics and hyphens." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:215 +#: ../git-debrebase.1.pod:218 msgid "" "The combined upstream is itself recorded as a commit, with each of the " "upstream pieces' commits as parents. The combined commit contains an " @@ -430,24 +439,24 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:221 +#: ../git-debrebase.1.pod:224 msgid "<git-rebase options>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:223 +#: ../git-debrebase.1.pod:226 msgid "These will be passed to git rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:225 +#: ../git-debrebase.1.pod:228 msgid "" "If the upstream rebase is troublesome, -i may be helpful. As with plain git-" "debrebase, do not specify a base, or --onto, or --fork-point." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:231 +#: ../git-debrebase.1.pod:234 msgid "" "If you are planning to generate a .dsc, you will also need to have, or " "generate, actual orig tarball(s), which must be identical to the rev-" @@ -458,19 +467,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:242 +#: ../git-debrebase.1.pod:245 msgid "git-debrebase make-patches [--quiet-would-amend]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:244 +#: ../git-debrebase.1.pod:247 msgid "" "Generate patches in debian/patches/ representing the changes made to " "upstream files." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:247 +#: ../git-debrebase.1.pod:250 msgid "" "It is not normally necessary to run this command explicitly. When uploading " "to Debian, dgit and git-debrebase will cooperate to regenerate patches as " @@ -478,7 +487,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:254 +#: ../git-debrebase.1.pod:257 msgid "" "Normally git-debrebase make-patches will require a laundered branch. (A " "laundered branch does not contain any patches.) But if there are already " @@ -488,7 +497,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:263 +#: ../git-debrebase.1.pod:266 msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " @@ -498,53 +507,53 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:272 +#: ../git-debrebase.1.pod:275 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:274 +#: ../git-debrebase.1.pod:277 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:276 +#: ../git-debrebase.1.pod:279 msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:282 +#: ../git-debrebase.1.pod:285 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:286 +#: ../git-debrebase.1.pod:289 msgid "" "a patches-unapplied git packaging branch containing debian/patches, as used " "with quilt" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:291 +#: ../git-debrebase.1.pod:294 msgid "" "a git branch for a package which has no Debian delta - ie where upstream " "files are have not been modified in Debian, so there are no patches" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:297 +#: ../git-debrebase.1.pod:300 msgid "(These two commands operate identically and are simply aliases.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:299 +#: ../git-debrebase.1.pod:302 msgid "" "The conversion is done by generating a new anchor merge, converting any " "quilt patches as a delta queue, and dropping the patches from the tree." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:303 +#: ../git-debrebase.1.pod:306 msgid "" "The upstream commit-ish should correspond to the upstream branch or tag, if " "there is one. It is a snag if it is not an ancestor of HEAD, or if the " @@ -554,7 +563,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:311 +#: ../git-debrebase.1.pod:314 msgid "" "It is also a snag if the specified upstream has a debian/ subdirectory. " "This check exists to detect certain likely user errors, but if this " @@ -562,7 +571,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:317 +#: ../git-debrebase.1.pod:320 msgid "" "git-debrebase will try to look for the dgit archive view of the most recent " "release, and if it finds it will make a pseduomerge so that your new git-" @@ -570,14 +579,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:322 +#: ../git-debrebase.1.pod:325 msgid "" "The result is a well-formed git-debrebase interchange branch. The result is " "also fast-forward from the original branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:325 +#: ../git-debrebase.1.pod:328 msgid "" "It is a snag if the new branch looks like it will have diverged, just as for " "a laundering/unstitching call to git-debrebase; See L</Establish the current " @@ -585,7 +594,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:329 +#: ../git-debrebase.1.pod:332 msgid "" "Note that it is dangerous not to know whether you are dealing with a (gbp) " "patches-unapplied branch containing quilt patches, or a git-debrebase " @@ -594,39 +603,39 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:338 +#: ../git-debrebase.1.pod:341 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:342 +#: ../git-debrebase.1.pod:345 msgid "git-debrebase breakwater" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:344 +#: ../git-debrebase.1.pod:347 msgid "" "Prints the breakwater tip commitid. If your HEAD branch is not fully " "laundered, prints the tip of the so-far-laundered breakwater." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:348 +#: ../git-debrebase.1.pod:351 msgid "git-debrebase anchor" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:350 +#: ../git-debrebase.1.pod:353 msgid "Prints the breakwater anchor commitid." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:352 +#: ../git-debrebase.1.pod:355 msgid "git-debrebase analyse" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:354 +#: ../git-debrebase.1.pod:357 msgid "" "Walks the history of the current branch, most recent commit first, back " "until the most recent anchor, printing the commit object id, and commit type " @@ -634,44 +643,31 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:362 +#: ../git-debrebase.1.pod:365 msgid "git-debrebase record-ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:364 +#: ../git-debrebase.1.pod:367 msgid "" "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING " "AND LAUNDERING>, but does not launder the branch or move HEAD." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:368 +#: ../git-debrebase.1.pod:371 msgid "" "It is an error if the ffq-prev could not be recorded. It is also an error " "if an ffq-prev has already been recorded, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:372 -msgid "git-debrebase launder-v0" -msgstr "" - -#. type: textblock -#: ../git-debrebase.1.pod:374 -msgid "" -"Launders the branch without recording anything in ffq-prev. Then prints " -"some information about the current branch. Do not use this operation; it " -"will be withdrawn soon." -msgstr "" - -#. type: =item -#: ../git-debrebase.1.pod:379 +#: ../git-debrebase.1.pod:375 msgid "git-debrebase convert-to-gbp" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:381 +#: ../git-debrebase.1.pod:377 msgid "" "Converts a laundered branch into a gbp patches-unapplied branch containing " "quilt patches. The result is not fast forward from the interchange branch, " @@ -679,7 +675,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:386 +#: ../git-debrebase.1.pod:382 msgid "" "This is provided mostly for the test suite and for unusual situations. It " "should only be used with care and with a proper understanding of the " @@ -687,19 +683,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:391 +#: ../git-debrebase.1.pod:387 msgid "" "Be sure to not accidentally treat the result as a git-debrebase branch, or " "you will drop all the patches!" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:395 +#: ../git-debrebase.1.pod:391 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:397 +#: ../git-debrebase.1.pod:393 msgid "" "Converts any dgit-compatible git branch corresponding to a (possibly " "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " @@ -707,7 +703,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:401 +#: ../git-debrebase.1.pod:397 msgid "" "This operation should not be used if the branch is already in git-debrebase " "form. Normally git-debrebase will refuse to continue in this case (or " @@ -715,7 +711,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:406 +#: ../git-debrebase.1.pod:402 msgid "" "Some representation of the original upstream source code will be needed. If " "I<upstream> is supplied, that must be a suitable upstream commit. By " @@ -724,7 +720,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:412 +#: ../git-debrebase.1.pod:408 msgid "" "The upstream source must be exactly right and all the patches in debian/" "patches must be up to date. Applying the patches from debian/patches to the " @@ -732,7 +728,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:417 +#: ../git-debrebase.1.pod:413 msgid "" "The output is laundered and stitched. The resulting history is not " "particularly pretty, especially if orig tarball(s) were imported to produce " @@ -740,31 +736,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:422 +#: ../git-debrebase.1.pod:418 msgid "" "The available convert-options are as follows. (These must come after " "convert-from-dgit-view.)" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:427 +#: ../git-debrebase.1.pod:423 msgid "--[no-]diagnose" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:429 +#: ../git-debrebase.1.pod:425 msgid "" "Print additional error messages to help diagnose failure to find an " "appropriate upstream. --no-diagnose is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:433 +#: ../git-debrebase.1.pod:429 msgid "--build-products-dir" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:435 +#: ../git-debrebase.1.pod:431 msgid "" "Directory to look in for orig tarballs. The default is the git config " "option dgit.default.build-products-dir or failing that, C<..>. Passed on to " @@ -772,35 +768,35 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:441 +#: ../git-debrebase.1.pod:437 msgid "--[no-]origs" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:443 +#: ../git-debrebase.1.pod:439 msgid "" "Whether to try to look for or use any orig tarballs. --origs is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:446 +#: ../git-debrebase.1.pod:442 msgid "--[no-]tags" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:448 +#: ../git-debrebase.1.pod:444 msgid "" "Whether to try to look for or use any upstream git tags. --tags is the " "default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:451 +#: ../git-debrebase.1.pod:447 msgid "--always-convert-anyway" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:453 +#: ../git-debrebase.1.pod:449 msgid "" "Perform the conversion operation, producing unpleasant extra history, even " "if the branch seems to be in git-debrebase form already. This should not be " @@ -808,12 +804,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:461 +#: ../git-debrebase.1.pod:457 msgid "git-debrebase forget-was-ever-debrebase" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:463 +#: ../git-debrebase.1.pod:459 msgid "" "Deletes the ffq-prev and debrebase-last refs associated with this branch, " "that git-debrebase and dgit use to determine whether this branch is managed " @@ -821,19 +817,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:469 +#: ../git-debrebase.1.pod:465 msgid "" "This can be useful if you were just playing with git-debrebase, and have " "used git-reset --hard to go back to a commit before your experiments." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:473 +#: ../git-debrebase.1.pod:469 msgid "Do not use this if you expect to run git-debrebase on the branch again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:479 +#: ../git-debrebase.1.pod:475 msgid "" "This section documents the general options to git-debrebase (ie, the ones " "which immediately follow git-debrebase or git debrebase on the command " @@ -842,78 +838,78 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:491 +#: ../git-debrebase.1.pod:487 msgid "-f<snag-id>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:493 +#: ../git-debrebase.1.pod:489 msgid "Turns snag(s) with id <snag-id> into warnings." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:495 +#: ../git-debrebase.1.pod:491 msgid "" "Some troublesome things which git-debrebase encounters are B<snag>s. (The " "specific instances are discussed in the text for the relevant operation.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:500 +#: ../git-debrebase.1.pod:496 msgid "" "When a snag is detected, a message is printed to stderr containing the snag " "id (in the form C<-f<snag-idE<gt>>), along with some prose." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:505 +#: ../git-debrebase.1.pod:501 msgid "" "If snags are detected, git-debrebase does not continue, unless the relevant -" "f<snag-id> is specified, or --force is specified." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:509 +#: ../git-debrebase.1.pod:505 msgid "--force" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:511 +#: ../git-debrebase.1.pod:507 msgid "Turns all snags into warnings. See the -f<snag-id> option." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:514 +#: ../git-debrebase.1.pod:510 msgid "" "Do not invoke git-debrebase --force in scripts and aliases; instead, specify " "the particular -f<snag-id> for expected snags." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:517 +#: ../git-debrebase.1.pod:513 msgid "--noop-ok" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:519 +#: ../git-debrebase.1.pod:515 msgid "" "Suppresses the error in some situations where git-debrebase does nothing, " "because there is nothing to do." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:523 +#: ../git-debrebase.1.pod:519 msgid "" "The specific instances are discussed in the text for the relvant operation." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:526 +#: ../git-debrebase.1.pod:522 msgid "--anchor=<commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:528 +#: ../git-debrebase.1.pod:524 msgid "" "Treats <commit-ish> as an anchor. This overrides the usual logic which " "automatically classifies commits as anchors, pseudomerges, delta queue " @@ -921,74 +917,91 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:532 +#: ../git-debrebase.1.pod:528 msgid "" "It also disables some coherency checks which depend on metadata extracted " -"from its commit message, so it is a snag if <commit-ish> is the anchor for " -"the previous upstream version in git-debrebase new-upstream operations." +"from its commit message, so it is a snag (C<-fanchor-treated>) if <commit-" +"ish> is the anchor for the previous upstream version in git-debrebase new-" +"upstream operations. You have to check yourself that the new upstream is " +"fast forward from the old one, and has the right components (as if " +"applicable)." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:539 +#: ../git-debrebase.1.pod:538 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:541 +#: ../git-debrebase.1.pod:540 msgid "" "Run <program>, instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:545 +#: ../git-debrebase.1.pod:544 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:547 +#: ../git-debrebase.1.pod:546 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:549 +#: ../git-debrebase.1.pod:548 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:551 +#: ../git-debrebase.1.pod:550 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:554 +#: ../git-debrebase.1.pod:553 msgid "" -"This option may generate lossage of various kinds, including misleading " -"error messages, references to nonexistent documentation, and you being " -"handed an incomprehensible pile of multidimensional merge wreckage." +"If using this option succeeds, the output is likely to be correct, although " +"it would be a good idea to check that it seems sane." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:557 +msgid "If it fails, your tree should be left where it was." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:559 +msgid "" +"However, there may be lossage of various kinds, including misleading error " +"messages, and references to nonexistent documentation. On merge failure, it " +"might invite you to delve into an incomprehensible pile of multidimensional " +"merge wreckage, which is supposed to be left in special refs invented for " +"the purpose (so, not your working tree, or HEAD)." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:562 +#: ../git-debrebase.1.pod:571 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:564 +#: ../git-debrebase.1.pod:573 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:567 +#: ../git-debrebase.1.pod:576 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:569 +#: ../git-debrebase.1.pod:578 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -996,30 +1009,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:581 +#: ../git-debrebase.1.pod:590 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:586 +#: ../git-debrebase.1.pod:595 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:591 +#: ../git-debrebase.1.pod:600 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:596 +#: ../git-debrebase.1.pod:605 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:601 +#: ../git-debrebase.1.pod:610 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1027,7 +1040,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:606 +#: ../git-debrebase.1.pod:615 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -1036,31 +1049,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:612 +#: ../git-debrebase.1.pod:621 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:616 +#: ../git-debrebase.1.pod:625 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:618 +#: ../git-debrebase.1.pod:627 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:623 +#: ../git-debrebase.1.pod:632 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:625 +#: ../git-debrebase.1.pod:634 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1068,13 +1081,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:631 +#: ../git-debrebase.1.pod:640 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:636 +#: ../git-debrebase.1.pod:645 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" diff --git a/tag2upload.5.pod b/tag2upload.5.pod new file mode 100644 index 0000000..d00f905 --- /dev/null +++ b/tag2upload.5.pod @@ -0,0 +1,217 @@ +=head1 NAME + +tag2upload - protocol for uploading to Debian via signed git tag + +=head1 INTRODUCTION + +tag2upload is a scheme that allows an authorised Debian package maintainer +to update a package in the Debian archive, +by pushing an appropriate signed git tag. + +Typically these tags are created with git-debpush, +and interpreted by +C<dgit-repos-server --tag2upload>. + +However, the tags are plain git tags, +with small amounts of additional metadata, +so they could be made by other tooling. + +This document defines the syntax and semantics of the tag. + +=head1 BASICS + +A signed git tag is an instruction to the tag2upload service +if the tag message contains a line looking like this: + + [dgit ... please-upload ...] + +The tag must be signed by an authorised uploader, +for the relevant package. +The tagged object must be a git commit. +Metadata about the intended operation is obtained from both +the tag message +and the referenced git tree object. + +=head1 GIT METADATA + +The git tag's name must be C<DISTRO/VERSION>, +where VERSION is in the Debian package version number +transformed to be valid for git as specified in DEP-14, +and DISTRO is the distribution name +(the DEP-14 "vendor", C<debian> for Debian). + +The email address from git's C<tagger> field +(ie, the author of the tag, from git's point of view) +will be emailed any error reports. + +=head1 TAG2UPLOAD IN-TAG METADATA + +tag2upload reuses a tag metadata format, +and some metadata semantics, +from dgit. + +Metadata lines are in the form C<[dgit ...]>. +The brackets must be at the start and end of the line. +Inside the brackets, after C<dgit>, +are space separated metadata items. + +Each metadata item is C<keyword> or C<keyword=value>. +Keywords start with one of the characters C<- + . = 0-9 a-z>. +Items may not contain whitespace. +Any metadata line whose first item starts with a double quote C<"> +is reserved for future expansion, and the whole line is ignored. + +The placement and ordering of metadata items is not relevant, +unless specified otherwise here. +Some metadata items may be repeated. +Unknown keywords are ignored. + +=over + +=item C<please-upload> + +Declares that this tag is indeed an instruction +to a tag2upload service, +to produce and upload a source package +based on the commit at which the tag points. + +The relevant git objects will also be pushed to +a canonical server belonging to the targeted distro +(in Debian's case, *.dgit.debian.org). + +=item C<distro=DISTRO> + +Specifies an intended distribution, +to which the package is to be uploaded. +May be repeated. + +Each tag2upload instance ignores tags +which do not mention that instance's DISTRO. +So for a tag to be effective, +at least one distro= must be present. + +(Note that DISTRO also appears in the tag name, +so uploading to multiple distros necessarily involves several tags, +although they may have the same tag message.) + +=item C<upstream>=COMMITID C<upstream-tag>=TAG + +Identifies the upstream source code to be used. + +This corresponds to the "orig" in the source package. +The orig tarball will be generated with C<git archive>, +as invoked by C<git deborig>. + +Both or neither of these must be supplied. +TAG must be fetchable from the same repo as the tag2upload tag, +and must resolve to COMMMITID. + +If these are omitted, +any necessary orig must already be present +in the target source package archive. +With C<baredebian> quilt modes, this option is mandatory. + +(This metadata item might be ignored if the git tree +specifies a native source package format, +or if the targeted archive already contains a suitable orig.) + +=item C<--quilt=QUILT-MODE> + +Specifies the git tree format in use, +for a C<3.0 (quilt)> source package. + +The semantics are the same as for the identically-named dgit option. + +If this option is not specified, +the default is C<quilt=linear> +(depending on the distro and configuration). + +=item C<--deliberately=...> + +The semantics are the same as for the identically-named dgit option. +Unused or unknown deliberately options are ignored. + +=item C<split> + +Instructs the tag2upload service that this upload is +to be made in "split git view" mode: + +When converting from git to a source package, +and in order to push and upload, +it may be necessary to make changes -- +both to tree content and to git history. +For example, it may be necessary to apply quilt patches, +or to make the git branch fast-forwarding +from previous history in the targeted suite. + +C<split> instructs the tag2upload service to +make these changes, +and push git commits representing these changes +to only its canonical target repository. +I.e., the suite branch in the canonical target repository +may contain additional changes, +but these will not be automatically pushed +back to a maintainer-owned git repository +(eg salsa.debian.org). +The git history on the canonical target repository is always descended +from the form supplied by the tagger; +it can be readily obtained using dgit. + +Under the current implementation, +this metadata item is mandatory, +because the service is not capable +of doing anything else. + +=back + +=head1 IN-TREE METADATA + +The source package name, +target suite(s), +and version number, +are obtained from +F<debian/changelog>. + +The package and version must correspond to F<debian/control>, +or it is an error. + +=head1 CONTENTS OF THE TREE + +The tree must be in the form of an unpacked Debian source package. + +For a non-native source package format, +the upstream files must correspond to +any upstream commit specified, +or the orig already present in the archive -- +either patched or unpatched, according to the quilt mode. + +Mismatches will cause the tag2upload service's processing to fail. + +=head1 REPLAY + +Uploading is intended to be an idempotent process. + +Thus, the tag2upload tag is an instruction to upload +I<only if the supplied version is later than the one in the targeted suite>. + +Old tags, specifying old versions, will be rejected +(although replay attempts might generate some error mail to the tagger). + +=head1 INVOCATION AND QUEUEING + +Normally, arrangements will be made so that the tag2upload service +becomes aware of new git tags, in relevant repositories; +for example, by means of webhooks. + +If this mechanism fails, the tagging user may need to manually +provoke the tag2upload service into rescanning the relevant repository. + +=head1 CREDITS + +tag2upload was designed by Ian Jackson <ijackson@chiark.greenend.org.uk> and +Sean Whitton <spwhitton@spwhitton.name>. + +=head1 SEE ALSO + +dgit(1), +git-debpush(1). diff --git a/tests/http-static-server b/tests/http-static-server index f2f7cd0..723114e 100755 --- a/tests/http-static-server +++ b/tests/http-static-server @@ -71,10 +71,11 @@ sub handle_request { if (!$self->serve_static($cgi, $::webroot)) { print "HTTP/1.0 404 Not found\r\n"; - print $cgi->header, - $cgi->start_html('Not found'), + print $cgi->header; + print $cgi->start_html('Not found'), $cgi->h1('Not found'), - $cgi->end_html; + $cgi->end_html + if uc $cgi->request_method eq 'GET'; } } @@ -1,7 +1,6 @@ # exec 2>&1 -set -x set -o pipefail . tests/lib-core @@ -25,21 +24,42 @@ END trap ' rc=$? set +x + redirected_log="$DGIT_TEST_REDIRECTED_LOG" + if [ "$redirected_log" ]; then + exec 2>&5 >&2 + unset DGIT_TEST_REDIRECTED_LOG + cat -- "$redirected_log" ||: + fi test $rc = 0 || echo " %%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%% Most relevant logs are just before assignment rc=$rc Will now do cleanup etc. " - set -x + if [ $rc != 0 ] || ! [ "$DGIT_TRAP_QUIET" ]; then + set -x + pwd + fi set +e - pwd [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \ [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean set -e test $rc = 0 || t-report-failure ' EXIT +if [ "$AUTOPKGTEST_ARTIFACTS" ] && ! [ "$DGIT_TEST_REDIRECTED_LOG" ] \ + && ! [ "$DGIT_TEST_DIRECT_LOG" ]; then + # When running under real autopkgtest, don't spew our megabytes of + # logs unconditionally. Redirect them to a file, and print them + # only on failure. On success, t-save-artifacts comppresses them. + exec 5>&2 + export DGIT_TEST_REDIRECTED_LOG="$AUTOPKGTEST_ARTIFACTS"/"${0##*/}.log" + exec >"$DGIT_TEST_REDIRECTED_LOG" + exec 2>&1 +fi + +set -x + t-filter-out-git-hyphen-dir t-set-intree @@ -165,6 +185,7 @@ t-expect-push-fail () { t-reporefs pre-push t-expect-fail "$mpat" "$@" + cp $tmp/t.output $tmp/t.push-output t-reporefs post-push diff $tmp/show-refs.{pre,post}-push @@ -173,6 +194,23 @@ t-expect-push-fail () { eval "$t_expect_push_fail_hook" } +t-expect-push-fail-retriably () { + t-expect-push-fail "$@" + grep 'You can retry the push, after fixing the problem, if you like' \ + $tmp/t.push-output +} + +t-expect-push-fail-tainted () { + # t-expect-push-fail-local-and-remote $m $push_args... + # Message is implicitly prefixed with 'E:^' + # to avoid spotting them in protocol debug output etc. + # Same message is expected from the remote. + local m="$1"; shift + + t-expect-push-fail-retriably "E:^$m" "$@" + t-expect-push-fail "E:^remote: $m" "$@" --force-push-tainted +} + t-git-objects-not-present () { # t-git-objects-not-present GITDIR|'' OBJID [...] # specifying '' means the repo for package $p @@ -436,6 +474,8 @@ t-git-fsck () { 0) fail "unexpected messages from git-fsck" ;; *) fail "grep of git-fsck failed" ;; esac + + t-output "" git log --all --grep '^\[dgit .*INTERNAL.*]' } t-check-only-bpd () { @@ -467,8 +507,22 @@ t-save-artifacts () { artifacts="$AUTOPKGTEST_ARTIFACTS" if [ x"$artifacts" = x ]; then return; fi if [ x"tmp" = x ]; then return; fi + # Empirically in a non-autopkgtest run with AUTOPKGTEST_ARTIFACTS + # this `-1` flag to gzip decreased the runtime from 585s (2558s CPU) + # to 609s (2730s CPU), a decrease of 5-7%. It increased the + # total size of the artifacts from 24220k to 26092k, ie +8%, + # but in a real autopkgtest run there are many bigger things + # alongside AUTOPKGTEST_ARTIFACTS put there by autopkgtest itself. GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \ --exclude=\*.tar . + local logfile="$DGIT_TEST_REDIRECTED_LOG" + if [ "$logfile" ]; then + unset DGIT_TEST_REDIRECTED_LOG + set +x + DGIT_TRAP_QUIET=1 + exec >&5 2>&1 + gzip -f -- "$logfile" + fi } t-rm-dput-dropping () { @@ -604,6 +658,7 @@ t-setup-import () { simport="$1"; shift if [ -e "$simport" ]; then exit 0; fi env - "$@" \ + env -u DGIT_TEST_REDIRECTED_LOG \ "tests/setup/$setupname" ' x "$root" "$setupname" "$simport" fi @@ -1323,6 +1378,7 @@ t-alt-test () { } t-git-config dgit.default.old-dsc-distro test-dummy +t-git-config dgit-distro.test-dummy.policy-query-supported-ssh true for import in ${autoimport-gnupg}; do case "$0" in diff --git a/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz b/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz Binary files differindex dc1614c..5f9ae71 100644 --- a/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz +++ b/tests/pkg-srcs/example_1.0-1+absurd.debian.tar.xz diff --git a/tests/pkg-srcs/example_1.0-1+absurd.dsc b/tests/pkg-srcs/example_1.0-1+absurd.dsc index b26fcbe..cc7f80b 100644 --- a/tests/pkg-srcs/example_1.0-1+absurd.dsc +++ b/tests/pkg-srcs/example_1.0-1+absurd.dsc @@ -11,12 +11,12 @@ Package-List: Checksums-Sha1: 2bc730f941db49de57e9678fb0b07bd95507bb44 236 example_1.0.orig-docs.tar.gz 4bff9170ce9b10cb59937195c5ae2c73719fe150 373 example_1.0.orig.tar.gz - c0beeb06befcfbdd5952c6925801ac17c172d29e 1412 example_1.0-1+absurd.debian.tar.xz + 6ee4c2149fecb1924ffde88c034deefe6a4cee9d 1528 example_1.0-1+absurd.debian.tar.xz Checksums-Sha256: ad9671f6b25cdd9f0573f803f702448a45a45183db1d79701aa760bccbeed29c 236 example_1.0.orig-docs.tar.gz a3ef7c951152f3ec754f96fd483457aa88ba06df3084e6f1cc7c25b669567c17 373 example_1.0.orig.tar.gz - 673169591a1de79f28da17b08768fd8fb1b1e84721df6f1fd9b4708f33f2c80c 1412 example_1.0-1+absurd.debian.tar.xz + 79702097c21c31773f7fa3b5d0f4e535e6d6a66952075185b81915bfb27a62a8 1528 example_1.0-1+absurd.debian.tar.xz Files: cb0cb5487b1e5bcb82547396b4fe93e5 236 example_1.0.orig-docs.tar.gz 599f47808a7754c66aea3cda1b3208d6 373 example_1.0.orig.tar.gz - 27324c0ef68306a4fa9c29ab7ade2492 1412 example_1.0-1+absurd.debian.tar.xz + ed26c7be15f59fafbacffb505365731a 1528 example_1.0-1+absurd.debian.tar.xz diff --git a/tests/tests/badcommit-rewrite b/tests/tests/badcommit-rewrite deleted file mode 100755 index f116723..0000000 --- a/tests/tests/badcommit-rewrite +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -set -e -. tests/lib - -t-setup-import examplegit -t-tstunt-parsechangelog - -cd $tmp/git/$p.git -git config core.sharedRepository true -chmod -R g+w objects -umask 022 - -cd $tmp/example - -suite=stable - -t-commit 'No changes, just send to stable' '' stable - -t-make-badcommit -git reset --hard $badcommit - -t-dgit -wgf build -t-dgit push-built --overwrite=1.2 stable -t-archive-process-incoming stable - -rstable=refs/remotes/dgit/dgit/stable - -t-dgit fetch stable -t-has-parent-or-is $rstable $badcommit - -fixup=${DGIT_BADCOMMIT_FIXUP-dgit-badcommit-fixup} - -cd $tmp/git/$p.git -git gc --aggressive --prune=all -rmdir objects/* ||: - -$fixup --real - -cd $tmp/$p -git symbolic-ref HEAD >../sym.before -git rev-parse HEAD >../ref.before - -$fixup --real - -git symbolic-ref HEAD >../sym.after -git rev-parse HEAD >../ref.after -diff ../sym.before ../sym.after -set +e; diff ../ref.before ../ref.after; rc=$?; set -e; test $rc = 1 - -t-dgit fetch stable - -t-expect-fail "child $rstable lacks parent $badcommit" \ -t-has-parent-or-is $rstable $badcommit - -check_shared () { - find "$1" -perm -200 \! -perm -020 -ls |tee $tmp/badperm - test -f $tmp/badperm -a ! -s $tmp/badperm -} - -check_shared $tmp/git/$p.git/objects - -t-ok diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject index e02abd4..bc084ae 100755 --- a/tests/tests/debpolicy-newreject +++ b/tests/tests/debpolicy-newreject @@ -27,7 +27,8 @@ t-git-objects-not-present "" $bad ' t-dgit build -t-expect-push-fail 'forbidden for testing' \ +t-expect-push-fail-tainted \ + 'Reason: forbidden for testing' \ t-dgit push --new t-git-dir-check enoent @@ -53,7 +54,8 @@ t-git-dir-check enoent t-commit 'should require --deliberately...questionable' t-dgit build -t-expect-push-fail E:"tag $tagpfx/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \ +t-expect-push-fail-tainted \ + "Reason: tag $tagpfx/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \ t-dgit push --new t-git-dir-check enoent @@ -77,23 +79,27 @@ git reset --hard start t-commit 'should require --deliberately..not-ff' t-dgit build -t-expect-push-fail "HEAD is not a descendant of the archive's version" \ +# Rewound, without passing the option +t-expect-push-fail-retriably \ + E:"^dgit: error: .* HEAD is not a descendant of the archive's version" \ t-dgit push +# Rewound, passing stunt option to defeat local checks +# so we check that remote check is effective. t-expect-push-fail \ - "Package is in NEW and has not been accepted or rejected yet" \ + E:"^remote: Package is in NEW and has not been accepted or rejected yet" \ t-dgit --deliberately-TEST-dgit-only-not-fast-forward push t-dgit --deliberately-not-fast-forward --force-reusing-version push cd $dgitrepo -t-expect-push-fail "Not a valid object name" \ +t-expect-fail "Not a valid object name" \ git cat-file -p $oldobj cd $tmp/$p t-commit 'Still not accepted, will override taint' t-dgit build -t-expect-push-fail \ +t-expect-push-fail-tainted \ "Package is in NEW and has not been accepted or rejected yet" \ t-dgit push @@ -109,17 +115,30 @@ t-dgit push git checkout -b stoats $tagpfx/$vanished t-commit 'Simulate accidentally building on rejected version' t-dgit build -t-expect-push-fail "HEAD is not a descendant of the archive's version" \ +t-expect-push-fail \ + E:"^dgit: error:.* HEAD is not a descendant of the archive's version" \ t-dgit push : "check that uploader can't force it now" -t-expect-push-fail "not fast forward on dgit branch" \ -t-dgit --deliberately-not-fast-forward push +t-expect-push-fail \ + E:"^remote: .*: reject: not fast forward on dgit branch" \ +t-dgit --deliberately-not-fast-forward push \ + --deliberately-include-questionable-history \ + --force-push-tainted +# Ideally ^ this would be detected locally first, in which case we would +# use t-expect-push-fail-tainted or something like it. But it isn't. t-dgit pull t-dgit build -t-expect-push-fail \ +t-expect-push-fail-tainted \ 'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \ t-dgit --force-reusing-version push +: "override the previous taint check" +t-dgit --force-reusing-version push-source \ + --deliberately-include-questionable-history + +t-commit 'Check taint is truly gone' +t-dgit push-source + t-ok diff --git a/tests/tests/debpolicy-taintrm b/tests/tests/debpolicy-taintrm index a9e54da..eccc290 100755 --- a/tests/tests/debpolicy-taintrm +++ b/tests/tests/debpolicy-taintrm @@ -17,6 +17,12 @@ t-dgit setup-mergechangelogs t-dgit push-source --new +t-commit 'edit after first push' + +t-expect-push-fail-tainted \ + 'Package is in NEW and has not been accepted or rejected yet' \ +t-dgit push-source --new + : cut rm $tmp/incoming/* @@ -31,10 +37,15 @@ t-commit 'edit after cut' : push, needs --deliberately -t-expect-push-fail \ - 'all previously pushed versions were found to have been removed from NEW' \ +t-expect-push-fail-tainted \ + 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ t-dgit push-source --new +t-expect-push-fail-tainted \ + 'Reason:.* all previously pushed versions were found to have been removed from NEW' \ +t-dgit push-source --new --deliberately-not-fast-forward \ + --force-reusing-version + t-dgit push-source --new --deliberately-include-questionable-history \ --force-reusing-version diff --git a/tests/tests/distropatches-reject b/tests/tests/distropatches-reject index 00e5edc..58c62ce 100755 --- a/tests/tests/distropatches-reject +++ b/tests/tests/distropatches-reject @@ -9,7 +9,7 @@ cp $troot/pkg-srcs/${p}_3.2.6.orig.tar.gz . t-worktree test cd $p -t-dgit --quilt=smash -wgf quilt-fixup +t-dgit --quilt=try-linear -wgf quilt-fixup build () { t-dgit -wg --dpkg-buildpackage:-d build diff --git a/tests/tests/dpkgsourceignores-correct b/tests/tests/dpkgsourceignores-correct index f71c3a4..f3d70fa 100755 --- a/tests/tests/dpkgsourceignores-correct +++ b/tests/tests/dpkgsourceignores-correct @@ -48,6 +48,6 @@ git add . git commit -m 'want these' t-dgit --quilt=smash -wgf build-source -t-dgit -wgf push-built +t-dgit --force-uploading-old-version -wgf push-built t-ok diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects index f102d95..72db5a9 100755 --- a/tests/tests/drs-push-rejects +++ b/tests/tests/drs-push-rejects @@ -76,7 +76,7 @@ for h in object type tag; do rc=$? set -e - if [ $rc = 128 ] && grep 'fatal: corrupt tag' badtag.err; then + if [ $rc = 128 ] && egrep 'fatal: corrupt tag|error: object fails fsck: missing.*Entry: invalid format' badtag.err; then continue elif [ $rc != 0 ]; then cat badtag.err @@ -144,11 +144,23 @@ mktag mustfail 'tag name in tag is wrong' \ refs/tags/$tagpfx/wombat:refs/tags/$tagpfx/$version $push_spec1 -t-make-badcommit -git checkout -b broken $badcommit -prep unstable sid -mktag -mustfail "corrupted object $badcommit" $push_spec +set +e +badcommit=$( + set -e + LC_MESSAGES=C t-make-badcommit 2>badcommit.err + echo "$badcommit" +) +rc=$? +set -e +if [ $rc = 0 ]; then + git checkout -b broken $badcommit + prep unstable sid + mktag + mustfail "corrupted object $badcommit" $push_spec +elif [ $rc = 128 ] && egrep 'error: object fails fsck: missingCommitter: invalid format' badcommit.err; then :; else + cat badcommit.err + fail "could not bad commit" +fi git checkout dgit/sid prep unstable sid diff --git a/tests/tests/gdr-fresh b/tests/tests/gdr-fresh index 169181c..642aacc 100755 --- a/tests/tests/gdr-fresh +++ b/tests/tests/gdr-fresh @@ -25,21 +25,22 @@ git commit -m 'initial debianisation' t-make-orig example 1.0 -dgit-quilt-fixup-uses-gdr () { +dgit-quilt-fixup-uses-dgit-linear () { t-git-next-date DGIT_TEST_DEBUG=-DD t-dgit quilt-fixup 2>&1 |tee ../fixup.out - grep '^branch_is_gdr .* YES$' ../fixup.out + grep '^branch_is_gdr .* unmarked BreakwaterStart NO$' ../fixup.out + + t-dgit --quilt=nofix quilt-fixup } -dgit-quilt-fixup-uses-gdr +dgit-quilt-fixup-uses-dgit-linear git checkout --detach patch-queue/quilt-tip git rebase master git push . HEAD:master git checkout master -dgit-quilt-fixup-uses-gdr -t-gdr-made-patches +dgit-quilt-fixup-uses-dgit-linear t-ok diff --git a/tests/tests/gdr-import-nostitch b/tests/tests/gdr-import-nostitch index c32b71e..3833c2e 100755 --- a/tests/tests/gdr-import-nostitch +++ b/tests/tests/gdr-import-nostitch @@ -25,6 +25,6 @@ t-git-debrebase -fupstream-has-debian -funused-patches -fseries-comments \ convert-from-gbp \ 2>&1 | tee ../convert-msg -grep -e 'dgit --overwrite will be needed' ../convert-msg >/dev/null +grep -e 'dgit --trust-changelog will be needed' ../convert-msg >/dev/null t-ok diff --git a/tests/tests/gitworktree b/tests/tests/gitworktree index e0f0e0d..e8963b7 100755 --- a/tests/tests/gitworktree +++ b/tests/tests/gitworktree @@ -22,6 +22,6 @@ git add modification git commit -m 'want this' t-dgit -wgf quilt-fixup -t-dgit -wgf --quilt=nofix push-source +t-dgit -wgf --quilt=nofix push-source --force-uploading-old-version t-ok diff --git a/tests/tests/i18n-messages b/tests/tests/i18n-messages index f2aaa87..babcff1 100755 --- a/tests/tests/i18n-messages +++ b/tests/tests/i18n-messages @@ -3,7 +3,7 @@ set -e autoimport= . tests/lib -t-dependencies NO-DGIT GDR +t-dependencies NO-DGIT GDR locales-all t-restrict x-dgit-out-of-tree-only # We don't run this test in-tree because: # 1. The .mo files that we would use might need to be built @@ -31,6 +31,7 @@ git checkout master anchor=$(t-git-debrebase anchor) +expect_fail_lcmessages=C.UTF-8 t-expect-fail F:'old anchor is recognised' \ t-git-debrebase --anchor=$anchor new-upstream 2.1 diff --git a/tests/tests/import-linkorigs b/tests/tests/import-linkorigs index 815f960..ff0d816 100755 --- a/tests/tests/import-linkorigs +++ b/tests/tests/import-linkorigs @@ -3,6 +3,8 @@ set -e . tests/lib . $troot/lib-import-chk +t-dependencies xz-utils + t-tstunt-parsechangelog t-archive-none example @@ -58,3 +60,17 @@ for bpdhow in none rel abs; do cd ../.. done done + +rm -rf dupes +cp -a rel-rel dupes +cd dupes +orig=${p}_${v%-*}.orig.tar +zcat bpd/$orig.gz | xz -1 >$orig.xz +cd $p + +ls -al ../bpd + +t-expect-fail 'Duplicate/inconsistent orig tarballs' \ +t-dgit build-source + +t-ok diff --git a/tests/tests/import-pushold b/tests/tests/import-pushold new file mode 100755 index 0000000..ed73fa3 --- /dev/null +++ b/tests/tests/import-pushold @@ -0,0 +1,37 @@ +#!/bin/bash +set -e +. tests/lib + +t-tstunt-parsechangelog + +p=example +old=1.0-1 +current=1.0-1.100 + +t-archive $p $current +t-git-none + +mkdir $p +cd $p +git init +t-dgit import-dsc $troot/pkg-srcs/${p}_${old}.dsc main +git checkout main + +t-dgit fetch + +: "attempt push of old" + +t-expect-fail 'trying to push an old version' \ +t-dgit push-source --deliberately-not-fast-forward --overwrite + +: "attempt push of current" + +t-dgit checkout sid + +t-expect-fail 'trying to push an old version' \ +t-dgit push-source --deliberately-not-fast-forward --overwrite + +t-dgit push-source --force-uploading-old-version +t-pushed-good dgit/sid + +t-ok diff --git a/tests/tests/import-r1clog b/tests/tests/import-r1clog new file mode 100755 index 0000000..80044aa --- /dev/null +++ b/tests/tests/import-r1clog @@ -0,0 +1,94 @@ +#!/bin/bash +set -e +. tests/lib + +p=sunxi-tools +v_upstr=1.2 +v_base=$v_upstr-2 +v_input=$v_base.~~dgittest + +dpkg-source -x $troot/pkg-srcs/${p}_${v_input}.dsc unmang + +mkdir $p +cd $p +git init +cd .. + +perl-i-clog () { + perl -i "$@" debian/changelog +} + +mangle-start () { + mang=$1 + v="$v_base.$mang" + cp -al unmang $mang + cd $mang + perl-i-clog -pe 's{\~\~dgittest}{'$mang'} if $.==1' + cat >>debian/changelog <<'END' + +sunxi-tools (1.0-1) unstable; urgency=medium + + * Lies for dgit testing + + -- Example <example@example.org> Sat, 12 Jul 2011 20:51:56 +0100 +END +} +mangle-import () { + rm -f debian/*~ + dpkg-source -b . + cd ../$p + t-dgit import-dsc ../${p}_${v}.dsc $mang + git checkout $mang +} +mangle-done () { + cd .. +} + +mangle-start good +mangle-import + +: ---------- 'check that if all is well we make right author line' ---------- + +perl -ne <debian/changelog ' + next unless m{^'$p' \('$v_upstr'-1\) }...m{^\S}; + next unless m{^ -- (.*) (.*) ([-+]\d+)}; + $time_t = `date -d "$2 $3" +%s`; + chomp $time_t; + $authline = "$1 $time_t $3"; + print "author $authline\n"; + print "committer $authline\n"; + exit 0; +' >../headlines-exp +ch=$(git log -P --grep '^\[dgit import orig ' --pretty='format:%H') +git cat-file commit $ch | +perl -ne 'next if m/^$/..0; print if m/^(?:author|committer) /' \ + >../headlines-got-orig +diff ../headlines-exp ../headlines-got-orig + +mangle-done + +: ---------- 'test missing finalisation data in -1' ---------- + +mangle-start missingdate +perl-i-clog -pe '$_="" if m{^ -- .* Sat, 12 Jul 2014 20:51:56}' +mangle-import +mangle-done + +: ---------- 'test garbage before -1' ---------- + +mangle-start garbage +perl-i-clog -ne '$_ = "GARBAGE\n" if (m{^\S} && $. != 1) .. 0; print;' +mangle-import +mangle-done + +: ---------- 'test malformed authline' ---------- + +mangle-start bademail +# This causes the output syntax check in clogp_authline to trip; +# (that's the one which is intended to stop us feeding bad data to git). +perl-i-clog -pe ' + next unless m{^ -- .* Sat, 12 Jul 2014 20:51:56.*}; + s{^([^<]+) }{ -- cause <things to choke> }; +' +mangle-import +mangle-done diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format index 2649a31..ee51dd7 100755 --- a/tests/tests/manpages-format +++ b/tests/tests/manpages-format @@ -53,7 +53,6 @@ not_egrep_vxPf () { } expected txt dgit.1 <<'END' -.* # table wider than line width END prep () { diff --git a/tests/tests/overwrite-chkclog b/tests/tests/overwrite-chkclog index 35147bc..9e2cf88 100755 --- a/tests/tests/overwrite-chkclog +++ b/tests/tests/overwrite-chkclog @@ -13,7 +13,7 @@ t-commit 'No changes, just send to stable' '' stable t-dgit -wgf build t-expect-fail 'Perhaps debian/changelog does not mention' \ -t-dgit push-built --overwrite stable +t-dgit push-built --trust-changelog stable t-dgit setup-mergechangelogs @@ -30,7 +30,7 @@ git commit -m 'UNRELEASED changelog' t-dgit -wgf build t-expect-fail E:'Distribution.*is UNRELEASED' \ -t-dgit push-built --overwrite stable +t-dgit push-built --trust-changelog stable git revert --no-edit 'HEAD^{/UNRELEASED changelog}' @@ -41,7 +41,7 @@ git add debian/changelog git commit -m 'Break changelog' t-expect-fail 'Perhaps debian/changelog does not mention' \ -t-dgit push-built --overwrite stable +t-dgit push-built --trust-changelog stable git revert --no-edit 'HEAD^{/Break changelog}' diff --git a/tests/tests/overwrite-splitbrains b/tests/tests/overwrite-splitbrains index 6e72c3d..4d50918 100755 --- a/tests/tests/overwrite-splitbrains +++ b/tests/tests/overwrite-splitbrains @@ -13,13 +13,13 @@ t-dgit fetch t-refs-same-start t-ref-head -t-expect-fail 'maybe --overwrite is needed' \ +t-expect-fail 'maybe --trust-changelog is needed' \ t-dgit --quilt=gbp --dgit-view-save=split.p push-built t-refs-same-start t-ref-head -t-dgit --quilt=gbp --dgit-view-save=split.p --overwrite push-built +t-dgit --quilt=gbp --dgit-view-save=split.p --trust-changelog push-built t-gbp-pushed-good diff --git a/tests/tests/quilt-colour b/tests/tests/quilt-colour new file mode 100755 index 0000000..724f561 --- /dev/null +++ b/tests/tests/quilt-colour @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +. tests/lib + +t-archive ruby-rails-3.2 3.2.6-1 +t-git-none + +t-dgit clone $p +cd $p + +echo 'added line' >>metadata.yml +git add metadata.yml +git commit -m metadata + +git config --global color.ui always + +t-dgit -wgf build-source + +t-ok diff --git a/tests/tests/quilt-include-binaries b/tests/tests/quilt-include-binaries new file mode 100755 index 0000000..74a0de9 --- /dev/null +++ b/tests/tests/quilt-include-binaries @@ -0,0 +1,130 @@ +#!/bin/bash +set -e +. tests/lib +t-tstunt-parsechangelog + +p=example + +mkdir example +cd example +git init + +r=1 +v0=1.0-$r +t-dgit import-dsc $troot/pkg-srcs/${p}_${v0}.dsc +import + +git reset --hard import + +cat >debian/source/include-binaries <<END +# comment + +enoent/file +bins/file +debian/binfile + +../bin-in-parent +$tmp/bin-with-abs +debian/../../bin-tricky-in-parent +.git/index +bins/bin-via-link +$tmp/ +.. +debian/../.. +END + +for f in bin-in-parent bin-with-abs bin-tricky-in-parent bin-via-link; do + echo SHOULD-NOT-APPEAR-$f >../$f +done + +git add debian/source/include-binaries +git commit -m 'specify include binaries' + +t-prep () { + local m=$1 + git checkout -B work master + t-git-next-date + r=$(( $r + 1 )) + v=1.0-$r + t-dch-commit -v$v -m "$1" +} + +t-make-some-bin () { + local file="$1" + perl -e ' + use autodie; + print pack "H*", "d41d8cd98f00b204e9800998ecf8427e"; + print "\n'"$file $r"'\n"; + ' >"$file" +} + +t-try-build-source () { + LC_MESSAGES=C LANGUAGE=C \ + t-dgit --quilt=nofix --since-version=$v0 "$@" build-source +} + +t-roundtrips-1 () { + t-try-build-source "$@" 2>&1 | tee ../build-source-out.$r + t-dgit import-dsc ../${p}_${v}.dsc +reimport + set +e + git --no-pager grep SHOULD-NOT-APPEAR reimport -- + rc=$? + set -e + test $rc = 1 + git diff --exit-code work reimport -- +} + +t-roundtrips () { + t-roundtrips-1 + t-roundtrips-1 --include-dirty +} + +t-prep 'straightforward' + +mkdir bins +t-make-some-bin bins/file +git add bins/file +git commit -m 'add bin' + +t-roundtrips + +for wrongness in \ + "forbidden path component '..'" \ + "path starts with '.git'" \ +; do + grep "$wrongness" ../build-source-out.$r +done + +t-prep 'bin via link' + +linktarget="$tmp" +: 'make a new orig, gnagh' +mkdir ../repack +cd ../repack +tar axf $troot/pkg-srcs/${p}_1.0.orig.tar.gz +ln -s "$linktarget" example/bins +tar zcf ../${p}_1.1.orig.tar.gz example +cd ../example +cp ../${p}_1.{0,1}.orig-docs.tar.gz + +v=1.1-$r +t-dch-commit -v$v -m 'update upstream' + +ln -s "$linktarget" bins +git add bins +git commit -m 'add bins' + +t-roundtrips + +t-prep 'ignored weird file' + +mkdir bins +mkfifo bins/file + +t-roundtrips-1 -wdn + +grep "'bins/file' not a plain file or directory" ../build-source-out.$r + +t-expect-fail E:'dpkg-source: error: *new version is named pipe' \ +t-try-build-source -wdn --ignore-dirty + +t-ok diff --git a/tests/tests/rpush b/tests/tests/rpush index 71bbe2b..3378da9 100755 --- a/tests/tests/rpush +++ b/tests/tests/rpush @@ -17,13 +17,32 @@ debcommit -a t-refs-same-start t-ref-head -t-dgit --dpkg-buildpackage:-d build +t-dgit-rpush () { + t-dgit "$@" --ssh=$troot/ssh rpush somehost:$tmp/$p +} mkdir $tmp/empty cd $tmp/empty -#t-dgit --ssh=$troot/ssh rpush somehost:$troot/$p -#echo $? -t-dgit --ssh=$troot/ssh rpush somehost:$tmp/$p + +t-expect-fail F:'error: looked for .dsc' \ +t-dgit-rpush -cdgit.default.rpush-subcmd=built + +t-expect-fail F:'error: looked for .dsc' \ +t-dgit-rpush -cdgit.default.push-subcmd=built + +cd $tmp/$p + +t-dgit --dpkg-buildpackage:-d build + +cd $tmp/empty + +t-expect-fail F:'dgit rpush, but dgit.default.[r]push-subcmd set to reject' \ +t-dgit-rpush -cdgit.default.rpush-subcmd=reject + +t-expect-fail F:'dgit rpush, but dgit.default.[r]push-subcmd set to reject' \ +t-dgit-rpush + +t-dgit-rpush -cdgit.default.rpush-subcmd=built cd $tmp/$p t-pushed-good dgit/sid diff --git a/tests/tests/rpush-quilt b/tests/tests/rpush-quilt index bb49fc6..aca403a 100755 --- a/tests/tests/rpush-quilt +++ b/tests/tests/rpush-quilt @@ -11,7 +11,7 @@ t-dgit -wgf --quilt=gbp --dgit-view-save=split.b build-source mkdir $tmp/empty cd $tmp/empty t-dgit --quilt=gbp --dgit-view-save=split.p \ - --ssh=$troot/ssh rpush somehost:$tmp/$p + --ssh=$troot/ssh rpush-built somehost:$tmp/$p cd $tmp/$p t-gbp-pushed-good diff --git a/tests/tests/rpush-source b/tests/tests/rpush-source new file mode 100755 index 0000000..465cf1c --- /dev/null +++ b/tests/tests/rpush-source @@ -0,0 +1,27 @@ +#!/bin/bash +set -e +. tests/lib + +t-archive pari-extra 3-1 +t-git pari-extra 3-1 + +t-dgit clone $p + +cd $p +t-cloned-fetched-good + +v=3-2~dummy1 +t-apply-diff 3-1 $v +debcommit -a + +t-refs-same-start +t-ref-head + +mkdir $tmp/empty +cd $tmp/empty +t-dgit --ssh=$troot/ssh rpush-source somehost:$tmp/$p + +cd $tmp/$p +t-pushed-good dgit/sid + +t-ok diff --git a/tests/tests/sbuild-gitish b/tests/tests/sbuild-gitish index da90b6f..6b4d812 100755 --- a/tests/tests/sbuild-gitish +++ b/tests/tests/sbuild-gitish @@ -17,6 +17,7 @@ buildrune=$( next if !m/\S/ .. 0; s/^ +\%//; $fixchr += s/(\s-c\s*)jessie(\s|$)/$1'"$schroot"'$2/; + s/^\s*sbuild/$& -v/m; print or die $!; END { $fixchr == 1 or die $fixchr; } ' diff --git a/tests/tests/tagupl b/tests/tests/tagupl index 9d3e45a..3bb683d 100755 --- a/tests/tests/tagupl +++ b/tests/tests/tagupl @@ -103,8 +103,9 @@ expect-email () { } raw-mangled () { - git update-ref refs/tags/$tagname \ - $(git hash-object -w -t tag ../tagobj-$ident) + local tagobj + tagobj=$(git hash-object -w -t tag ../tagobj-$ident) + git update-ref refs/tags/$tagname "$tagobj" t-tagupl-run-drs $tmp/$p } @@ -177,8 +178,16 @@ perl -pe <../raw-base ' ' >../tagobj-$ident echo >>../tagobj-$ident cat ../basetag >>../tagobj-$ident -raw-mangled -grep 'failed to fish tagger out of tag' ../tagupl/overall.log +set +e +(set -e; LC_MESSAGES=C raw-mangled 2>../mktag.err) +rc=$? +set -e +if [ $rc = 0 ]; then + grep 'failed to fish tagger out of tag' ../tagupl/overall.log +elif [ $rc = 128 ] && egrep 'error: object fails fsck: badTimezone: invalid author/committer line - bad time zone' ../mktag.err; then : +else + fatal 'failed to make raw-mangled' +fi cd .. rm -rf $p diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay index 8ebeb2c..f96165f 100755 --- a/tests/tests/trustingpolicy-replay +++ b/tests/tests/trustingpolicy-replay @@ -50,7 +50,8 @@ prepare-replay () { t-commit "request with $delib that we will replay" t-dgit build t-expect-push-fail 'system: No such file or directory' \ - t-dgit push-source $delib + t-dgit -cdgit-distro.test-dummy.policy-query-supported-ssh=false \ + push-source $delib t-policy dgit-repos-policy-trusting |