1117021 - Update gitweb theme

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Gregory Szorc [:gps]]

We're currently running a fork of the "gitweb" theme on hg.mozilla.org. The theme code appears to be based on some ancient version of Mercurial - likely before the 2.x series.

As part of migrating hg.mozilla.org to paper, let's update the gitweb theme to modern times. This make the transition easier, as it will make a diff of vanilla to Mozilla easier and this in turn will make porting to paper easier.

Comment 1

[Gregory Szorc [:gps]]

Attachment: MozReview Request: bz://1117021/gps

Comment 2

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision
/r/1901 - hgtemplates: add file comparison
/r/1903 - hgtemplates: refresh graph from upstream
/r/1905 - hgtemplates: clean up navigation headers
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest

Pull down these commits:

hg pull review -r eadbbfa23cde151828b0c81efc451b7cd07d15c7

Comment 3

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision
/r/1901 - hgtemplates: add file comparison
/r/1903 - hgtemplates: refresh graph from upstream
/r/1905 - hgtemplates: clean up navigation headers
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1959 - hgtemplates: import paper style
/r/1961 - hgtemplates: synchronize raw style
/r/1963 - hgtemplates: remove old .hgtags file
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/1975 - hgtemplates: remove gitweb_ecma style

Pull down these commits:

hg pull review -r 777b8d7078c5adeb92d8c7d71b7219583afcb8b0

Comment 4

[Gregory Szorc [:gps]]

Ted: I figure you may want to peruse the changes. I'm confident I accidentally regressed something we purposefully added many years ago. Maybe you can spot it before it rolls out to production :)

Comment 5

[(not currently active) Ted Mielczarek]

https://reviewboard.mozilla.org/r/1887/#review1295

