From bacc1c866e2c30b4939292056d273289757f1124 Mon Sep 17 00:00:00 2001 From: Suzanne Soy Date: Fri, 18 Jun 2021 19:37:26 +0100 Subject: [PATCH] better error messages, empty filesystem, WIP on log --- git-tutorial.css | 5 ++++ git-tutorial.js | 77 ++++++++++++++++++++++++++++++++++++++++++++---- index.html | 75 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 147 insertions(+), 10 deletions(-) diff --git a/git-tutorial.css b/git-tutorial.css index dac14bc..1726be5 100644 --- a/git-tutorial.css +++ b/git-tutorial.css @@ -51,6 +51,7 @@ article#git-tutorial table { width: 77rem; margin-left: calc( ( ( 63rem - 77rem #git-tutorial tr:last-child td { border:thin solid #aaa; } #git-tutorial tr:hover td { opacity: 1; border:thin solid black; } #git-tutorial tr:last-child.different td, #git-tutorial .different td { border: thin solid black; opacity: 1; background: #f0f6f8; } +#git-tutorial table .empty-filesystem { text-align: center !important; color: #444 !important; opacity: 1 !important; border: thin solid black !important; } #git-tutorial .specialchar { color: red; word-wrap: normal; } #git-tutorial .hex-prefix { color: lightgrey; } #git-tutorial .hex { color: brown; } @@ -90,3 +91,7 @@ article#git-tutorial .onlytoc { display: none; } /* Highlight elements when a click on e.g. a hash scrolls to the destination */ #git-tutorial .scroll-destination-hilite, #git-tutorial .scroll-destination-hilite td { transition: background 0.5s linear 0.5s, opacity 0.4s linear 0.5s; background: #ffd3d3 !important; opacity: 1 !important; } #git-tutorial .scroll-destination-lolite, #git-tutorial .scroll-destination-lolite td { transition: background linear 0.5s, opacity linear 0.5s; } +#git-tutorial .trivia { opacity: 80%; border: thin solid slategrey; margin: 1em; padding: 0.3em; } +#git-tutorial .trivia:before { content: "Trivia"; border-bottom: thin solid slategrey; display: block; text-align: center; } +#git-tutorial .trivia table { min-width: 90%; max-width: 90%; width: 90%; margin-left: auto; margin-right: auto; } +/*#git-tutorial .trivia table td.cell-contents, #git-tutorial .trivia table th.cell-contents { width: 30%; }*/ \ No newline at end of file diff --git a/git-tutorial.js b/git-tutorial.js index 43a15dd..cb49f1d 100644 --- a/git-tutorial.js +++ b/git-tutorial.js @@ -472,6 +472,16 @@ function ___filesystem_to_table(fs, previous_filesystem) { for (var i = 0; i < entries.length; i++) { tbody.append(___format_entry(previous_filesystem, entries[i])); } + if (entries.length == 0) { + var tr_empty = document.createElement('tr'); + tbody.append(tr_empty); + + var td_empty = document.createElement('td'); + tr_empty.append(td_empty); + td_empty.setAttribute('colspan', '2'); + td_empty.classList.add('empty-filesystem'); + td_empty.innerText = "The filesystem is empty." + } return table; } function ___filesystem_to_string(fs, just_table, previous_filesystem) { @@ -514,21 +524,76 @@ function ___copyprintf_click(id) { elem.disabled = true; } } -var global_filesystem=false; +var ___script_log_header = '' + + 'var ___log = [];\n' + + 'var console = (function(real_console) {\n' + + ' return {\n' + + ' log: function() {\n' + + ' ___log[___log.length] = arguments;\n' + + ' real_console.log.apply(console, arguments);\n' + + ' },\n' + + ' assert: real_console.assert,\n' + + ' };\n' + + '})(window.console);\n' + + '\n'; + +function ___eval_result_to_string(filesystem, previous_filesystem, log) { + return '
' + log.map(function(l) { return l.map(function (x) { return x.toString(); }).join(', '); }).join('\n') + '
' + + ___filesystem_to_string(filesystem, false, previous_filesystem); +} function ___git_eval(current) { document.getElementById('hide-eval-' + current).style.display = ''; - var script = ''; + var script = ___script_log_header; for (i = 0; i <= current - 1; i++) { script += ___textarea_value(___global_editors[i]); } - script += "\n var ___previous_filesystem = {}; for (k in filesystem) { ___previous_filesystem[k] = filesystem[k]; }\n"; + script += '\n' + + 'var ___previous_filesystem = {};\n' + + 'for (k in filesystem) { ___previous_filesystem[k] = filesystem[k]; }\n' + + '___log = [];\n'; script += ___textarea_value(___global_editors[current]); - script += "\n document.getElementById('out' + current).innerHTML = ___filesystem_to_string(filesystem, false, ___previous_filesystem); filesystem;"; + script += '\n' + + '"End of the script";\n' + + '\n' + + '\n' + + 'document.getElementById("out" + current).innerHTML = ___eval_result_to_string(filesystem, ___previous_filesystem, ___log);\n' + + 'filesystem;\n'; try { - global_filesystem = eval(script); + document.getElementById('debug').innerText = script; + eval(script); } catch (e) { + // Stack traces usually include :line:column + var rx = /:([0-9][0-9]*):[0-9][0-9]*/g; + var linecol = rx.exec(''+e.stack); + var line = null; + if (linecol && linecol.length > 0) { + line=parseInt(linecol[1]); + } else { + // Some older versions of Firefox and probably some other browsers use just :line + var rx = /:([0-9][0-9]*)*/g; + var justline = rx.exec(''+e.stack); + if (justline && justline.length > 0) { + line=parseInt(justline[1], 10); + } + } + if (typeof(line) == 'number') { + var lines = script.split('\n'); + if (line < lines.length) { + var from = Math.max(0, line-2); + var to = Math.min(lines.length - 1, line+2+1); + var showline = '' + + 'Possible location of the error: near line ' + line + '\n' + + '\n' + + lines.slice(from, to).map(function(l, i) { return '' + (from + i) + ': ' + l; }).join('\n') + + '\n' + + '\n'; + } + } else { + var showline = 'Sorry, this tutorial could not pinpoint precisely\nthe location of the error.\n' + + 'The stacktrace below may contain more information.\n' + } var error = ___specialchars("" + e + "\n\n" + e.stack); - document.getElementById('out' + current).innerHTML = '
' + error + '
'; + document.getElementById('out' + current).innerHTML = '
' + showline + error + '
'; } } diff --git a/index.html b/index.html index d53b867..fd9fe40 100644 --- a/index.html +++ b/index.html @@ -516,7 +516,16 @@ directly to a commit hash like or can point to another symbolic reference, in which case the .git/HEAD file will contain e.g. refs/heads/main.

-

Branches are simple files stored in .git/refs/heads/name-of-the-branch

+

Branches are simple files stored in .git/refs/heads/name-of-the-branch +and usually contain a hash like +0123456789abcdef0123456789abcdef01234567.

+ +

Tags are identical to branches in terms of representation. It seems that the only difference +between tags and branches is the behaviour of git checkout and similar commands. +These commands, as explained in the section about git checkout below, +normally write ref: refs/heads/name-of-branch in .git/HEAD when +checking out a branch, but write the hash of the target commit when checking out a tag or +any other non-branch reference.

+
-

git rev-parse

+

git rev-parse