This applies on nd/the-index (b3c7eef9b05) and is the logical continuation of
the object store series, which I sent over the last year.
The previous series did take a very slow and pedantic approach,
using a #define trick, see cfc62fc98c for details, but it turns out,
that it doesn't work:
When changing the signature of widely used functions, it burdens the
maintainer in resolving the semantic conflicts.
In the orginal approach this was called a feature, as then we can ensure
that not bugs creep into the code base during the merge window (while such
a refactoring series wanders from pu to master). It turns out this
was not well received and was just burdensome.
The #define trick doesn't buy us much to begin with when dealing with
non-merge-conflicts. For example, see deref_tag at tag.c:68, which got
the repository argument in 286d258d4f (tag.c: allow deref_tag to handle
arbitrary repositories, 2018-06-28) but lost its property of working on any
repository while 8c4cc32689 (tag: don't warn if target is missing but
promised, 2018-07-12) was in flight simultaneously.
Another example of failure of this approach is seen in patch 5, which
shows that the pedantry was missed.
This series takes another approach as it doesn't change the signature of
functions, but introduces new functions that can deal with arbitrary
repositories, keeping the old function signature around using a shallow wrapper.
Additionally each patch adds a semantic patch, that would port from the old to
the new function. These semantic patches are all applied in the very last patch,
but we could omit applying the last patch if it causes too many merge conflicts
and trickl in the semantic patches over time when there are no merge conflicts.
The original goal of all these refactoring series was to remove add_submodule_odb
in submodule.c, which was partially reached with this series. I'll investigate the
remaining calls in another series, but it shows we're close to be done with these
large refactorings as far as I am concerned.
Thanks,
Stefan
Stefan Beller (19):
sha1_file: allow read_object to read objects in arbitrary repositories
packfile: allow has_packed_and_bad to handle arbitrary repositories
object-store: allow read_object_file_extended to read from arbitrary
repositories
object-store: prepare read_object_file to deal with arbitrary
repositories
object: parse_object to honor its repository argument
commit: allow parse_commit* to handle arbitrary repositories
commit.c: allow paint_down_to_common to handle arbitrary repositories
commit.c: allow merge_bases_many to handle arbitrary repositories
commit.c: allow remove_redundant to handle arbitrary repositories
commit: allow get_merge_bases_many_0 to handle arbitrary repositories
commit: prepare get_merge_bases to handle arbitrary repositories
commit: prepare get_commit_buffer to handle arbitrary repositories
commit: prepare in_merge_bases[_many] to handle arbitrary repositories
commit: prepare repo_unuse_commit_buffer to handle arbitrary
repositories
commit: prepare logmsg_reencode to handle arbitrary repositories
pretty: prepare format_commit_message to handle arbitrary repositories
submodule: use submodule repos for object lookup
submodule: don't add submodule as odb for push
Apply semantic patches from previous patches
apply.c | 6 +-
archive.c | 5 +-
bisect.c | 5 +-
blame.c | 15 +--
builtin/am.c | 2 +-
builtin/blame.c | 4 +-
builtin/cat-file.c | 21 +++--
builtin/checkout.c | 4 +-
builtin/commit.c | 13 ++-
builtin/describe.c | 4 +-
builtin/difftool.c | 3 +-
builtin/fast-export.c | 7 +-
builtin/fmt-merge-msg.c | 8 +-
builtin/grep.c | 2 +-
builtin/index-pack.c | 8 +-
builtin/log.c | 4 +-
builtin/merge-base.c | 2 +-
builtin/merge-tree.c | 9 +-
builtin/mktag.c | 3 +-
builtin/name-rev.c | 2 +-
builtin/notes.c | 12 ++-
builtin/pack-objects.c | 22 +++--
builtin/reflog.c | 5 +-
builtin/replace.c | 2 +-
builtin/shortlog.c | 5 +-
builtin/show-branch.c | 4 +-
builtin/tag.c | 4 +-
builtin/unpack-file.c | 2 +-
builtin/unpack-objects.c | 3 +-
builtin/verify-commit.c | 2 +-
bundle.c | 2 +-
combine-diff.c | 2 +-
commit-graph.c | 8 +-
commit.c | 120 ++++++++++++++----------
commit.h | 67 ++++++++++---
config.c | 2 +-
contrib/coccinelle/the_repository.cocci | 114 ++++++++++++++++++++++
diff.c | 3 +-
dir.c | 2 +-
entry.c | 3 +-
fast-import.c | 7 +-
fsck.c | 9 +-
grep.c | 3 +-
http-push.c | 3 +-
log-tree.c | 3 +-
mailmap.c | 2 +-
match-trees.c | 4 +-
merge-blobs.c | 6 +-
merge-recursive.c | 13 +--
negotiator/default.c | 6 +-
negotiator/skipping.c | 2 +-
notes-cache.c | 5 +-
notes-merge.c | 4 +-
notes-utils.c | 2 +-
notes.c | 10 +-
object-store.h | 13 ++-
object.c | 2 +-
packfile.c | 5 +-
packfile.h | 2 +-
pretty.c | 33 ++++---
pretty.h | 7 +-
read-cache.c | 5 +-
remote-testsvn.c | 4 +-
remote.c | 2 +-
rerere.c | 5 +-
revision.c | 12 +--
sequencer.c | 55 ++++++-----
sha1-file.c | 22 +++--
sha1-name.c | 9 +-
shallow.c | 4 +-
streaming.c | 2 +-
submodule-config.c | 3 +-
submodule.c | 51 +++++++---
t/helper/test-revision-walking.c | 3 +-
tag.c | 5 +-
tree-walk.c | 6 +-
tree.c | 5 +-
walker.c | 2 +-
xdiff-interface.c | 2 +-
79 files changed, 571 insertions(+), 278 deletions(-)
create mode 100644 contrib/coccinelle/the_repository.cocci
--
2.19.0
