summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* changelog: add entry for 6.6~bpo9+1debian/6.6_bpo9+1archive/debian/6.6_bpo9+1Sean Whitton2018-08-09
|
* Merge tag 'debian/6.6' into stretch-bpoSean Whitton2018-08-09
|\ | | | | | | | | | | | | | | | | dgit release 6.6 for unstable (sid) [dgit] [dgit distro=debian] # gpg: Signature made Sun 05 Aug 2018 10:43:37 BST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
| * changelog: finalise 6.6.debian/6.6archive/debian/6.6Ian Jackson2018-08-05
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Fix gdr's calls to dgit when run formally in autopkgtest.Ian Jackson2018-08-05
| | | | | | | | | | | | | | | | We should not pass `--dgit='. That causes gdr to try to exec "". Affects gdr-import-dgitview. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: Start 6.5Ian Jackson2018-08-05
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 6.5debian/6.5archive/debian/6.5Ian Jackson2018-08-04
| |
| * changelog: Categorise and reorder entriesIan Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: scrap: Run git-rebase --abort if applicableIan Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: check for git-rebase in progress and abort most operationsIan Jackson2018-08-04
| | | | | | | | | | | | scrap should abort, but doesn't yet. status just prints a message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-subcommands: Drop obsolete lineIan Jackson2018-08-04
| | | | | | | | | | | | | | We have done this another way and there will never be a push-hook like this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-subcommands: Test scrapIan Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: scrap: Make it honour --noop-okIan Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-viagit: Test scrapIan Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: New feature `scrap'Ian Jackson2018-08-04
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-import-dgitview: Actually test convert-from-dgitviewIan Jackson2018-08-04
| | | | | | | | | | | | This was always my intention with this test, of course. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Provide new convert-from-dgit-view operation.Ian Jackson2018-08-04
| | | | | | | | | | | | | | | | The output is, unavoidably, not very pretty. Closes:#905322. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Support --dgit option for finding dgitIan Jackson2018-08-04
| | | | | | | | | | | | Nothing uses this yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: gdr-import-dgitview: New test for dgit dsc importsIan Jackson2018-08-04
| | | | | | | | | | | | So far this just tests the bugfixes I've just done. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Improve error message formatting from $bomb in walkIan Jackson2018-08-04
| | | | | | | | | | | | The : and ; were messed up. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Properly reject bare dgit dsc importsIan Jackson2018-08-04
| | | | | | | | | | | | | | | | | | | | | | A bare dgit dsc import is not a legal gdr branch, because the main merge contains debian/patches/. So it cannot be processed without conversion. Previously an attempt to launder such a branch would crash with a stack trace, although keycommits would falsely claim it was OK Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Have resolve_upstream_commit set @$tried firstIan Jackson2018-08-04
| | | | | | | | | | | | | | This allows a caller to know what tag name was successfully found, by looking at $tried[-1]; Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Break out resolve_upstream_versionIan Jackson2018-08-04
| | | | | | | | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: resolve_upstream_version: Rename $upstream_versionIan Jackson2018-08-04
| | | | | | | | | | | | | | | | | | This used to be called $new_upstream_version but this function is called in other contexts too. NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase; Refactor resolve_upstream_version to take upstream versionIan Jackson2018-08-03
| | | | | | | | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Use upstreamversion rather than open-codingIan Jackson2018-08-03
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Move upstreamversion from dgitIan Jackson2018-08-03
| | | | | | | | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Deconfuse argument orders of is_orig_file_of_p_v etc.Ian Jackson2018-08-03
| | | | | | | | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Improve error message for unknown suite, to suggest -dIan Jackson2018-08-03
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * Dgit.pm: Move is_orig_file_of_p_v and its dependencies from dgitIan Jackson2018-08-03
| | | | | | | | | | | | | | | | | | We want is_orig_file_of_p_v, so move it and all the things it depends on. NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: factor out getoptions for subcommandIan Jackson2018-08-03
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Provide print-unapplied-treeish subcommand.Ian Jackson2018-08-03
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Break out quilt_fakedsc2unapplied.Ian Jackson2018-08-03
| | | | | | | | | | | | NFC. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Rename --dgit-view-save to --save-dgit-view, leaving an alias.Ian Jackson2018-08-03
| | | | | | | | | | | | This name makes more sense. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit: Refactor %internal_object_save from $dgit_view_saveIan Jackson2018-08-03
| | | | | | | | | | | | Preparatory to allow saving other internal objects. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.Ian Jackson2018-08-03
| | | | | | | | | | | | By making the script a dependency of the .ok stamp file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite: Add t-tstunt-parsechangelog to many gdr tests.Ian Jackson2018-08-03
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 6.5Ian Jackson2018-08-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 6.4debian/6.4archive/debian/6.4Ian Jackson2018-08-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(1): Fix typo "unappled".Ian Jackson2018-08-02
| | | | | | | | | | | | Closes:#905064. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: start 6.4Ian Jackson2018-08-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * changelog: finalise 6.3debian/6.3archive/debian/6.3Ian Jackson2018-08-02
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Implement --help, providing a summary.Ian Jackson2018-07-31
| | | | | | | | | | | | | | | | | | | | | | | | Provide a usage message. I'm not convinced an option summary here is a good idea, mainly there aren't any really important options. (-f will be advertised when it is relevant.) So I have just summarised the most important operations. Closes:#904990. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * dgit-maint-debrebase(7): Warn more against plain git rebase.Ian Jackson2018-07-31
| | | | | | | | | | | | | | | | | | | | | | Specifically, - warn that pseudomerges must not be rebased over - warn and that git-rebase without a base should not be used - say to run gdr instead Closes:#905004. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(1): Warn against plain git rebase.Ian Jackson2018-07-31
| | | | | | | | | | | | Re #905004. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase(5): Add ILLEGAL OPERATIONS section.Ian Jackson2018-07-31
| | | | | | | | | | | | Re #905004. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * test suite; convert-from-gbp: test not identical in upstream filesIan Jackson2018-07-31
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Improve error message for convert-from-gbp upstream discrepancyIan Jackson2018-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes:#905078. I don't intend to print `small' diffs because I think that kind of dwim is probably more annoying than helpful. I don't intend to factor this kind of pattern out throughout because: The messages for these commands are generally not the actual diff rune dgit or gdr ran, for various reasons (notably that dgit/gdr often use object hashes). The result is that there is little duplication. So I think the situation now is OK. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Improve error messages for bad options.Ian Jackson2018-07-31
| | | | | | | | | | | | | | | | | | | | * GetOptions calls warn(). So we need a wrapper which disables or $SIG{__WARN__} (which prints a stack trace). * Put the call to badusage in the wrapper. * Change the messages to be clearer about what is meant. * Add the program name to the badusage message. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: convert-from-gbp: Use same algorithm for finding upstreamIan Jackson2018-07-31
| | | | | | | | | | | | | | | | | | | | | | | | The version is in the changelog, and thus upstream commitish can then be found from as new-upstream. This also means we now give the same error message, which is much better than the one we had before. Closes:#905062. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| * git-debrebase: Break out resolve_upstream_version (nfc)Ian Jackson2018-07-31
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 12:14:52 +0000