Anton Shestakov <av6@dwimlabs.net> [Mon, 04 Dec 2017 19:08:41 +0800] rev 35222
spartan: render changesets server-side on /graph page
Anton Shestakov <av6@dwimlabs.net> [Mon, 04 Dec 2017 18:26:54 +0800] rev 35221
monoblue: render changesets server-side on /graph page
Anton Shestakov <av6@dwimlabs.net> [Mon, 04 Dec 2017 17:43:45 +0800] rev 35220
gitweb: render changesets server-side on /graph page
Anton Shestakov <av6@dwimlabs.net> [Mon, 04 Dec 2017 16:21:15 +0800] rev 35219
paper: render changesets server-side on /graph page
Anton Shestakov <av6@dwimlabs.net> [Fri, 01 Dec 2017 16:00:40 +0800] rev 35218
hgweb: only include graph-related data in jsdata variable on /graph pages (BC)
Historically, client-side graph code was not only rendering the graph itself,
but it was also adding all of the changeset information to the page as well.
It meant that JavaScript code needed to construct valid HTML as a string
(although proper escaping was done server-side). It wasn't too clunky, even
though it meant that a lot of server-side things were duplicated client-side
for no good reason, but the worst thing about it was the data format it used.
It was somewhat future-proof, but not human-friendly, because it was just a
tuple: it was possible to append things to it (as was done in e.g.
270f57d35525), but you'd then have to remember the indices and reading the
resulting JS code wasn't easy, because cur[8] is not descriptive at all.
So what would need to happen for graph to have more features, such as more
changeset information or a different vertex style (branch-closing, obsolete)?
First you'd need to take some property, process it (e.g. escape and pass
through templatefilters function, and mind the encoding too), append it to
jsdata and remember its index, then go add nearly identical JavaScript code to
4 different hgweb themes that use jsdata to render HTML, and finally try and
forget how brittle it all felt. Oh yeah, and the indices go to double digits if
we add 2 more items, say phase and obsolescence, and there are more to come.
Rendering vertex in a different style would need another property (say,
character "o", "_", or "x"), except if you want to be backwards-compatible, it
would need to go after tags and bookmarks, and that just doesn't feel right.
So here I'm trying to fix both the duplication of code and the data format:
- changesets will be rendered by hgweb templates the same way as changelog and
other such pages, so jsdata won't need any information that's not needed for
rendering the graph itself
- jsdata will be a dict, or an Object in JS, which is a lot nicer to humans and
is a lot more future-proof in the long run, because it doesn't use numeric
indices
What about hgweb themes? Obviously, this will break all hgweb themes that
render graph in JavaScript, including 3rd-party custom ones. But this will also
reduce the size of client-side code and make it more uniform, so that it can be
shared across hgweb themes, further reducing its size. The next few patches
demonstrate that it's not hard to adapt a theme to these changes. And in a
later series, I'm planning to move duplicate JS code from */graph.tmpl to
mercurial.js and leave only 4 lines of code embedded in those <script>
elements, and even that would be just to allow redefining graph.vertex
function. So adapting a custom 3rd-party theme to these changes would mean:
- creating or copying graphnode.tmpl and adding it to the map file (if a theme
doesn't already use __base__)
- modifying one line in graph.tmpl and simply removing the bigger part of
JavaScript code from there
Making these changes in this patch and not updating every hgweb theme that uses
jsdata at the same time is a bit of a cheat to make this series more
manageable: /graph pages that use jsdata are broken by this patch, but since
there are no tests that would detect this, bisect works fine; and themes are
updated separately, in the next 4 patches of this series to ease reviewing.
Augie Fackler <augie@google.com> [Tue, 05 Dec 2017 16:55:41 -0500] rev 35217
tests: write and use a custom helper script to avoid find's -printf
-printf on find is a GNU-ism and will be banned in an upcoming
check-code change.
Differential Revision: https://phab.mercurial-scm.org/D1597
Anton Shestakov <av6@dwimlabs.net> [Fri, 01 Dec 2017 14:17:20 +0800] rev 35216
hgweb: adopt child nodes in ajaxScrollInit on /graph pages too
ajaxScrollInit is a function that loads more elements (e.g. changelog entries)
when browser window is scrolled down to the bottom of the page. It basically
fetches the next page from the server as HTML, finds container element in that
document and "adopts" (essentially, moves) all its child nodes to the container
in the current document.
Currently, hgweb doesn't render any changesets on /graph page (everything is
done in JavaScript), so there are no children to adopt. But there will be soon,
so let's create a reusable function that does it.
Hardcoding #graphnodes selector is suboptimal, but graph code already does this
in two other places.
Matt Harbison <matt_harbison@yahoo.com> [Sun, 26 Nov 2017 21:14:48 -0500] rev 35215
lfs: enable the extension locally after converting to an 'lfs' repo
This is consistent with clone and share in the previous commits.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 16 Nov 2017 21:01:21 -0500] rev 35214
lfs: enable the extension locally after sharing a repo with 'lfs' requirement
This is consistent with clone in the previous commit.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 16 Nov 2017 20:23:20 -0500] rev 35213
lfs: enable the extension locally after cloning a repo with 'lfs' requirement
We do the same thing on clone for the largefiles extension, as a convenience.
Similar to largefiles, it's probably safer to only enable this extension on a
per repo basis because it is trivial to add an lfs file. And that gives the
repository some centralized VCS characteristics.
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Dec 2017 16:29:49 +0900] rev 35212
log: translate column labels at once (
issue5750)
This makes sure that all columns are aligned. getlogcolumns() is hosted by
templatekw so the namespaces module can see it.
i18n/de.po is updated so test-log.t passes with no error. "obsolete:" and
"instability:" are kept untranslated.
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Dec 2017 16:08:24 +0900] rev 35211
log: remove temporary variable 'date' used only once
Augie Fackler <augie@google.com> [Mon, 04 Dec 2017 11:28:29 -0500] rev 35210
merge with stable
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:39:59 -0500] rev 35209
lock: allow to configure when the lock messages are displayed
We add a new 'ui.timeout.warn' config to set a grace period before we display
lock related warning:
waiting for lock on PATH held by PROCESS
The config is based on 'ui.timeout' and expresses a number of seconds before
the warning is displayed. Negative values disable the warning altogether.
The messages go to the debug output to help people trouble-shooting deadlocks.
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:36:29 -0500] rev 35208
lock: add a trylock method handling the timeout and messaging logic
We are about to make the messages around lock more flexible. We move all the
currently logic into a function in the lock module. We'll update the message
scheme in the next changeset.
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 21:00:02 -0500] rev 35207
lock: use configint for 'ui.timeout' config
The ui object can do the conversion itself.
Boris Feld <boris.feld@octobus.net> [Mon, 04 Dec 2017 09:39:37 +0100] rev 35206
scmutil: improve format pattern used in nodesummaries
As spotted by Yuya Nishihara, that value is an integer.
Matt Harbison <matt_harbison@yahoo.com> [Sat, 02 Dec 2017 17:52:53 -0500] rev 35205
tests: trivial fixes for Windows
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 29 Nov 2017 08:40:25 +0530] rev 35204
py3: use encoding.strtolocal() to convert string to bytes
Differential Revision: https://phab.mercurial-scm.org/D1557
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 29 Nov 2017 08:39:48 +0530] rev 35203
py3: use pycompat.bytestr() or '%d' in place of str()
Differential Revision: https://phab.mercurial-scm.org/D1556
James May <james.may@draeger.com> [Fri, 01 Dec 2017 17:39:21 +1100] rev 35202
archive: pass thru mtime for directory archives, like other archive types do
Without this files in the output archive directory have their mtimes set to
whatever time they were written their. This is in this inconsistent with
the other archivers, eg. zip, which use exactly the same time for all files.
Works on my machine (Windows), but I don't have a *nix box available to run
anything more thorough, unfortunately.
Anton Shestakov <av6@dwimlabs.net> [Fri, 01 Dec 2017 20:33:02 +0800] rev 35201
hgweb: remove negative top from .info line in graph
"top: -Xpx" shifts a block up by X pixels, which can be used to visually
compress two lines of text to have less space between them, in this case it's
used for the changesets on /graph page. But not only it's not needed there
(both lines fit fine into their allowed vertical space), but it would also look
better (not as crammed, more vertically centered) without these negative
values.
"position: relative" is needed solely for the "top" property to have effect on
the element, no children of the .info element rely on it, so let's remove it as
well.
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 03 Dec 2017 00:29:51 +0530] rev 35200
unamend: drop unused vars, query after taking lock, use ctx.hex() for extras
This is the followup of review on D821.
Differential Revision: https://phab.mercurial-scm.org/D1579
Matt Harbison <matt_harbison@yahoo.com> [Fri, 01 Dec 2017 22:40:55 -0500] rev 35199
test-lfs: drop a hack for ignoring convert devel-warnings
This was fixed on stable in
281214150561.
Matt Harbison <matt_harbison@yahoo.com> [Fri, 01 Dec 2017 23:27:08 -0500] rev 35198
convert: restore the ability to use bzr < 2.6.0 (
issue5733)
This effectively conditionalizes
a234b32b744a. Some Linux distributions (like
CentOS 7) use really old versions, and the change referenced was causing
exceptions to be thrown.
Even though the deprecation warning says 'since 2.5.0', it wasn't marked as such
in 2.5.1, but is by 2.6.0. This was tested with 2.4.2 and 2.6.0 with
PYTHONWARNINGS=::DeprecationWarning, and both paths were exercized.
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 01 Dec 2017 16:53:55 +0530] rev 35197
py3: use bytes in place of basestring
All strings in mercurial must be bytes so we can easily replace basestring with
bytes.
Differential Revision: https://phab.mercurial-scm.org/D1555
Martin von Zweigbergk <martinvonz@google.com> [Fri, 01 Dec 2017 14:13:55 -0800] rev 35196
amend: make a copy of "extra" to avoid mutating an input
I don't know of any problems this has caused, it just seems less
surprising.
Differential Revision: https://phab.mercurial-scm.org/D1575
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 02 Dec 2017 06:32:41 +0530] rev 35195
tests: removes bashism from test-unamend.t
FreeBSD builders fail because of bashism.
Differential Revision: https://phab.mercurial-scm.org/D1578
Martin von Zweigbergk <martinvonz@google.com> [Fri, 01 Dec 2017 12:28:05 -0800] rev 35194
run-tests: avoid calculating _testdir again
Differential Revision: https://phab.mercurial-scm.org/D1574
Martin von Zweigbergk <martinvonz@google.com> [Fri, 01 Dec 2017 12:27:28 -0800] rev 35193
run-tests: simplify by using dict.pop() with default
Differential Revision: https://phab.mercurial-scm.org/D1573