Commit Graph

32 Commits

Author SHA1 Message Date
Alastair Poole 9ff3615165 edi: Add Log to the SCM Tool.
Nice to remember what's been happening in the working tree.
2020-08-13 17:33:35 +01:00
Alastair Poole 65b1330a47 build: Fix warnings.
As compilers get smarter, the devs get...TBC
2020-08-11 17:26:22 +01:00
Alastair Poole 98af64fd4a scm: Add clone depth.
It's useful to either clone a full git history or one commit in
depth. One for cloning an existing (welcome screen) and one
shallow clone for our examples repo which is massive now!
This probably could become useful later on. It resolves the issue
of our examples being huge now.
2020-03-13 21:51:06 +00:00
Alastair Poole ee376c04a9 filepanel: Add Undo (checkout) to SCM Menu.
Add an option to checkout file to last commit to
the menu.
2019-12-15 17:09:12 +00:00
Alastair Poole 227231d06e examples: update examples if repository exists.
This adds a git_update method to the scm lib which we use here
to update the existing examples git repository. This ensures
the developer is always using an up-to-date copy of EFL
examples when creating.
2018-09-03 16:11:09 +01:00
Alastair Poole 8fafc6c00a scm_git: Allow us to unstage even if there is no remote url.
This allows us to use edi_scm fully even if the repo has no
remote url. Otherwise business as usual.
2018-05-14 00:37:16 +01:00
Al Poole f92c4c13d6 scm: use cached value, but do check for "" return too.
The previous commit made things SLOW due to fork/exec/parse too
much! Return if we have a result that is not "". Don't
repopulate if value is good!
2018-03-21 22:16:54 +00:00
Al Poole 417e895356 scm: store scm credentials and fix UI stash and commit.
First, make sure the project stores user/email for SCM (again!). Also
allow user to change the user/email > once. Add a check to
stash (from menu) for credentials also.

This allows us to change the remote user and email more than once.
Also it ensures that
2018-03-19 23:38:01 +00:00
Andy Williams 611c68175f scm: Fix initialisation to be based either on path or on CWD/edi_project_get
Refactoring lookups to be more re-usable as well. Should be a clearer API
2017-12-30 19:00:04 +00:00
Al Poole 56a3cc3d04 edi_scm: Consistent results for SCM root_directory.
Sorry about this sin of ommission. Also let's not
unnecessarily call method for which value already
exists. :/
2017-12-29 11:53:26 +00:00
Al Poole d603f4bf3d scm: refactor of scm 2017-12-28 23:44:28 +00:00
Al Poole 33556aeae2 edi_scm: move project root detection into the library.
Previous commit wasn't really right.
2017-12-27 21:55:50 +00:00
Al Poole 817c291bce edi_scm: Add support for staging and unstaging.
Also refactor some of the API to be less clashy.
2017-12-20 21:47:21 +00:00
Al Poole 2a9d02fc2f libedi_scm: make sure we always change to valid directory. 2017-10-08 14:44:34 +01:00
Al Poole 7ea3ce5d84 edi_scm: sanitize titie.
This patch ensures a consistent window title when used
internally (in Edi) or externally. The title should
correspond to that Edi provides in its window title.
2017-10-08 14:34:01 +01:00
Al Poole 9e7999b500 scm: Actually allow for checking of scm anywhere within a git tree. 2017-09-29 22:08:24 +01:00
Al Poole be53c4df18 scm: Create edi_scm binary for commit dialogue and use elsewhere.
This removes the existing popup code. The edi_scm executable should
run in any git tree giving the status of the repository. The Edi
UI calls this for the commit dialogue also.
2017-09-29 21:37:21 +01:00
Al Poole e86760b802 edi: escape paths where necessary. 2017-09-27 19:42:45 +01:00
Al Poole 376d4c5752 screens: scm. only show staged changes. 2017-09-21 20:46:17 +01:00
Al Poole 76532d799f filepanel: add icon statuses.
Fix scm to avoid race-condition. Also get rid of the custom
text as it's too much. Two icons, one for states and one for
staged (visible if not staged).
2017-09-19 00:18:46 +01:00
Al Poole d54d156cd3 scm: reimplement support for file listing file status.
This method is far more efficient and works well with large
software trees. e.g. enlightenment.git.
2017-09-17 16:34:35 +01:00
Al Poole 2c42965b15 scm: fix init.
Make sure we actually init and also upon init update the
file list and initialise the local engine.
2017-09-16 20:41:46 +01:00
Al Poole 59a0ec1bae scm: add support for file listing file status.
Add support for file listing status. Also some refactoring.
More to do, more testing first.
2017-09-16 01:19:54 +01:00
Al Poole 4b12a5a1ae scm: add method to get diff of changes in SCM repository.
Add method to obtain the diff of changes and also add this to the
commit screen. There is also some minor UI tweaks included in
this commit, though related to methods modified.
2017-09-11 16:27:40 +01:00
Al Poole d4d8d4fb91 edi_scm: make sure we always delete the file if it is untracked.
Summary:
there are times when new files are difficult to delete without adding commiting and removing etc.
this should stop that.

Reviewers: ajwillia.ms

Reviewed By: ajwillia.ms

Differential Revision: https://phab.enlightenment.org/D5120
2017-08-28 14:02:45 +01:00
Al Poole a232dccaba edi_scm: add support to add status of changes to the commit dialogue.
Reviewers: ajwillia.ms

Reviewed By: ajwillia.ms

Differential Revision: https://phab.enlightenment.org/D4959
2017-06-17 13:04:52 +01:00
Andy Williams 31d2d30980 welcome: Add support to clone a project from the welcome screen
Also re-lay it out a little to be clearer :)
2017-06-08 23:13:02 -07:00
Andy Williams f7d2a85044 scm: Add avatar to commit window
But it's crashing and I can't figure why
2017-06-07 22:38:21 -07:00
Andy Williams b257e81955 scm: Fix naming and hide implementation details
Also don't set credentials for push - only needed for commit
2017-06-07 14:32:10 -07:00
Andy Williams 9cf9fa415c scm: make remote adding not overwrite previous remotes
Also set upstream tracking by default not fixing retrospectively
2017-06-06 19:23:40 -07:00
Andy Williams e69cdf44d1 scm: add safety in code and in git branching
We assume origin is the name of our remote in some places so must
do so everywhere - otherwise we can overwrite the wrong remote
2017-06-06 18:11:45 -07:00
Al Poole d208afac91 scm: add support for SCM (git) in library and the UI.
Reviewers: ajwillia.ms

Reviewed By: ajwillia.ms

Tags: #edi

Differential Revision: https://phab.enlightenment.org/D4938
2017-06-06 18:09:25 -07:00