Bugzilla – Full Text Bug Listing
| Summary: | [client][git] Navigation hints between various git pages | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | John Arthorne <john.arthorne> |
| Component: | Client | Assignee: | Szymon Brandys <Szymon.Brandys> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P2 | CC: | bokowski, libingw, susan, Szymon.Brandys, tomasz.zarna |
| Version: | 0.2 | ||
| Target Milestone: | 0.2 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
| Bug Depends on: | 348721 | ||
| Bug Blocks: | |||
|
Description
John Arthorne
We could also use status area to show what is next. For instance, if you are on Git Remote UI and you did Fetch and Merge and there are unresolved conflicts, I would show in the status area a message like "There are unresolved conflicts. Got to >Git Status UI< to resolve them" and >Git Status UI< would be a link. (In reply to comment #1) > We could also use status area to show what is next. For instance, if you are on > Git Remote UI and you did Fetch and Merge and there are unresolved conflicts, I > would show in the status area a message like "There are unresolved conflicts. > Got to >Git Status UI< to resolve them" and >Git Status UI< would be a link. +1. The smarter we can be about guiding to the next logical step, the better. I will handle the issue during overall Git UI polishing. This is where I could really use links: 1. I do commit on git status. Link to git log would be nice here, to see my new commit and of course often the next step is to Push 2. When merge fails it's usually because I have some uncommitted changes (similar to comment 1) I would like to have a link to git status (btw there is no error message now at all bug 348721) 3. When I try to push to repository and there are some incoming changes that are not merged I get a warning "REJECTED_NONFASTFORWARD". I'd rather we an error and a link to git remote to do fetch and merge (In reply to comment #4) > 1. I do commit on git status. Link to git log would be nice here, to see my new > commit and of course often the next step is to Push This link is now there, as well as a link to the log for the remote tracking branch. > 2. When merge fails it's usually because I have some uncommitted changes > (similar to comment 1) I would like to have a link to git status (btw there is > no error message now at all bug 348721) Yes, a link to git status would be great! > 3. When I try to push to repository and there are some incoming changes that > are not merged I get a warning "REJECTED_NONFASTFORWARD". I'd rather we an > error and a link to git remote to do fetch and merge Just another reason (from my point of view) why having push and fetch/merge buttons on the Git Status page would make sense. (In reply to comment #5) > > 2. When merge fails it's usually because I have some uncommitted changes > > (similar to comment 1) I would like to have a link to git status (btw there is > > no error message now at all bug 348721) > > Yes, a link to git status would be great! > > > 3. When I try to push to repository and there are some incoming changes that > > are not merged I get a warning "REJECTED_NONFASTFORWARD". I'd rather we an > > error and a link to git remote to do fetch and merge > > Just another reason (from my point of view) why having push and fetch/merge > buttons on the Git Status page would make sense. There should be a link to Git Status page in the progress result (the toolbar), when merging fails. Unfortunately JGit sometimes throws internal exceptions during merge, when it should throw API exception saying that we should stage and commit changes from the working directory first. I need to work around it. Moreover to improve the experience I'm merging Git Log and Gir Remote, see Bug 344500. both incoming and outgoing changes will be shown on one page and I hope to have fetch, merge and push available on one page too. If we have it all fixed, I don't think that we would need fetch/merge/push actions on Git Status. However if Libing can add it, I'm fine with it, especially that it was shown on the Boris' mockup. We may verify later what works better and how to change the flow. (In reply to comment #5) > (In reply to comment #4) > > 1. I do commit on git status. Link to git log would be nice here, to see my new > > commit and of course often the next step is to Push > > This link is now there, as well as a link to the log for the remote tracking > branch. I think that Susan mentioned that instead of links to git log or git remote, we should rather add actions like "Push my changes" or "Fetch and merge from remote". Or even something like "If you want to share your commits, push changes now" (In reply to comment #7) > I think that Susan mentioned that instead of links to git log or git remote, we > should rather add actions like "Push my changes" or "Fetch and merge from > remote". Or even something like "If you want to share your commits, push > changes now" To clarify, these action would take you to the git log page where you could do these things. Will continue during RC2. The navigation was improved recently. There are links added to easily switch between local and remote log views. There are already links from the log views to the git status page and back. I think this bug may be marked fixed. If there is any link missing we will open a separate bug for it. Filed bug 349831. |