Skip to content

Commit

Permalink
Merge branch 'release/1.3.26'
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhioromano committed Oct 2, 2024
2 parents d157d0c + 93eaf3a commit 3124677
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 11,038 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ github.event.push.ref }}
- name: Use Node.js 16.*
- name: Use Node.js 20.*
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '20'
cache: 'npm'
- name: Install NPM Packages
run: |
Expand Down
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
out
.vscode-test
*.vsix
node_modules
out
.vscode-test
*.vsix
package-lock.json
19 changes: 16 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,30 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch Extension",
"args": [
"--profile=ExtensionDebug",
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js"
],
"preLaunchTask": "npm: compile",
"request": "launch",
"type": "extensionHost"
},
{
"name": "Run Extension",
"type": "pwa-extensionHost",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
"preLaunchTask": "watch"
},
{
"name": "Extension Tests",
Expand All @@ -31,4 +44,4 @@
"preLaunchTask": "${defaultBuildTask}"
}
]
}
}
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ Git Flow is ideally suited for projects that have a scheduled release cycle and

When installed, you will find 2 new views in SCM side bar, GITFLOW and VERSIONS. Also in status bar you will find **Git Flow** button to launch Quick Pick menu, or you can use `Shift`+`Alt`+`D` short key.

To see list of all commands use `F1` or `Ctrl`+`Shift`+`P` and type gitflow.
To see list of all commands use `F1` or `Ctrl`+`Shift`+`P` and type GitFlow.

![ext](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/ss.png)
![ext.](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/ss.png)

> We suggest [Git Graph](https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph) to complement this extension.
## Features

All basic operations you need to do in a single place.

### Gitflow
### GitFlow

- Init git flow
- Feature (Start, Finish, Checkout, Delete, Rebase, Publish, Track)
Expand Down Expand Up @@ -70,13 +70,13 @@ All basic operations you need to do in a single place.

Multiple folder workspace was long awaited feature of VS Code for many people. It would be a shame not to support it.

![Gitflow multiple folder workspace](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/mfw.png)
![GitFlow multiple folder workspace](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/mfw.png)

### Quick Pick

Quick Pick is a popup with essential Git Flow commands, like creating a new flow branch or appling actions to the currently selected flow brunch. You can call it with `Shift`+`Alt`+`d` short key. Note this command is available only if extension was initialized successfully.
Quick Pick is a popup with essential Git Flow commands, like creating a new flow branch or applying actions to the currently selected flow brunch. You can call it with `Shift`+`Alt`+`d` short key. Note this command is available only if extension was initialized successfully.

![Git flow quick pik](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/qp.png)
![Git flow quick pick](https://raw.githubusercontent.com/Serhioromano/vscode-gitflow/main/resources/media/qp.png)

### Automatic version bump

Expand All @@ -94,7 +94,7 @@ or
### [UNRELEASED] (DD-MM-YYYY)
```

Or any combination of `[Unreleased]`, `[unreleased]`, `[UNRELEASED]`, `yyyy`, `mm` or `dd` and all uppercase variations, these will be replaced with the relevent info.
Or any combination of `[Unreleased]`, `[unreleased]`, `[UNRELEASED]`, `yyyy`, `mm` or `dd` and all uppercase variations, these will be replaced with the relevant info.

### How to work with Support branch

Expand Down Expand Up @@ -128,14 +128,14 @@ Thus your `master` or `main` branch contain most recent version of your product

### Working remotely

In order to push branches to or delete branches from a remote repository like GitHub, you must be authenticated. For github there are 2 main ways to work with repositories - over SSH protocol or over HTTPS. Those 2 different protocols usually refer to repository with different URL. Here is example of the SSH and HTTPS urls for this extension.
In order to push branches to or delete branches from a remote repository like GitHub, you must be authenticated. For GitHub there are 2 main ways to work with repositories - over SSH protocol or over HTTPS. Those 2 different protocols usually refer to repository with different URL. Here is example of the SSH and HTTPS URLs for this extension.

```text
https://github.com/Serhioromano/vscode-gitflow.git
[email protected]:Serhioromano/vscode-gitflow.git
```

You can clone a repository with either url.
You can clone a repository with either URL.

#### SSH (recommended)

Expand Down Expand Up @@ -185,8 +185,8 @@ GitHub CLI will automatically store your Git credentials for you when you choose
- enhance - Branch name creation now is checked through `git check-ref-format --branch ***` with allows create any qualified branch name.
- add - Option to automatically bump version on release or not.
- add - replace spaces in branch name with `_`
- fix - tmp dir for message files on release and hotfix
- add - parameter `gitflow.path` to manually set gitflow executable.
- fix - `tmp` directory for message files on release and hotfix
- add - parameter `gitflow.path` to manually set GitFlow executable.
- fix - Month updated in changelog one month less.
- fix - Some words in command message `-m"Something"` caused command failed. Fixed by using file.
- add - use `git.path` settings.
Expand All @@ -202,7 +202,7 @@ GitHub CLI will automatically store your Git credentials for you when you choose
- add - update changelog automatically
- enhance - Allow change finish message when finish hotfix or release
- 1.1.0
- optimize - performance improvement using memoization technique.
- optimize - performance improvement using memorization technique.
- 1.0.0
- add - Parameter to show all internal git commands run in `git flow` in output window
- add - Output logger named Git Flow
Expand Down Expand Up @@ -230,9 +230,9 @@ GitHub CLI will automatically store your Git credentials for you when you choose
- enhance - CI flow was created for fast delivery of new versions.
- 0.2.11
- fix - take name of flow branches from configuration
- fix - ui buttons
- fix - UI buttons
- 0.2.9
- add - single command to sync all root branches (develop and master ot main)
- add - single command to sync all root branches (develop and master or main)
- add - command to checkout root branches
- enhance - better icons
- 0.2.2
Expand Down
Loading

0 comments on commit 3124677

Please sign in to comment.