summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | dgit: Break out import_tarball_commitsIan Jackson2019-06-30
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Break out import_tarball_tartreesIan Jackson2019-06-30
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: read_tree_*: Treat '' as meaning 'delete this'Ian Jackson2019-06-30
| | | | | | | | | | | | No functional change with existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Break out $quilt_options_reIan Jackson2019-06-30
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian: break out lib-baredebian, baredebian-testIan Jackson2019-06-30
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian: Add missing dependency quilIan Jackson2019-06-30
| | | | | | | | | | | | This was simply missing and causes the formal adt run to fail. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: lib: Add missing dependencies for git-deborigIan Jackson2019-06-30
| | | | | | | | | | | | | | I seem to have overlooked the 2nd line of the relevant part of the devscripts package description. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian-push: Add missing dependency DEBORIGIan Jackson2019-06-30
| | | | | | | | | | | | | | Our enumeration system does not capture dependencies from t-setup-import. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: t-setup-done: Arrange to save all DGIT_TEST_REAL_*Ian Jackson2019-06-30
| | | | | | | | | | | | | | | | Otherwise the importer may end up with our stunt versions on their PATH, but without the necessary DGIT_TEST_REAL_* variables which stop infinite recursion. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): split view: Talk about `your local git clone'Ian Jackson2019-06-29
| | | | | | | | | | Suggested-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): document --quilt=bareebianIan Jackson2019-06-29
| | | | | | | | | | Closes: #903392 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian-push: Test rejection of -wgfIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: Reject --clean=gitIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian-push: Check that history is roughly rightIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: Note upstream commitish source in proseIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: Provide $quilt_upstream_commitish_messageIan Jackson2019-06-29
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: Note upstream version and commitish sourceIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian-push: Actually test --quilt=baredebianIan Jackson2019-06-29
| | | | | | | | | | | | This is all quite awful really. I think that is inherent. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: baredebian setup, and a skeleton to run itIan Jackson2019-06-29
| | | | | | | | | | | | The baredebian-push test will be fleshed out in a moment. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | i18n: Add translator notes about ASCII art changes displayIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: New quilt modeIan Jackson2019-06-29
| | | | | | | | | | | | | | This is the bulk of the implementation including all essential changes. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: baredebian: Introduce --upstream-commitishIan Jackson2019-06-29
| | | | | | | | | | | | | | | | | | Not documented yet. Nor, used, since $quilt_mode is not ever baredebian yet. So currently just an option you can pass to make dgit bomb out. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: Add DEBORIG pseudo-dependencyIan Jackson2019-06-29
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: resolve_upstream_version: Return a message tooIan Jackson2019-06-29
| | | | | | | | | | | | No functional change for existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Introduce $uhead and $uhead_whatshortIan Jackson2019-06-29
| | | | | | | | | | | | | | | | No overall functional change other than (sadly) to complicate the life of translators. I will add some notes for translators after I've made this string actually vary. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Make $format available in build_or_push_prep_modesIan Jackson2019-06-29
| | | | | | | | | | | | | | | | By returning it from determine_whether_split_brain. No functional change yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | git-debrebase: Replace one open-coded hash-object with hash_commitIan Jackson2019-06-29
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: Move hash_commit from dgitIan Jackson2019-06-29
| | | | | | | | | | | | No functional change other than to no longer honour @git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: Move make_commit (git-commit-tree wrapper) from gdrIan Jackson2019-06-29
| | | | | | | | | | | | No functional change other than to no longer honour @git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Rename various *make_commit* to *hash_commit*Ian Jackson2019-06-29
| | | | | | | | | | | | | | | | This avoids a subroutine name clash with make_commit in gdr. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: Move read-tree wrappers from git-debrebaseIan Jackson2019-06-29
| | | | | | | | | | | | No functional change other than to no longer honour @git. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: Move resolve_upstream_version from git-debrebaseIan Jackson2019-06-29
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | Dgit.pm: Move upstream_commitish_search from git-debrebaseIan Jackson2019-06-29
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | docs: Document --split-view and change terminologyIan Jackson2019-06-29
| | | | | | | | | | | | | | | | | | We now speak in the docs of * splitting quilt mode(s) * split view (being) in operation Closes: #926640 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: new test forcesplit-linearIan Jackson2019-06-28
| | | | | | | | | | | | Test split view with non-splitting quilt mode. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: forcesplit-overwrite: Test with bare --overwriteIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: forcesplit-overwrite: Test without --overwriteIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: forcesplit-overwrite: Break out "try"Ian Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite: forcesplit-overwrite: Check -pushed-goodIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | test suite; New test forcesplit-overwriteIan Jackson2019-06-28
| | | | | | | | | | | | | | | | Still needs: * checking that we didn't move HEAD * checking HEAD tree is equal Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Reject split view with correct messageIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | Now, it is not just a splitting quilt mode which might cause this, but also an explicit request for split view. This has some duplicated text, which I understand is easier for translators. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Support split view in non-splitting quilt modesIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | Provide --split-view|brain=auto|always|never and the corresponding access cfg option .split-view. This is not documented or tested yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: In code, rename splitbrain quilt modes to splittingIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | A "splitting" quilt mode is going to be one which requires split brain mode. But split brain mode is going to be possible in other quilt modes too. The existing name of the splitbrain quilt cache is correct: it is used precisely for quilt fixup, in split brain modes (even for non splitting quilt modes, now). In split brain mode without quilt, it is not needed or used. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Reject dgit pull in split brain modeIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | | | | | In splitting quilt modes dgit pull would have to back-convert the changes and currently there is no code to do this, and these cases were correctly rejected before. But in other quilt modes it would still have to strip off pseudomerges or quilt fixup commits. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Move determine_whether_split_brain further up the fileIan Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Break out determine_whether_split_brainIan Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Crash if we forgot to set $do_split_brainIan Jackson2019-06-28
| | | | | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Put !! inside do_split_brain()Ian Jackson2019-06-28
| | | | | | | | | | | | No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit: Introduce do_split_brain()Ian Jackson2019-06-28
| | | | | | | | | | | | No functional change yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* | dgit(1): Tidying up after tag format: Drop splitbrain conditionalIan Jackson2019-06-28
| | | | | | | | | | | | | | | | | | Now, debiantags is always just debiantag_new plus debiantag_maintview. So we can drop this complexity. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>