summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* 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: 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>
* dgit: Bail if single-debian-patch needs committing with --quilt=nofixIan Jackson2018-06-16
| | | | | | Also, if the user invokes dgit push with uncommitted debian/patches/. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* exit status: Document in changelog.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: New test for subcommandsIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-newupstream-v0: new testIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu-dgit: new testIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yetIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-viagit: new testIan Jackson2018-06-16
| | | | | | | | | | | | | | | | | | | | | Have verified with this: diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit index 55fe4d74..20576c23 100755 --- a/tests/tests/gdr-viagit +++ b/tests/tests/gdr-viagit @@ -17,6 +17,7 @@ git-debrebase) ;; cat <<'END' >$st #!/bin/sh set -x +export GIT_DIR=$PWD/`git-rev-parse --git-dir` exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@" END chmod +x $st that this would indeed spot at least some problems. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-*: use faketime to control dch datesIan Jackson2018-06-16
| | | | | | | | | This means that the dgit- and gdr-generated commits with dates from changelogs are all adjusted. This makes the gitk in the gdr tests look more like a real one would, so we can see if it's pretty. (It also makes it easier to debug the tests.) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-import-dgit: wipIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-edits: wip new testIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* debian/control, git-debrebase: "use fnmatch;"Ian Jackson2018-06-16
| | | | | | We are going to want this for globbing in the ffq configuration. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: In quilt_fixup_multipatch, work around git checkout pathsIan Jackson2018-06-16
| | | | | | | git checkout paths does not delete files. This is a hypothetical bug AFAIAA. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: When checking that the tree is clean, check the git index too.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm, dgit: Break $extra_orig_namepart_re out into Dgit.pm.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: "confess" when we die due to a warning, rather than symply dieing.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Break out git_get_symrefIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Dgit.pm: Move $playground global to dgit.Ian Jackson2018-06-16
| | | | | | | | It makes the interface to the playground functions confusing. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 4.5~Ian Jackson2018-04-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* finalise 4.4debian/4.4archive/debian/4.4Ian Jackson2018-04-23
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: bugfix: Use full key hash rather than short keyid.Ian Jackson2018-04-23
| | | | | | Closes:#896653. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 4.4Ian Jackson2018-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 4.3debian/4.3archive/debian/4.3Ian Jackson2018-01-25
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: mention #887850 fixIan Jackson2018-01-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: mention #884646Ian Jackson2018-01-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(7): Discuss git-unrepresentable properties of source trees.Ian Jackson2018-01-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit(7): Discuss file executability.Ian Jackson2018-01-24
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: archive-api-query: Avoid crashing due to lack of $isuiteIan Jackson2018-01-07
| | | | | | | | | | Otherwise: Use of uninitialized value $isuite in concatenation (.) or string at dgit line 705. This breaks the infrastructure. Closes:#886592. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: start 4.3Ian Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: finalise 4.2debian/4.2archive/debian/4.2Ian Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Set distribution to unstableSean Whitton2018-01-07
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* changelog: Document using dpkg-source to build source packagesSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Entry for push-source subcommandSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: push-source: new testsSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Update some copyright infoSean Whitton2018-01-07
| | | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib: t-git-fsck: put dgit-test-fsck.errs in git dirIan Jackson2018-01-07
| | | | | | | | | | This needs to not be in the working tree; it causes trouble there. This was broken in 090071ae8e31c8f81283af477c1114835ed8fd02 "test suite: Tolerate worktrees when trying to git-fsck" Reported-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* changelog: Document gnupg workaroundsIan Jackson2018-01-07
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Merge branch stable into masterIan Jackson2018-01-07
|\ | | | | | | | | | | Also regenerate debian/tests/control Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 3.13debian/3.13archive/debian/3.13Ian Jackson2017-10-22
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Add missing `chiark-utils-bin' to Test-Depends.Ian Jackson2017-10-22
| | | | | | | | | | | | Not normally a visible bug because dgit-infrastructure depends on it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Add missing `use' for Dpkg::Compresson et al.Ian Jackson2017-10-22
| | | | | | | | | | | | | | Closes:#879526. Reported-by: Didier 'OdyX' Raboud Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Start 3.13~Ian Jackson2017-10-22
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: When source discrepancy involves mode changes, report them specially.Ian Jackson2018-01-06
| | | | | | | | | | | | Closes:#886442. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix suggested diff rune in split brain modeIan Jackson2018-01-06
| | | | | | | | | | | | | | | | | | | | | | In split brain mode, with unexpected diffs, print dgit view commitid in suggested diff rune. HEAD is wrong in this case. Closes:#886443. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Fix message about missing quilt cache entryIan Jackson2018-01-06
| | | | | | | | | | | | | | | | Should refer to HEAD rather than tree, since dgit needs a commit. Closes:#884646. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | debian/control: Remove dependency alternative on realpathIan Jackson2018-01-06
| | | | | | | | | | | | That package last existed in Debian wheezy. Closes:#877552. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>