Closed (fixed)
Project:
Version Control API
Version:
6.x-2.x-dev
Component:
Commit Log
Priority:
Normal
Category:
Task
Assigned:
Unassigned
Issue tags:
Reporter:
Created:
12 Nov 2010 at 19:17 UTC
Updated:
15 Apr 2014 at 22:25 UTC
Jump to comment: Most recent, Most recent file
Comments
Comment #1
tizzo commentedBase views are now provided. We still need them to look presentable.
Ideally we probably want to tweak both a bit but either will do. The pages in question are urls like the following:
/commitlog => the global commit view
/commitlog/author/jpetso%20%3Cjpetso%3E => the commit view for author jpesto
/commitlog/repository/9 => the commit log for repository 9
We want them to look pretty. Preferably something like http://drupal.org/cvs.
Hopefully we can style it once and let the same code do our work for:
#970206: Create a shippable per user commit view and #970218: Create a shippable per repository view
All of the views are generated by (the newly retooled) commitlog_operations_page in commitlog.module.
Ideally we'll probably modify the markup a bit so that we can keep it reasonably semantic (maybe emulate http://drupal.org/cvs to make deployment easier?) and so that we don't have to dump lots of views-specific css in that breaks if the views are customized. We want to make our views at our URLs to look good but also be customizable. Any solution that walks that line would be great.
The markup could be overridden in templates provided by our module and we can use template_preprocess functions to run them (I could do that part if the .tpl files were included in a patch / tar).
There is some css in commitlog.css that might help, though I'm not sure.
Comment #2
marvil07 commentedComment #3
sarah_p commentedHere is some styling, I used the view of CVS commits in both the new theme, and garland for a guide since ultimately we would want the theme to control most of the output.
Currently these styles only apply to the /commitlog page. I'm working on translating them for the rest. Below is a screenshot link and attached is a patch. Just a heads up I modified the custom text field on the commitlog_global_commits view to make it easier to style the author, date, etc. However, I re-exported all the views so you should be able to get everything by just installing the commitlog module.
Mac OSX - Firefox 3.6.12
http://img.skitch.com/20101119-guytegw7j5sdud83k4b9rhh9de.png
Comment #4
sarah_p commentedHere's patch round two this includes the css for all of the above views in one file, as well as a few minor changes on each view. I exported the views again so you should just be able to update your own code. Below are screenshots of each view.
Mac OSX - Firefox 3.6.12
global view -- http://img.skitch.com/20101119-pcmpdufyscgwbchhca2bkf2r6k.png
author view -- http://img.skitch.com/20101119-puwri8miw98kcu83iwh2ypc6n.png
repository view -- http://img.skitch.com/20101119-1kh2ft76kpa5yhgbnaf9cgw6yi.png
Comment #5
sarah_p commentedAdding pre tag to make the commit messages look cleaner makes them run off the page
Doing this:
https://skitch.com/sdboyer/rbfq9/edit-view-commitlog-global-commits-drup...
Produces this:
https://skitch.com/sdboyer/rbfk9/commit-messages-drupal.org-testing-site
I'm going to see if I can fix it. :D
Comment #6
sdboyer commentedsorry, thought i posted this earlier...
I've committed sarah_p's patch from #4, and have also committed a couple of tweaks and additions.
Comment #7
sdboyer commentedOK, it's just occurred to me that it's rather silly to have three separate issues for essentially the same view, especially when we're really only using one. So I'm marking those duplicates, and turning this into the master issue for creating a shippable commit view. Also tagging for sprint 5.
Comment #8
sarah_p commentedIssues that are under 'shippable views umbrella':
#979058: Cause Commit messages to wrap
#979066: Insert and Delete graphics on commitlog
Comment #9
sarah_p commentedAssigning this to myself to handle the majority of the work, may need help from tizzo and sdboyer to actually get this to shippable.
Comment #10
sarah_p commentedComment #11
sarah_p commentedThis also covers #979058: Cause Commit messages to wrap and #1010212: User should be able to page through commitlog views I'm placing the patch here as well because it generally covers the commitlog view not just those issues:
This patch changes the commitlog view/page in the following ways:
- Pager
- Pre-tags that wrap and look generally legible
- Moves the add/removed lines (although this may change later after Mike's additions)
- Hides the Operator ID
- Moves the "Action" field above the file instead of in the middle. (May try to mimic github on this by using an image to represent the action committed, probably next sprint)
- Cleans up the text sizes a little
Image in Firefox in Mac OSX - https://img.skitch.com/20101231-durteg9tx1fya928mb8nehj25k.jpg
Comment #12
sdboyer commentedPatch in #11 has been committed. Good progress on this, but we're not quite there yet, so putting back to 'needs work'.
Comment #13
eliza411 commentedTagging Git Sprint 8
Comment #14
sdboyer commentedI'm working up a big, definitive post that lays out all the views we actually need. Quickly, though, I want to post this image as there are two crucial changes I'm going to make to the commit log views, both of which are a direct result of how git is different from CVS:
Comment #15
sdboyer commentedper sarah_p's request, here's a list of the views we ACTUALLY need. I've broken them down into the views set to which they belong, and included graphics as much as possible. Quick reminder - a views set is a group of vcapi views (one backend-agnostic 'base' view, then tailored views for each backend as needed) that all perform the same purpose - e.g. list repositories, show commit logs. We'll probably want separate issues for these, but for the moment it makes sense to have all this information in one place in the meta-issue.
Global commit log - set owned by commitlog (in VCAPI), implemented in plugin
versioncontrol/commitlog/includes/plugins/views_sets/global_commit_view.inc. Shows commit log listing of all commits known to all repositories in the system. This is the equivalent to http://drupal.org/cvs ; the exact path it will eventually live at is tbd during sprint 8.ss of the view as it exists right now:
Project-friendly global commit log - set owned by versioncontrol_project, implemented in plugin
versioncontrol_project/plugins/views_sets/project_global_commit_view.inc. Identical to the global commit log except that it shows project name instead of repo name.Per-repository commit log - set owned by commitlog (in VCAPI), implemented in plugin
versioncontrol/commitlog/includes/plugins/views_sets/repository_commit_view.inc. Shows commit log listing of all commits in the specified repository. This is the equivalent to http://drupal.org/project/cvs/343333 .ss of this view right now:
Per-user commit log - set owned by commitlog (in VCAPI), implemented in plugin
commitlog/includes/plugins/views_sets/user_commit_view.inc. Shows commit log listing of all commits made by a particular user (uid) in all repositories known to the system. This is the equivalent to what we see at, for example, http://drupal.org/user/146719/track/code . the exact path it will eventually live at is tbd during sprint 8.Project-friendly per-user commit log - set owned by versioncontrol_project, implemented in plugin
versioncontrol_project/plugins/views_sets/project_user_commit_view.inc. Identical to the base vcapi per-user commit log, except that it shows project names instead of repo names (see the pattern? :P).An exhausting list with a lot of annoying repetition, but hopefully this clears it up.
Comment #16
sdboyer commentedFYI, the patch in #11 contained a partial regression - seems you pasted the commitlog_commit_items over the commitlog_global_commits view in the defaults, so the global view disappeared. I've restored it.
Comment #17
sdboyer commentedAlso, let me clarify on #15 - those are the commit log views we need. There's a chance we'll also have some views to do for push activity, depending on how #879600: Meta: introduce an activity stream separate from commit logs comes out, but that's likely going to happen late in Spring 9, not right away. These commit log views are the big focus right now.
Comment #18
sdboyer commentedAlso, I realized that this list actually neglects the 'inner' commit items listing view. In #1013188-1: Fix crufty, CVS-driven assumptions in commitlog views, I explain how I added three displays to the view. Now I've also had to make a clone of that view that can be used by vc_project, as some of the file item listings it has to generate need to contain the project name. That view is called
vc_project_commit_items, and has been committed to vc_project.Comment #19
eliza411 commentedWith so many more major issues to attend to right now, I propose the following:
1) Ensure sarah can edit files directly on git-dev by Monday, Jan 10, even though she won't start then.
1a) If some other approach is needed (bzr, etc), I want to set up to be able to do the work also.
2) After the Thursday demo rehearsal, in which the views should (still) be visible and stable, Sarah will theme the views, with a priority to looking good on d.o.
3) If everything is a go with git-dev during the rehearsal, that night Sarah can work and it will be incorporated into the Friday demo if feasible.
4) The theming work will be complete by the January 17 planning meeting (noon PST). it's one of the things that needs to be in place for timely testing and a pre-Chicago launch.
5) The foundational work to get a basic common-denominator theme in place can come during Sprint 9.
Comment #20
sdboyer commented@eliza411 - sounds like a plan.
Comment #21
eliza411 commented1) is taken care of. Thanks @sdboyer.
Comment #22
sarah_p commentedI will be doublechecking my testing environment by Mon. Jan 10th, and start editing the views on the 10th as well. More to come!
Comment #23
sdboyer commentedI've created a little diagram illustrating the hierarchy that all these views sets fall into, and highlighted the actual view that's going to be used on d.o in bold & red text.
This is just an easier visual representation of the verbose information laid out in #15.
Comment #24
sarah_p commentedI was able to get some work done on the commitlogs see #1025330: Add CSS for Git for the patch. This is a basic conversion of some of the code that was in the bluecheese theme style.css.
(The screenshot is with the addition of a pre-tag on the 'vc-git-global-commits' view on the the message field. Which I'll be working on in this and other related issues).
https://img.skitch.com/20110113-kk42u437fujny4qw8wfga6iep5.png
Comment #25
eliza411 commentedComment #26
sarah_p commenteddeleted duplicate comment
Comment #27
sarah_p commentedIssue for adding pre-tags and li tags to the views in commitlog. #1026440: Fix Commit Log views structure and html types.
Comment #28
sarah_p commentedBluecheese issues: For Testing #1025330: Add CSS for Git and for launch #1026462: Making Git look good for launch.
Comment #29
sarah_p commentedBlocking/related issues on this:
#1026408: Link commit logs to gitweb viewer
#1026484: Group commits by date & Remove Date from commit-global
#1026440: Fix Commit Log views structure and html types.
#1025334: Create per-project commit logs
Comment #30
webchickI went through the commit logs with a fine-toothed comb tonight, and now fully understand where Sarah was coming from. Though what are on git-dev.drupal.org certainly look and smell like commit log views, they are missing several pieces of information compared to the current ones:
I wouldn't necessarily call all of these launch-critical (like 7 and 8, which I never even knew existed before I clicked on everything here), but there's definitely more work to do here before these can be styled.
Comment #31
sarah_p commentedSince we're tag teaming on this I'm assigning it to mikey_p.
Comment #32
mikey_p commentedComment #33
sarah_p commentedI can see the css from bluecheese, but for some reason the location of the source css is located in a
http://git-dev.drupal.org/files/css/css...
I'm not sure if this is a cache issue or something else, but I can't seem to be able to edit the css to any effect. Since the views have been rearranged I tried to take off the border, but even though it is removed from bluecheese it's still showing up.
https://img.skitch.com/20110123-p6fi8cuty74j1x8yhhwumecj4r.png
Comment #34
eliza411 commentedAggressive caching and css optimization are enabled on git-dev and will be after each rebuild. You can log in and disable them as you need. Ping me or sdboyer if you don't know the credentials.
We are highly likely to open for testing tomorrow evening, so we may need to define a window where you working won't cause issues for testers.
Comment #35
sarah_p commentedWas able to get the css working, and implement some fixes.
Comment #36
sarah_p commentedTo follow the code additions to blue-cheese see #1025330: Add CSS for Git.
Comment #37
eliza411 commentedDone enough to remove testing blocker tag.
Comment #38
marvil07 commentedI have not re-read the whole issue, but is this need to be open?
what are the things left to do?
IMHO it would be better to just close this an open specific issues if needed.
Comment #39
marvil07 commentedCreating specific issues:
#1387282: Provide an override of vc_git_individual_commit to provide a link to project page
IMHO this is not really something natural on git, which is our current main target. Anyway I guess someone can open a new issue if needed.
#1387292: Provide a view listing all operations of a given branch
That's working right now ;-)
And closing this.