Merge from master #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Requires OAuthToken set to use GitHub3Plugin features
…ith the GitProtocol already used
and fetch from it once added
to have a consistent api. Following comment: #6328 (review)
GitHub: easily add upstream remote
Refactor translations
Path must be well formatted for Path.GetDirectoryName()
Restore title of AppearanceSettingsPage
Add script options c/sRemoteBranchName and RepoName
* stage *.xlf files - this way we ignore EOL issues,
* check if there are any xlf files are modified, and if so:
- capture and publish the diff for the xlf files as git-diff-xlf.txt
- break the build with a meaningful error
Rewrite the callsite to use `InvokeAsync` instead, that switches the execution context to the UI thread. Closes #6799
Enforce translations
Check for empty language selection
…oNotUseInNewCode Deprecate and remove InvokeAsyncDoNotUseInNewCode
+ Creation of GitHubRemoteParser & AzureDevOpsRemoteParser
before renabling the the FileWatcher for GitStatusMonitor
…directory Check that directory (still) exists
Previously, images were displayed as binary diffs, except some in FormCommit: .png and new worktree images Other: * FormCommit always show the worktree commit for index .png * Show all images in FormCommit (i.e. show index images and changed other than .png) * Regression from a94a30a (ObjectId) where blob guid were ignored and diff not shown * Combined guid should never be used to get file blob guid * openWithDiffTool action were not called from stash and RevisionDiff
Popup when error staring mergetool
…eption Catch ConEmu exception for Done()
* Update contributors.txt
due to "orphan" filename lines that has for effect to overwrite good commit data by incomplete ones when "Detect move and copy in all files" is enabled. For example, command: `git blame --porcelain -M -C -w -l "18fcca6d89c2d38ac1830697b5da3f78630b226e" -- "GitUI/Translation/English.Plugins.xlf"` returns (part of the file): `8f8393c283e7ad60c02805182d6778e5fc0c8b28 180 13 <trans-unit id="MsBuildEnabled.Caption"> b1d567e 7506 14 3 filename GitUI/Translation/English.xlf <= orphan line that breaks the blame <source>Enabled</source> b1d567e 7507 15 <target /> b1d567e 7508 16 </trans-unit> 8f8393c 184 17 12 <trans-unit id="MsBuildPath.Caption">`
Support older Gerrit API
Fix emails
Update contributors.txt
Update readme
…idation That prevent a boring question to be asked to the user because the commit message doesn't follow the regex when "fixup!" or "squash!" prefixes are used.
…eption GitIndexWatcher: check that directory exists before enabling
Dont confirm switch worktree option
Exclude "fixup!" and "squash!" prefixes from commit message RegEx validation
GitStatusMonitor: Improve logic for timer 25 days wrap
because we don't control the controls lifecycle and the settings controls are disposed when settings are closed. It depends on how the settings control is defined but could prevent exceptions (and make plugins easier to write)
Ordering of options
…sed_control Settings: Regenerate the Controls when previous instance was disposed
Add ability to specify commit message on the command line
Reordering of Appearance Options
Add tests for `ArgumentBuilder`
Blame: Fix missing commit metadata on some commits
Remove test assuming local file paths
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #
Changes proposed in this pull request:
Screenshots before and after (if PR changes UI):
What did I do to test the code and ensure quality:
Has been tested on (remove any that don't apply):