2019-05-28 13:12:27 +03:00
|
|
|
$ setconfig extensions.treemanifest=!
|
2018-01-23 23:09:16 +03:00
|
|
|
$ . helpers-usechg.sh
|
|
|
|
|
2010-08-14 04:18:17 +04:00
|
|
|
$ HGMERGE=true; export HGMERGE
|
|
|
|
|
|
|
|
init
|
|
|
|
|
2011-11-18 15:04:31 +04:00
|
|
|
$ hg init repo
|
|
|
|
$ cd repo
|
2010-08-14 04:18:17 +04:00
|
|
|
|
|
|
|
commit
|
|
|
|
|
|
|
|
$ echo 'a' > a
|
|
|
|
$ hg ci -A -m test -u nobody -d '1 0'
|
|
|
|
adding a
|
|
|
|
|
|
|
|
annotate -c
|
|
|
|
|
|
|
|
$ hg annotate -c a
|
|
|
|
8435f90966e4: a
|
|
|
|
|
|
|
|
annotate -cl
|
|
|
|
|
|
|
|
$ hg annotate -cl a
|
|
|
|
8435f90966e4:1: a
|
|
|
|
|
|
|
|
annotate -d
|
|
|
|
|
|
|
|
$ hg annotate -d a
|
|
|
|
Thu Jan 01 00:00:01 1970 +0000: a
|
|
|
|
|
|
|
|
annotate -n
|
|
|
|
|
|
|
|
$ hg annotate -n a
|
|
|
|
0: a
|
|
|
|
|
|
|
|
annotate -nl
|
|
|
|
|
|
|
|
$ hg annotate -nl a
|
|
|
|
0:1: a
|
|
|
|
|
|
|
|
annotate -u
|
|
|
|
|
|
|
|
$ hg annotate -u a
|
|
|
|
nobody: a
|
|
|
|
|
|
|
|
annotate -cdnu
|
|
|
|
|
|
|
|
$ hg annotate -cdnu a
|
|
|
|
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
|
|
|
|
|
|
|
|
annotate -cdnul
|
|
|
|
|
|
|
|
$ hg annotate -cdnul a
|
|
|
|
nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
|
|
|
|
|
2014-09-17 18:21:20 +04:00
|
|
|
annotate (JSON)
|
|
|
|
|
|
|
|
$ hg annotate -Tjson a
|
|
|
|
[
|
|
|
|
{
|
2017-06-02 18:25:24 +03:00
|
|
|
"abspath": "a",
|
|
|
|
"lines": [{"line": "a\n", "rev": 0}],
|
|
|
|
"path": "a"
|
2014-09-17 18:21:20 +04:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
$ hg annotate -Tjson -cdfnul a
|
|
|
|
[
|
|
|
|
{
|
2017-06-02 18:25:24 +03:00
|
|
|
"abspath": "a",
|
|
|
|
"lines": [{"date": [1.0, 0], "file": "a", "line": "a\n", "line_number": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "rev": 0, "user": "nobody"}],
|
|
|
|
"path": "a"
|
2014-09-17 18:21:20 +04:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2010-08-14 04:18:17 +04:00
|
|
|
$ cat <<EOF >>a
|
|
|
|
> a
|
|
|
|
> a
|
|
|
|
> EOF
|
|
|
|
$ hg ci -ma1 -d '1 0'
|
|
|
|
$ hg cp a b
|
|
|
|
$ hg ci -mb -d '1 0'
|
|
|
|
$ cat <<EOF >> b
|
|
|
|
> b4
|
|
|
|
> b5
|
|
|
|
> b6
|
|
|
|
> EOF
|
|
|
|
$ hg ci -mb2 -d '2 0'
|
|
|
|
|
2017-06-02 18:25:24 +03:00
|
|
|
annotate multiple files (JSON)
|
|
|
|
|
|
|
|
$ hg annotate -Tjson a b
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"abspath": "a",
|
|
|
|
"lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}],
|
|
|
|
"path": "a"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"abspath": "b",
|
|
|
|
"lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}, {"line": "b4\n", "rev": 3}, {"line": "b5\n", "rev": 3}, {"line": "b6\n", "rev": 3}],
|
|
|
|
"path": "b"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
annotate multiple files (template)
|
|
|
|
|
|
|
|
$ hg annotate -T'== {abspath} ==\n{lines % "{rev}: {line}"}' a b
|
|
|
|
== a ==
|
|
|
|
0: a
|
|
|
|
1: a
|
|
|
|
1: a
|
|
|
|
== b ==
|
|
|
|
0: a
|
|
|
|
1: a
|
|
|
|
1: a
|
|
|
|
3: b4
|
|
|
|
3: b5
|
|
|
|
3: b6
|
|
|
|
|
2010-08-14 04:18:17 +04:00
|
|
|
annotate -n b
|
|
|
|
|
|
|
|
$ hg annotate -n b
|
2016-11-08 20:37:33 +03:00
|
|
|
0: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1: a
|
2010-08-14 04:18:17 +04:00
|
|
|
3: b4
|
|
|
|
3: b5
|
|
|
|
3: b6
|
|
|
|
|
|
|
|
annotate --no-follow b
|
|
|
|
|
|
|
|
$ hg annotate --no-follow b
|
|
|
|
2: a
|
|
|
|
2: a
|
|
|
|
2: a
|
|
|
|
3: b4
|
|
|
|
3: b5
|
|
|
|
3: b6
|
|
|
|
|
|
|
|
annotate -nl b
|
|
|
|
|
|
|
|
$ hg annotate -nl b
|
|
|
|
0:1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1:2: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1:3: a
|
|
|
|
3:4: b4
|
|
|
|
3:5: b5
|
|
|
|
3:6: b6
|
|
|
|
|
|
|
|
annotate -nf b
|
|
|
|
|
|
|
|
$ hg annotate -nf b
|
2016-11-08 20:37:33 +03:00
|
|
|
0 a: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1 a: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1 a: a
|
2010-08-14 04:18:17 +04:00
|
|
|
3 b: b4
|
|
|
|
3 b: b5
|
|
|
|
3 b: b6
|
|
|
|
|
|
|
|
annotate -nlf b
|
|
|
|
|
|
|
|
$ hg annotate -nlf b
|
|
|
|
0 a:1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1 a:2: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
3 b:5: b5
|
|
|
|
3 b:6: b6
|
|
|
|
|
|
|
|
$ hg up -C 2
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cat <<EOF >> b
|
|
|
|
> b4
|
|
|
|
> c
|
|
|
|
> b5
|
|
|
|
> EOF
|
|
|
|
$ hg ci -mb2.1 -d '2 0'
|
|
|
|
$ hg merge
|
|
|
|
merging b
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -mmergeb -d '3 0'
|
|
|
|
|
|
|
|
annotate after merge
|
|
|
|
|
|
|
|
$ hg annotate -nf b
|
2016-11-08 20:37:33 +03:00
|
|
|
0 a: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1 a: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1 a: a
|
2010-08-14 04:18:17 +04:00
|
|
|
3 b: b4
|
|
|
|
4 b: c
|
|
|
|
3 b: b5
|
|
|
|
|
|
|
|
annotate after merge with -l
|
|
|
|
|
|
|
|
$ hg annotate -nlf b
|
|
|
|
0 a:1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1 a:2: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
|
|
|
|
|
|
|
$ hg up -C 1
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg cp a b
|
|
|
|
$ cat <<EOF > b
|
|
|
|
> a
|
|
|
|
> z
|
|
|
|
> a
|
|
|
|
> EOF
|
|
|
|
$ hg ci -mc -d '3 0'
|
|
|
|
$ hg merge
|
|
|
|
merging b
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ cat <<EOF >> b
|
|
|
|
> b4
|
|
|
|
> c
|
|
|
|
> b5
|
|
|
|
> EOF
|
|
|
|
$ echo d >> b
|
|
|
|
$ hg ci -mmerge2 -d '4 0'
|
|
|
|
|
|
|
|
annotate after rename merge
|
|
|
|
|
|
|
|
$ hg annotate -nf b
|
2016-11-15 23:56:49 +03:00
|
|
|
0 a: a
|
2010-08-14 04:18:17 +04:00
|
|
|
6 b: z
|
|
|
|
1 a: a
|
|
|
|
3 b: b4
|
|
|
|
4 b: c
|
|
|
|
3 b: b5
|
|
|
|
7 b: d
|
|
|
|
|
|
|
|
annotate after rename merge with -l
|
|
|
|
|
|
|
|
$ hg annotate -nlf b
|
2016-11-15 23:56:49 +03:00
|
|
|
0 a:1: a
|
2010-08-14 04:18:17 +04:00
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
|
|
|
7 b:7: d
|
|
|
|
|
2017-05-25 05:39:33 +03:00
|
|
|
--skip nothing (should be the same as no --skip at all)
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip '1::0'
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
|
|
|
7 b:7: d
|
|
|
|
|
2017-06-10 17:46:06 +03:00
|
|
|
--skip a modified line. Note a slight behavior difference in pure - this is
|
|
|
|
because the pure code comes up with slightly different deltas internally.
|
2017-05-25 05:39:33 +03:00
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 6
|
|
|
|
0 a:1: a
|
2017-10-05 22:12:11 +03:00
|
|
|
1 a:2* z (no-pure !)
|
|
|
|
0 a:1* z (pure !)
|
2017-05-25 05:39:33 +03:00
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
|
|
|
7 b:7: d
|
|
|
|
|
|
|
|
--skip added lines (and test multiple skip)
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 3
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
2017-10-02 20:18:57 +03:00
|
|
|
1 a:3* b4
|
2017-05-25 05:39:33 +03:00
|
|
|
4 b:5: c
|
2017-10-02 20:18:57 +03:00
|
|
|
1 a:3* b5
|
2017-05-25 05:39:33 +03:00
|
|
|
7 b:7: d
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 4
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
2017-10-02 20:18:57 +03:00
|
|
|
1 a:3* c
|
2017-05-25 05:39:33 +03:00
|
|
|
3 b:5: b5
|
|
|
|
7 b:7: d
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 3 --skip 4
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
2017-10-02 20:18:57 +03:00
|
|
|
1 a:3* b4
|
|
|
|
1 a:3* c
|
|
|
|
1 a:3* b5
|
2017-05-25 05:39:33 +03:00
|
|
|
7 b:7: d
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 'merge()'
|
|
|
|
0 a:1: a
|
|
|
|
6 b:2: z
|
|
|
|
1 a:3: a
|
|
|
|
3 b:4: b4
|
|
|
|
4 b:5: c
|
|
|
|
3 b:5: b5
|
2017-10-02 20:18:57 +03:00
|
|
|
3 b:5* d
|
2017-05-25 05:39:33 +03:00
|
|
|
|
|
|
|
--skip everything -- use the revision the file was introduced in
|
|
|
|
|
|
|
|
$ hg annotate -nlf b --skip 'all()'
|
|
|
|
0 a:1: a
|
2017-10-02 20:18:57 +03:00
|
|
|
0 a:1* z
|
|
|
|
0 a:1* a
|
|
|
|
0 a:1* b4
|
|
|
|
0 a:1* c
|
|
|
|
0 a:1* b5
|
|
|
|
0 a:1* d
|
2017-05-25 05:39:33 +03:00
|
|
|
|
2011-05-18 17:41:03 +04:00
|
|
|
Issue2807: alignment of line numbers with -l
|
|
|
|
|
|
|
|
$ echo more >> b
|
|
|
|
$ hg ci -mmore -d '5 0'
|
|
|
|
$ echo more >> b
|
|
|
|
$ hg ci -mmore -d '6 0'
|
|
|
|
$ echo more >> b
|
|
|
|
$ hg ci -mmore -d '7 0'
|
|
|
|
$ hg annotate -nlf b
|
2016-11-15 23:56:49 +03:00
|
|
|
0 a: 1: a
|
2011-05-18 17:41:03 +04:00
|
|
|
6 b: 2: z
|
|
|
|
1 a: 3: a
|
|
|
|
3 b: 4: b4
|
|
|
|
4 b: 5: c
|
|
|
|
3 b: 5: b5
|
|
|
|
7 b: 7: d
|
|
|
|
8 b: 8: more
|
|
|
|
9 b: 9: more
|
|
|
|
10 b:10: more
|
|
|
|
|
2010-08-14 04:18:17 +04:00
|
|
|
linkrev vs rev
|
|
|
|
|
|
|
|
$ hg annotate -r tip -n a
|
2016-11-08 20:37:33 +03:00
|
|
|
0: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1: a
|
2010-08-14 04:18:17 +04:00
|
|
|
|
|
|
|
linkrev vs rev with -l
|
|
|
|
|
|
|
|
$ hg annotate -r tip -nl a
|
|
|
|
0:1: a
|
2016-11-15 23:56:49 +03:00
|
|
|
1:2: a
|
2010-08-14 04:18:17 +04:00
|
|
|
1:3: a
|
|
|
|
|
2010-09-24 12:13:49 +04:00
|
|
|
Issue589: "undelete" sequence leads to crash
|
2010-08-14 04:18:17 +04:00
|
|
|
|
|
|
|
annotate was crashing when trying to --follow something
|
|
|
|
|
|
|
|
like A -> B -> A
|
|
|
|
|
|
|
|
generate ABA rename configuration
|
|
|
|
|
|
|
|
$ echo foo > foo
|
|
|
|
$ hg add foo
|
|
|
|
$ hg ci -m addfoo
|
|
|
|
$ hg rename foo bar
|
|
|
|
$ hg ci -m renamefoo
|
|
|
|
$ hg rename bar foo
|
|
|
|
$ hg ci -m renamebar
|
|
|
|
|
|
|
|
annotate after ABA with follow
|
|
|
|
|
2019-07-20 11:01:33 +03:00
|
|
|
$ hg annotate --file foo
|
2010-08-14 04:18:17 +04:00
|
|
|
foo: foo
|
|
|
|
|
2011-03-19 09:34:49 +03:00
|
|
|
missing file
|
|
|
|
|
|
|
|
$ hg ann nosuchfile
|
2011-05-18 17:41:03 +04:00
|
|
|
abort: nosuchfile: no such file in rev e9e6b4fa872f
|
2011-03-19 09:34:49 +03:00
|
|
|
[255]
|
2011-11-18 15:04:31 +04:00
|
|
|
|
2012-01-10 12:18:19 +04:00
|
|
|
annotate file without '\n' on last line
|
|
|
|
|
|
|
|
$ printf "" > c
|
|
|
|
$ hg ci -A -m test -u nobody -d '1 0'
|
|
|
|
adding c
|
|
|
|
$ hg annotate c
|
|
|
|
$ printf "a\nb" > c
|
|
|
|
$ hg ci -m test
|
|
|
|
$ hg annotate c
|
|
|
|
[0-9]+: a (re)
|
|
|
|
[0-9]+: b (re)
|
|
|
|
|
annotate: increase refcount of each revisions correctly (issue3841)
Before this patch, refcount (managed in "needed") of parents of each
revisions in "visit" is increased, only when parent is not annotated
yet (examined by "p not in hist").
But this causes less refcount of the revision like "A" in the tree
below ("A" is assumed as the second parent of "C"):
A --- B --- C
\ /
\-----/
Steps of annotation for "C" in this case are shown below:
1. for "C"
1.1 increase refcount of "B"
1.2 increase refcount of "A" (=> 1)
1.3 defer annotation for "C"
2. for "A"
2.1 annotate for "A" (=> put result into "hist[A]")
2.2 clear "pcache[A]" ("pcache[A] = []")
3. for "B"
3.1 not increase refcount of "A", because "A not in hist" is False
3.2 annotate for "B"
3.3 decrease refcount of "A" (=> 0)
3.4 delete "hist[A]", even though "A" is still needed by "C"
3.5 clear "pcache[B]"
4. for "C", again
4.1 not increase refcount of "B", because "B not in hist" is False
4.2 increase refcount of "A" (=> 1)
4.3 defer annotation for "C"
5. for "A", again
5.1 annotate for "A" (=> put result into "hist[A]", again)
5.2 clear "pcache[A]"
6. for "C", once again
6.1 not increase refcount of "B", because "B not in hist" is False
6.2 not increase refcount of "A", because "A not in hist" is False
6.3 annotate for "C"
6.4 decrease refcount of "A", and delete "hist[A]"
6.5 decrease refcount of "B", and delete "hist[B]"
6.6 clear "pcache[C]"
At step (5.1), annotation for "A" mis-recognizes that all lines are
created at "A", because "pcache[A]" already cleared at step (2.2)
prevents from scanning ancestors of "A".
So, annotation for "C" or its descendants loses information about "A"
or its ancestors.
The root cause of this problem is that refcount of "A" is decreased at
step (3.3), even though it isn't increased at step (3.1).
To increase refcount correctly, this patch increases refcount of each
parents of each revisions:
- regardless of "p not in hist" or not, and
- only once for each revisions in "visit" (by "not pcached")
In fact, this problem should occur only on legacy repositories in
which a filelog includes the merging between the revision and its
ancestor (as the second parent), because:
- tree is scanned in depth-first
without such merging, revisions in "visit" refer different
revisions as parent each other
- recent Mercurial doesn't allow such merging
changelog and manifest can include such merging someway, but
filelogs can't, because "localrepository._filecommit()" converts
such merging request to linear history.
This patch tests merging cases below: these cases are from filelog of
"mercurial/commands.py" in the repository of Mercurial itself.
- both parents are same
10 --- 11 --- 12
\_/
filelogrev: changesetid:
10 526aca6bcb38
11 05098100ff44
12 2d4f4cfa81d6
- the second parent is also ancestor of the first one
37 --- 38 --- 39 --- 40
\________/
filelogrev: changesetid:
37 033dc4170fe6
38 5ff1a23ce38c
39 661a47367859
40 a2ba99fd026f
2013-03-29 17:57:16 +04:00
|
|
|
Issue3841: check annotation of the file of which filelog includes
|
|
|
|
merging between the revision and its ancestor
|
|
|
|
|
|
|
|
to reproduce the situation with recent Mercurial, this script uses (1)
|
|
|
|
"hg debugsetparents" to merge without ancestor check by "hg merge",
|
|
|
|
and (2) the extension to allow filelog merging between the revision
|
|
|
|
and its ancestor by overriding "repo._filecommit".
|
|
|
|
|
|
|
|
$ cat > ../legacyrepo.py <<EOF
|
2017-08-22 21:58:10 +03:00
|
|
|
> from __future__ import absolute_import
|
2019-01-30 03:25:33 +03:00
|
|
|
> from edenscm.mercurial import error, node
|
annotate: increase refcount of each revisions correctly (issue3841)
Before this patch, refcount (managed in "needed") of parents of each
revisions in "visit" is increased, only when parent is not annotated
yet (examined by "p not in hist").
But this causes less refcount of the revision like "A" in the tree
below ("A" is assumed as the second parent of "C"):
A --- B --- C
\ /
\-----/
Steps of annotation for "C" in this case are shown below:
1. for "C"
1.1 increase refcount of "B"
1.2 increase refcount of "A" (=> 1)
1.3 defer annotation for "C"
2. for "A"
2.1 annotate for "A" (=> put result into "hist[A]")
2.2 clear "pcache[A]" ("pcache[A] = []")
3. for "B"
3.1 not increase refcount of "A", because "A not in hist" is False
3.2 annotate for "B"
3.3 decrease refcount of "A" (=> 0)
3.4 delete "hist[A]", even though "A" is still needed by "C"
3.5 clear "pcache[B]"
4. for "C", again
4.1 not increase refcount of "B", because "B not in hist" is False
4.2 increase refcount of "A" (=> 1)
4.3 defer annotation for "C"
5. for "A", again
5.1 annotate for "A" (=> put result into "hist[A]", again)
5.2 clear "pcache[A]"
6. for "C", once again
6.1 not increase refcount of "B", because "B not in hist" is False
6.2 not increase refcount of "A", because "A not in hist" is False
6.3 annotate for "C"
6.4 decrease refcount of "A", and delete "hist[A]"
6.5 decrease refcount of "B", and delete "hist[B]"
6.6 clear "pcache[C]"
At step (5.1), annotation for "A" mis-recognizes that all lines are
created at "A", because "pcache[A]" already cleared at step (2.2)
prevents from scanning ancestors of "A".
So, annotation for "C" or its descendants loses information about "A"
or its ancestors.
The root cause of this problem is that refcount of "A" is decreased at
step (3.3), even though it isn't increased at step (3.1).
To increase refcount correctly, this patch increases refcount of each
parents of each revisions:
- regardless of "p not in hist" or not, and
- only once for each revisions in "visit" (by "not pcached")
In fact, this problem should occur only on legacy repositories in
which a filelog includes the merging between the revision and its
ancestor (as the second parent), because:
- tree is scanned in depth-first
without such merging, revisions in "visit" refer different
revisions as parent each other
- recent Mercurial doesn't allow such merging
changelog and manifest can include such merging someway, but
filelogs can't, because "localrepository._filecommit()" converts
such merging request to linear history.
This patch tests merging cases below: these cases are from filelog of
"mercurial/commands.py" in the repository of Mercurial itself.
- both parents are same
10 --- 11 --- 12
\_/
filelogrev: changesetid:
10 526aca6bcb38
11 05098100ff44
12 2d4f4cfa81d6
- the second parent is also ancestor of the first one
37 --- 38 --- 39 --- 40
\________/
filelogrev: changesetid:
37 033dc4170fe6
38 5ff1a23ce38c
39 661a47367859
40 a2ba99fd026f
2013-03-29 17:57:16 +04:00
|
|
|
> def reposetup(ui, repo):
|
|
|
|
> class legacyrepo(repo.__class__):
|
|
|
|
> def _filecommit(self, fctx, manifest1, manifest2,
|
|
|
|
> linkrev, tr, changelist):
|
|
|
|
> fname = fctx.path()
|
|
|
|
> text = fctx.data()
|
|
|
|
> flog = self.file(fname)
|
|
|
|
> fparent1 = manifest1.get(fname, node.nullid)
|
|
|
|
> fparent2 = manifest2.get(fname, node.nullid)
|
|
|
|
> meta = {}
|
|
|
|
> copy = fctx.renamed()
|
|
|
|
> if copy and copy[0] != fname:
|
2015-10-08 22:55:45 +03:00
|
|
|
> raise error.Abort('copying is not supported')
|
annotate: increase refcount of each revisions correctly (issue3841)
Before this patch, refcount (managed in "needed") of parents of each
revisions in "visit" is increased, only when parent is not annotated
yet (examined by "p not in hist").
But this causes less refcount of the revision like "A" in the tree
below ("A" is assumed as the second parent of "C"):
A --- B --- C
\ /
\-----/
Steps of annotation for "C" in this case are shown below:
1. for "C"
1.1 increase refcount of "B"
1.2 increase refcount of "A" (=> 1)
1.3 defer annotation for "C"
2. for "A"
2.1 annotate for "A" (=> put result into "hist[A]")
2.2 clear "pcache[A]" ("pcache[A] = []")
3. for "B"
3.1 not increase refcount of "A", because "A not in hist" is False
3.2 annotate for "B"
3.3 decrease refcount of "A" (=> 0)
3.4 delete "hist[A]", even though "A" is still needed by "C"
3.5 clear "pcache[B]"
4. for "C", again
4.1 not increase refcount of "B", because "B not in hist" is False
4.2 increase refcount of "A" (=> 1)
4.3 defer annotation for "C"
5. for "A", again
5.1 annotate for "A" (=> put result into "hist[A]", again)
5.2 clear "pcache[A]"
6. for "C", once again
6.1 not increase refcount of "B", because "B not in hist" is False
6.2 not increase refcount of "A", because "A not in hist" is False
6.3 annotate for "C"
6.4 decrease refcount of "A", and delete "hist[A]"
6.5 decrease refcount of "B", and delete "hist[B]"
6.6 clear "pcache[C]"
At step (5.1), annotation for "A" mis-recognizes that all lines are
created at "A", because "pcache[A]" already cleared at step (2.2)
prevents from scanning ancestors of "A".
So, annotation for "C" or its descendants loses information about "A"
or its ancestors.
The root cause of this problem is that refcount of "A" is decreased at
step (3.3), even though it isn't increased at step (3.1).
To increase refcount correctly, this patch increases refcount of each
parents of each revisions:
- regardless of "p not in hist" or not, and
- only once for each revisions in "visit" (by "not pcached")
In fact, this problem should occur only on legacy repositories in
which a filelog includes the merging between the revision and its
ancestor (as the second parent), because:
- tree is scanned in depth-first
without such merging, revisions in "visit" refer different
revisions as parent each other
- recent Mercurial doesn't allow such merging
changelog and manifest can include such merging someway, but
filelogs can't, because "localrepository._filecommit()" converts
such merging request to linear history.
This patch tests merging cases below: these cases are from filelog of
"mercurial/commands.py" in the repository of Mercurial itself.
- both parents are same
10 --- 11 --- 12
\_/
filelogrev: changesetid:
10 526aca6bcb38
11 05098100ff44
12 2d4f4cfa81d6
- the second parent is also ancestor of the first one
37 --- 38 --- 39 --- 40
\________/
filelogrev: changesetid:
37 033dc4170fe6
38 5ff1a23ce38c
39 661a47367859
40 a2ba99fd026f
2013-03-29 17:57:16 +04:00
|
|
|
> if fparent2 != node.nullid:
|
|
|
|
> changelist.append(fname)
|
|
|
|
> return flog.add(text, meta, tr, linkrev,
|
|
|
|
> fparent1, fparent2)
|
2015-10-08 22:55:45 +03:00
|
|
|
> raise error.Abort('only merging is supported')
|
annotate: increase refcount of each revisions correctly (issue3841)
Before this patch, refcount (managed in "needed") of parents of each
revisions in "visit" is increased, only when parent is not annotated
yet (examined by "p not in hist").
But this causes less refcount of the revision like "A" in the tree
below ("A" is assumed as the second parent of "C"):
A --- B --- C
\ /
\-----/
Steps of annotation for "C" in this case are shown below:
1. for "C"
1.1 increase refcount of "B"
1.2 increase refcount of "A" (=> 1)
1.3 defer annotation for "C"
2. for "A"
2.1 annotate for "A" (=> put result into "hist[A]")
2.2 clear "pcache[A]" ("pcache[A] = []")
3. for "B"
3.1 not increase refcount of "A", because "A not in hist" is False
3.2 annotate for "B"
3.3 decrease refcount of "A" (=> 0)
3.4 delete "hist[A]", even though "A" is still needed by "C"
3.5 clear "pcache[B]"
4. for "C", again
4.1 not increase refcount of "B", because "B not in hist" is False
4.2 increase refcount of "A" (=> 1)
4.3 defer annotation for "C"
5. for "A", again
5.1 annotate for "A" (=> put result into "hist[A]", again)
5.2 clear "pcache[A]"
6. for "C", once again
6.1 not increase refcount of "B", because "B not in hist" is False
6.2 not increase refcount of "A", because "A not in hist" is False
6.3 annotate for "C"
6.4 decrease refcount of "A", and delete "hist[A]"
6.5 decrease refcount of "B", and delete "hist[B]"
6.6 clear "pcache[C]"
At step (5.1), annotation for "A" mis-recognizes that all lines are
created at "A", because "pcache[A]" already cleared at step (2.2)
prevents from scanning ancestors of "A".
So, annotation for "C" or its descendants loses information about "A"
or its ancestors.
The root cause of this problem is that refcount of "A" is decreased at
step (3.3), even though it isn't increased at step (3.1).
To increase refcount correctly, this patch increases refcount of each
parents of each revisions:
- regardless of "p not in hist" or not, and
- only once for each revisions in "visit" (by "not pcached")
In fact, this problem should occur only on legacy repositories in
which a filelog includes the merging between the revision and its
ancestor (as the second parent), because:
- tree is scanned in depth-first
without such merging, revisions in "visit" refer different
revisions as parent each other
- recent Mercurial doesn't allow such merging
changelog and manifest can include such merging someway, but
filelogs can't, because "localrepository._filecommit()" converts
such merging request to linear history.
This patch tests merging cases below: these cases are from filelog of
"mercurial/commands.py" in the repository of Mercurial itself.
- both parents are same
10 --- 11 --- 12
\_/
filelogrev: changesetid:
10 526aca6bcb38
11 05098100ff44
12 2d4f4cfa81d6
- the second parent is also ancestor of the first one
37 --- 38 --- 39 --- 40
\________/
filelogrev: changesetid:
37 033dc4170fe6
38 5ff1a23ce38c
39 661a47367859
40 a2ba99fd026f
2013-03-29 17:57:16 +04:00
|
|
|
> repo.__class__ = legacyrepo
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ cat > baz <<EOF
|
|
|
|
> 1
|
|
|
|
> 2
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ hg add baz
|
|
|
|
$ hg commit -m "baz:0"
|
|
|
|
|
|
|
|
$ cat > baz <<EOF
|
|
|
|
> 1 baz:1
|
|
|
|
> 2
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ hg commit -m "baz:1"
|
|
|
|
|
|
|
|
$ cat > baz <<EOF
|
|
|
|
> 1 baz:1
|
|
|
|
> 2 baz:2
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ hg debugsetparents 17 17
|
|
|
|
$ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:2"
|
|
|
|
$ hg debugindexdot .hg/store/data/baz.i
|
|
|
|
digraph G {
|
|
|
|
-1 -> 0
|
|
|
|
0 -> 1
|
|
|
|
1 -> 2
|
|
|
|
1 -> 2
|
|
|
|
}
|
|
|
|
$ hg annotate baz
|
|
|
|
17: 1 baz:1
|
|
|
|
18: 2 baz:2
|
|
|
|
16: 3
|
|
|
|
16: 4
|
|
|
|
16: 5
|
|
|
|
|
|
|
|
$ cat > baz <<EOF
|
|
|
|
> 1 baz:1
|
|
|
|
> 2 baz:2
|
|
|
|
> 3 baz:3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ hg commit -m "baz:3"
|
|
|
|
|
|
|
|
$ cat > baz <<EOF
|
|
|
|
> 1 baz:1
|
|
|
|
> 2 baz:2
|
|
|
|
> 3 baz:3
|
|
|
|
> 4 baz:4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ hg debugsetparents 19 18
|
|
|
|
$ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:4"
|
|
|
|
$ hg debugindexdot .hg/store/data/baz.i
|
|
|
|
digraph G {
|
|
|
|
-1 -> 0
|
|
|
|
0 -> 1
|
|
|
|
1 -> 2
|
|
|
|
1 -> 2
|
|
|
|
2 -> 3
|
|
|
|
3 -> 4
|
|
|
|
2 -> 4
|
|
|
|
}
|
|
|
|
$ hg annotate baz
|
|
|
|
17: 1 baz:1
|
|
|
|
18: 2 baz:2
|
|
|
|
19: 3 baz:3
|
|
|
|
20: 4 baz:4
|
|
|
|
16: 5
|
|
|
|
|
2014-08-16 12:50:55 +04:00
|
|
|
annotate clean file
|
|
|
|
|
|
|
|
$ hg annotate -ncr "wdir()" foo
|
|
|
|
11 472b18db256d : foo
|
|
|
|
|
|
|
|
annotate modified file
|
|
|
|
|
|
|
|
$ echo foofoo >> foo
|
|
|
|
$ hg annotate -r "wdir()" foo
|
|
|
|
11 : foo
|
|
|
|
20+: foofoo
|
|
|
|
|
|
|
|
$ hg annotate -cr "wdir()" foo
|
|
|
|
472b18db256d : foo
|
|
|
|
b6bedd5477e7+: foofoo
|
|
|
|
|
|
|
|
$ hg annotate -ncr "wdir()" foo
|
|
|
|
11 472b18db256d : foo
|
|
|
|
20 b6bedd5477e7+: foofoo
|
|
|
|
|
|
|
|
$ hg annotate --debug -ncr "wdir()" foo
|
2018-06-21 05:27:18 +03:00
|
|
|
fsmonitor: fallback to core status, full rewalk requested (fsmonitor !)
|
2014-08-16 12:50:55 +04:00
|
|
|
11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo
|
|
|
|
20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo
|
|
|
|
|
|
|
|
$ hg annotate -udr "wdir()" foo
|
|
|
|
test Thu Jan 01 00:00:00 1970 +0000: foo
|
|
|
|
test [A-Za-z0-9:+ ]+: foofoo (re)
|
|
|
|
|
|
|
|
$ hg annotate -ncr "wdir()" -Tjson foo
|
|
|
|
[
|
|
|
|
{
|
2017-06-02 18:25:24 +03:00
|
|
|
"abspath": "foo",
|
|
|
|
"lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": null, "rev": null}],
|
|
|
|
"path": "foo"
|
2014-08-16 12:50:55 +04:00
|
|
|
}
|
|
|
|
]
|
|
|
|
|
|
|
|
annotate added file
|
|
|
|
|
|
|
|
$ echo bar > bar
|
|
|
|
$ hg add bar
|
|
|
|
$ hg annotate -ncr "wdir()" bar
|
|
|
|
20 b6bedd5477e7+: bar
|
|
|
|
|
|
|
|
annotate renamed file
|
|
|
|
|
|
|
|
$ hg rename foo renamefoo2
|
|
|
|
$ hg annotate -ncr "wdir()" renamefoo2
|
|
|
|
11 472b18db256d : foo
|
|
|
|
20 b6bedd5477e7+: foofoo
|
|
|
|
|
|
|
|
annotate missing file
|
|
|
|
|
|
|
|
$ rm baz
|
2017-07-09 01:38:44 +03:00
|
|
|
|
2014-08-16 12:50:55 +04:00
|
|
|
$ hg annotate -ncr "wdir()" baz
|
2017-12-03 03:33:34 +03:00
|
|
|
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
|
|
|
|
abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
|
2014-08-16 12:50:55 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
annotate removed file
|
|
|
|
|
|
|
|
$ hg rm baz
|
2017-07-09 01:38:44 +03:00
|
|
|
|
2014-08-16 12:50:55 +04:00
|
|
|
$ hg annotate -ncr "wdir()" baz
|
2017-12-03 03:33:34 +03:00
|
|
|
abort: $TESTTMP\repo\baz: $ENOENT$ (windows !)
|
|
|
|
abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !)
|
2014-08-16 12:50:55 +04:00
|
|
|
[255]
|
|
|
|
|
2017-01-04 18:47:49 +03:00
|
|
|
$ hg revert --all --no-backup --quiet
|
|
|
|
$ hg id -n
|
|
|
|
20
|
|
|
|
|
2017-01-16 11:24:47 +03:00
|
|
|
Test followlines() revset; we usually check both followlines(pat, range) and
|
|
|
|
followlines(pat, range, descend=True) to make sure both give the same result
|
|
|
|
when they should.
|
2017-01-04 18:47:49 +03:00
|
|
|
|
2017-04-20 22:40:28 +03:00
|
|
|
$ echo a >> foo
|
|
|
|
$ hg ci -m 'foo: add a'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=20)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-01-16 11:24:47 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
2017-01-16 11:24:47 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=True)'
|
2017-04-14 15:25:06 +03:00
|
|
|
19: baz:3
|
2017-01-16 11:24:47 +03:00
|
|
|
20: baz:4
|
2017-01-04 18:47:49 +03:00
|
|
|
$ printf "0\n0\n" | cat - baz > baz1
|
|
|
|
$ mv baz1 baz
|
|
|
|
$ hg ci -m 'added two lines with 0'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-15 12:29:42 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=true, startrev=19)'
|
2017-04-14 15:25:06 +03:00
|
|
|
19: baz:3
|
2017-01-16 11:24:47 +03:00
|
|
|
20: baz:4
|
2017-01-04 18:47:49 +03:00
|
|
|
$ echo 6 >> baz
|
|
|
|
$ hg ci -m 'added line 8'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-15 12:29:42 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=1)'
|
2017-04-14 15:25:06 +03:00
|
|
|
19: baz:3
|
2017-01-16 11:24:47 +03:00
|
|
|
20: baz:4
|
2017-01-04 18:47:49 +03:00
|
|
|
$ sed 's/3/3+/' baz > baz.new
|
|
|
|
$ mv baz.new baz
|
|
|
|
$ hg ci -m 'baz:3->3+'
|
2017-04-15 12:29:42 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, descend=0)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
2017-04-14 15:25:06 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)'
|
|
|
|
19: baz:3
|
2017-01-16 11:24:47 +03:00
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
2017-04-15 12:29:42 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2, descend=false)'
|
2017-04-20 22:40:28 +03:00
|
|
|
22: added two lines with 0
|
2017-01-04 18:47:49 +03:00
|
|
|
|
|
|
|
file patterns are okay
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)'
|
2017-04-20 22:40:28 +03:00
|
|
|
22: added two lines with 0
|
2017-01-04 18:47:49 +03:00
|
|
|
|
|
|
|
renames are followed
|
|
|
|
$ hg mv baz qux
|
|
|
|
$ sed 's/4/4+/' qux > qux.new
|
|
|
|
$ mv qux.new qux
|
|
|
|
$ hg ci -m 'qux:4->4+'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
|
|
|
25: qux:4->4+
|
2017-01-16 11:24:47 +03:00
|
|
|
|
|
|
|
but are missed when following children
|
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=22, descend=True)'
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
2017-01-04 18:47:49 +03:00
|
|
|
|
|
|
|
merge
|
2017-04-20 22:40:28 +03:00
|
|
|
$ hg up 24 --quiet
|
2017-01-04 18:47:49 +03:00
|
|
|
$ echo 7 >> baz
|
|
|
|
$ hg ci -m 'one more line, out of line range'
|
|
|
|
$ sed 's/3+/3-/' baz > baz.new
|
|
|
|
$ mv baz.new baz
|
|
|
|
$ hg ci -m 'baz:3+->3-'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
|
|
|
27: baz:3+->3-
|
|
|
|
$ hg merge 25
|
2017-01-04 18:47:49 +03:00
|
|
|
merging baz and qux to qux
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -m merge
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
|
|
|
25: qux:4->4+
|
|
|
|
27: baz:3+->3-
|
|
|
|
28: merge
|
|
|
|
$ hg up 25 --quiet
|
|
|
|
$ hg merge 27
|
2017-01-04 18:47:49 +03:00
|
|
|
merging qux and baz to qux
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -m 'merge from other side'
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)'
|
2017-01-04 18:47:49 +03:00
|
|
|
16: baz:0
|
|
|
|
19: baz:3
|
|
|
|
20: baz:4
|
2017-04-20 22:40:28 +03:00
|
|
|
24: baz:3->3+
|
|
|
|
25: qux:4->4+
|
|
|
|
27: baz:3+->3-
|
|
|
|
29: merge from other side
|
|
|
|
$ hg up 24 --quiet
|
2017-01-04 18:47:49 +03:00
|
|
|
|
2017-01-16 11:24:47 +03:00
|
|
|
we are missing the branch with rename when following children
|
2017-04-20 22:40:28 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=26, descend=True)'
|
|
|
|
27: baz:3+->3-
|
2017-01-16 11:24:47 +03:00
|
|
|
|
2017-04-14 09:55:18 +03:00
|
|
|
we follow all branches in descending direction
|
2017-04-20 22:40:28 +03:00
|
|
|
$ hg up 23 --quiet
|
2017-04-14 09:55:18 +03:00
|
|
|
$ sed 's/3/+3/' baz > baz.new
|
|
|
|
$ mv baz.new baz
|
|
|
|
$ hg ci -m 'baz:3->+3'
|
2017-04-14 15:09:26 +03:00
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 2:5, startrev=16, descend=True)' --graph
|
2017-04-20 22:40:28 +03:00
|
|
|
@ 30: baz:3->+3
|
2017-04-14 09:55:18 +03:00
|
|
|
:
|
2017-04-20 22:40:28 +03:00
|
|
|
: o 27: baz:3+->3-
|
2017-04-14 09:55:18 +03:00
|
|
|
: :
|
2017-04-20 22:40:28 +03:00
|
|
|
: o 24: baz:3->3+
|
2017-04-14 09:55:18 +03:00
|
|
|
:/
|
|
|
|
o 20: baz:4
|
|
|
|
|\
|
2017-04-14 15:09:26 +03:00
|
|
|
| o 19: baz:3
|
|
|
|
|/
|
2017-04-14 15:25:06 +03:00
|
|
|
o 18: baz:2
|
|
|
|
:
|
|
|
|
o 16: baz:0
|
|
|
|
|
|
|
|
|
~
|
2017-04-14 09:55:18 +03:00
|
|
|
|
2017-07-05 14:54:53 +03:00
|
|
|
Issue5595: on a merge changeset with different line ranges depending on
|
|
|
|
parent, be conservative and use the surrounding interval to avoid loosing
|
|
|
|
track of possible further descendants in specified range.
|
|
|
|
|
|
|
|
$ hg up 23 --quiet
|
|
|
|
$ hg cat baz -r 24
|
|
|
|
0
|
|
|
|
0
|
|
|
|
1 baz:1
|
|
|
|
2 baz:2
|
|
|
|
3+ baz:3
|
|
|
|
4 baz:4
|
|
|
|
5
|
|
|
|
6
|
|
|
|
$ cat > baz << EOF
|
|
|
|
> 0
|
|
|
|
> 0
|
|
|
|
> a
|
|
|
|
> b
|
|
|
|
> 3+ baz:3
|
|
|
|
> 4 baz:4
|
|
|
|
> y
|
|
|
|
> z
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m 'baz: mostly rewrite with some content from 24'
|
|
|
|
$ hg merge --tool :merge-other 24
|
|
|
|
merging baz
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg ci -m 'merge forgetting about baz rewrite'
|
|
|
|
$ cat > baz << EOF
|
|
|
|
> 0
|
|
|
|
> 0
|
|
|
|
> 1 baz:1
|
|
|
|
> 2+ baz:2
|
|
|
|
> 3+ baz:3
|
|
|
|
> 4 baz:4
|
|
|
|
> 5
|
|
|
|
> 6
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m 'baz: narrow change (2->2+)'
|
|
|
|
$ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:4, startrev=20, descend=True)' --graph
|
|
|
|
@ 33: baz: narrow change (2->2+)
|
|
|
|
|
|
|
|
|
o 32: merge forgetting about baz rewrite
|
|
|
|
|\
|
|
|
|
| o 31: baz: mostly rewrite with some content from 24
|
|
|
|
| :
|
|
|
|
| : o 30: baz:3->+3
|
|
|
|
| :/
|
|
|
|
+---o 27: baz:3+->3-
|
|
|
|
| :
|
|
|
|
o : 24: baz:3->3+
|
|
|
|
:/
|
|
|
|
o 20: baz:4
|
|
|
|
|\
|
|
|
|
~ ~
|
|
|
|
|
2017-01-04 18:47:49 +03:00
|
|
|
check error cases
|
2017-04-20 22:40:28 +03:00
|
|
|
$ hg up 24 --quiet
|
2017-01-09 10:02:56 +03:00
|
|
|
$ hg log -r 'followlines()'
|
|
|
|
hg: parse error: followlines takes at least 1 positional arguments
|
|
|
|
[255]
|
|
|
|
$ hg log -r 'followlines(baz)'
|
2017-01-09 11:58:19 +03:00
|
|
|
hg: parse error: followlines requires a line range
|
2017-01-09 10:02:56 +03:00
|
|
|
[255]
|
|
|
|
$ hg log -r 'followlines(baz, 1)'
|
2017-01-09 11:58:19 +03:00
|
|
|
hg: parse error: followlines expects a line range
|
2017-01-09 10:02:56 +03:00
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))'
|
2017-01-04 18:47:49 +03:00
|
|
|
hg: parse error: followlines expects exactly one revision
|
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines("glob:*", 1:2)'
|
2017-01-04 18:47:49 +03:00
|
|
|
hg: parse error: followlines expects exactly one file
|
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines(baz, 1:)'
|
2017-01-04 18:47:49 +03:00
|
|
|
hg: parse error: line range bounds must be integers
|
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines(baz, :1)'
|
|
|
|
hg: parse error: line range bounds must be integers
|
|
|
|
[255]
|
|
|
|
$ hg log -r 'followlines(baz, x:4)'
|
|
|
|
hg: parse error: line range bounds must be integers
|
|
|
|
[255]
|
|
|
|
$ hg log -r 'followlines(baz, 5:4)'
|
2017-01-04 18:47:49 +03:00
|
|
|
hg: parse error: line range must be positive
|
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines(baz, 0:4)'
|
2017-01-04 18:47:49 +03:00
|
|
|
hg: parse error: fromline must be strictly positive
|
|
|
|
[255]
|
2017-01-09 11:58:19 +03:00
|
|
|
$ hg log -r 'followlines(baz, 2:40)'
|
2017-01-04 18:47:49 +03:00
|
|
|
abort: line range exceeds file size
|
|
|
|
[255]
|
2017-04-15 12:29:42 +03:00
|
|
|
$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])'
|
2017-07-08 07:07:59 +03:00
|
|
|
hg: parse error at 43: not a prefix: [
|
2018-03-16 21:14:39 +03:00
|
|
|
(followlines(baz, 2:4, startrev=20, descend=[1])
|
|
|
|
^ here)
|
2017-04-15 12:29:42 +03:00
|
|
|
[255]
|
|
|
|
$ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)'
|
2017-04-30 23:52:36 +03:00
|
|
|
hg: parse error: descend argument must be a boolean
|
2017-04-15 12:29:42 +03:00
|
|
|
[255]
|
2017-01-04 18:47:49 +03:00
|
|
|
|
2017-06-02 18:25:24 +03:00
|
|
|
Test empty annotate output
|
|
|
|
|
|
|
|
$ printf '\0' > binary
|
|
|
|
$ touch empty
|
|
|
|
$ hg ci -qAm 'add binary and empty files'
|
|
|
|
|
|
|
|
$ hg annotate binary empty
|
|
|
|
binary: binary file
|
|
|
|
|
|
|
|
$ hg annotate -Tjson binary empty
|
|
|
|
[
|
|
|
|
{
|
|
|
|
"abspath": "binary",
|
|
|
|
"path": "binary"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"abspath": "empty",
|
|
|
|
"lines": [],
|
|
|
|
"path": "empty"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
|
2011-11-18 15:04:31 +04:00
|
|
|
Test annotate with whitespace options
|
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
$ hg init repo-ws
|
|
|
|
$ cd repo-ws
|
|
|
|
$ cat > a <<EOF
|
|
|
|
> aa
|
|
|
|
>
|
|
|
|
> b b
|
|
|
|
> EOF
|
|
|
|
$ hg ci -Am "adda"
|
|
|
|
adding a
|
2012-08-08 20:10:37 +04:00
|
|
|
$ sed 's/EOL$//g' > a <<EOF
|
2011-11-18 15:04:31 +04:00
|
|
|
> a a
|
|
|
|
>
|
2012-08-08 20:10:37 +04:00
|
|
|
> EOL
|
2011-11-18 15:04:31 +04:00
|
|
|
> b b
|
|
|
|
> EOF
|
|
|
|
$ hg ci -m "changea"
|
|
|
|
|
|
|
|
Annotate with no option
|
|
|
|
|
|
|
|
$ hg annotate a
|
|
|
|
1: a a
|
|
|
|
0:
|
|
|
|
1:
|
|
|
|
1: b b
|
|
|
|
|
|
|
|
Annotate with --ignore-space-change
|
|
|
|
|
|
|
|
$ hg annotate --ignore-space-change a
|
|
|
|
1: a a
|
|
|
|
1:
|
|
|
|
0:
|
|
|
|
0: b b
|
|
|
|
|
|
|
|
Annotate with --ignore-all-space
|
|
|
|
|
|
|
|
$ hg annotate --ignore-all-space a
|
|
|
|
0: a a
|
|
|
|
0:
|
|
|
|
1:
|
|
|
|
0: b b
|
|
|
|
|
|
|
|
Annotate with --ignore-blank-lines (similar to no options case)
|
|
|
|
|
|
|
|
$ hg annotate --ignore-blank-lines a
|
|
|
|
1: a a
|
|
|
|
0:
|
|
|
|
1:
|
|
|
|
1: b b
|
|
|
|
|
2012-06-11 03:40:51 +04:00
|
|
|
$ cd ..
|
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Because of the way filenodes are computed, you can have multiple changesets
"introducing" the same file revision. For example, in the changeset graph
below, changeset 2 and 3 both change a file -to- and -from- the same content.
o 3: content = new
|
| o 2: content = new
|/
o 1: content = old
In such cases, the file revision is create once, when 2 is added, and just reused
for 3. So the file change in '3' (from "old" to "new)" has no linkrev pointing
to it). We'll call this situation "linkrev-shadowing". As the linkrev is used for
optimization purposes when walking a file history, the linkrev-shadowing
results in an unexpected jump to another branch during such a walk.. This leads to
multiple bugs with log, annotate and rename detection.
One element to fix such bugs is to ensure that walking the file history sticks on
the same topology as the changeset's history. For this purpose, we extend the
logic in 'basefilectx.parents' so that it always defines the proper changeset
to associate the parent file revision with. This "proper" changeset has to be an
ancestor of the changeset associated with the child file revision.
This logic is performed in the '_adjustlinkrev' function. This function is
given the starting changeset and all the information regarding the parent file
revision. If the linkrev for the file revision is an ancestor of the starting
changeset, the linkrev is valid and will be used. If it is not, we detected a
topological jump caused by linkrev shadowing, we are going to walk the
ancestors of the starting changeset until we find one setting the file to the
revision we are trying to create.
The performance impact appears acceptable:
- We are walking the changelog once for each filelog traversal (as there should
be no overlap between searches),
- changelog traversal itself is fairly cheap, compared to what is likely going
to be perform on the result on the filelog traversal,
- We only touch the manifest for ancestors touching the file, And such
changesets are likely to be the one introducing the file. (except in
pathological cases involving merge),
- We use manifest diff instead of full manifest unpacking to check manifest
content, so it does not involve applying multiple diffs in most case.
- linkrev shadowing is not the common case.
Tests for fixed issues in log, annotate and rename detection have been
added.
But this changeset does not solve all problems. It fixes -ancestry-
computation, but if the linkrev-shadowed changesets is the starting one, we'll
still get things wrong. We'll have to fix the bootstrapping of such operations
in a later changeset. Also, the usage of `hg log FILE` without --follow still
has issues with linkrev pointing to hidden changesets, because it relies on the
`filelog` revset which implement its own traversal logic that is still to be
fixed.
Thanks goes to:
- Matt Mackall: for nudging me in the right direction
- Julien Cristau and Rémi Cardona: for keep telling me linkrev bug were an
evolution show stopper for 3 years.
- Durham Goode: for finding a new linkrev issue every few weeks
- Mads Kiilerich: for that last rename bug who raise this topic over my
anoyance limit.
2014-12-24 02:30:38 +03:00
|
|
|
|
|
|
|
Annotate with linkrev pointing to another branch
|
|
|
|
------------------------------------------------
|
|
|
|
|
|
|
|
create history with a filerev whose linkrev points to another branch
|
|
|
|
|
|
|
|
$ hg init branchedlinkrev
|
|
|
|
$ cd branchedlinkrev
|
|
|
|
$ echo A > a
|
|
|
|
$ hg commit -Am 'contentA'
|
|
|
|
adding a
|
|
|
|
$ echo B >> a
|
|
|
|
$ hg commit -m 'contentB'
|
|
|
|
$ hg up --rev 'desc(contentA)'
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo unrelated > unrelated
|
|
|
|
$ hg commit -Am 'unrelated'
|
|
|
|
adding unrelated
|
|
|
|
$ hg graft -r 'desc(contentB)'
|
|
|
|
grafting 1:fd27c222e3e6 "contentB"
|
|
|
|
$ echo C >> a
|
|
|
|
$ hg commit -m 'contentC'
|
2015-04-18 08:10:55 +03:00
|
|
|
$ echo W >> a
|
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Because of the way filenodes are computed, you can have multiple changesets
"introducing" the same file revision. For example, in the changeset graph
below, changeset 2 and 3 both change a file -to- and -from- the same content.
o 3: content = new
|
| o 2: content = new
|/
o 1: content = old
In such cases, the file revision is create once, when 2 is added, and just reused
for 3. So the file change in '3' (from "old" to "new)" has no linkrev pointing
to it). We'll call this situation "linkrev-shadowing". As the linkrev is used for
optimization purposes when walking a file history, the linkrev-shadowing
results in an unexpected jump to another branch during such a walk.. This leads to
multiple bugs with log, annotate and rename detection.
One element to fix such bugs is to ensure that walking the file history sticks on
the same topology as the changeset's history. For this purpose, we extend the
logic in 'basefilectx.parents' so that it always defines the proper changeset
to associate the parent file revision with. This "proper" changeset has to be an
ancestor of the changeset associated with the child file revision.
This logic is performed in the '_adjustlinkrev' function. This function is
given the starting changeset and all the information regarding the parent file
revision. If the linkrev for the file revision is an ancestor of the starting
changeset, the linkrev is valid and will be used. If it is not, we detected a
topological jump caused by linkrev shadowing, we are going to walk the
ancestors of the starting changeset until we find one setting the file to the
revision we are trying to create.
The performance impact appears acceptable:
- We are walking the changelog once for each filelog traversal (as there should
be no overlap between searches),
- changelog traversal itself is fairly cheap, compared to what is likely going
to be perform on the result on the filelog traversal,
- We only touch the manifest for ancestors touching the file, And such
changesets are likely to be the one introducing the file. (except in
pathological cases involving merge),
- We use manifest diff instead of full manifest unpacking to check manifest
content, so it does not involve applying multiple diffs in most case.
- linkrev shadowing is not the common case.
Tests for fixed issues in log, annotate and rename detection have been
added.
But this changeset does not solve all problems. It fixes -ancestry-
computation, but if the linkrev-shadowed changesets is the starting one, we'll
still get things wrong. We'll have to fix the bootstrapping of such operations
in a later changeset. Also, the usage of `hg log FILE` without --follow still
has issues with linkrev pointing to hidden changesets, because it relies on the
`filelog` revset which implement its own traversal logic that is still to be
fixed.
Thanks goes to:
- Matt Mackall: for nudging me in the right direction
- Julien Cristau and Rémi Cardona: for keep telling me linkrev bug were an
evolution show stopper for 3 years.
- Durham Goode: for finding a new linkrev issue every few weeks
- Mads Kiilerich: for that last rename bug who raise this topic over my
anoyance limit.
2014-12-24 02:30:38 +03:00
|
|
|
$ hg log -G
|
|
|
|
@ changeset: 4:072f1e8df249
|
|
|
|
| tag: tip
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: contentC
|
|
|
|
|
|
|
|
|
o changeset: 3:ff38df03cc4b
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: contentB
|
|
|
|
|
|
|
|
|
o changeset: 2:62aaf3f6fc06
|
|
|
|
| parent: 0:f0932f74827e
|
|
|
|
| user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: unrelated
|
|
|
|
|
|
|
|
|
| o changeset: 1:fd27c222e3e6
|
|
|
|
|/ user: test
|
|
|
|
| date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
| summary: contentB
|
|
|
|
|
|
|
|
|
o changeset: 0:f0932f74827e
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: contentA
|
|
|
|
|
|
|
|
|
|
|
|
Annotate should list ancestor of starting revision only
|
|
|
|
|
|
|
|
$ hg annotate a
|
|
|
|
0: A
|
|
|
|
3: B
|
|
|
|
4: C
|
|
|
|
|
2015-04-18 08:10:55 +03:00
|
|
|
$ hg annotate a -r 'wdir()'
|
|
|
|
0 : A
|
|
|
|
3 : B
|
|
|
|
4 : C
|
|
|
|
4+: W
|
|
|
|
|
2014-12-24 14:26:48 +03:00
|
|
|
Even when the starting revision is the linkrev-shadowed one:
|
|
|
|
|
|
|
|
$ hg annotate a -r 3
|
|
|
|
0: A
|
|
|
|
3: B
|
|
|
|
|
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Because of the way filenodes are computed, you can have multiple changesets
"introducing" the same file revision. For example, in the changeset graph
below, changeset 2 and 3 both change a file -to- and -from- the same content.
o 3: content = new
|
| o 2: content = new
|/
o 1: content = old
In such cases, the file revision is create once, when 2 is added, and just reused
for 3. So the file change in '3' (from "old" to "new)" has no linkrev pointing
to it). We'll call this situation "linkrev-shadowing". As the linkrev is used for
optimization purposes when walking a file history, the linkrev-shadowing
results in an unexpected jump to another branch during such a walk.. This leads to
multiple bugs with log, annotate and rename detection.
One element to fix such bugs is to ensure that walking the file history sticks on
the same topology as the changeset's history. For this purpose, we extend the
logic in 'basefilectx.parents' so that it always defines the proper changeset
to associate the parent file revision with. This "proper" changeset has to be an
ancestor of the changeset associated with the child file revision.
This logic is performed in the '_adjustlinkrev' function. This function is
given the starting changeset and all the information regarding the parent file
revision. If the linkrev for the file revision is an ancestor of the starting
changeset, the linkrev is valid and will be used. If it is not, we detected a
topological jump caused by linkrev shadowing, we are going to walk the
ancestors of the starting changeset until we find one setting the file to the
revision we are trying to create.
The performance impact appears acceptable:
- We are walking the changelog once for each filelog traversal (as there should
be no overlap between searches),
- changelog traversal itself is fairly cheap, compared to what is likely going
to be perform on the result on the filelog traversal,
- We only touch the manifest for ancestors touching the file, And such
changesets are likely to be the one introducing the file. (except in
pathological cases involving merge),
- We use manifest diff instead of full manifest unpacking to check manifest
content, so it does not involve applying multiple diffs in most case.
- linkrev shadowing is not the common case.
Tests for fixed issues in log, annotate and rename detection have been
added.
But this changeset does not solve all problems. It fixes -ancestry-
computation, but if the linkrev-shadowed changesets is the starting one, we'll
still get things wrong. We'll have to fix the bootstrapping of such operations
in a later changeset. Also, the usage of `hg log FILE` without --follow still
has issues with linkrev pointing to hidden changesets, because it relies on the
`filelog` revset which implement its own traversal logic that is still to be
fixed.
Thanks goes to:
- Matt Mackall: for nudging me in the right direction
- Julien Cristau and Rémi Cardona: for keep telling me linkrev bug were an
evolution show stopper for 3 years.
- Durham Goode: for finding a new linkrev issue every few weeks
- Mads Kiilerich: for that last rename bug who raise this topic over my
anoyance limit.
2014-12-24 02:30:38 +03:00
|
|
|
$ cd ..
|
annotate: pre-calculate the "needed" dictionary (issue5360)
The "needed" dict is used as a reference counter to free items in the giant
"hist" dict. However, currently it is not very accurate and can lead to
dropping "hist" items unnecessarily, for example, with the following DAG,
-3-
/ \
0--1--2--4--
The current algorithm will visit and calculate rev 1 twice, undesired. And
it tries to be smart by clearing rev 1's parents: "pcache[1] = []" at the
time hist[1] being accessed (note: hist[1] needs to be used twice, by rev 2
and rev 3). It can result in incorrect results if p1 of rev 4 deletes chunks
belonging to rev 0.
However, simply removing "needed" is not okay, because it will consume 10x
memory:
# without any change
% HGRCPATH= lrun ./hg annotate mercurial/commands.py -r d130a38 3>&2 [1]
MEMORY 49074176
CPUTIME 9.213
REALTIME 9.270
# with "needed" removed
MEMORY 637673472
CPUTIME 8.164
REALTIME 8.249
This patch moves "needed" (and "pcache") calculation to a separate DFS to
address the issue. It improves perf and fixes issue5360 by correctly reusing
hist, while maintaining low memory usage. Some additional attempt has been
made to further reduce memory usage, like changing "pcache[f] = []" to "del
pcache[f]". Therefore the result can be both faster and lower memory usage:
# with this patch applied
MEMORY 47575040
CPUTIME 7.870
REALTIME 7.926
[1]: lrun is a lightweight sandbox built on Linux cgroup and namespace. It's
used to measure CPU and memory usage here. Source code is available at
github.com/quark-zju/lrun.
2016-09-02 17:20:59 +03:00
|
|
|
|
|
|
|
Issue5360: Deleted chunk in p1 of a merge changeset
|
|
|
|
|
|
|
|
$ hg init repo-5360
|
|
|
|
$ cd repo-5360
|
|
|
|
$ echo 1 > a
|
|
|
|
$ hg commit -A a -m 1
|
|
|
|
$ echo 2 >> a
|
|
|
|
$ hg commit -m 2
|
|
|
|
$ echo a > a
|
|
|
|
$ hg commit -m a
|
|
|
|
$ hg update '.^' -q
|
|
|
|
$ echo 3 >> a
|
|
|
|
$ hg commit -m 3 -q
|
|
|
|
$ hg merge 2 -q
|
|
|
|
$ cat > a << EOF
|
|
|
|
> b
|
|
|
|
> 1
|
|
|
|
> 2
|
|
|
|
> 3
|
|
|
|
> a
|
|
|
|
> EOF
|
|
|
|
$ hg resolve --mark -q
|
|
|
|
$ hg commit -m m
|
|
|
|
$ hg annotate a
|
|
|
|
4: b
|
|
|
|
0: 1
|
|
|
|
1: 2
|
|
|
|
3: 3
|
|
|
|
2: a
|
|
|
|
|
|
|
|
$ cd ..
|