| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
| |
reset from printing a confusing message about HEAD.
|
| |
|
|
|
|
| |
Otherwise the cache entry's .dsc contains the hash of a fake
debian.tar.gz which has had a timestamp put in it by gzip, defeating
the cache.
|
| | |
|
| |
|
|
| |
Not documented yet.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Everywhere we invoke dpkg-buildpackage, check if we need to apply the
patches. And at the end of every command that might have done this,
check if we did, and unapply them if so.
We don't try to unapply patches in case of error. That seems likely
to be quite fragile.
Print a warning when we apply patches, suggesting ways to avoid the
need.
|
| | |
|
| |
|
|
|
| |
We use runcmd shell_cmd for gbp pq import, and the other commands not
produce undesirable output.
|
| | |
|
| |
|
|
| |
This can make a radical difference!
|
| |
|
|
|
|
|
| |
Do the quiltify_splitbrain_needed if there _are_ patches, not if there
aren't. And if we're told it was an unapplied tree, check that HEAD
and orig are indeed the same (excluding debian/*, of course) and print
a useful message if not.
|
| | |
|
| |
|
|
|
| |
And, after the source build is done, copy the resulting files out into
the invocation directory's parent, where people expect to find them.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
* Move the fast forward die to where we will need to make the
synthetic commit, so that the tree equality check is done on the
thing we will actually push.
* Crash if we are trying to do split brain without split build.
(This should never happen.)
* Set split build if we need split brain.
|
| |
|
|
|
| |
This variable name was very confusing. Also, add a comment explaining
the semantics.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
And explain why in a comment.
|
| |
|
|
| |
This code does not work properly yet; it will be fixed soon.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
Close our FH onto the file, and run git diff to fill it with the
actual diff. Add the file to series. Use git add and git commit to
commit the patch to the private git branch.
Now most of the code to generate the .gitignore properly is present, I
think, but not debugged.
|
| |
|
|
|
| |
When we need to make the .gitignore patch, there may not yet be any
debian/patches directory.
|
| |
|
|
| |
So far we still don't generate the patch.
|
| |
|
|
| |
It is going to need this extra info in a moment.
|
| |
|
|
|
| |
We are going to need this information to construct the substantive
diff for the .gitignores patch.
|
| | |
|
| | |
|
| |
|
|
| |
Generate a patch header, for now. Still not finished.
|
| |
|
|
|
| |
We want this to apply to any commits we use git to make, not just
gbp-pq.
|
| |
|
|
|
|
| |
* Direct gbp-pq's stdout to /dev/null
* Specify GIT_COMMITER_* so that the results are reproducible
* Detect .gitignore problem
|
| |
|
|
| |
We are going to want this in a moment.
|
| |
|
|
|
|
|
|
| |
We are going to want this (so that we can set GIT_... variables to the
pieces to make git construct commits the way we want).
Both current call sites provide scalar context, so no functional
change.
|
| |
|
|
|
|
| |
This will make it a bit easier to reuse it. Actually AFAICT it turns
out (looking at the rest of the branch) that this is not needed, but
it's nicer for the future I think.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
`Split brain' means the situation where `dgit push' makes private
commits, to push to the dgit repos server, which are not left on the
user's actual branch.
Check whether the quilt mode and tree differences, taken together,
mean that we need split brain.
If we do need split brain, use gbp pq to apply the patch series.
.gitignore changes are mishandled, still. And we don't actually
follow through much yet.
Also, fix a case where quilt mode `apply' hadn't been changed to
`unapplied'.
|
| |
|
|
|
|
|
| |
Replace ${user,{,un}applied}2${,un}applied with $diffbits->{[HOA]2[HOA]}
This encapsulates the info it nicely and makes it easy to pass
it to quiltify_splitbrain, which is going to need it.
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
* Replace quilt_could_gbp with new calculation based on three calls to
quiltify_trees_differ.
* Reworked messages about quilt differences.
* Start to provide the `gbp', `apply' and `dpm' quilt modes.
Currently we crash with a die if any of these are used.
Nevertheless, we allow `gbp' and `apply' to be specified.
|
| |
|
|
|
|
|
|
| |
Have it be able to explain what was different, by returning a bitmask.
Update the call sites.
Incidentally, fix a bug where .gitignores other than in the toplevel
would not be ignored when they ought to have been.
|
| |
|
|
|
|
| |
Found this in a commit "WIP SPLIT BRAIN NEW DIFFS SEEM GOOD". Not
sure why (I thought) it was needed. Maybe it should be reverted, but
it's probably harmless.
|
| |
|
|
|
| |
Actually --quilt=gbp and --quilt=unapplied (well, what's called
--quilt=apply here) aren't going to be quite identical.
|
| |
|
|
|
| |
And pass the result as an argument. Code outside quiltify is going
to want this information.
|
| |
|
|
|
|
| |
Note that the message refers to `--quilt=gbp' aka `--quilt=apply'
which do not exist yet (and which we're going to call something else,
later in this series). Oh well.
|
| |
|
|
| |
We are going to want to handle this specially.
|
| |
|
|
| |
This is clearer.
|
| |
|
|
|
| |
No functional change as yet. But, now the correct value for $origtree
is passed to quiltify.
|
| |
|
|
|
|
|
|
| |
We are going to want to capture the patches-unapplied state of the
tree as a git tree object. So split out the patch application part of
the fake .dsc extraction.
No functional change as yet.
|
| |
|
|
|
| |
We will want these because we're going to be doing more exciting
dpkg-source and gbp operations etc.
|
| |
|
|
| |
Currently not used, nor any sensible value passed.
|
