lib/git-merge-changelog.c


Log

Author Commit Date CI Message
Bruno Haible 03eac9d3 2017-09-14T00:35:56 all: Replace many more http URLs by https URLs. Update stale URLs. * users.txt: Remove mention of 'newts'. * lib/localename.c: Update comment about LANG_SOTHO.
Paul Eggert ca35d468 2017-09-13T00:48:18 all: prefer https: URLs
Paul Eggert d55ed063 2016-10-25T14:59:29 diffseq: restore TOO_EXPENSIVE heuristic * lib/diffseq.h: Problem with diffutils reported by Andreas Schwab (Bug#24715). The simplest solution is to restore the TOO_EXPENSIVE heuristic that I added to GNU diff in 1993, while using a higher threshold to avoid Bug#16848 on smaller files. * lib/diffseq.h (struct context): Restore member too_expensive. (struct partition): Restore members lo_minimal, hi_minimal. (diag, compareseq): Restore arg find_minimal. All uses changed. (diag): Restore the TOO_EXPENSIVE heuristic that I added back in 1993 to make 'diff' run faster (but not as well) on large inputs, but use a threshold of 4096 instead of the old 256. * lib/fstrcmp.c (strcmp_bounded): * lib/git-merge-changelog.c (compute_differences): Adjust to diffseq.h changes.
Pino Toscano f29814b9 2016-08-18T15:18:23 Port modules to use getprogname explicitly ... instead of requiring progname to be used (or program_name to be provided). * lib/argmatch.c: Do not include progname.h. [TEST] (program_name): Do not define. [TEST] (main): Call getprogname instead of using program_name. * lib/c-stack.c: Do not include progname.h. (program_name): Do not define. (die): Call getprogname instead of using program_name. * lib/chdir-long.c: Do not include progname.h. [TEST_CHDIR] (main): Do not set program_name. * lib/error.c [!_LIBC]: Include progname.h. [!_LIBC] (program_name): Define using getprogname. * lib/euidaccess.c: Do not include progname.h. [TEST] (main): Do not set program_name. * lib/git-merge-changelog.c: Include getprogname.h instead of progname.h. (usage): Call getprogname instead of using program_name. (main): Likewise. Stop calling set_program_name. * lib/group-member.c: Do not include progname.h. [TEST] (main): Do not set program_name. * modules/argmatch (Depends-on): Add getprogname. * modules/c-stack (Depends-on): Likewise. * modules/error (Depends-on): Likewise. * modules/git-merge-changelog (Depends-on): Likewise. Also remove progname.
Paul Eggert 67b00f9a 2014-02-23T16:16:31 diffseq: remove TOO_EXPENSIVE heuristic Problem with diffutils reported by Vincent Lefevre in <http://bugs.gnu.org/16848>. The simplest solution is to remove the TOO_EXPENSIVE heuristic that I added to GNU diff in 1993. Although appropriate for circa-1993 hardware, these days the heuristic seems to be more trouble than it's worth. * lib/diffseq.h: Modernize citations. (struct context): Remove member too_expensive. All uses changed. (struct partition): Remove members lo_minimal, hi_minimal. All uses changed. (diag, compareseq): Remove arg find_minimal. All uses changed. (diag): Remove the TOO_EXPENSIVE heuristic that I added back in 1993 to make 'diff' run faster (but not as well) on large inputs. These days, computers are fast enough that it's typically better to run slower but more accurately. * lib/fstrcmp.c: Remove duplicate comment. * lib/fstrcmp.c (strcmp_bounded): * lib/git-merge-changelog.c (compute_differences): Adjust to diffseq.h changes.
Mark Wielaard 6cfb7e03 2012-03-16T19:08:17 git-merge-changelog: add specific example on how to use with hg. * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
Mark Wielaard bed5facc 2012-03-18T12:52:10 git-merge-changelog: Report bugs to bug-gnulib@gnu.org. git-merge-changelog is maintained in gnulib, so bug reports should go to bug-gnulib@gnu.org, not bug-gnu-gettext@gnu.org.
Paul Eggert a4d796fb 2012-02-05T13:42:03 maint: spelling fixes
Paul Eggert 04c1ac69 2012-01-05T23:44:15 Use ', not `, for quoting output. * build-aux/announce-gen (usage, sizes, print_news_deltas) (print_changelog_deltas, get_tool_versions, main program): * build-aux/git-version-gen: * build-aux/gitlog-to-changelog (usage, parse_amend_file): * build-aux/move-if-change (help): * build-aux/useless-if-before-free (usage, main program): * check-module (parse_module_file, usage) (find_included_lib_files, check_module): * lib/argmatch.c (main) [TEST]: * lib/argp-help.c (_help): * lib/getopt1.c (main) [TEST]: * lib/git-merge-changelog.c (usage): * lib/xstrtol-error.c (xstrtol_error): * m4/alloca.m4 (_AC_LIBOBJ_ALLOCA): * m4/argz.m4 (gl_FUNC_ARGZ): * m4/bison.m4 (gl_BISON): * m4/calloc.m4 (gl_FUNC_CALLOC_GNU): * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): * m4/flexmember.m4 (AC_C_FLEXIBLE_ARRAY_MEMBER): * m4/fpending.m4 (gl_PREREQ_FPENDING): * m4/gc-random.m4 (gl_GC_RANDOM): * m4/intl.m4 (gt_CHECK_DECL): * m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): * m4/longlong.m4 (AC_TYPE_LONG_LONG_INT) (AC_TYPE_UNSIGNED_LONG_LONG_INT): * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): * m4/lstat.m4 (gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK): * m4/onceonly.m4 (AC_CHECK_FUNCS_ONCE): * m4/posixver.m4 (gl_DEFAULT_POSIX2_VERSION): * tests/test-dirname.c (main): * tests/test-getpass.c (main): * tests/test-iconvme.c (main): * tests/test-parse-datetime.c (LOG): * tests/test-xstrtoimax.sh: * tests/test-xstrtol.sh: * tests/test-xstrtoll.sh: * tests/test-xstrtoumax.sh: * tests/unigbrk/test-uc-is-grapheme-break.c (main): * top/GNUmakefile (abort-due-to-no-makefile): Quote 'like this', not `like this', as per the recent change to the GNU coding standards.
Brian Gough fb0f15d4 2010-08-14T19:57:11 git-merge-changelog: add doc relating to use with bzr and hg.
Bruno Haible e967460a 2010-05-23T18:03:16 git-merge-changelog: Enable --split-merged-entry by default.
Bruno Haible 766d4f1d 2009-12-14T00:24:41 Move the malloc checking from module 'list' to new module 'xlist'.
Bruno Haible 441aa304 2009-12-10T20:28:30 Use spaces for indentation, not tabs.
Bruno Haible 2d46d4a0 2009-07-04T11:25:49 Fix an assertion failure.
Bruno Haible af26ae76 2009-07-03T01:15:25 Speedup git-merge-changelog for git cherry-pick.
Bruno Haible 82ddbdf2 2009-07-03T00:40:49 Fix small mistake.
Bruno Haible 841bfdf3 2009-07-02T23:33:11 Speed up approximate search for matching ChangeLog entries.
Bruno Haible 26bcf332 2009-07-02T11:31:33 Add comment.
Bruno Haible 7aab7954 2009-03-18T02:34:04 Typo in comment.
Bruno Haible f19c2f15 2008-05-20T00:16:32 Remove trailing spaces.
Bruno Haible 47e4c43c 2008-04-13T18:29:05 Remove stray semicolon.
Bruno Haible ea180b80 2008-02-18T03:36:33 Avoid generating no-op conflicts.
Bruno Haible 0eb77fc8 2008-02-18T03:11:40 Speed up by 10%.
Bruno Haible 65bd1047 2008-02-18T03:09:00 Speed up by 25%.
Bruno Haible 29b57c22 2008-02-18T02:41:03 Speed up from O(n^2) to O(n).
Bruno Haible 5f193761 2008-02-18T01:55:47 New option --split-merged-entry.
Bruno Haible 177498a1 2008-02-17T15:42:34 Support the "git pull --rebase" situation.
Bruno Haible 0f37e2e6 2008-02-11T13:24:11 Comment changes.
Bruno Haible 521cc733 2008-02-11T01:16:24 New module 'git-merge-changelog'.