[PATCH v3 00/11] struct object_id, Part 4

["brian m. carlson" <sandals@crustytoothpaste.net>]

This series is part 4 in a series of conversions to replace instances of
unsigned char [20] with struct object_id.  Most of this series touches
the merge-recursive code.

New in this series is the use of Coccinelle (http://coccinelle.lip6.fr/)
semantic patches.  These semantic patches can make automatic
transformations to C source code for cleanup or refactoring reasons.

This series introduces a set of transforms for the struct object_id
transition, cleans up some existing code with them, and applies a small
number of semantic patches to transform parts of the merge-recursive
code.  Some manual refactoring work follows.

Note that in the patches created with the semantic patches, the only
manual change was the definition of the struct member.  Opinions on
whether this is a viable technique for further work to ease both the
creation and review of patches are of course welcomed.

The testsuite continues to pass at each step, and this series rebases
cleanly on next.

I picked up Junio's change from sha_eq to oid_eq, but didn't convert the
calls to oidcmp.  I think the current version (with oid_eq) is actually
more readable than using oidcmp, if slightly less efficient.

Changes from v2:
* Pick up improvements from Junio's version on pu.
* Add oid_to_hex_r.
* Add oid_to_hex_r to object_id.cocci.
* Convert prep_temp_blob as suggested by Junio.
* Converted hashcpy(.*, null_sha1) to hashclr.

Changes from v1:
* Move the object ID transformations to contrib/examples/coccinelle.
* Add a README to that folder explaining what they are.
* Adjust the Coccinelle patches to transform plain structs before
  pointers to structs to avoid misconversions.  This addresses the issue
  that Johannes Sixt caught originally.

brian m. carlson (11):
  hex: add oid_to_hex_r.
  contrib/coccinelle: add basic Coccinelle transforms
  Convert hashcpy with null_sha1 to hashclr.
  coccinelle: apply object_id Coccinelle transformations
  diff: convert struct diff_filespec to struct object_id
  diff: rename struct diff_filespec's sha1_valid member
  merge-recursive: convert struct stage_data to use object_id
  merge-recursive: convert struct merge_file_info to object_id
  merge-recursive: convert leaf functions to use struct object_id
  merge-recursive: convert merge_recursive_generic to object_id
  diff: convert prep_temp_blob to struct object_id.

 bisect.c                           |   2 +-
 builtin/blame.c                    |   6 +-
 builtin/fast-export.c              |  10 +-
 builtin/merge-recursive.c          |  20 +--
 builtin/merge.c                    |  15 +-
 builtin/reset.c                    |   4 +-
 builtin/unpack-objects.c           |   4 +-
 cache.h                            |   1 +
 combine-diff.c                     |  14 +-
 contrib/coccinelle/README          |   2 +
 contrib/coccinelle/object_id.cocci |  95 ++++++++++++
 diff.c                             |  99 ++++++------
 diffcore-break.c                   |   4 +-
 diffcore-rename.c                  |  16 +-
 diffcore.h                         |   4 +-
 hex.c                              |   5 +
 line-log.c                         |  12 +-
 merge-recursive.c                  | 310 +++++++++++++++++++------------------
 merge-recursive.h                  |   6 +-
 notes-merge.c                      |  42 ++---
 refs/files-backend.c               |   4 +-
 submodule-config.c                 |   2 +-
 submodule.c                        |   4 +-
 t/helper/test-submodule-config.c   |   2 +-
 wt-status.c                        |   3 +-
 25 files changed, 403 insertions(+), 283 deletions(-)
 create mode 100644 contrib/coccinelle/README
 create mode 100644 contrib/coccinelle/object_id.cocci