summaryrefslogtreecommitdiff
path: root/dgit
Commit message (Collapse)AuthorAge
* Tag change: Rename debiantag to debiantag_oldIan Jackson2016-07-31
| | | | | | | | | | | | | | | | | We are going to change the tag name of the main signed tag used by dgit to signal the user's intent to the archive server. Prepare for this by changing debiantag to debiantag_old and changing all call sites outside dgit itself. dgit will want to be able to generate either, depending on whether it's cooperating in an rpush with a new or old dgit so reintroduce a wrapper called debiantag there. This will also allow us to have dgit generate old tags for testing. No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit: rpush protocol comment: Add some missing protocol elementsIan Jackson2016-07-31
| | | | | | | progress, supplementary-message, previously, and param csuite, were all missing. Document them. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* Split brain: When pushing, find the dgit view in the cacheIan Jackson2016-07-17
| | | | | We now do set $split_brain, and we don't do anythig with the cached dgit view, so we'll crash at the die, in a moment.
* Innards: Improve mktree_in_ud_from_only_subdir messageIan Jackson2016-07-17
| | | | When it finds multiple subdirs, print them.
* Subprocess error handling: Initialise $? to -1Ian Jackson2016-07-17
| | | | | | | | | | | | | | | When system(3perl) fails due to syscall error, it sets only $!. When it succeeds it sets only $? and sometimes trashes $!. Conversely, close of a popened filehandle always sets both in all cases. Document this in a comment. So when using system and relying on $?/$! (rather than looking at system's return value), such as when about to use failedcmd, it's necessary to initialise $? to -1. Fix the three call sites where system might be followed by failedcmd but this wasn't done.
* Subprocess error handling: Fix when divert check failsIan Jackson2016-07-17
| | | | | If the remote command failed, do not try to match the undef value against the various regexps.
* Subprocess error handling: Do not call faildcmd when open failsIan Jackson2016-07-17
| | | | | failecmd wants to look at $? too and anyway the full command is not of much interest in these cases.
* Split brain: Fix grammar in a messageIan Jackson2016-07-17
|
* Split brain: In dopush, get HEAD earlier (nfc)Ian Jackson2016-07-17
|
* Split brain: Do not look at all of %INC for cache keyIan Jackson2016-07-17
| | | | | | | | Look only at dgit and Debian/Dgit. The prompt for this is that some of our submodules seem to dynamically load some of their components depending on what dgit does, making the cache key unstable.
* quilt innards: Change calling convention for quilt_check_splitbrain_cacheIan Jackson2016-07-17
|
* quilt innards: Break out quilt_check_splitbrain_cache (nfc)Ian Jackson2016-07-17
|
* quilt innards: Break out uilt_make_fake_dsc (nfc)Ian Jackson2016-07-17
|
* quilt innards: Remove a couple of stray blank linesIan Jackson2016-07-17
|
* quilt innards: Fix a formatting glitchIan Jackson2016-07-17
|
* Quilt mode reporting: Only print warning about quilt onceIan Jackson2016-07-17
|
* When synthesing a commit from a .dsc from the archive, stop internal git ↵Ian Jackson2016-07-16
| | | | reset from printing a confusing message about HEAD.
* Split brain: Use GZIP -1n to avoid spurious timestampIan Jackson2016-07-16
| | | | | | Otherwise the cache entry's .dsc contains the hash of a fake debian.tar.gz which has had a timestamp put in it by gzip, defeating the cache.
* Split brain: Improve and rationalise progress messagesIan Jackson2016-07-16
|
* Split brain: Provide --gbp= and --gbp:Ian Jackson2016-07-16
| | | | Not documented yet.
* Split brain: With patches-unapplied trees, apply before running rulesIan Jackson2016-07-16
| | | | | | | | | | | | Everywhere we invoke dpkg-buildpackage, check if we need to apply the patches. And at the end of every command that might have done this, check if we did, and unapply them if so. We don't try to unapply patches in case of error. That seems likely to be quite fragile. Print a warning when we apply patches, suggesting ways to avoid the need.
* Split brain: Show progress message when dgit view created OKIan Jackson2016-07-16
|
* Split brain: Do not leave STDOUT redirected to /dev/null (!)Ian Jackson2016-07-16
| | | | | We use runcmd shell_cmd for gbp pq import, and the other commands not produce undesirable output.
* Split brain: Use `gbp pq' (which exists) not `gbp-pq' (which doesn't)Ian Jackson2016-07-16
|
* Split brain: Include quilt mode in cache keyIan Jackson2016-07-16
| | | | This can make a radical difference!
* Split brain: Fix unapplied tree handlingIan Jackson2016-07-16
| | | | | | | Do the quiltify_splitbrain_needed if there _are_ patches, not if there aren't. And if we're told it was an unapplied tree, check that HEAD and orig are indeed the same (excluding debian/*, of course) and print a useful message if not.
* Split build: Add a bit more debugging outputIan Jackson2016-07-16
|
* Split brain: Run source build in dgit view directoryIan Jackson2016-07-16
| | | | | And, after the source build is done, copy the resulting files out into the invocation directory's parent, where people expect to find them.
* Split build: Split clean from source build in split build modeIan Jackson2016-07-16
|
* Split brain: some work on integration into the rest of dgitIan Jackson2016-07-16
| | | | | | | | | | | * Move the fast forward die to where we will need to make the synthetic commit, so that the tree equality check is done on the thing we will actually push. * Crash if we are trying to do split brain without split build. (This should never happen.) * Set split build if we need split brain.
* dgit: Rename $suppress_clean to $clean_using_builder (nfc)Ian Jackson2016-07-16
| | | | | This variable name was very confusing. Also, add a comment explaining the semantics.
* Split brain: Quieten dgit-view checkoutIan Jackson2016-07-16
|
* Split brain: introduce quiltmode_splitbrain() (nfc)Ian Jackson2016-07-16
|
* Split brain: Memoise (cache) split brain dgit-view in a reflogIan Jackson2016-07-16
|
* Split brain: Actually get gbp pq output back onto dgit-view branchIan Jackson2016-07-16
| | | | And explain why in a comment.
* Split brain: Transfer gbp-pq patch application output to dgit-view branchIan Jackson2016-07-16
| | | | This code does not work properly yet; it will be fixed soon.
* Split brain: Generate .gitignore patch in deterministic orderIan Jackson2016-07-16
|
* Split brain: Actually generate .gitignore patchIan Jackson2016-07-16
| | | | | | | | | Close our FH onto the file, and run git diff to fill it with the actual diff. Add the file to series. Use git add and git commit to commit the patch to the private git branch. Now most of the code to generate the .gitignore properly is present, I think, but not debugged.
* Split brain: Create debian/patches in case it does not existIan Jackson2016-07-16
| | | | | When we need to make the .gitignore patch, there may not yet be any debian/patches directory.
* Split brain: Add [dgit version ] tag to autogenerated .gitignore patch headerIan Jackson2016-07-16
| | | | So far we still don't generate the patch.
* Split brain: Provide a lot more information to quiltify_splitbrain (nfc)Ian Jackson2016-07-16
| | | | It is going to need this extra info in a moment.
* Split brain: Provide optional $ignorenamesr argument to quiltify_trees_differIan Jackson2016-07-16
| | | | | We are going to need this information to construct the substantive diff for the .gitignores patch.
* Split brain: quiltify_trees_differ: document $ignorenamesrIan Jackson2016-07-16
|
* Split brain: Print $unapplied tree hash to debug log, tooIan Jackson2016-07-16
|
* Split brain: Start work on generating gitignore patchIan Jackson2016-07-16
| | | | Generate a patch header, for now. Still not finished.
* Split brain: Move GIT_COMMITTER_* setting to quiltify_splitbrain toplevel (nfc)Ian Jackson2016-07-16
| | | | | We want this to apply to any commits we use git to make, not just gbp-pq.
* Split brain: Further improvements to split brain patch applicationIan Jackson2016-07-16
| | | | | | * Direct gbp-pq's stdout to /dev/null * Specify GIT_COMMITER_* so that the results are reproducible * Detect .gitignore problem
* Split brain: Pass $clogp to quiltify_splitbrain (nfc)Ian Jackson2016-07-16
| | | | We are going to want this in a moment.
* Split brain: Make clogp_authline capable of returning individual pieces (nfc)Ian Jackson2016-07-16
| | | | | | | | We are going to want this (so that we can set GIT_... variables to the pieces to make git construct commits the way we want). Both current call sites provide scalar context, so no functional change.
* Split brain: Break out $git_authline_reIan Jackson2016-07-16
| | | | | | This will make it a bit easier to reuse it. Actually AFAICT it turns out (looking at the rest of the branch) that this is not needed, but it's nicer for the future I think.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 04:57:40 +0000