mercurial/templates/map-cmdline.status
author Kyle Lippincott <spectral@google.com>
Wed, 03 Feb 2021 16:33:10 -0800
changeset 46607 e9901d01d135
parent 38947 f9a98075a37e
permissions -rw-r--r--
revlog: add a mechanism to verify expected file position before appending If someone uses `hg debuglocks`, or some non-hg process writes to the .hg directory without respecting the locks, or if the repo's on a networked filesystem, it's possible for the revlog code to write out corrupted data. The form of this corruption can vary depending on what data was written and how that happened. We are in the "networked filesystem" case (though I've had users also do this to themselves with the "`hg debuglocks`" scenario), and most often see this with the changelog. What ends up happening is we produce two items (let's call them rev1 and rev2) in the .i file that have the same linkrev, baserev, and offset into the .d file, while the data in the .d file is appended properly. rev2's compressed_size is accurate for rev2, but when we go to decompress the data in the .d file, we use the offset that's recorded in the index file, which is the same as rev1, and attempt to decompress rev2.compressed_size bytes of rev1's data. This usually does not succeed. :) When using inline data, this also fails, though I haven't investigated why too closely. This shows up as a "patch decode" error. I believe what's happening there is that we're basically ignoring the offset field, getting the data properly, but since baserev != rev, it thinks this is a delta based on rev (instead of a full text) and can't actually apply it as such. For now, I'm going to make this an optional component and default it to entirely off. I may increase the default severity of this in the future, once I've enabled it for my users and we gain more experience with it. Luckily, most of my users have a versioned filesystem and can roll back to before the corruption has been written, it's just a hassle to do so and not everyone knows how (so it's a support burden). Users on other filesystems will not have that luxury, and this can cause them to have a corrupted repository that they are unlikely to know how to resolve, and they'll see this as a data-loss event. Refusing to create the corruption is a much better user experience. This mechanism is not perfect. There may be false-negatives (racy writes that are not detected). There should not be any false-positives (non-racy writes that are detected as such). This is not a mechanism that makes putting a repo on a networked filesystem "safe" or "supported", just *less* likely to cause corruption. Differential Revision: https://phab.mercurial-scm.org/D9952
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
     1
%include map-cmdline.default
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
     2
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 29000
diff changeset
     3
[templates]
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
     4
# Override base templates
38947
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     5
changeset = '{cset}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{summary}{lfiles}\n'
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     6
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{parents}{luser}{ldate}{description}{lfiles}\n'
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     7
changeset_debug = '{fullcset}{branches}{bookmarks}{tags}{lphase}{parents}{manifest}{luser}{ldate}{extras}{description}{lfiles}\n'
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
     8
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
     9
# Override the file templates
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    10
lfiles = '{if(files,
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    11
              label('ui.note log.files',
29000
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    12
                    'files:\n'))}{lfile_mods}{lfile_adds}{lfile_dels}'
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    13
29000
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    14
lfile_adds = '{file_adds % "{lfile_add}{lfile_src}"}'
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    15
lfile_mods = '{file_mods % "{lfile_mod}{lfile_src}"}'
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    16
lfile_add = '{label("status.added", "A {file}\n")}'
29000
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    17
lfile_mod = '{label("status.modified", "M {file}\n")}'
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    18
lfile_src = '{ifcontains(file, file_copies_switch,
2d3837a4bded log: fix status template to list copy source per dest (issue5155)
Yuya Nishihara <yuya@tcha.org>
parents: 25628
diff changeset
    19
              label("status.copied", "  {get(file_copies_switch, file)}\n"))}'
25006
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    20
517763f87141 log: add a status template
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
diff changeset
    21
lfile_dels = '{file_dels % "{label('status.removed', 'R {file}\n')}"}'