| Age | Commit message (Collapse) | Author |
|---|
|
The fixed bugs:
* "Binary files differ" did not show up either in unidiff or
side-by-side-diff.
* Subproject diffs did not work for side-by-side diffs.
* The ssdiff link on diff pages did not conserve the path.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Aligned all different files, so that all side-by-side tables look
the same. Also made sure that the tables take up the whole browser
width.
Also various changes to the css to make things easier on the eye.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
A new config option side-by-side-diffs added, defaulting to 0,
meaning unidiff. Also a query option (ss) is used toggle this.
In the commit page you can switch between the two diff formats by
clicking on the link on the "commit"-row, to the right of (patch).
In the diff page you can switch by using the link at the start
of the page.
All commit-links and diff-links will remember the choice.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This constitutes the first prototype of a side-by-side diff. It is not
possible to switch between unidiff and side-by-side diff at all at this
stage.
Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch)
how to handle binary files.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
When printing a path-filtered diff it wasn't obvious how to get back to
the full diff (clicking the 'diff' tab would do this). Making the diffstat
heading into a link seems to improve the usability.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
The links in the diffstat is supposed to work as a filter for the diff,
but this only worked when a single rev was supplied, i.e. the filtered
diff was always against the parent of the specified rev.
With this patch it is now possible to use the diffstat as a 'filter menu'
for urls like http://hjemli.net/git/cgit/diff/?id=v0.7.2&id2=v0.7.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This fixes a regression created by fe1230dece81450004d02fa8a470f8dab8f7fdd9,
and modifies a test to avoid future regressions.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
By removing the test for commit objects it's now possible to specify a
tag name for the id query-string parameter (it already worked for id2).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This creates a generic diffstat function in ui-diff, which then is
invoked from cgit_print_diff with the result that both commit and diff-
view gets a diffstat.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This is finally a proper headerfile for the shared ui-functions which
used to reside in cgit.h
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
All html-functions can be quite easily separated from the rest of cgit, so
lets do it; the only issue was html_filemode which uses some git-defined
macros so the function is moved into ui-shared.c::cgit_print_filemode().
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This struct will hold all the cgit runtime information currently found in
a multitude of global variables.
The first cleanup removes all querystring-related variables.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Each diff header now links to the old and new version of each file
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This allows a diff to be restricted to the path prefix specified in the url.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This paramter can be used to restrict a diff to the specified path prefix.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
* jo/dirlink:
Rename dirlink to gitlink.
Conflicts:
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This adds a new function used to generate links to the diff page and uses
it everywhere such links appear (expect for single files in the diffstat
displayed on the commit page: this is now a link to the tree page).
The updated diff-page now expects zero, one or two revision specifiers, in
parameters head, id and id2. Id defaults to head unless otherwise specified,
while head (as usual) defaults to repo.defbranch. If id2 isn't specified, it
defaults to the first parent of id1.
The most important change is of course that now all repo pages (summary, log,
tree, commit and diff) has support for passing on the current branch and
revision, i.e. the road is now open for a 'static' menu with links to all
of these pages.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
The previous commit fixed the diff-view when two trees where specified on
the querystring (sha1/sha2) but made the generated html invalid when only
a commit sha1 is specified. This fixes it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This fixes a bug which made the diff-link for each parent of a commit
output a diff without correct styles.
It also adds an error-message if the head commit specified on the querystring
isn't a valid commit object.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Git changed from dirlink to gitlink in
302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.
Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
|
|
At least those that were catched by tidy.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
The subprojects needs special handling, since they refer to objects
which normally won't exist in the refering repository.
Fix some extended header bugs and missing features while at it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
The commitdiff will be generated against the first parent, and the
diff page also gets the benefit of repo.defbranch.
Cleaned up some bad whitespace in cgit.h while at it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
The diff headers showed an invalid filename when a patch created or
deleted a file. Fix it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
This makes the diffview look more like 'git-diff' in a terminal.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
A link is added next to each parent of a commit, leading to the new
diff-functionality in ui-diff.c.
Also added support for a path-parameter to filelevel diffs accessed via the
diffstat.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
|
|
|
Finally, xdiff is used to show per-file diffs via commit view.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
|
