merge-ort: add basic rename detection #812

newren · 2020-12-09T05:42:38Z

This series builds on en/merge-ort-2 and adds basic rename detection to merge-ort.

Changes since v2 (all due to feedback from Stolee's reviews):

reordered two of the patches (one depended on vars declared in another)
a few other adjustments to make patches individually compile (I usually check this; so embarrassing that I somehow missed it)

cc: Derrick Stolee stolee@gmail.com
cc: Elijah Newren newren@gmail.com
cc: Johannes Schindelin Johannes.Schindelin@gmx.de

newren · 2020-12-09T19:40:24Z

/submit

gitgitgadget · 2020-12-09T19:41:53Z

Submitted as pull.812.git.1607542887.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-812/newren/ort-renames-v1

To fetch this version to local tag pr-812/newren/ort-renames-v1:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-812/newren/ort-renames-v1

gitgitgadget · 2020-12-10T02:16:49Z

This branch is now known as en/merge-ort-3.

gitgitgadget · 2020-12-10T02:16:50Z

This patch series was integrated into seen via git@9e3eb82.

merge-ort.c

gitgitgadget · 2020-12-11T02:07:08Z

User Derrick Stolee <stolee@gmail.com> has been added to the cc: list.

merge-ort.c

gitgitgadget · 2020-12-11T09:44:20Z

User Elijah Newren <newren@gmail.com> has been added to the cc: list.

gitgitgadget · 2020-12-14T00:03:21Z

This patch series was integrated into seen via git@3b21576.

This will grow later, but we only need a few fields for basic rename handling. Signed-off-by: Elijah Newren <newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>

Based heavily on merge-recursive's get_diffpairs() function, and also includes the necessary paired call to diff_warn_rename_limit() so that users will be warned if merge.renameLimit is not sufficiently large for rename detection to run. Signed-off-by: Elijah Newren <newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>

Add code which determines which kind of special rename case each rename corresponds to, but leave the handling of each type unimplemented for now. Future commits will implement each one. There is some tenuous resemblance to merge-recursive's process_renames(), but comparing the two is very unlikely to yield any insights. merge-ort's process_renames() is a bit complex and I would prefer if I could simplify it more, but it is far easier to grok than merge-recursive's function of the same name in my opinion. Plus, merge-ort handles more rename conflict types than merge-recursive does. Signed-off-by: Elijah Newren <newren@gmail.com>

gitgitgadget · 2020-12-14T15:47:45Z

User Johannes Schindelin <Johannes.Schindelin@gmx.de> has been added to the cc: list.

newren · 2020-12-14T16:20:39Z

/submit

gitgitgadget · 2020-12-14T16:22:21Z

Submitted as pull.812.v2.git.1607962900.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-812/newren/ort-renames-v2

To fetch this version to local tag pr-812/newren/ort-renames-v2:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-812/newren/ort-renames-v2

gitgitgadget · 2020-12-14T18:19:33Z

This patch series was integrated into seen via git@4589bda.

gitgitgadget · 2020-12-14T20:04:56Z

This patch series was integrated into seen via git@7f4032b.

webstech · 2020-12-14T20:05:20Z

@dscho This PR is missing comments from the mailing list. As an example, from the azure mail handler jobs:
First comment on a patch:

Message-ID 84a4d97b-8496-4c83-5d32-19f57e17a871@gmail.com
 (length 8888) for PR https://github.com/gitgitgadget/git/pull/812,
 commit b9e0e1a60b92a6a220193bf9fe80796df91126a7, 
 comment ID: undefined

See email

Reply to first comment:

Message-ID CABPp-BGNvZv9KNnnwGEz_sv9MV8zNTRjXGQ=gBd6kEy+NuEJbg@mail.gmail.com
 (length 14031) for PR https://github.com/gitgitgadget/git/pull/812,
  commit b9e0e1a60b92a6a220193bf9fe80796df91126a7, 
  comment ID: 540648617

See email

The comment ID is incorrect (way too low). Have not seen the problem in other PRs randomly checked.

gitgitgadget · 2021-01-06T01:16:26Z

This patch series was integrated into seen via git@34500b4.

gitgitgadget · 2021-01-07T06:44:57Z

This patch series was integrated into seen via git@8671183.

gitgitgadget · 2021-01-08T00:38:02Z

This patch series was integrated into seen via git@8f894b2.

gitgitgadget · 2021-01-08T03:32:29Z

This patch series was integrated into seen via git@b2f939a.

gitgitgadget · 2021-01-08T05:01:30Z

This patch series was integrated into seen via git@8f894b2.

gitgitgadget · 2021-01-08T07:53:16Z

This patch series was integrated into seen via git@eb87282.

gitgitgadget · 2021-01-08T08:22:54Z

This patch series was integrated into seen via git@38bb6a7.

gitgitgadget · 2021-01-08T08:52:11Z

This patch series was integrated into seen via git@8f894b2.

gitgitgadget · 2021-01-08T17:37:54Z

This patch series was integrated into next via git@fe481b9.

gitgitgadget · 2021-01-08T22:51:08Z

This patch series was integrated into seen via git@fe481b9.

gitgitgadget · 2021-01-09T00:47:15Z

This patch series was integrated into seen via git@8bc1deb.

gitgitgadget · 2021-01-12T02:42:42Z

This patch series was integrated into seen via git@2a7448f.

gitgitgadget · 2021-01-13T01:06:53Z

This patch series was integrated into seen via git@fe481b9.

gitgitgadget · 2021-01-13T02:13:13Z

This patch series was integrated into seen via git@23ef02e.

gitgitgadget · 2021-01-13T08:51:02Z

This patch series was integrated into seen via git@fe481b9.

gitgitgadget · 2021-01-13T09:25:06Z

This patch series was integrated into seen via git@5fce263.

gitgitgadget · 2021-01-15T01:24:32Z

This patch series was integrated into seen via git@fe481b9.

gitgitgadget · 2021-01-15T02:00:14Z

This patch series was integrated into seen via git@6232dd9.

gitgitgadget · 2021-01-15T05:51:22Z

This patch series was integrated into seen via git@fe481b9.

gitgitgadget · 2021-01-15T07:39:34Z

This patch series was integrated into seen via git@04355e5.

gitgitgadget · 2021-01-16T00:24:50Z

This patch series was integrated into seen via git@f50dab9.

gitgitgadget · 2021-01-16T22:04:03Z

This patch series was integrated into seen via git@3eeaef6.

gitgitgadget · 2021-01-25T23:45:06Z

This patch series was integrated into seen via git@2856089.

gitgitgadget · 2021-01-25T23:45:07Z

This patch series was integrated into next via git@2856089.

gitgitgadget · 2021-01-25T23:45:08Z

This patch series was integrated into master via git@2856089.

gitgitgadget · 2021-01-25T23:45:13Z

Closed via 2856089.

newren force-pushed the ort-renames branch from 442f6ac to 476553e Compare December 9, 2020 05:43

gitgitgadget bot added the seen label Dec 10, 2020