| Commit message (Collapse) | Author | Age |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As discussed in email with Sean.
We could use git-deborig --just-print --version= but its error
handling is rather troublesome.
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rather than having the next type recorded in netype, record it in
etypes. This is more orthogonal, and will allow more subtle
specifications of what is expected.
No functional change for now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Recognise gdr branches, by the presence of corresponding
ffq-prev or debrebase-last refs.
* Before trying to do our own multi-patch linear quilt fixup, on a gdr
branch, see if gdr can do it. If so that is faster and better.
* If our branch is an unstitched gdr branch, which would be ff from
the archive if we were to stitch it, then do so.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| | |
Provide the --git-debrebase= option, and pass it in the test suite.
Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
dgit is going to want this too, for interoperability.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| | |
No user yet. I wanted this for a test which actually isn't going to
work like that, but I thought I would commit it anyway.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
This stylistic change improves the orthogonality.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| | |
This allows the introduction of chaining checkletters which modify
subsequent attempts.
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 want to make the error handling dependent on options, etc. Moving
the differs analysis into cmd_make_patches avoids having a complex
calling convention for make_patches.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Most of `fail' is error message construction. This change allows
callers to do something other with the message, than pass it to die.
No functional change.
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows a caller to avoid having keycommits crash on
unrecognisable stuff. This will be used in a moment.
No functional change, because the default implementation calls fail
the same way it did before.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, presumably, this little fragment was within an anonymous
sub. Now it isn't any more, and we can simply return.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
No overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
We are going to want this within the scope of the anon sub $x.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Rename $snags_checked to $snags_summarised and make it a counter
of the snags we have summarised in snags_maybe_bail.
* Introduce all_snags_summarised, which uses arithmetic to see if
we have had new snags since the most recent snags_maybe_bail,
* Use this in run_deferred_updates rather than the existing
approach; this means we can crash if there were new snags for
which we should have bailed.
* Make snags_maybe_bail not produce a redundant identical summary.
* Initialise counters to 0 so arithmetic does not give undef warnings.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is the result of some playing around with gitk. Notably,
for example,
git-branch -f t dgit/stretch-security && ~/things/Dgit/play/swap-pseudomerges -f RELEASE-4.8.0..t
where dgit/stretch-security is c9517ee45383271e90f40b7a9773d1e6fefaeca7
and swap-pseudomerges is something like this
#!/bin/sh
#
# runs
# git-filter-branch --some-filters "$@"
set -e
git-filter-branch --parent-filter '
case "$(git cat-file commit $GIT_COMMIT)" in
*"git-debrebase new-upstream breakwater"*|*"git-debrebase anchor"*)
perl -ne '\''
chomp;
print join " ", reverse split / +(?=-p )/;
print "\n";
'\''
;;
*)
cat
esac
' "$@"
or
....
*"git-debrebase new-upstream breakwater"*|*"git-debrebase anchor"*)
....
and then runes like
gitk --first-parent dgit/stretch-security &
gitk dgit/stretch-security -- ':/' ':!/debian' &
etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
Also, if the user invokes dgit push with uncommitted debian/patches/.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
This matches 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>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| | |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
No callers yet.
Also, no version for dgit-infrastructure. The one perl script in
dgit-infrastructure that cares a lot about its exit status
(dgit-repos-policy-debian) already has an END { } and uses _exit,
which is a bit like our approach here, but simpler.
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the branch is stitched, gbp pq will descend into both sides of
the pseudomerge. This will duplicate patches and be generally bad.
So instead, use walk to generate, privately, a laundered version of
HEAD, to use to generate the patches.
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Almost the only thing gdr does as an output is to update HEAD and
other refs. That's done with run_deferred_updates. So, there,
check that (i) we have called snags_maybe_bail at least once;
(ii) we have not had any snags since.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| |
| | |
That these were missing is a bit alarming. I am about to add some
more defences against missing this check.
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
<Diziet> I discover that stitch treats non-launderedness as a snag.
<Diziet> This is not quite compatible with these newfangled
push-your-unlaundered-stuff workflows.
<Diziet> It would be possible to make one of prepush or stitch
(currently synonyms) behave differently in this respect.
<spwhitton> do you know why stitch treats non-launderedness as a snag?
<spwhitton> given that we expect [most people] to use `git debrebase
conclude`, which launders, and never invoke `git debrebase
stitch` explicitly, it would be okay to change that such
that `git debrebase stitch` does not consider
non-launderedness to be a snag.
<Diziet> I think it does that just because I am the kind of person
who thinks, when writing some routine, "what could I check
here?" :-)
<Diziet> I think you are perhaps right that it ought not to.
<Diziet> "conclude" didn't exist then of course.
<spwhitton> okay. git-debrebase(1) could note "you probably want
conclude because you probably want to launder"
<Diziet> Mmmm.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
| |
| |
| |
| |
| |
| | |
Update all call sites. No functional change just yet.
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>
|