Mercurial > hg
annotate tests/test-merge6.t @ 23976:344939126579 stable
largefiles: don't interfere with logging normal files
The previous code was adding standin files to the matcher's file list when
neither the standin file nor the original existed in the context. Somehow, this
was confusing the logging code into behaving differently from when the extension
wasn't loaded.
It seems that this was an attempt to support naming a directory that only
contains largefiles, as a test fails if the else clause is dropped entirely.
Therefore, only append the "standin" if it is a directory. This was found by
running the test suite with --config extensions.largefiles=.
The first added test used to log an additional cset that wasn't logged normally.
The only relation it had to file 'a' is that 'a' was the source of a move, but
it isn't clear why having '.hglf/a' in the list causes this change:
@@ -47,6 +47,11 @@
Make sure largefiles doesn't interfere with logging a regular file
$ hg log a --config extensions.largefiles=
+ changeset: 3:2ca5ba701980
+ user: test
+ date: Thu Jan 01 00:00:04 1970 +0000
+ summary: d
+
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
The second added test used to complain about a file not being in the parent
revision:
@@ -1638,10 +1643,8 @@
Ensure that largefiles doesn't intefere with following a normal file
$ hg --config extensions.largefiles= log -f d -T '{desc}' -G
- @ c
- |
- o a
-
+ abort: cannot follow file not in parent revision: ".hglf/d"
+ [255]
$ hg log -f d/a -T '{desc}' -G
@ c
|
Note that there is still something fishy with the largefiles code, because when
using a glob pattern like this:
$ hg log 'glob:sub/*'
the pattern list would contain '.hglf/glob:sub/*'. None of the tests show this
(this test lives in test-largefiles.t at 1349), it was just something that I
noticed when the code was loaded up with print statements.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 30 Jan 2015 20:44:11 -0500 |
parents | f2719b387380 |
children | 2428e8ec0793 |
rev | line source |
---|---|
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
1 $ cat <<EOF > merge |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
2 > import sys, os |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
3 > print "merging for", os.path.basename(sys.argv[1]) |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
4 > EOF |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
5 $ HGMERGE="python ../merge"; export HGMERGE |
616 | 6 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
7 $ hg init A1 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
8 $ cd A1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
9 $ echo This is file foo1 > foo |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
10 $ echo This is file bar1 > bar |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
11 $ hg add foo bar |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11979
diff
changeset
|
12 $ hg commit -m "commit text" |
616 | 13 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
14 $ cd .. |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
15 $ hg clone A1 B1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
16 updating to branch default |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
17 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 | 18 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
19 $ cd A1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
20 $ rm bar |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
21 $ hg remove bar |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11979
diff
changeset
|
22 $ hg commit -m "commit test" |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
23 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
24 $ cd ../B1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
25 $ echo This is file foo22 > foo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11979
diff
changeset
|
26 $ hg commit -m "commit test" |
616 | 27 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
28 $ cd .. |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
29 $ hg clone A1 A2 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
30 updating to branch default |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
32 $ hg clone B1 B2 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
33 updating to branch default |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
34 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
616 | 35 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
36 $ cd A1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
37 $ hg pull ../B1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
38 pulling from ../B1 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
39 searching for changes |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
40 adding changesets |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
41 adding manifests |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
42 adding file changes |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
43 added 1 changesets with 1 changes to 1 files (+1 heads) |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
44 (run 'hg heads' to see heads, 'hg merge' to merge) |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
45 $ hg merge |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
47 (branch merge, don't forget to commit) |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11979
diff
changeset
|
48 $ hg commit -m "commit test" |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
49 bar should remain deleted. |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
50 $ hg manifest --debug |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
51 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
616 | 52 |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
53 $ cd ../B2 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
54 $ hg pull ../A2 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
55 pulling from ../A2 |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
56 searching for changes |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
57 adding changesets |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
58 adding manifests |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
59 adding file changes |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
60 added 1 changesets with 0 changes to 0 files (+1 heads) |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
61 (run 'hg heads' to see heads, 'hg merge' to merge) |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
62 $ hg merge |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
63 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
64 (branch merge, don't forget to commit) |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11979
diff
changeset
|
65 $ hg commit -m "commit test" |
11979
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
66 bar should remain deleted. |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
67 $ hg manifest --debug |
39fb1e4c079f
tests: unify test-merge6
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4295
diff
changeset
|
68 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
69 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
70 $ cd .. |