Mercurial > hg
annotate tests/test-merge10.t @ 33554:2943141f5e07
revset: pass repo when passing ui
The repo instance is currently only used to provide a changeset
lookup function as part of parsing revsets. I /think/ this allows
node fragments to resolve. I'm not sure why we wouldn't want this
to always "just work" if parsing a revset string.
Plus, an upcoming commit will introduce a new consumer that needs a
handle on the repo. So passing it more often will make that code
work more.
Passing a repo instance in all callers of revset.match* results in
a bunch of test changes. Notably, branch and tags caches get
populated as part of evaluating revsets. I'm not sure if this is
desirable. So this patch takes the conservative approach and only
passes the repo if we're passing a ui instance.
Differential Revision: https://phab.mercurial-scm.org/D97
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 15 Jul 2017 15:51:57 -0700 |
parents | f2719b387380 |
children | eb586ed5d8ce |
rev | line source |
---|---|
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
1 Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
2 (merge correctly when all the files in a directory are moved |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
3 but then local changes are added in the same directory) |
4696
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
5 $ hg init a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
6 $ cd a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
7 $ mkdir -p testdir |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
8 $ echo a > testdir/a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
9 $ hg add testdir/a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11983
diff
changeset
|
10 $ hg commit -m a |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
11 $ cd .. |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
12 |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
13 $ hg clone a b |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
14 updating to branch default |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
16 $ cd a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
17 $ echo alpha > testdir/a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11983
diff
changeset
|
18 $ hg commit -m remote-change |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
19 $ cd .. |
4696
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
20 |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
21 $ cd b |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
22 $ mkdir testdir/subdir |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
23 $ hg mv testdir/a testdir/subdir/a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11983
diff
changeset
|
24 $ hg commit -m move |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
25 $ mkdir newdir |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
26 $ echo beta > newdir/beta |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
27 $ hg add newdir/beta |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11983
diff
changeset
|
28 $ hg commit -m local-addition |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
29 $ hg pull ../a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
30 pulling from ../a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
31 searching for changes |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
32 adding changesets |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
33 adding manifests |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
34 adding file changes |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
35 added 1 changesets with 1 changes to 1 files (+1 heads) |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
36 (run 'hg heads' to see heads, 'hg merge' to merge) |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
37 $ hg up -C 2 |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
38 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
39 $ hg merge |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
40 merging testdir/subdir/a and testdir/a to testdir/subdir/a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
42 (branch merge, don't forget to commit) |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
43 $ hg stat |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
44 M testdir/subdir/a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
45 $ hg diff --nodates |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11983
diff
changeset
|
46 diff -r bc21c9773bfa testdir/subdir/a |
11983
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
47 --- a/testdir/subdir/a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
48 +++ b/testdir/subdir/a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
49 @@ -1,1 +1,1 @@ |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
50 -a |
27649cf258e3
tests: unify test-merge10
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8168
diff
changeset
|
51 +alpha |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12156
diff
changeset
|
52 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12156
diff
changeset
|
53 $ cd .. |