summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * dgit-maint-debrebase(7): add another "# if needed"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): be consistent about referring to the toolSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): downgrade very minimal debrebasing workflow yet furtherSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): improve "Upstream branches"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): further notes about d/patchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): respond to feedback on DFSG-non-free sectionSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): notes about d/patchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): improve advice about minimising stitchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): correct what debrebase will do when debrebasing an NMUSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): drop claims about purpose of branchesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): simplify hint about manual rebaseSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix debrebase invocationsSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): add "EDITING THE DEBIAN PACKAGING"Sean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix desc. of convert-from-gbp cmdSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): respond to feedbackSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): Verifying->ComparingSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): first commit to new package must introduce debian/ ↵Sean Whitton2018-04-19
| | | | | | | | | | | | and nothing else Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): make the wood visible despite the treesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): it's an exampleSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): avoiding mergesSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): fix NMUs sectionSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): patch queue -> delta queueSean Whitton2018-04-19
| | | | | | | | | | | | For consistency with git-debrebase(5). Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): add another advantageSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): begin incorporating feedbackSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| * dgit-maint-debrebase(7): first draftSean Whitton2018-04-19
| | | | | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* | test suite: git-debrebase: Do some tests without dgit installedIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We provide a new psuedo-dependency NO-DGIT which throws away the usual default dependency list. We abolish NO-DEFAULT which could not be useful because the tests pretty much all depend on setup/gnupg which (currently, as a workaround for the gnupg2 races) requires chiark-utils-bin for with-lock-ex. There are two tests which don't actually need any interaction with the archive. Mark them accordingly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: Split into its own packageIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Provide and use Debian::Dgit::GDR which does the same for @INC as Debian::Dgit:Infra, only for GDR. It's not *entirely* similar as its doc comment talks about ExitStatus too. * In Makefile, split off lots of GDR_* variables and the two targets install-gdr and installdirs-gdr We take no care that only the required manpages are built for each install target; instead, they all go in MANPAGES and `all'. * Add a control file stanza. git-debrebase takes over the dependenc on libfile-fnmatch-perl. We Recommend dgit and gbp. (Even though if you're working with neither the Debian archive nor `3.0 (quilt)', you need neither.) * In rules, add specpkg_install_gdr, to run the Makefile machinery. * In the test dependencies, GDR now means to ask for git-debrebase and also git-buildpackage (for make-patches). libfile-fnmatch-perl is handled via the dependencies of git-debrebase.deb. * Add a .gitignore for the staging area in debian/ Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: git-debrebase: Use gdr-convert-gbp-noarchiveIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gdr-convert-gbp-noarchive: new setup kindIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | Introduce $ifnoarchive in gdr-convert-gbp, which allows us to run it without any of the operations which touch the simulated archive. This is faster. Also in the future after we split the packages this will make it possible to run this new setup without having dgit or the archive management tools installed. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Get perl -I for source tree rightIan Jackson2018-06-17
| | | | | | | | | | | | | | | | We wanted the Dgit.pm in the source tree (ie, the test suite's). Previously this would work by accident, because Dgit.pm would be installed in /usr. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: t-setup-done: get $import right setup using t-chain-testIan Jackson2018-06-17
| | | | | | | | | | | | | | We need to honour DGIT_TEST_NAME, rather than just using $0, in that case. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: divergence checking: Do not mind if a ref we are checking ↵Ian Jackson2018-06-17
| | | | | | | | | | | | does not exist Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: git-debrebase: provide GDR "macro" for dependenciesIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: enumerate-tests: Refactor dependencies, support NO-DEFAULTIan Jackson2018-06-17
| | | | | | | | | | | | | | | | This will allow more flexibility in a moment. No users of NO-DEFAULT yet, and no functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | debian/rules: Refactor dgit-infrastructure perl arrangementsIan Jackson2018-06-17
| | | | | | | | | | | | We are going to want to do this for another package too. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | changelog: Document gdr, and bump to 5.0~Ian Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | documentation: Discuss gdr make-patches vs dgit quilt-fixup, etc.Ian Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: Use git-deborig style upstream commitish findingIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | 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>
* | git-debrebase: Add some plans for future, in a commentIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: gdr-edits: Rely on dgit interop, and test that it DTRTIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test suite: t-gdr-good: Introduce etypes, a sequenceIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | 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>
* | dgit: Interoperate with git-debrebase, automaticallyIan Jackson2018-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | dgit: Prepare for calling git-debrebaseIan Jackson2018-06-17
| | | | | | | | | | | | | | 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.pm: gdr_ffq_prev_branchinfo: move from git-debrebaseIan Jackson2018-06-17
| | | | | | | | | | | | dgit is going to want this too, for interoperability. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: make-patched: Provide --quiet-would-amendIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test suite: gdr-subcommands: provide X checkletterIan Jackson2018-06-17
| | | | | | | | | | | | | | 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>
* | git-debrebase: test suite: gdr-subcommands: use xopts for N*Ian Jackson2018-06-17
| | | | | | | | | | | | This stylistic change improves the orthogonality. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test suite: gdr-subcommands: split off XXIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test suite: gdr-subcommands: honour new $xoptsIan Jackson2018-06-17
| | | | | | | | | | | | | | This allows the introduction of chaining checkletters which modify subsequent attempts. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: test suite: gdr-subcommands: document XXIan Jackson2018-06-17
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 09:52:55 +0000