| Commit message (Collapse) | Author | Age |
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
We are going to want to do some other things beforehand, but after the
dryrun safety catch.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
When cloning a distro which has no git server, correctly leave the
user on the local dgit branch, not on `master'.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Again, we are going to want to reuse these bits.
No functional change right now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
We are going to want to reuse these bits of the fetch finishing-up.
No functional change right now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Not only when a noncanonical one was specified. This makes some
output less confusing - especially when combined with the forthcoming
multisuite feature.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
No significant functional change right now.
When $us changes, it will be more right.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
(Provide the configuration to use the aptget method.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Uses Sources. This is not very efficient and should be avoided for
large apt repositories.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
This is going to be useful for *-security.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
| |
This distro name is used for tag names, protocol elements, etc., and
also as a search element for config lookups.
Each distro can specify a nominal-distro.
No functional change with current config.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
Now the archive_query functions return urls, not subpaths.
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 -p is specified during push, we check that it's right.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
| |
def02420f6d5 "-p option" abolished various adhocery in command line
positional parameter parsing and documented the -p option. But it
didn't implement it!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
| |
This deals with the possible "bad object" problem from an in-archive
copy. Any such in-archive copy should come with either an update to
the suite branch on the dgit-repos server (if maybe it needed a
pseudomerge for centrally maintained history), or be identical to the
upload's version tag.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If $lastpush_hash is '', it means that the dgit git server does not
have the suite branch. That can even happen if the current version in
the suite was a .dsc with a Dgit field, if an in-archive copy moved
the .dsc from whereever it was uploaded.
Do not crash in this situation. Instead, give the user the Dgit hash
(and maybe pseudomerge it with the user's history - sigh).
There is still a possible problem: maybe the referenced commit is on
another branch.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
To avoid creating unfortunate wreckage on non-dgit-view
branches. Closes:#842608.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
if it seems applicable. Closes:#841094.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
| |
Currently only one call site which is only ever called once. We make
it idempotent since we're going to want that.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
And many call sites. No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
(with a warning in the manpage about possible skew).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
This makes it less likely that the user will trip over any
timestamp-dependent FTBFS bugs (eg #842452).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
In particular, means that the output of a split view quilt-fixup is
left somewhere useful.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
If --require-valid-signature was not set, we would not print the
warning if there was one. That is quite wrong.
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>
|
|
|
|
| |
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>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No other change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
| |
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
| |
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
* Spot if any of our .origs have different hashes to the archive's
* Update the .changes to have the set of .origs that the archive doesn't
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
Now dgit can, during the test suite, make file_in_archive queries,
without exploding.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Like ftpmasterapi but knows that actually behind the scenes it's just
mostly cat. Ths is relevant because file_in_archive_dummycatapi has
to be different.
(This is because the test suite can't sensibly predict what queries
dgit might make, because the relevant bits of the test suite don't
actually really know what .origs might be supposed to exist.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|
|
|
|
|
|
|
| |
That makes these easier to reuse for another method. No functional
change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
|