Announcement

Collapse
No announcement yet.

Git Source Control Provider Plugin

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • Git Source Control Provider Plugin

    Hi all!

    I've been working on a Git Plugin for the past two weeks
    I've already mention this on the Feedback for Epic: Additional Source Control providers support thread , but I figured I would get some more attention here from other developers...

    So here I am, with a UE4 Git Plugin beta released!

    This is still in development, but all common operation are now supported:
    - display status icons to show modified/added/deleted/untracked files
    - show history of a file
    - diff against depot or between previous versions of a file
    - revert modifications of a file
    - add/delete a file
    - checkin/commit a file

    Please, read carefully the detailed instruction on Read-me & Website, and report any issue or limitation not already described there.

    I've also started a Wiki page

    Thanks for reading, waiting for your comments!
    SRombauts

    edit: Someone else wrote a Wiki tutorial to get you started on your project
    Last edited by SRombauts; 01-05-2015, 06:57 AM. Reason: New release+Tutorial
    UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
    UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
    PayPal me a beer to support my work

  • #2
    Originally posted by SRombauts View Post
    Enable the Unreal Editor to interact with Git, the popular distributed source code management (think GitHub, Bitbucket...).

    The plugin currently supports add, remove, revert and commit operations, shows file history and visual diff of assets.



    Wow this is incredible!

    I can see everyone using this as a standard thing really soon!

    Rama
    100+ UE4 C++ Tutorials on the UE4 Code Wiki, including UE4 Multi-Threading!

    UE4 Marketplace: Melee Weapon Plugin & Compressed Binary Save System Plugin | Rama's C++ AI Jumping Videos | Vertex Snap Editor Plugin

    Visit www.ue4code.com to see lots of videos about my C++ Creations! ♥ Rama

    Comment


    • #3
      Thanks for the kind word Rama (as always)!

      When reaching a more stable/feature reach version, it will be most useful for folks wanting to interact with the Unreal Tournament Github repository

      For that we will need to improve the Editor itself - I would like to enable a full "github workflow" within the Editor:
      - Create a branch for a new feature
      - Commit, Push => Pull Request
      - Merge other branches
      UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
      UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
      PayPal me a beer to support my work

      Comment


      • #4
        UE4 Git Plugin alpha v0.4 released

        UE4 Git Plugin alpha v0.4 released, with many bug fixes and improvements to usability.

        I've started to use it "for real" in my own small projects.
        As I see it, I will move on "Beta" for the next version, to reflect this increased stability.

        Please let me know if you try it, an report any bug or missing feature.

        Cheers!
        UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
        UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
        PayPal me a beer to support my work

        Comment


        • #5
          In cas anyone else wants to know:
          Are you still updating the Git plugin? And does it support Blueprint Diffs?
          Hi,
          Yes I do, though I didn't have much time lately; I want to polish it a little bit to release a v0.5 beta for UE4.2. Are you specifically waiting for this? You can already grab the 4.2 branch, with an unofficial binary for UE4.2

          And yes it supports diff of Blueprints, for sure!

          Cheers!
          UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
          UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
          PayPal me a beer to support my work

          Comment


          • #6
            UE4 Git Plugin beta v0.5 released

            UE4 Git Plugin beta v0.5 released, for the new Unreal Engine 4.2 Editor.

            I am using it without any trouble, so its now labeled "beta"

            Cheers!
            UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
            UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
            PayPal me a beer to support my work

            Comment


            • #7
              Great work here SRombauts. Will this work on OSX?
              My Gear VR app got through to the Oculus Mobile Jam 2015 finals. Hurray!
              Check out the latest video and download the installer by visiting:
              The Curator's Mini-Museum of Natural History - http://imnh.org (Built with UE4)

              Comment


              • #8
                Hi,
                I did not build the plugin for OSX as I have no easy access to a Mac.
                But if you want, you could build it yourself from sources...
                This should work, but as I've never tried it, there might be a few glitches.

                I should also ask a friend if he can try that fit me!
                UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
                UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
                PayPal me a beer to support my work

                Comment


                • #9
                  Building for Mac OSX

                  Hi all, so I managed to get the plugin to compile for OSX, there was only a trivial bug with a missing local variable on a non Windows code path (so Linux was also affected).

                  The source code fix is already on GitHub, onto the 4.1 branch (where we tested it) and merged on the 4.2 branch.

                  I did not have enough time to test it, so I did not release anything yet, this will have to wait until after the weekend now.

                  By the way, it would be really nice if anyone could test it and report any problems (or success!

                  Cheers!
                  UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
                  UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
                  PayPal me a beer to support my work

                  Comment


                  • #10
                    First off I would like to say that this is amazing. I was actually working on something recently to do this. I will be playing around with this and testing it out and I will submit any feedback I have to help your development along. This already seems like a solid plugin and I'm going to get my dev team on it ASAP.

                    I have a question as well. The main reason I was putting one together is because rebasing with blueprint files turned out to be quite a headache. I wrote an extension for git to help with the process (https://github.com/ruba1987/UDiff) but it didn't quite cut it because when I merged uasset files it didn't know about some things like interfaces that the BP was inheriting from. Meaning when I merged two BPs the interface events became custom events that weren't linked to the interface. Granted this was better than nothing. What I'm wondering is how well it handles merging thing like blueprints and do you have plans to put rebase functionality in?

                    Comment


                    • #11
                      Hi,

                      No, sadly UE4 Source Control does not offer any help for merging or rebasing Blueprints, but it as been discussed for long term goal..

                      By the way, I would have no idea on how to implement this myself into the Engine...

                      Cheers!
                      UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
                      UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
                      PayPal me a beer to support my work

                      Comment


                      • #12
                        I just wanted to say a big thanks, this was hugely helpful with tracking down a subtle, intermittent bug that cropped up a while back in one of my blueprints.

                        Thanks for sharing!


                        SINGMETOSLEEP (surreal dreamscape narrative)
                        / PARASOMNIA (hypnagogic labyrinth) / PRETTY ABRASIVE MUSIC / TWITTER @ACATALEPT

                        Comment


                        • #13
                          Hi, nice to hear that someone is actually using this

                          I am doing some C++ stuff, where my plugin is in no use!

                          I don't have access to UE 4.3 (yet) so I would love to know if the plugin still work on it.
                          Anyone?
                          UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
                          UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
                          PayPal me a beer to support my work

                          Comment


                          • #14
                            Originally posted by SRombauts View Post
                            I don't have access to UE 4.3 (yet) so I would love to know if the plugin still work on it.
                            I'd say it's unlikely, I haven't tried building your plugin, but they've integrated a change of mine that adds an extra method to ISourceControlState, which means your ISourceControlState subclass will fail to build until you implement the new method. It's a very simple method, you can see my implementation here. I'll probably update my hg plugin for 4.3 today, so I'll let you know if there are any other API changes.
                            Contact: enlight in #unrealengine IRC channel on Freenode, or @macagonator on Twitter

                            Comment


                            • #15
                              Thanks enlight, yes if you remember I did participate in discussions with your pull requests relative to 'CanCheckIn()' ;
                              so I have already implemented the code into my plugin at that time already (we where at 4.1 at that time)

                              I only commented out the 'OVERRIDE' specifier with a proper @todo comment.

                              As far as I know this is the only API change so I expect it to build and work flawlessly

                              Would you be kind enough to clone my plugin and give it a try while you update yours?
                              That would be great!
                              UE4 Git Source Control Plugin v2.2 for UE4.17 - (v1 integrated by default in Beta status since UE4.7)
                              UE4 Plastic SCM Source Control Plugin (1.0.4 for UE4.17)
                              PayPal me a beer to support my work

                              Comment

                              Working...
                              X