##// END OF EJS Templates
context: write dirstate out explicitly after marking files as clean...
context: write dirstate out explicitly after marking files as clean To detect change of a file without redundant comparison of file content, dirstate recognizes a file as certainly clean, if: (1) it is already known as "normal", (2) dirstate entry for it has valid (= not "-1") timestamp, and (3) mode, size and timestamp of it on the filesystem are as same as ones expected in dirstate This works as expected in many cases, but doesn't in the corner case that changing a file keeps mode, size and timestamp of it on the filesystem. The timetable below shows steps in one of typical such situations: ---- ----------------------------------- ---------------- timestamp of "f" ---------------- dirstate file- time action mem file system ---- ----------------------------------- ---- ----- ----- N -1 *** - make file "f" clean N - execute 'hg foobar' - instantiate 'dirstate' -1 -1 - 'dirstate.normal("f")' N -1 (e.g. via dirty check) - change "f", but keep size N N+1 - release wlock - 'dirstate.write()' N N - 'hg status' shows "f" as "clean" N N N ---- ----------------------------------- ---- ----- ----- The most important point is that 'dirstate.write()' is executed at N+1 or later. This causes writing dirstate timestamp N of "f" out successfully. If it is executed at N, 'parsers.pack_dirstate()' replaces timestamp N with "-1" before actual writing dirstate out. Occasional test failure for unexpected file status is typical example of this corner case. Batch execution with small working directory is finished in no time, and rarely satisfies condition (2) above. This issue can occur in cases below; - 'hg revert --rev REV' for revisions other than the parent - failure of 'merge.update()' before 'merge.recordupdates()' The root cause of this issue is that files are changed without flushing in-memory dirstate changes via 'repo.commit()' (even though omitting 'dirstate.normallookup()' on changed files also causes this issue). To detect changes of files correctly, this patch writes in-memory dirstate changes out explicitly after marking files as clean in 'workingctx._checklookup()', which is invoked via 'repo.status()'. After this change, timetable is changed as below: ---- ----------------------------------- ---------------- timestamp of "f" ---------------- dirstate file- time action mem file system ---- ----------------------------------- ---- ----- ----- N -1 *** - make file "f" clean N - execute 'hg foobar' - instantiate 'dirstate' -1 -1 - 'dirstate.normal("f")' N -1 (e.g. via dirty check) ----------------------------------- ---- ----- ----- - 'dirsttate.write()' -1 -1 ----------------------------------- ---- ----- ----- - change "f", but keep size N N+1 - release wlock - 'dirstate.write()' -1 -1 - 'hg status' -1 -1 N ---- ----------------------------------- ---- ----- ----- To reproduce this issue in tests certainly, this patch emulates some timing critical actions as below: - timestamp of "f" in '.hg/dirstate' is -1 at the beginning 'hg debugrebuildstate' before command invocation ensures it. - make file "f" clean at N - change "f" at N 'touch -t 200001010000' before and after command invocation changes mtime of "f" to "2000-01-01 00:00" (= N). - invoke 'dirstate.write()' via 'repo.status()' at N 'fakedirstatewritetime.py' forces 'pack_dirstate()' to use "2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked via 'workingctx._checklookup()'. - invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N") 'pack_dirstate()' via releasing wlock uses actual timestamp at runtime as "now", and it should be different from the "2000-01-01 00:00" of "f". BTW, this patch also changes 'test-largefiles-misc.t', because adding 'dirstate.write()' makes recent dirstate changes visible to external process.

File last commit:

