Reimplementation of Remotes module #26

scunz · 2015-03-21T18:51:56Z

@antis81, this is a copy from the modules-PR. Please go ahead here; the Modules Repo is now fully integrated and I rebased this one so that it ought to be in exactly the same state; just with the new locations.

scunz · 2015-03-21T22:42:20Z

You should now be able to clone "just" libMacGitverCore (plus dependencies of course) and compile a whole MacGitver from it.

As soon as you give me a go, I'll rename the MacGitver.git to MacGitverOld.git and rename this repository to MacGitver.git (As it was once upon a time...)

antis81 · 2015-03-22T00:05:59Z

Yeah, just do it whenever you like. I have only small pending changes. Not a problem at all.

scunz · 2015-03-22T00:25:20Z

Done :)

The menu is at the wrong place and about to be moved to the appropriate context (e.g. repo, branch, remote, ...)

…s a mergeable submenu.

…tions

The dialog is non-functional yet. It could use the (Options ...) technique from the clone dialog to hide the "advanced options".

…> all remotes" Also fixes a compile error due to a double closing bracket. Caution: This currently *only* works within a repository context (static cast to RM::Repo)! If used in other contexts, MGV might crash or not behave like expected!

This allows us to define different entry points for the fetch/push actions and assign an appropriate action context later.

The menu structure is also meant to be integrated in the reference and history view later.

…it Remotes

This is meant to limit the fetch context and thus requires a single "Remote" or "remote branch" context.

Sets the parent to the main window.

antis81 · 2015-04-11T09:14:09Z

FYI: Here's a screenshot of what the new "Remotes" dialog now looks like:

scunz · 2015-04-11T13:08:27Z

Could you drop the "manage the" in the caption? It's a bit confusing.

antis81 · 2015-04-11T22:46:54Z

Yes, no problem. This is a relict 😄.

Extended options need some cleanup to appear correctly aligned.

scunz · 2015-05-09T12:49:56Z

Can we get this into development, so that I'd be able to rebase the whole repoman forest on top of this?

antis81 · 2015-05-09T14:56:14Z

Sure, I'll push the merge button :).

Restructuring the Remotes module

antis81 · 2015-05-09T15:19:44Z

Note: The "Repository" menu currently looks a bit puzzled. This is related to some commits sleeping in #36 cleaning this up. Sorry for the inconvenience. 😇

scunz · 2015-05-09T17:36:37Z

Could you cherry-pick these onto development before I rebase or is it going to be too complex?

antis81 · 2015-05-09T17:38:23Z

Hm ... actually I don't know. Let me take a look. I'll try and cherry pick those.

antis81 · 2015-05-10T08:24:00Z

Sorry, once again a typical PEBKAC problem 👨 🪲. I forgot about, how the menu looked before. This PR just adds the right entries related to the "Remotes" module - appart from the "clone" entry - which still resides in the "Repository" module. See by yourself:

The changes merge completely fine into the "current" main menu. The former "Remotes" menu became a submenu of "Repository" and was renamed to "Active Repository".

The "Repository->New" entry should be at the top. Uhm, like this:

I have to recheck, where I've changed it. It's has to be either part of #36 or in my private branch. If it is easy to cherry-pick, I'll do that.

Anyways, this doesn't hold us back from rebasing or cause any other trouble - this is all I wanted to say 😄.

antis81 · 2015-05-10T08:38:51Z

Ok, found it: Lives in PR #36 commit c6bf612. However, it is not possible to simply cherry-pick this (tried it and it causes lots of trouble). Maybe I can split it up and cleanup the commits.

antis81 · 2015-05-10T09:13:55Z

DONE! Git rebase is simply great 👍!!!

FYI: I removed the change completely from #36 and transplanted it as a new commit on development.

scunz · 2015-05-10T13:14:09Z

Somehow I don't get messages for everything. I'm not sure if that's Github's or my mail server's fault, actually - but Github is strange at times.

I've actually been rebasing all night long, actually. Rebase is great. I'm trying to clean up my mess in #27 - I've pushed an intermediate version to sacu/temp/repoman-cleanup...

scunz · 2015-05-10T13:16:06Z

Oh, ant btw: I don't really like the Idea of moving the remotes menu into the repository menu. It's wrong semantically.

And since we have the concept of a context for all actions, it should be self explaining that the main menu actions actually act on the active repository.

scunz · 2015-05-10T13:19:11Z

And me again: It's okay for now. We really really really have to take care of the underlying stuff now. So, the priorities are: RepoMan / Activities / Services. We should not start anything new unless these things reach a mature state and everything is properly ported. We've been beating around the bush for quite a while and now it's time to do it right :)

scunz · 2015-05-10T13:36:23Z

Somehow I don't get messages for everything.

As always, when I don't get notifications: GitHub didn't even try to connect to my mail server in the related timespan today, even though I'm subscribed to this PR.

antis81 · 2015-05-10T21:26:31Z

As always, when I don't get notifications: GitHub didn't even try to connect to my mail server in the related timespan today, even though I'm subscribed to this PR.

Hm ... I didn't experience such problems up to now. This might however be the fact, that I get less messages ... Or maybe a hungry shark ate the underwater cable 🐟 😄.

scunz force-pushed the ngf/remotes-module branch from 273c785 to 221e0ec Compare March 21, 2015 20:26

antis81 changed the title ~~Copy from MacGitverModules~~ Reimplementation of Remotes module Mar 30, 2015

antis81 force-pushed the ngf/remotes-module branch 2 times, most recently from 2f99e28 to a0cb7a3 Compare April 9, 2015 09:38

antis81 force-pushed the development branch from 30f6fb0 to c1c3175 Compare April 9, 2015 11:59

antis81 added 19 commits April 11, 2015 10:57

Remotes Module: remove all "global" module actions

c9e3851

The menu is at the wrong place and about to be moved to the appropriate context (e.g. repo, branch, remote, ...)

Remotes Module: Prepare an action container to build the fetch menu a…

afa67d4

…s a mergeable submenu.

Remotes Module: Add action container to manage Git Remotes.

18f420f

Repository Module: Add menu merge places for "Fetch" and "Remotes" ac…

1cd7d98

…tions

Remotes Module: minor cleanup in the edit dialog for Git Remotes

d6d3965

The dialog is non-functional yet. It could use the (Options ...) technique from the clone dialog to hide the "advanced options".

Remotes Module: replaced include guards with #pragma once

4a04046

add submenu "Active Repository" to "Repository" main menu

1014c40

move "Remotes" merge place to "Active Repository" menu

11822a1

reorganize "Remotes" actions

040ef73

This allows us to define different entry points for the fetch/push actions and assign an appropriate action context later.

insert the "Remotes" merge places into the appropriate menus

363af46

The menu structure is also meant to be integrated in the reference and history view later.

Remotes Module: remove unused class RemotesView and related code

0d25b51

Remotes Module: add skeletons for the action slots and a dialog to ed…

9025dc9

…it Remotes

Remotes Module: fixed minor crash due to invalid "apply" button

634d260

Remotes Module: added "FetchThis" action container

e53d07a

This is meant to limit the fetch context and thus requires a single "Remote" or "remote branch" context.

Remotes Module: renamed class "RemotesCreateEditDlg" -> "RemotesDlg"

6efaa96

Remotes Module: inherit "Remotes" dialog from BlueSky::Dialog

4b19af0

Sets the parent to the main window.

Remotes Module: reimplement RemotesDlg based on ExpandableDlg

c0da2a9

Remotes Module: minor cleanup

04cff93

antis81 force-pushed the ngf/remotes-module branch from 7573564 to 04cff93 Compare April 11, 2015 09:06

antis81 added 2 commits April 12, 2015 01:14

Remotes Module: Changed window title in "Remotes" dialog.

b89e462

Remotes Module: cleanup UI for "Remotes" dialog

ec327e6

Extended options need some cleanup to appear correctly aligned.

antis81 mentioned this pull request May 9, 2015

Reorganize clone dialog #36

Open

3 tasks

antis81 added a commit that referenced this pull request May 9, 2015

Merge pull request #26 from macgitver/ngf/remotes-module

fea6cf7

Restructuring the Remotes module

antis81 merged commit fea6cf7 into development May 9, 2015

antis81 deleted the ngf/remotes-module branch May 9, 2015 14:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reimplementation of Remotes module #26

Reimplementation of Remotes module #26

scunz commented Mar 21, 2015

scunz commented Mar 21, 2015

antis81 commented Mar 22, 2015

scunz commented Mar 22, 2015

antis81 commented Apr 11, 2015

scunz commented Apr 11, 2015

antis81 commented Apr 11, 2015

scunz commented May 9, 2015

antis81 commented May 9, 2015

antis81 commented May 9, 2015

scunz commented May 9, 2015

antis81 commented May 9, 2015

antis81 commented May 10, 2015

antis81 commented May 10, 2015

antis81 commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

antis81 commented May 10, 2015

Reimplementation of Remotes module #26

Reimplementation of Remotes module #26

Conversation

scunz commented Mar 21, 2015

scunz commented Mar 21, 2015

antis81 commented Mar 22, 2015

scunz commented Mar 22, 2015

antis81 commented Apr 11, 2015

scunz commented Apr 11, 2015

antis81 commented Apr 11, 2015

scunz commented May 9, 2015

antis81 commented May 9, 2015

antis81 commented May 9, 2015

scunz commented May 9, 2015

antis81 commented May 9, 2015

antis81 commented May 10, 2015

antis81 commented May 10, 2015

antis81 commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

scunz commented May 10, 2015

antis81 commented May 10, 2015