Magic Lantern Forum

Using Magic Lantern => Tutorials and Creative Uses => Topic started by: Audionut on August 28, 2013, 09:26:10 AM

Title: Submitting a pull request all via web browser
Post by: Audionut on August 28, 2013, 09:26:10 AM
Pretty easy job this one. 

For small changes to code anyway :P

From the main repo, create a fork.

https://bitbucket.org/hudson/magic-lantern/overview

(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fpij5sn9kx%2Ffork.png&hash=c6b1bc59762c2c2a718d192c6437c109)

Give it a name and fork it.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Figptk6vcx%2Ffork1.png&hash=12d70f55a9ccc52cb0a13155af8c7ce6)

Voila, your own repository.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fdbom2kif5%2Frepositry.jpg&hash=19061dd141529b096568d39470c6ed2d)

From there you can browse the source code and edit it.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fwx8hl0vgh%2Fedit.png&hash=622f76578a84375d4803880d840b58c1)

When you've finished editing the source, it's time to commit it.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Flic0gej41%2Fcommit.png&hash=3440f51b93ed733c61e87b36bd16ce00)

You should give it a name that suits the changes you have made.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Ficreq70ht%2Fcommit1.png&hash=f3a0f352df4685e82e36e7a7488f98d7)

Once the changes have been committed to your own repo, it's time to create a pull request for merge into the main repo.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fi6ib0ugqp%2Fpullrequest.png&hash=cc25b377f505aee8b6c496ac9518a3b2)

Note:  You can edit more files at this stage before creating the pull request.

You can change the title, add a description, and then create the pull request.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fshunti8g1%2Fpullrequest1.png&hash=454e7a6a6a4e743c402235eb1e4b7e93)

Note:  You can edit more files (or the same file) at this stage and update the pull request.  Just hit the pull request button again and follow the procedure above.  A new pull request will not be created, the original pull request will be updated.

And it ends up in the main repo as a pull request :)
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fagbivpef5%2Fpullrequest2.jpg&hash=5bd5244058f55981608217b2de894ddc)

Where hopefully it gets merged into the main source tree.
(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fsfas6o4sh%2Fmerged.jpg&hash=ea81b64152a1df3c0f706e2d50f01bd7)
Title: Re: Submitting a pull request all via web browser
Post by: garry23 on May 22, 2017, 07:49:37 PM
Help: I'm stupid and stuck at 'create a fork'.

How do I do this: I've never done this before.

I'm trying to make a pull request to change some code in focus.c

Cheers

Garry
Title: Re: Submitting a pull request all via web browser
Post by: ilia3101 on May 22, 2017, 08:58:30 PM
Pictures aren't loading in Safari, Firefox or Chromium, I'm in UK. Anyone else not seeing them?

Exactly the tutorial I wanted though :) Theres a small change I want to add(don't know if its useful but been using it myself)

Edit: oh just noticed this is quite old ::) I guess its the DropBox thing.
Title: Re: Submitting a pull request all via web browser
Post by: Audionut on May 26, 2017, 03:32:30 AM
Image links fixed.
Title: Re: Submitting a pull request all via web browser
Post by: garry23 on May 26, 2017, 07:03:29 AM
@Audionut

Many thanks for taking the time to do this.

For those like me, i.e. not programmers and infrequent submitters, having this tutorial is a key resource, i.e. To remind us what to do.

BTW, having just made a pull request for correcting the DoFs in focus.c, I noticed a silly mistake in the submitted pull request. Can I correct this, or do I need to make another pull request and reference ignoring the original pull request.

Finally, I truly would welcome a tutorial like this, that showed me how to compile on a Win from my fork. I've tried following the existing tutorial, but keep getting errors.

Once again, many thanks.
Title: Re: Submitting a pull request all via web browser
Post by: garry23 on May 26, 2017, 07:12:52 AM
Oops: just read this  :)

Quote
Note:  You can edit more files (or the same file) at this stage and update the pull request.  Just hit the pull request button again and follow the procedure above.  A new pull request will not be created, the original pull request will be updated.
Title: Re: Submitting a pull request all via web browser
Post by: Audionut on June 30, 2017, 08:13:24 AM
Finally, I truly would welcome a tutorial like this, that showed me how to compile on a Win from my fork. I've tried following the existing tutorial, but keep getting errors.

Sorry for the late reply.

Which tutorial?
Title: Re: Submitting a pull request all via web browser
Post by: garry23 on June 30, 2017, 09:47:47 AM
@Audionut

Time has moved on, but I think I was hoping for a 'dummies guide' for making a pull request from my fork.

I'm still not yet compiling and editing as I should, i.e. I end up doing things incorrectly.

Others have spotted my mistakes, so, for now, I've stopped trying: so I stick with Lua for now.

As I say, time has moved on.

Cheers

Garry
Title: Re: Submitting a pull request all via web browser
Post by: ArcziPL on March 10, 2019, 10:22:25 PM
Pretty easy job this one. 

For small changes to code anyway :P

From the main repo, create a fork.

https://bitbucket.org/hudson/magic-lantern/overview

(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fs14.postimg.cc%2Fpij5sn9kx%2Ffork.png&hash=c6b1bc59762c2c2a718d192c6437c109)

If someone recently wants to create a fork according to this tutoral, will scratch his head already on the first step and keep shouting "WTF?!" (Where's the fork?!)...
It's been moved to a submenu on the left, under a plus sign.

(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fi.postimg.cc%2FpVYrspdS%2Fbitbucket-fork-wtf.png&hash=772a8e4ac3af4aa6798ecc474f4f2b97)

(https://www.magiclantern.fm/forum/proxy.php?request=https%3A%2F%2Fi.postimg.cc%2FkgD5Msyr%2Fbitbucket-fork-wtf2.png&hash=d5afe909cde1994d4cfe16c2ccc5a997)
Title: Re: Submitting a pull request all via web browser
Post by: scrax on March 11, 2019, 11:15:06 AM
If someone recently wants to create a fork according to this tutoral, will scratch his head already on the first step and keep shouting "WTF?!" (Where's the fork?!)...


 :D
I had that feeling too...