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

Re: [PATCHv6 4/5] gitweb: parse parent..current syntax from PATH_INFO

From
Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date
Oct 20, 2008, 14:52 UTC
Message-ID
<cb7bb73a0810200752l70e1952dmb8e14a419b02f61b@mail.gmail.com>
In-Reply-To
<200810201118.44654.jnareb@gmail.com>
On Mon, Oct 20, 2008 at 11:18 AM, Jakub Narebski <jnareb@gmail.com> wrote:
Show 10 quoted lines
> On Thu, 16 Oct 2008, Giuseppe Bilotta wrote:
>
>> This patch makes it possible to use an URL such as
>> $project/somebranch..otherbranch:/filename to get a diff between
>> different version of a file. Paths like
>> $project/$action/somebranch:/somefile..otherbranch:/otherfile are parsed
>> as well.
>
> Just a nitpick: why '$project' and '$action', but 'somebranch',
> 'otherbranch' and 'filename'?
Good question ... I think I got distracted along the way.
Show 6 quoted lines
>> All '*diff' actions and in general actions that use $hash_parent[_base]
>> and $file_parent can now get all of their parameters from PATH_INFO
>
> Which currently mean 'shortlog', and I guess in the future would mean
> also all other log-like views: 'log', 'history', 'search' (the commit
> message kind, not the pickaxe kind), and perhaps also 'rss'/'atom'.

I'm not sure rss/atom makes sense, but the others were already in my todo list after the shortlog patch, so I'll try to get them ready as soon as I have the time to refactor them as we discussed on IRC.

Show 7 quoted lines
> Side note: the regexp below allow for $parentpathname to contain
> '..', but we don't want to rely on such minute detail of implementation
> detail (because it depends on whether we use greedy or non-greedy
> matching there).
>
>> +     my ($parentrefname, $parentpathname, $refname, $pathname) =
>> +             ($path_info =~ /^(?:(.+?)(?::(.+))?\.\.)?(.+?)(?::(.+))?$/);

Hm, actually it might be a better idea to make the first pathname match non-greedy.

Show 19 quoted lines
>> -                     $input_params{'action'} ||= "blob_plain";
>> +                     # the default action depends on whether we had parent info
>> +                     # or not
>> +                     if ($parentrefname) {
>> +                             $input_params{'action'} ||= "blobdiff_plain";
>> +                     } else {
>> +                             $input_params{'action'} ||= "blob_plain";
>> +                     }
>
> Nice.
>
> I was wondering about 'project/hash_parent..hash' syntax, but then I have
> realized that it doesn't change action (as in 'blob_plain' -> 'blobdiff_plain'),
> but is always 'shortlog'.
>
> By the way, I wonder if it should be 'blobdiff_plain' or just 'blobdiff'.
> the 'blob_plain' was here to use gitweb as a kind of versioned web
> server; there is no such equivalent for 'p/hbp..hb:f' syntax. On the
> other hand it is consistent behavior, always using *_plain...

Moreover, it allows sending shorter URLs for patches, which are the ones you usually write by hand.

Show 10 quoted lines
>> +
>> +     # next, handle the 'parent' part, if present
>> +     if (defined $parentrefname) {
>> +             # a missing pathspec defaults to the 'current' filename, allowing e.g.
>> +             # someproject/blobdiff/oldrev..newrev:/filename
>> +             if ($parentpathname) {
>> +                     $parentpathname =~ s,^/+,,;
>> +                     $parentpathname =~ s,/$,,;
>
> Hmmm... should we strip trailing '/' here?
I must confess I don't remember why I decided that was needed.
-- 
Giuseppe "Oblomov" Bilotta
Previous: Jakub NarebskiNext: Jakub Narebski
Message 21 of 26 in “[PATCHv6 0/5] gitweb: PATH_INFO enhancement”
  1. Giuseppe BilottaOct 16, 2008
  2. 1/5 gitweb: parse project/action/hash_base:filename PATH_INFOGiuseppe Bilotta, Oct 16, 2008
  3. 2/5 gitweb: generate project/action/hash URLsGiuseppe Bilotta, Oct 16, 2008
  4. 3/5 gitweb: use_pathinfo filenames start with /Giuseppe Bilotta, Oct 16, 2008
  5. 4/5 gitweb: parse parent..current syntax from PATH_INFOGiuseppe Bilotta, Oct 16, 2008
  6. 5/5 gitweb: generate parent..current URLsGiuseppe Bilotta, Oct 16, 2008
  7. 6/6 gitweb: retrieve snapshot format from PATH_INFOGiuseppe Bilotta, Oct 19, 2008
  8. 6/8 gitweb: retrieve snapshot format from PATH_INFOGiuseppe Bilotta, Oct 19, 2008
  9. 7/8 gitweb: embed snapshot format parameter in PATH_INFOGiuseppe Bilotta, Oct 19, 2008
  10. 8/8 gitweb: make the supported snapshot formats array globalGiuseppe Bilotta, Oct 19, 2008
  11. Jakub NarebskiNov 2, 2008
  12. Junio C HamanoNov 2, 2008
  13. Jakub NarebskiNov 1, 2008
  14. Giuseppe BilottaNov 1, 2008
  15. Jakub NarebskiOct 21, 2008
  16. Giuseppe BilottaOct 21, 2008
  17. Junio C HamanoOct 21, 2008
  18. Jakub NarebskiOct 20, 2008
  19. Giuseppe BilottaOct 20, 2008
  20. Jakub NarebskiOct 20, 2008
  21. Giuseppe BilottaOct 20, 2008
  22. Jakub NarebskiOct 18, 2008
  23. Giuseppe BilottaOct 18, 2008
  24. Jakub NarebskiOct 19, 2008
  25. Jakub NarebskiOct 18, 2008
  26. Jakub NarebskiOct 18, 2008

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.