git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/7] gitweb: support filename prefix in git_patchset_body/git_difftree_body

From
Jakub Narebski <jnareb@gmail.com>
Date
Apr 27, 2007, 10:55 UTC
Message-ID
<200704271255.24200.jnareb@gmail.com>
In-Reply-To
<11766699713715-git-send-email-mkoegler@auto.tuwien.ac.at>
On Sunday, 15 April 2007, Martin Koegler wrote:
> git_treediff supports comparing subdirectories. As the output of
> git-difftree is missing the path to the compared directories,
> the links in the output would be wrong.
You mean that git-diff-tree output for diff between two non-toplevel
trees lacks the path to compared tree, e.g.
  $ git diff-tree <commit1>:<path1> <commit2>:<path2>
lacks <path1> prefix in the from part, and <path2> prefix in to part,
and the goal is to add those missing prefixes in the links, without
changing the visible output of git_patchset_body/git_difftree_body.
 
> The patch adds two new parameters to add the missing path prefix.
...and makes use of them while generating links.

Although I'm not sure if it wouldn't be better to put e.g. $prefix_from.$diff{'file'} in $diff{'file_from_url'} or something like that.

Show 8 quoted lines
> Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
> ---
> I renamed the parameters to to/from_prefix.
> 
> Modifying the file name in $diff would require bigger changes
> and cause new problems: 
> * new output rewriter for plain view needed
> * for modified files only one file name, but possibly two prefixes

Looks nice, although I think this patch is needed only when we have "treediff" (and "treediff_plain") views, i.e. when we are able to compare not only top level trees (like in "commitdiff" view), or individual files (in "blobdiff" view), but also arbitrary trees.

It can be usefull to compare for example git-gui/ directory in git.git mainline branch with the root directory from git://repo.or.cz/git-gui or gitweb/ directory after including gitweb in git repository with the gitweb.git commits. Although not that useful in first example: there is as far as I know no development of git-gui directly in git.git repository so the only difference is that in mainline git-gui stuff resides in git-gui/ and in git://repo.or.cz/git-gui in top directory

-- 
Jakub Narebski
ShadeHawk on #git
Poland
Previous: Martin KoeglerNext: Martin Koegler
Message 8 of 14 in “gitweb: show "no difference" message for empty diff”
  1. 1/7 gitweb: show "no difference" message for empty diffMartin Koegler, Apr 15, 2007
  2. 2/7 gitweb: Support comparing blobs with different namesMartin Koegler, Apr 15, 2007
  3. 3/7 gitweb: support filename prefix in git_patchset_body/git_difftree_bodyMartin Koegler, Apr 15, 2007
  4. 4/7 gitweb: Add treediff viewMartin Koegler, Apr 15, 2007
  5. 5/7 gitweb: Prototyp for selecting diffs in JavaScriptMartin Koegler, Apr 15, 2007
  6. 6/7 gitweb: pass root directory as empty file parameterMartin Koegler, Apr 15, 2007
  7. 7/7 gitweb: Adapt gitweb.js to new git_treeview calling conventionMartin Koegler, Apr 15, 2007
  8. Jakub NarebskiApr 27, 2007
  9. Martin KoeglerApr 28, 2007
  10. Jakub NarebskiApr 20, 2007
  11. Junio C HamanoApr 20, 2007
  12. Jakub NarebskiApr 20, 2007
  13. 0/4 git-diff: use mode for tree:name syntax (was: Re: [PATCH 2/7] gitweb: Support comparing blobs with different names)Martin Koegler, Apr 21, 2007
  14. Jakub NarebskiApr 18, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.