Mercurial > hg
view tests/test-narrow-debugcommands.t @ 48788:f90337706ce7
filemerge: make `_maketempfiles()` more reusable
`_maketempfiles()` is very specialized for its current use. I hope to
use it also when creating temporary files for input for tools that do
partial conflict resolution. That'll be possible if the function is
more generic. Instead of passing in two contexts (for "other" and
"base") and an optional path (for "local"), let's pass a single list
of files to make backups for. Even if we don't end up using for
partial conflict resolution, this is still a simplification (but I do
have a WIP patch for partial conflict resolution and it is able to
benefit from this).
Differential Revision: https://phab.mercurial-scm.org/D12193
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 14 Feb 2022 22:49:03 -0800 |
parents | ce0bc2952e2a |
children | ccd76e292be5 |
line wrap: on
line source
$ . "$TESTDIR/narrow-library.sh" $ hg init repo $ cd repo $ cat << EOF > .hg/store/narrowspec > [include] > path:foo > [exclude] > EOF $ cp .hg/store/narrowspec .hg/narrowspec.dirstate $ echo treemanifest >> .hg/requires $ echo narrowhg-experimental >> .hg/requires $ mkdir -p foo/bar $ echo b > foo/f $ echo c > foo/bar/f $ hg commit -Am hi adding foo/bar/f adding foo/f $ hg debugindex -m rev linkrev nodeid p1 p2 0 0 14a5d056d75a 000000000000 000000000000 $ hg debugindex --dir foo rev linkrev nodeid p1 p2 0 0 e635c7857aef 000000000000 000000000000 $ hg debugindex --dir foo/ rev linkrev nodeid p1 p2 0 0 e635c7857aef 000000000000 000000000000 $ hg debugindex --dir foo/bar rev linkrev nodeid p1 p2 0 0 e091d4224761 000000000000 000000000000 $ hg debugindex --dir foo/bar/ rev linkrev nodeid p1 p2 0 0 e091d4224761 000000000000 000000000000 $ hg debugdata -m 0 foo\x00e635c7857aef92ac761ce5741a99da159abbbb24t (esc) $ hg debugdata --dir foo 0 bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc) f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc) $ hg debugdata --dir foo/ 0 bar\x00e091d42247613adff5d41b67f15fe7189ee97b39t (esc) f\x001e88685f5ddec574a34c70af492f95b6debc8741 (esc) $ hg debugdata --dir foo/bar 0 f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc) $ hg debugdata --dir foo/bar/ 0 f\x00149da44f2a4e14f488b7bd4157945a9837408c00 (esc)