::: hgtemplates/gitweb_mozilla/changeset.tmpl
(Diff revision 2)
> -{desc|strip|escape|firstline|buglink} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span>
> +<a class="title" href="{url|urlescape}raw-rev/{node|short}">{desc|strip|escape|firstline|buglink|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>

As someone pointed out in bug 1088315 this will break because the buglink filter outputs <a> elements, and nested <a>s aren't going to work. It's probably okay to just remove buglink here since this is just the first line and the whole commit message is below.

::: hgtemplates/gitweb_mozilla/filerevision.tmpl
(Diff revision 2)
> -{desc|strip|escape|addbreaks|buglink}
> +{desc|strip|escape|websub|addbreaks|nonempty}

You dropped buglink here, was that intentional?

::: hgtemplates/static/style-gitweb.css
(Diff revision 2)
> -span.difflineat { color:#990099; }

It looks like these were an intentional change:
http://hg.mozilla.org/hgcustom/version-control-tools/rev/2c355a580af6

We may need to upstream that.

Comment 6

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1887/#review1319

> It looks like these were an intentional change:
> http://hg.mozilla.org/hgcustom/version-control-tools/rev/2c355a580af6
> 
> We may need to upstream that.

Nice catch! I submitted the patch to upstream: http://www.selenic.com/pipermail/mercurial-devel/2015-January/065241.html

> You dropped buglink here, was that intentional?

Nope. Will fix.

Comment 7

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision
/r/1901 - hgtemplates: add file comparison
/r/1903 - hgtemplates: refresh graph from upstream
/r/1905 - hgtemplates: clean up navigation headers
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1959 - hgtemplates: import paper style
/r/1961 - hgtemplates: synchronize raw style
/r/1963 - hgtemplates: remove old .hgtags file
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/1975 - hgtemplates: remove gitweb_ecma style

Pull down these commits:

hg pull review -r c05d09165bbc9cdb56e2fa07a288e8529ef9b213

Comment 8

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision
/r/1901 - hgtemplates: add file comparison
/r/1903 - hgtemplates: refresh graph from upstream
/r/1905 - hgtemplates: clean up navigation headers
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1959 - hgtemplates: import paper style
/r/1961 - hgtemplates: synchronize raw style
/r/1963 - hgtemplates: remove old .hgtags file
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/1975 - hgtemplates: remove gitweb_ecma style
/r/2099 - hgtemplates: move "age" class in shortlogentry

Pull down these commits:

hg pull review -r 3f3d19d5095d31a2c467d008a2e6e9733ab8c3a5

Comment 9

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1893/#review1353

::: hgtemplates/gitweb_mozilla/summary.tmpl
(Diff revision 2)
> -<form action="{url}log">
> +<form action="{url|urlescape}log">

Does this look right to you? It's not a standard <a> tag, it's the action name of a form.

Other than the question earlier, this looks very cut and dry. Ship it.

Comment 10

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1895/#review1355

lgtm, lots of replicated code. Are most of these the changes taken from upstream?

Comment 11

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1897/#review1357

This seems to be reverting the logo link of some pages from MDN back to http://mercurial.selenic.com/ . Is this intentional? Perhaps with this patch we should be adding config.web.logourl = MDN?

Comment 12

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1899/#review1359

lgtm

Comment 13

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1901/#review1361

lgtm

Comment 14

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1897/#review1363

Yes, we'll want to add the following to the hgrc on these machines:

   [web]
   logourl = https://developer.mozilla.org/en/docs/Mercurial

Comment 15

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1903/#review1365

lgtm

Comment 16

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1905/#review1367

::: hgtemplates/gitweb_mozilla/changelog.tmpl
(Diff revision 2)
> -<a href="{url|urlescape}graph/{rev}{sessionvars%urlparameter}">graph</a> |
> +<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |

Do we care about changing the behavior of these graph/ links? Or will the rev be pased in the sessionvars?

Other than the behavior question earlier, lgtm.

Comment 17

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1909/#review1369

lgtm

Comment 18

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1893/#review1483

> Does this look right to you? It's not a standard <a> tag, it's the action name of a form.

This is how it is done upstream, for better or worse. I'm just going to take it.

Comment 19

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1895/#review1485

Yes, this is pretty much all from upstream as-is.

Comment 20

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1905/#review1487

> Do we care about changing the behavior of these graph/ links? Or will the rev be pased in the sessionvars?

Doh. Looks like this is a Mozilla-ism. I'll keep it in.

Comment 21

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}; r=bkero
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections; r=bkero
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision; r=bkero
/r/1901 - hgtemplates: add file comparison; r=bkero
/r/1903 - hgtemplates: refresh graph from upstream; r=bkero
/r/1905 - hgtemplates: clean up navigation headers; r=bkero
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values; r=bkero
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1959 - hgtemplates: import paper style
/r/1961 - hgtemplates: synchronize raw style
/r/1963 - hgtemplates: remove old .hgtags file
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/1975 - hgtemplates: remove gitweb_ecma style
/r/2099 - hgtemplates: move "age" class in shortlogentry

Pull down these commits:

hg pull review -r 052a508bd787d61b0e504e5c2bbbbdcccb819962

Comment 22

[Hal Wine [:hwine] use NI!]

https://reviewboard.mozilla.org/r/1961/#review1495

Ship It!

Comment 23

[Hal Wine [:hwine] use NI!]

https://reviewboard.mozilla.org/r/1919/#review1499

lgtm - the deployment is global I assume, but most repos won't have bookmarks so should be a non-issue at bottom of current list.

Comment 24

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}; r=bkero
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections; r=bkero
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision; r=bkero
/r/1901 - hgtemplates: add file comparison; r=bkero
/r/1903 - hgtemplates: refresh graph from upstream; r=bkero
/r/1905 - hgtemplates: clean up navigation headers; r=bkero
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values; r=bkero
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/2099 - hgtemplates: move "age" class in shortlogentry
/r/1975 - hgtemplates: remove gitweb_ecma style

Pull down these commits:

hg pull review -r f58c4e02fd69ec4907535e29e91122a9287f1c53

Comment 25

[Gregory Szorc [:gps]]

/r/1893 - hgtemplates: URL escape {url}; r=bkero
/r/1895 - hgtemplates: add missing branches, bookmarks, and help sections; r=bkero
/r/1897 - hgtemplates: use {logourl}
/r/1899 - hgtemplates: link to latest file revision; r=bkero
/r/1901 - hgtemplates: add file comparison; r=bkero
/r/1903 - hgtemplates: refresh graph from upstream; r=bkero
/r/1905 - hgtemplates: clean up navigation headers; r=bkero
/r/1907 - hgtemplates: expand map entries into multiple lines
/r/1909 - hgtemplates: escape some values; r=bkero
/r/1911 - hgtemplates: move graph and pushlog
/r/1913 - hgtemplates: escape some values
/r/1915 - hgtemplates: add bookmarktag
/r/1917 - hgtemplates: add bookmarks to summary / fix branches link
/r/1919 - hgtemplates: display bookmarks in manifest; r=hwine
/r/1925 - hgtemplates: synchronize excanvas.js
/r/1927 - hgtemplates: synchronize some CSS rules
/r/1929 - hgtemplates: synchronize style.css
/r/1931 - hgtemplates: synchronize changeset.tmpl
/r/1933 - hgtemplates: synchronize fileannotate.tmpl
/r/1935 - hgtemplates: synchronize filerevision.tmpl
/r/1937 - hgtemplates: synchronize shortlog.tmpl
/r/1939 - hgtemplates: add comparison link in file links
/r/1941 - hgtemplates: synchronize diff and annotate line entries
/r/1943 - hgtemplates: make template formatting consistent with upstream
/r/1945 - hgtemplates: make filelogrename consistent with upstream
/r/1947 - hgtemplates: render age in tagentry consistent with upstream
/r/1949 - hgtemplates: make branchentry consistent with upstream
/r/1951 - hgtemplates: remove filelogentry_old
/r/1953 - hgtemplates: make navigation header consistent with upstream
/r/1955 - hgtemplates: synchronize hg icon and logo with upstream
/r/1957 - hgtemplates: synchronize gitweb
/r/1965 - hgtemplates: URL escape {url} in atom style
/r/1967 - hgtemplates: add missing atom files
/r/1969 - hgtemplates: synchronize atom changelogentry.tmpl with upstream
/r/1971 - hgtemplates: synchronize rss style with upstream
/r/1973 - hgtemplates: synchronize command line map files
/r/2099 - hgtemplates: move "age" class in shortlogentry
/r/1975 - hgtemplates: remove gitweb_ecma style

Pull down these commits:

hg pull review -r 021a3036a31275512fe8ee659e1f8d8ccadb3d69

Comment 26

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1907/#review1821

lgtm

Comment 27

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1909/#review1823

Ship It!

Comment 28

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1911/#review1825

Ship It!

Comment 29

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1913/#review1827

Ship It!

Comment 30

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1915/#review1829

Ship It!

Comment 31

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1917/#review1831

Ship It!

Comment 32

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1919/#review1833

Ship It!

Comment 33

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1925/#review1835

Seems to work, okay.

Comment 34

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1927/#review1837

Ship It!

Comment 35

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1929/#review1839

Ship It!

Comment 36

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1931/#review1843

Ship It!

Comment 37

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1933/#review1845

Ship It!

Comment 38

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1935/#review1847

Ship It!

Comment 39

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1937/#review1849

w00t infinite scrolling

Comment 40

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1939/#review1851

Ship It!

Comment 41

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1955/#review1853

Ship It!

Comment 42

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1947/#review1855

Ship It!

Comment 43

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1945/#review1857

Ship It!

Comment 44

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1941/#review1859

Ship It!

Comment 45

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1943/#review1861

Ship It!

Comment 46

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1949/#review1863

::: hgtemplates/gitweb_mozilla/map
(Diff revision 6)
> -    <td><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td>
> +    <td><a class="list" href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td>

This is s/rev/shortlog/. Is that expected? Aren't those two pages different?

Comment 47

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1951/#review1867

Ship It!

Comment 48

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1953/#review1875

Ship It!

Comment 49

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1957/#review1877

