mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
54,426 Commits 6 Branches 956 Tags 512 MiB
0cda1003b7
Commit Graph

1289 Commits

Author SHA1 Message Date
Nguyễn Thái Ngọc Duy
0cda1003b7 diff-parseopt: convert --ext-diff 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
9bbaf1ce34 diff-parseopt: convert --quiet 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
1086ea0cc2 diff-parseopt: convert --exit-code 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
212db69d8c diff-parseopt: convert --color-words 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
797df119a2 diff-parseopt: convert --word-diff-regex 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
e9fb39b668 diff-parseopt: convert --word-diff 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
8b81c26e5c diff-parseopt: convert --[no-]color 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
1e9250b5aa diff-parseopt: convert --[no-]follow 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
4f99f29905 diff-parseopt: convert -R 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:22 +09:00
Nguyễn Thái Ngọc Duy
c37d4c0a3c diff-parseopt: convert -a|--text 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
4fe0167215 diff-parseopt: convert --full-index 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
6d9af6f4da diff-parseopt: convert --binary 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
df84a43627 diff-parseopt: convert --anchored 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
10f35b1cc0 diff-parseopt: convert --diff-algorithm 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
f1e68ef561 diff-parseopt: convert --histogram 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
31fd640e95 diff-parseopt: convert --patience 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
06f77518db diff-parseopt: convert --[no-]indent-heuristic 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-03-07 08:02:21 +09:00
Nguyễn Thái Ngọc Duy
87649a1674 diff-parseopt: convert --ignore-some-changes 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
2e75f922f3 diff-parseopt: convert --[no-]minimal 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
0b1c5b59f0 diff-parseopt: convert --relative 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
cdc43eb0b8 diff-parseopt: convert --no-renames|--[no--rename-empty 
For --rename-empty, see 90d43b0768 (teach diffcore-rename to
optionally ignore empty content - 2012-03-22) for more information.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
bdd4741bfd diff-parseopt: convert --find-copies-harder 
--no-find-copies-harder is also added on purpose (because I don't see
why we should not have the --no- version for this)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
7f64850d36 diff-parseopt: convert -C|--find-copies 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
1e5332968a diff-parseopt: convert -D|--irreversible-delete 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
f476308b27 diff-parseopt: convert -M|--find-renames 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
ced4e179fe diff-parseopt: convert -B|--break-rewrites 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
af2f368091 diff-parseopt: convert --output-* 
This also validates that the user specifies a single character in
--output-indicator-*, not a string.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
7d7942b796 diff-parseopt: convert --[no-]compact-summary 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
84b5089e41 diff-parseopt: convert --stat* 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
e01df7a33d diff-parseopt: convert -s|--no-patch 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:59 -08:00
Nguyễn Thái Ngọc Duy
a23874726b diff-parseopt: convert --name-status 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
0e840e2af4 diff-parseopt: convert --name-only 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
e550f58551 diff-parseopt: convert --patch-with-stat 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
70a304179a diff-parseopt: convert --summary 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
fc6af3e92a diff-parseopt: convert --check 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
4ce7aab5a5 diff-parseopt: convert --dirstat and friends 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-21 15:16:58 -08:00
Nguyễn Thái Ngọc Duy
e56736203e diff-parseopt: convert --numstat and --shortstat 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-20 12:32:53 -08:00
Nguyễn Thái Ngọc Duy
c659f30398 diff-parseopt: convert --patch-with-raw 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-02-20 12:32:53 -08:00
Nguyễn Thái Ngọc Duy
ed88148674 diff.c: convert --raw 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-01-27 16:28:18 -08:00
Nguyễn Thái Ngọc Duy
7fd9a1ba03 diff.c: convert -W|--[no-]function-context 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-01-27 16:28:18 -08:00
Nguyễn Thái Ngọc Duy
d473e2e0e8 diff.c: convert -U|--unified 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-01-27 16:28:18 -08:00
Nguyễn Thái Ngọc Duy
cc013c224c diff.c: convert -u|-p|--patch 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-01-27 16:28:18 -08:00
Nguyễn Thái Ngọc Duy
4a28847839 diff.c: prepare to use parse_options() for parsing 
This is a preparation step to start using parse_options() to parse
diff/revision options instead of what we have now. There are a couple
of good things from using parse_options():

- better help usage
- easier to add new options
- better completion support
- help usage generation
- better integration with main command option parser. We can just
  concat the main command's option array and diffopt's together and
  parse all in one go.
- detect colidding options (e.g. --reverse is used by revision code,
  so diff code can't use it as long name for -R)
- consistent syntax, e.g. option that takes mandatory argument will
  now accept both "--option=value" and "--option value".

The plan is migrate all diff/rev options to parse_options(). Then we
could get rid of diff_opt_parse() and expose parseopts[] directly to
the caller.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-01-27 16:28:18 -08:00
Junio C Hamano
3434569fc2 Merge branch 'nd/style-opening-brace' 
Code clean-up.

* nd/style-opening-brace:
  style: the opening '{' of a function is in a separate line
 2019-01-18 13:49:52 -08:00
Junio C Hamano
932b867be0 Merge branch 'sb/diff-color-moved-config-option-fixup' 
Minor inconsistency fix.

* sb/diff-color-moved-config-option-fixup:
  diff: align move detection error handling with other options
 2019-01-14 15:29:31 -08:00
Junio C Hamano
cde555480b Merge branch 'nd/the-index' 
More codepaths become aware of working with in-core repository
instance other than the default "the_repository".

* nd/the-index: (22 commits)
  rebase-interactive.c: remove the_repository references
  rerere.c: remove the_repository references
  pack-*.c: remove the_repository references
  pack-check.c: remove the_repository references
  notes-cache.c: remove the_repository references
  line-log.c: remove the_repository reference
  diff-lib.c: remove the_repository references
  delta-islands.c: remove the_repository references
  cache-tree.c: remove the_repository references
  bundle.c: remove the_repository references
  branch.c: remove the_repository reference
  bisect.c: remove the_repository reference
  blame.c: remove implicit dependency the_repository
  sequencer.c: remove implicit dependency on the_repository
  sequencer.c: remove implicit dependency on the_index
  transport.c: remove implicit dependency on the_index
  notes-merge.c: remove implicit dependency the_repository
  notes-merge.c: remove implicit dependency on the_index
  list-objects.c: reduce the_repository references
  list-objects-filter.c: remove implicit dependency on the_index
  ...
 2019-01-04 13:33:33 -08:00
Nguyễn Thái Ngọc Duy
3b3357626e style: the opening '{' of a function is in a separate line 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-12-10 15:41:09 +09:00
Junio C Hamano
f5f0f68d61 Merge branch 'tb/print-size-t-with-uintmax-format' 
Code preparation to replace ulong vars with size_t vars where
appropriate.

* tb/print-size-t-with-uintmax-format:
  Upcast size_t variables to uintmax_t when printing
 2018-11-19 16:24:41 +09:00
Stefan Beller
d173e799ea diff: align move detection error handling with other options 
This changes the error handling for the options --color-moved-ws
and --color-moved-ws to be like the rest of the options.

Move the die() call out of parse_color_moved_ws into the parsing
of command line options. As the function returns a bit field, change
its signature to return an unsigned instead of an int; add a new bit
to signal errors. Once the error is signaled, we discard the other
bits, such that it doesn't matter if the error bit overlaps with any
other bit.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-11-14 16:27:50 +09:00
Junio C Hamano
39d23dfa40 Merge branch 'jk/xdiff-interface' 
The interface into "xdiff" library used to discover the offset and
size of a generated patch hunk by first formatting it into the
textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers
out.  A new interface has been introduced to allow callers a more
direct access to them.

* jk/xdiff-interface:
  xdiff-interface: drop parse_hunk_header()
  range-diff: use a hunk callback
  diff: convert --check to use a hunk callback
  combine-diff: use an xdiff hunk callback
  diff: use hunk callback for word-diff
  diff: discard hunk headers for patch-ids earlier
  diff: avoid generating unused hunk header lines
  xdiff-interface: provide a separate consume callback for hunks
  xdiff: provide a separate emit callback for hunks
 2018-11-13 22:37:27 +09:00