Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitk: added external diff file rename detection #1774

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ToBoMi
Copy link

@ToBoMi ToBoMi commented Aug 15, 2024

Changes since v1:

  • Commit message ident
  • Commit message line length

Copy link

gitgitgadget bot commented Aug 15, 2024

Welcome to GitGitGadget

Hi @ToBoMi, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that either:

  • Your Pull Request has a good description, if it consists of multiple commits, as it will be used as cover letter.
  • Your Pull Request description is empty, if it consists of a single commit, as the commit message should be descriptive enough by itself.

You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <revi.ewer@example.com>, Ill Takalook <ill.takalook@example.net>

NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description,
because it will result in a malformed CC list on the mailing list. See
example.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

Copy link

gitgitgadget bot commented Aug 15, 2024

There are issues in commit 37f18d1:
gitk: Added external diff file rename detection
Prefixed commit message must be in lower case
Commit not signed off

@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from 37f18d1 to 383d90c Compare August 15, 2024 13:29
Copy link

gitgitgadget bot commented Aug 15, 2024

There are issues in commit 383d90c:
gitk: Added external diff file rename detection
Prefixed commit message must be in lower case

@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from 383d90c to 5d4b12e Compare August 15, 2024 13:46
@ToBoMi ToBoMi changed the title gitk: Added external diff file rename detection gitk: added external diff file rename detection Aug 15, 2024
@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch 2 times, most recently from 383d90c to 5d4b12e Compare August 16, 2024 08:57
Copy link

gitgitgadget bot commented Aug 16, 2024

Error: User ToBoMi is not yet permitted to use GitGitGadget

@dscho
Copy link
Member

dscho commented Aug 16, 2024

/allow

@dscho
Copy link
Member

dscho commented Aug 16, 2024

/allow

Just for the record (this was already accomplished in #1773).

Copy link

gitgitgadget bot commented Aug 16, 2024

User ToBoMi already allowed to use GitGitGadget.

Copy link

gitgitgadget bot commented Aug 16, 2024

Error: Could not determine full name of ToBoMi

@ToBoMi
Copy link
Author

ToBoMi commented Aug 16, 2024

/preview

Copy link

gitgitgadget bot commented Aug 16, 2024

Preview email sent as pull.1774.git.1723806010304.gitgitgadget@gmail.com

@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from 5d4b12e to 829b37b Compare August 16, 2024 12:02
@ToBoMi
Copy link
Author

ToBoMi commented Aug 16, 2024

/preview

Copy link

gitgitgadget bot commented Aug 16, 2024

Preview email sent as pull.1774.git.1723816893059.gitgitgadget@gmail.com

@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from 829b37b to 4ff4aec Compare August 19, 2024 08:42
@ToBoMi
Copy link
Author

ToBoMi commented Aug 22, 2024

/submit

Copy link

gitgitgadget bot commented Aug 22, 2024

Submitted as pull.1774.git.1724318874608.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v1

To fetch this version to local tag pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v1

@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from 4ff4aec to a4b9c33 Compare August 27, 2024 14:01
* If a file was renamed between commits and an external diff is started
  through gitk on the THE ORIGINAL FILE NAME (not the renamed one),
  gitk was unable to open the renamed file in the external diff editor.
  It failed to fetch the renamed file from git, because it fetched it
  with the original path in contrast to using the renamed path
* gitk now detects the rename and opens the external diff with the
  original and the RENAMED file instead of no file (it is able to
  fetch the renamed file now from git with the renamed path/filename)
* Since git doesn't destinguish between move or rename this also works
  for moved files
* External diff detection and usage is optional and has to be enabled in
  gitk settings
* External rename detection ist marked EXPERIMENTAL in the settings
  and disabled by default
* Showing the renamed file doesn't work when THE RENAMED FILE is selected
  in gitk and an external diff ist started on that file, because the
  selected file is not renamed in that commit. It already IS the renamed
  file.

Signed-off-by: Tobias Boeesch <tobias.boesch@miele.com>
@ToBoMi ToBoMi force-pushed the detect_renamed_files_when_opening_diff branch from a4b9c33 to 6209080 Compare September 6, 2024 06:47
@ToBoMi
Copy link
Author

ToBoMi commented Sep 6, 2024

/submit

Copy link

gitgitgadget bot commented Sep 6, 2024

Submitted as pull.1774.v2.git.1725607698680.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v2

To fetch this version to local tag pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v2:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1774/ToBoMi/detect_renamed_files_when_opening_diff-v2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants