Skip to content
This repository has been archived by the owner on Jun 3, 2024. It is now read-only.

Reimplementation of Remotes module #26

Merged
merged 21 commits into from
May 9, 2015
Merged

Conversation

scunz
Copy link
Member

@scunz scunz commented Mar 21, 2015

@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 scunz force-pushed the ngf/remotes-module branch from 273c785 to 221e0ec Compare March 21, 2015 20:26
@scunz
Copy link
Member Author

scunz commented Mar 21, 2015

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
Copy link
Member

antis81 commented Mar 22, 2015

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

@scunz
Copy link
Member Author

scunz commented Mar 22, 2015

Done :)

@antis81 antis81 changed the title Copy from MacGitverModules Reimplementation of Remotes module Mar 30, 2015
@antis81 antis81 force-pushed the ngf/remotes-module branch 2 times, most recently from 2f99e28 to a0cb7a3 Compare April 9, 2015 09:38
antis81 added 19 commits April 11, 2015 10:57
The menu is at the wrong place and about to be moved to the appropriate context (e.g. repo, branch, remote, ...)
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.
This is meant to limit the fetch context and thus requires a single "Remote" or "remote branch" context.
@antis81 antis81 force-pushed the ngf/remotes-module branch from 7573564 to 04cff93 Compare April 11, 2015 09:06
@antis81
Copy link
Member

antis81 commented Apr 11, 2015

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

@scunz
Copy link
Member Author

scunz commented Apr 11, 2015

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

@antis81
Copy link
Member

antis81 commented Apr 11, 2015

Yes, no problem. This is a relict 😄.

@antis81 antis81 mentioned this pull request May 9, 2015
3 tasks
@scunz
Copy link
Member Author

scunz commented May 9, 2015

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

@antis81
Copy link
Member

antis81 commented May 9, 2015

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

antis81 added a commit that referenced this pull request May 9, 2015
@antis81 antis81 merged commit fea6cf7 into development May 9, 2015
@antis81 antis81 deleted the ngf/remotes-module branch May 9, 2015 14:57
@antis81
Copy link
Member

antis81 commented May 9, 2015

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
Copy link
Member Author

scunz commented May 9, 2015

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

@antis81
Copy link
Member

antis81 commented May 9, 2015

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

@antis81
Copy link
Member

antis81 commented May 10, 2015

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:

mgv-menu-before

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:
mgv-menu-should-be

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
Copy link
Member

antis81 commented May 10, 2015

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
Copy link
Member

antis81 commented May 10, 2015

DONE! Git rebase is simply great 👍!!!

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

@scunz
Copy link
Member Author

scunz commented May 10, 2015

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
Copy link
Member Author

scunz commented May 10, 2015

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
Copy link
Member Author

scunz commented May 10, 2015

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
Copy link
Member Author

scunz commented May 10, 2015

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
Copy link
Member

antis81 commented May 10, 2015

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 🐟 😄.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants