timbrel / gitsavvy Goto Github PK
View Code? Open in Web Editor NEWFull git and GitHub integration with Sublime Text
License: MIT License
Full git and GitHub integration with Sublime Text
License: MIT License
Leaving this here as a feature request. How hard/easy it is to support Bitbucket as well?
docs/
super-enter
on linkBasically the option to customize this line: https://github.com/divmain/GitSavvy/blob/83a486eaad8aac982160caabeb7099052da5e462/core/commands/log_graph.py#L29
For instance, displaying the status of a branch named bug/1234
will output a branch name of bug
.
super+enter
on a branch name checks out that branchsuper+enter
on a commit will checkout that commit as detached HEADenter
on a commit displays the full commit message and diff in a separate windowUsing git update-index --assume-unchanged
, git update-index --no-assume-unchanged
and git ls-files -v
where files are marked as "assume unchanged" if first char in output is h
.
Required merge functionality:
git: merge
git: abort merge
git: merge (rebase)
git: fetch and merge
git: restart merge
git: restart merge for file...
There should be mention in the README that this is for Sublime Text 3 only and wont work on older versions.
Thoughts for a rebase dashboard.
REBASE: master --> my-feature-branch
STATUS: conflict at 221ca4
┳ (dcc578)
┃
✔ 11dc57 some commit message
┃
✔ d0c116 some other commit message
┃ resolved: path/to/some/file.ext
┃
▸ ✕ 221ca4 message for commit with conflict
┃ conflict: path/to/some/conflicting/file.ext
┃ resolved: path/to/file/already/resolved.ext
┃
? a0891c message for commit to check next
┃
? 5fe330 message for last commit
┃
┻
############### #############
## CONFLICTS ## ## COMMITS ##
############### #############
[o] open file [s] squash commit with next
[a] accept file in current state [S] squash all commits
[m] use mine [u] move commit up (above previous)
[t] use theirs [d] move commit down (below next)
[M] launch external merge tool [e] edit commit message
####################
## REBASE ACTIONS ##
####################
[R] restart rebase
[A] abort rebase
[F] finalize rebase
-
Notes:
Add setting to allow signed and/or signed-off commits instead of "regular" commit.
BRANCH: On branch `Initial`.
ROOT: [ path ]
Also, deleted files should appear different in the status view somehow.
Most of the outputs in this plugin is done to the status bar.
I would like to see an option to output to panels, especially for certain actions like commit or push where you'd want to see the output, like a response from the server(s).
Follow-up for changes seen in #45.
ui.Interface
git commit --dry-run
, see #107)Currently just removes everything including and after the COMMIT_HELP_TEXT
. Instead, add a canonical separator below which all content will be excluded. Follow-up to #45.
git 1.9.3
sublime 3065
ubuntu linux 14.04
Traceback (most recent call last):
File "/opt/sublime_text/sublime_plugin.py", line 543, in run_
return self.run(edit, **args)
File "/home/oliver/.config/sublime-text-3/Packages/GitSavvy/core/commands/blame.py", line 39, in run
content = self.get_content()
File "/home/oliver/.config/sublime-text-3/Packages/GitSavvy/core/commands/blame.py", line 50, in get_content
blamed_lines, commits = self.parse_blame(blame_porcelain.splitlines())
File "/home/oliver/.config/sublime-text-3/Packages/GitSavvy/core/commands/blame.py", line 100, in parse_blame
k, v = re.match(r"([^ ]+) (.+)", next_line).groups()
AttributeError: 'NoneType' object has no attribute 'groups'
Cache last diff to be applied; when undo is invoked, apply the same diff with --reverse
toggled.
The default background colors result in a very low contrast because I'm using a light color scheme.
Is there a way to set these color values in the user config?
If not, would you consider to add in the config?
themeGenerator.add_scoped_style("GitSavvy Added Line", "git_savvy.change.addition", background="#37A832")
themeGenerator.add_scoped_style("GitSavvy Removed Line", "git_savvy.change.removal", background="#A83732")
Thanks.
I get the attached error message, the color scheme defaults to white with black text, and the changed hunks are unclear (in cached mode it seems like the changed hunks aren't shown at all, in uncached mode the hunks are shown as white text on black but it isn't clear what was removed, changed, added).
This would be a nice to have feature. See this repo for details on its implementation https://github.com/nvie/gitflow
Moved from #28.
Relates to #7.
Add basic documentation including:
Link to docs from README.
Include option for user to specify other merge tool.
Instead of:
Consider:
If you have a branch in the git flow style you name them things like feature/registration
. Unfortunately right now your status view will show a name like that as just feature
For debugging purposes (particularly for those submitting bugs), store the stdin
and stdout
of the most recent failed git
operation. Add command to open web browser with URL along the these lines:
https://github.com/divmain/GitSavvy/issues/new?title=failed%20git%20command%20X&body=some%0Ainput%0Aand%0Aoutput
When in the inline-diff view, you cannot do SUPER-L
, as this results in a locked machine. Introduce Windows-specific keybindings that swap SUPER
for CTRL
across the board.
There's no easy way of telling which hunks or lines are actually staged in the inline diff.
Consider adding a background color to these (e.g. yellow) to distinguish them.
This would be especially useful with #35.
Can we have a new feature that show repo status in bottom left-hand corner of Sublime Text Window?
Special view with:
Add a distinct style guide for the commit messages:
Coloring the background of any characters that exceed limits is ideal, only warning the user.
This should be optional, of course.
References:
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
https://github.com/blog/926-shiny-new-commit-styles
git
cannot be found, notify user and inform that they can either install or enter custom path in User/GitSavvy.sublime-settings
.When creating a commit, it's handy to see at a glance what you are actually committing, a diff displayed at the bottom is the optimal solution.
Should also be optional, as it would probably add extra load time on larger commits.
This isn't a real ticket.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.