| Commit message (Collapse) | Author | Age |
... | |
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
We want to be able to fetch from some other distro, or a bit more from
the same one.
No functional change since no callers pass trueish $supplementary.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Print default values too, when they are looked up and used.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
These do not need to vary with the suite, because the refs are named,
within this namespace, after the corresponding refs on the server.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Code motion only.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
So far we don't do much with it, so this akes no change except to
messages.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
This gives it the $dsc. Also it means that import-dsc will understand
very old .dscs with Vcs-Dgit-Master.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
These appear in various interchange output like tags. They should be
sane. They're going to appear in Dgit: too where people will need to
use them.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change other than changes to messages.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Downstream clients may need this to get the relevant git commits.
Worse, with the new rewrite functionality, they may get the _wrong_
commits because they may not be rewritten.
For now we implement the publication side. The reader side is
theoretically straightforward, but probably not so simple in reality,
and certainly fiddly to test.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
We should use the calculated $idistro and $isuite
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By moving parseopts_late_defaults call.
This is conceptually the same as finalise_late_opts, so do it there.
We have to add a missing call to build_prep_early, as otherwise we
call massage_dbp_args too soon.
Also move a nopushing() call until after $isuite is set
All of this means that we now honour $isuite (and sometimes $idistro)
much better.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This means $isuite is set a bit earlier, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
This means $isuite is set early enough.
As a side-effect, we correctly reject -p.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were two places in the code where ill-formed commits were
generated: both psedumerges.
One is in dgit import-dsc, a fairly minor problem.
The other is in --overwrite and is very bad because that's an
important option.
Nothing in git seems to notice, unless you run git-fsck. Even a git
server does not, by default. However, some other popular git servers
do reject these broken commits.
I have tested this changes with git-fsck (by using the test suite
patches which follow in this series) and now everything seems fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
In particular, do not fail utterly if dpkg-source and gbp
disagree. Closes:#848843.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Print the git old and new modes too.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
By psssing --include-removal to dpkg-source, and tolerating it when we
do our quilt fixup analysis.
dpkg-source has supported this since at least stretch.
Closes:#848901.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Honour DGIT_ABSURD_DEBUG, which is set by dgit from $debuglevel.
Also, in dgit, open the output file for append.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Closes:#848512.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Even in non-split-view quilt modes. Closes:#844129.
This breaks one of the test suite test cases, so disable it there.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
While we're at it, use a hash %y rather than repeatedly grepping.
No overall functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
If no changes are needed to the package, user may indeed just debsign
and dput. Closes:#844131.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Removes three identical copies of this y/// rune. No functional
change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Change all call sites, and callers of mktree_in_ud_from_only_subdir.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
No overall functional change. (We end up passing `.' to git add,
which these two sites didn't previously.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ie, if it contains other than one single directory toplevel.
Closes:#843422.
Specifically:
* We change the unpack directory to _unpack-tar in unpack, rather
than ../unpack-tar. This means that mktree_in_ud DTRT in that
directory, rather than in its supposed only subdiredctory
* We do write-tree on the whole tarball.
* Then if the tarball had only one subdir in it, we fish the
subtree's tree object out of the git tree object.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
origs <blah>.orig.tar.gz f.same=1 #f._differ=-1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
Have fudged it to see what it did, and it seems to work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
As documented in the manpage.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
fetchpullargs has to run before we have dealt with multisuites, which
cannot be straightforwardly canonicalised.
Move the canonicalisation out of fetchpullargs. Previously,
fetchpullargs would always call canonicalise_suite if it wasn't going
to fail. In one of the cases it would print a message, but we have
just changed canonicalise_suite to print a message too, so the one
from fetchpullargs was redundant.
fetchpullargs is called right before fetch, in cmd_fetch; and, in
cmd_pull. In cmd_pull the split brain check intervenes between
fetchpullargs and pull which calls fetch. So overall there is now no
functional change other than the loss of the now-redundant message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|