Didn't look too closely at this since this code isn't used in production (unless a user requests a specific style). As far as I'm concerned we can just nuke the dir and check out a fresh gitweb/ copy from upstream.

Comment 50

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1965/#review1881

Ship It!

Comment 51

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1967/#review1883

::: hgtemplates/atom/map
(Diff revision 6)
> +filedifflink = '{file|escape}<br />'

This and the following 3 lines should probably be their own commit, but shouldn't really matter.

Comment 52

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1967/#review1885

Ship It!

Comment 53

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1969/#review1889

Ship It!

Comment 54

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1967/#review1891

> This and the following 3 lines should probably be their own commit, but shouldn't really matter.

Misinterpreted the issue, the map is in /atom/. Disregard.

Comment 55

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1971/#review1893

Ship It!

Comment 56

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1973/#review1895

This looks fine to me, but I'm not sure if any of our automated testing is going to use these, then choke on the different output. I suppose those clients will have their own templates, so these should never be used.

Comment 57

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1975/#review1897

diediedie

Comment 58

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/2099/#review1899

Ship It!

Comment 59

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1897/#review1913

Ship It!

Comment 60

[Gregory Szorc [:gps]]

https://reviewboard.mozilla.org/r/1949/#review1915

> This is s/rev/shortlog/. Is that expected? Aren't those two pages different?

AFAICT, this URL has been present since gitweb_mozilla was checked in and wasn't changed by Mozilla. It must have changed upstream.

Comment 61

[Ben Kero [:bkero]]

https://reviewboard.mozilla.org/r/1949/#review1917

Ship It!

Comment 62

[Gregory Szorc [:gps]]

I pushed all these changesets. Will deploy shortly.

Comment 63

[Gregory Szorc [:gps]]

This is deployed \o/

Comment 64

[Hal Wine [:hwine] use NI!]

reopening until regressions resolved (current open blockers)

Comment 65

[Gregory Szorc [:gps]]

No need to reopen. Other bugs are on file. They are regressions. They are related but don't need to keep this bug open while they are outstanding.

Comment 67

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize excanvas.js

Comment 68

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize some CSS rules

Comment 69

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize style.css

Comment 70

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize changeset.tmpl

Comment 71

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize fileannotate.tmpl

Comment 72

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize filerevision.tmpl

Comment 73

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize shortlog.tmpl

Comment 74

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add comparison link in file links

Comment 75

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize diff and annotate line entries

Comment 76

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: make template formatting consistent with upstream

Comment 77

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: make filelogrename consistent with upstream

Comment 78

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: render age in tagentry consistent with upstream

Comment 79

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: make branchentry consistent with upstream

Comment 80

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: remove filelogentry_old

Comment 81

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: make navigation header consistent with upstream

Comment 82

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize hg icon and logo with upstream

Comment 83

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize gitweb

Comment 84

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: import paper style

Comment 85

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize raw style

Comment 86

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: remove old .hgtags file

Comment 87

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: URL escape {url} in atom style

Comment 88

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add missing atom files

Comment 89

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize atom changelogentry.tmpl with upstream

Comment 90

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: move "age" class in shortlogentry

Comment 91

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize command line map files

Comment 92

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: remove gitweb_ecma style

Comment 93

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: synchronize rss style with upstream

Comment 94

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: URL escape {url}; r=bkero

Comment 95

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add missing branches, bookmarks, and help sections; r=bkero

Comment 96

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: use {logourl}

Comment 97

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: link to latest file revision; r=bkero

Comment 98

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add file comparison; r=bkero

Comment 99

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: refresh graph from upstream; r=bkero

Comment 100

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: clean up navigation headers; r=bkero

Comment 101

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: expand map entries into multiple lines

Comment 102

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: escape some values; r=bkero

Comment 103

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: move graph and pushlog

Comment 104

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: escape some values

Comment 105

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add bookmarktag

Comment 106

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: add bookmarks to summary / fix branches link

Comment 107

[Gregory Szorc [:gps]]

Attachment: MozReview Request: hgtemplates: display bookmarks in manifest; r=hwine