delta/git.git/ref-filter.c, branch wd/userdiff-css

ref-filter.c: mark strings for translation

2016-02-29T22:27:58+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Merge branch 'jk/tighten-alloc'

2016-02-26T21:37:16+00:00

Update various codepaths to avoid manually-counted malloc().

* jk/tighten-alloc: (22 commits)
  ewah: convert to REALLOC_ARRAY, etc
  convert ewah/bitmap code to use xmalloc
  diff_populate_gitlink: use a strbuf
  transport_anonymize_url: use xstrfmt
  git-compat-util: drop mempcpy compat code
  sequencer: simplify memory allocation of get_message
  test-path-utils: fix normalize_path_copy output buffer size
  fetch-pack: simplify add_sought_entry
  fast-import: simplify allocation in start_packfile
  write_untracked_extension: use FLEX_ALLOC helper
  prepare_{git,shell}_cmd: use argv_array
  use st_add and st_mult for allocation size computation
  convert trivial cases to FLEX_ARRAY macros
  use xmallocz to avoid size arithmetic
  convert trivial cases to ALLOC_ARRAY
  convert manual allocations to argv_array
  argv-array: add detach function
  add helpers for allocating flex-array structs
  harden REALLOC_ARRAY and xcalloc against size_t overflow
  tree-diff: catch integer overflow in combine_diff_path allocation
  ...

convert trivial cases to FLEX_ARRAY macros

2016-02-22T22:51:09+00:00

Using FLEX_ARRAY macros reduces the amount of manual
computation size we have to do. It also ensures we don't
overflow size_t, and it makes sure we write the same number
of bytes that we allocated.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

ref-filter: introduce objectname_atom_parser()

2016-02-17T22:06:45+00:00

Introduce objectname_atom_parser() which will parse the
'%(objectname)' atom and store information into the 'used_atom'
structure based on the modifiers used along with the atom.

Helped-by: Ramsay Jones 
Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: introduce contents_atom_parser()

2016-02-17T22:06:45+00:00

Introduce contents_atom_parser() which will parse the '%(contents)'
atom and store information into the 'used_atom' structure based on the
modifiers used along with the atom. Also introduce body_atom_parser()
and subject_atom_parser() for parsing atoms '%(body)' and '%(subject)'
respectively.

Helped-by: Ramsay Jones 
Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: introduce remote_ref_atom_parser()

2016-02-17T22:06:45+00:00

Introduce remote_ref_atom_parser() which will parse the '%(upstream)'
and '%(push)' atoms and store information into the 'used_atom'
structure based on the modifiers used along with the corresponding
atom.

Helped-by: Ramsay Jones 
Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: align: introduce long-form syntax

2016-02-17T22:06:45+00:00

Introduce optional prefixes "width=" and "position=" for the align atom
so that the atom can be used as "%(align:width=,position=)".

Add Documentation and tests for the same.

Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: introduce align_atom_parser()

2016-02-17T22:06:45+00:00

Introduce align_atom_parser() which will parse an 'align' atom and
store the required alignment position and width in the 'used_atom'
structure for further usage in populate_value().

Since this patch removes the last usage of match_atom_name(), remove
the function from ref-filter.c.

Helped-by: Eric Sunshine 
Helped-by: Jeff King 
Helped-by: Ramsay Jones 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: introduce parse_align_position()

2016-02-17T22:06:45+00:00

Extract parse_align_position() from populate_value(), which, given a
string, would give us the alignment position. This is a preparatory
patch as to introduce prefixes for the %(align) atom and avoid
redundancy in the code.

Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

ref-filter: introduce color_atom_parser()

2016-02-17T22:06:45+00:00

Introduce color_atom_parser() which will parse a "color" atom and
store its color in the "used_atom" structure for further usage in
populate_value().

Helped-by: Ramsay Jones 
Helped-by: Eric Sunshine 
Signed-off-by: Karthik Nayak 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano