Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Closes: #973896
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Code motion.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

In command line runes and examples, generally change to
"dgit push-source".

In running text whwere we talk about "push or push-source", change to
"push-built or push-source".

In running text where we talk loosely about "push", leave it that way.

Closes: #992606
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

We speak here of "dgit push-*" when we mean "push-source or push-built
or push".

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Change the global test git config to reject plain "git push".
Update almost all tests to use "push-built".

In some cases, change to using "push-source".

In one case (chosen essentially arbitrarily), use the config override
and continue using push to mean push-built.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

No overall chagne in behaviour since in this commit the default
configuration is "built".

However, the documentation already anticipates the change to add the
warning.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

This represents a poor outcome which happily no longer occurs unless
the user is using the deprecated-by-us "single-debian-patch" features.

For more discussion see comments in quilt_fixup_dpkgsource_singlepatch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

This represents a poor outcome which happily no longer occurs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

See #1018984.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

This is to replace single-debian-patch.

Closes: #1018984
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Now, with single-debian-patch, we can still handle file removals.
(This may fix other corner cases too.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

git diff can represent changes to symlinks, but dpkg-source uses
diff(1) to apply changes, and git diff cannot.  The result if we
permit them is that we end up making source packages that can't be
built, or aren't treesame to our HEAD.

Reject this early.  This resolves the error handling regression in
  dgit: quilt fixup: Don't use dpkg-source --commit, but git diff

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Now we use git diffs, which can represent changes to the executability
of files.  dpkg-source uses diff(1) to apply these.  So it all works.
Handle this by normalising the +x bits before seeing if the mode
changed.

Now we properly support executable files.

Closes: #995056

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

quiltify_make_dpkg_patch now uses git diff which doesn't require us to
update the working tree.

We still need to do it at the end, because the next steps expect it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

There are many things that dpkg-source can successfully extract, but
which it can't create.  (This is because dpkg-source largely delegates
application to diff(1), and diff can do many more things nowadays.)

Most real packages were made with git-format-patch or equivalent
nowadays, so use of these features is common.  (Hence #949675
and #995056, where even glibc has patches that dpkg-source cannot make.)

Right now the practical consequences are:

 * Creating an executable file is fixed.  This actually completes
   the work for #949675.

 * Creating a symlink has a regression in the error handling.
   Previously, dpkg-source --commit failed during quilt fixup.
   Now, we happily git diff which generates a patch that dpkg-source
   can't apply.  We're going to fix this soon by aligning the
   representable change checking with reality.

 * It's faster and less complicated.

Closes: #1018143
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

It will need these for running git diff.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

This is going to stop using dpkg-source.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

A test case like this was removed in a0ac573f


  dgit: tolerate making quilt patches creating +x files

That removal was a mistake.  We should have changed the test outcome.

In fact, right now the test outcome is that we can't in fact make new
patches like this, because dpkg-source can't.  When we try, we createa
source package which doesn't represent our git tree.

However, dpkg-source can *apply* such patches if they already exist.
In #949675, there was an *existing* patch with this property.
We don't test for this separately, and never have.  Instead, I propose
to make all dpkg-source-applicable patches creatable by dgit.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

We are going to want to run these tests in different modes, and the
results might vary between mode.

So encode the expected results in the *arguments* to the sub-test
finish subroutine (which we rename).  The filenames go on the sub-test
start subroutine.

finish is going to gain features.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Dpkg::Source::Package::new takes both %opts and `options`,
one nested within the other.

Closes: #964286
Suggested-by: Guillem Jover <guillem@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Fix for "invalid variable interpolation" in i18n.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

These are operating on bpd etc., which they shouldn't with dry run.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>