r24427:811a1842 default
r25753:fe03f522 default
Show More
style-paper.css
416 lines | 6.9 KiB | text/css | CssLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 body {
margin: 0;
padding: 0;
background: white;
font-family: sans-serif;
}
.container {
padding-left: 115px;
}
.main {
position: relative;
background: white;
padding: 2em 2em 2em 0;
}
#.main {
width: 98%;
}
.overflow {
width: 100%;
overflow: auto;
}
.menu {
width: 90px;
margin: 0;
font-size: 80%;
text-align: left;
position: absolute;
top: 20px;
left: 20px;
right: auto;
}
.menu ul {
list-style: none;
padding: 0;
margin: 10px 0 0 0;
border-left: 2px solid #999;
}
.menu li {
margin-bottom: 3px;
padding: 2px 4px;
background: white;
color: black;
font-weight: normal;
}
.menu li.active {
font-weight: bold;
}
.menu img {
width: 75px;
height: 90px;
border: 0;
}
Anton Shestakov
hgweb: use css margin instead of empty <p> before <div class="atom-logo">...
r24041 div.atom-logo {
margin-top: 10px;
}
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 .atom-logo img{
width: 14px;
height: 14px;
border: 0;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .menu a { color: black; display: block; }
.search {
position: absolute;
top: .7em;
right: 2em;
}
form.search div#hint {
display: none;
position: absolute;
top: 40px;
right: 0px;
width: 190px;
padding: 5px;
background: #ffc;
font-size: 70%;
border: 1px solid yellow;
-moz-border-radius: 5px; /* this works only in camino/firefox */
-webkit-border-radius: 5px; /* this is just for Safari */
}
form.search:hover div#hint { display: block; }
a { text-decoration:none; }
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
Alexander Plavin
hgweb: introduce separate classes for stripey background...
r19431 .parity0,
.stripes4 > :nth-child(4n+1),
.stripes2 > :nth-child(2n+1) { background-color: #f0f0f0; }
.parity1,
.stripes4 > :nth-child(4n+3),
.stripes2 > :nth-child(2n+2) { background-color: white; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .plusline { color: green; }
.minusline { color: #dc143c; } /* crimson */
.atline { color: purple; }
Anton Shestakov
hgweb: use css margin instead of empty <p> before diffstat table...
r24042 .diffstat-table {
margin-top: 1em;
}
Steven Brown
paper, coal: define the diffstat templates...
r14563 .diffstat-file {
white-space: nowrap;
font-size: 90%;
}
.diffstat-total {
white-space: nowrap;
font-size: 90%;
}
.diffstat-graph {
width: 100%;
}
.diffstat-add {
background-color: green;
float: left;
}
.diffstat-remove {
background-color: red;
float: left;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .navigate {
text-align: right;
font-size: 60%;
margin: 1em 0;
}
.tag {
color: #999;
font-size: 70%;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
.branchhead {
color: #000;
font-size: 80%;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
ul#graphnodes .branchhead {
font-size: 75%;
}
.branchname {
color: #000;
Thomas Arendsen Hein
trailing spaces (and one stray tab)
r10575 font-size: 60%;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
h3 .branchname {
font-size: 80%;
}
/* Common */
pre { margin: 0; }
h2 { font-size: 120%; border-bottom: 1px solid #999; }
h2 a { color: #000; }
h3 {
anuraggoel
paper: overlapping of section title on help pages (issue4051)...
r20626 margin-top: +.7em;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-size: 100%;
}
/* log and tags tables */
.bigtable {
border-bottom: 1px solid #999;
border-collapse: collapse;
font-size: 90%;
width: 100%;
font-weight: normal;
text-align: left;
}
.bigtable td {
vertical-align: top;
}
.bigtable th {
padding: 1px 4px;
border-bottom: 1px solid #999;
}
.bigtable tr { border: none; }
.bigtable .age { width: 7em; }
Dan Villiom Podlaski Christiansen
hgweb: consistent author name width...
r18664 .bigtable .author { width: 15em; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .bigtable .description { }
Kevin Gessner
hgweb: add base link to file log for paper and coal styles (issue2452)
r13850 .bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .bigtable .node { width: 5em; font-family: monospace;}
.bigtable .permissions { width: 8em; text-align: left;}
.bigtable .size { width: 5em; text-align: right; }
.bigtable .annotate { text-align: right; }
.bigtable td.annotate { font-size: smaller; }
.bigtable td.source { font-size: inherit; }
.source, .sourcefirst, .sourcelast {
font-family: monospace;
white-space: pre;
padding: 1px 4px;
font-size: 90%;
}
.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; }
.sourcelast { border-top: 1px solid #999; }
.source a { color: #999; font-size: smaller; font-family: monospace;}
.bottomline { border-bottom: 1px solid #999; }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines {
font-size: 90%;
position: relative;
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 counter-reset: lineno;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 }
Alexander Plavin
hgweb: add line wrapping switch to file source view...
r19430 .wrap > span {
white-space: pre-wrap;
}
.linewraptoggle {
float: right;
}
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 .diffblocks { counter-reset: lineno; }
.diffblocks > div { counter-increment: lineno; }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines > span {
display: inline-block;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 box-sizing: border-box;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 width: 100%;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 padding: 1px 0px 1px 5em;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 counter-increment: lineno;
}
.sourcelines > span:before {
-moz-user-select: -moz-none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
display: inline-block;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 margin-left: -5em;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 width: 4em;
font-size: smaller;
color: #999;
text-align: right;
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 content: counters(lineno, ".");
Alexander Plavin
paper: fix rendering of the first tab in a line in Webkit (issue3990)...
r19492 float: left;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 }
Alexander Plavin
hgweb: highlight line which is linked to at comparison view
r19459 .sourcelines > span:target, tr:target td {
Alexander Plavin
hgweb: change highlighted line color to be different from 'inserted' color...
r19458 background-color: #bfdfff;
Alexander Plavin
hgweb: color line which is linked to in file source view...
r19389 }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines > a {
display: inline-block;
position: absolute;
left: 0px;
width: 4em;
height: 1em;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .fileline { font-family: monospace; }
.fileline img { border: 0; }
.tagEntry .closed { color: #99f; }
/* Changeset entry */
#changesetEntry {
border-collapse: collapse;
font-size: 90%;
width: 100%;
margin-bottom: 1em;
}
#changesetEntry th {
padding: 1px 4px;
width: 4em;
text-align: right;
font-weight: normal;
color: #999;
margin-right: .5em;
vertical-align: top;
}
div.description {
border-left: 2px solid #999;
margin: 1em 0 1em 0;
padding: .3em;
Adrian Buehlmann
paper: preserve whitespace on description instead of adding breaks...
r13934 white-space: pre;
Adrian Buehlmann
paper: use monospace font for description
r13961 font-family: monospace;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 }
/* Graph */
div#wrapper {
position: relative;
border-top: 1px solid black;
border-bottom: 1px solid black;
margin: 0;
padding: 0;
}
canvas {
position: absolute;
z-index: 5;
top: -0.7em;
margin: 0;
}
ul#graphnodes {
position: absolute;
z-index: 10;
top: -1.0em;
list-style: none inside none;
padding: 0;
}
ul#nodebgs {
list-style: none inside none;
padding: 0;
margin: 0;
top: -0.7em;
}
ul#graphnodes li, ul#nodebgs li {
height: 39px;
}
ul#graphnodes li .info {
display: block;
font-size: 70%;
position: relative;
top: -3px;
}
wujek srujek
hgweb: side-by-side comparison functionality...
r17202
/* Comparison */
.legend {
padding: 1.5% 0 1.5% 0;
}
.legendinfo {
border: 1px solid #999;
font-size: 80%;
text-align: center;
padding: 0.5%;
}
.equal {
background-color: #ffffff;
}
.delete {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #faa;
color: #333;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.insert {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #ffa;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.replace {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #e8e8e8;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.header {
text-align: center;
}
.block {
border-top: 1px solid #999;
}
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258
.breadcrumb {
color: gray;
}
.breadcrumb a {
color: blue;
}
Alexander Plavin
paper: add simple animation to the loading indicator
r19761
.scroll-loading {
-webkit-animation: change_color 1s linear 0s infinite alternate;
-moz-animation: change_color 1s linear 0s infinite alternate;
-o-animation: change_color 1s linear 0s infinite alternate;
animation: change_color 1s linear 0s infinite alternate;
}
@-webkit-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@-moz-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@-o-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
Alexander Plavin
paper: add reddish background to ajax error message
r19762 .scroll-loading-error {
background-color: #FFCCCC !important;
}