Mercurial > hg
annotate tests/test-import-context.t @ 34094:5d45a997d11d
rebase: remove complex unhiding code
This is similar to Martin von Zweigbergk's previous patch [1].
Previous patches are adding more `.unfiltered()` to the rebase code. So I
wonder: are we playing whack-a-mole regarding on `unfiltered()` in rebase?
Thinking about it, I believe most of the rebase code *should* just use an
unfiltered repo. The only exception is before we figuring out a
`rebasestate`. This patch makes it so. See added comment in code for why
that's more reasonable.
This would make the code base cleaner (not mangling the `repo` object),
faster (no need to invalidate caches), simpler (less LOC), less error-prone
(no need to think about what to unhide, ex. should we unhide wdir p2? how
about destinations?), and future proof (other code may change visibility in
an unexpected way, ex. directaccess may make the destination only visible
when it's in "--dest" revset tree).
[1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/094277.html
Differential Revision: https://phab.mercurial-scm.org/D644
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 06 Sep 2017 16:13:04 -0700 |
parents | 75be14993fda |
children | 4bc983568016 |
rev | line source |
---|---|
12825 | 1 Test applying context diffs |
2 | |
3 $ cat > writepatterns.py <<EOF | |
4 > import sys | |
5 > | |
6 > path = sys.argv[1] | |
7 > lasteol = sys.argv[2] == '1' | |
8 > patterns = sys.argv[3:] | |
9 > | |
10 > fp = file(path, 'wb') | |
11 > for i, pattern in enumerate(patterns): | |
12 > count = int(pattern[0:-1]) | |
13 > char = pattern[-1] + '\n' | |
14 > if not lasteol and i == len(patterns) - 1: | |
15 > fp.write((char*count)[:-1]) | |
16 > else: | |
17 > fp.write(char*count) | |
18 > fp.close() | |
19 > EOF | |
20 $ cat > cat.py <<EOF | |
21 > import sys | |
22 > sys.stdout.write(repr(file(sys.argv[1], 'rb').read()) + '\n') | |
23 > EOF | |
24 | |
25 Initialize the test repository | |
26 | |
27 $ hg init repo | |
28 $ cd repo | |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
29 $ $PYTHON ../writepatterns.py a 0 5A 1B 5C 1D |
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
30 $ $PYTHON ../writepatterns.py b 1 1A 1B |
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
31 $ $PYTHON ../writepatterns.py c 1 5A |
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
32 $ $PYTHON ../writepatterns.py d 1 5A 1B |
12825 | 33 $ hg add |
34 adding a | |
35 adding b | |
36 adding c | |
37 adding d | |
38 $ hg ci -m addfiles | |
39 | |
40 Add file, missing a last end of line | |
41 | |
42 $ hg import --no-commit - <<EOF | |
43 > *** /dev/null 2010-10-16 18:05:49.000000000 +0200 | |
44 > --- b/newnoeol 2010-10-16 18:23:26.000000000 +0200 | |
45 > *************** | |
46 > *** 0 **** | |
47 > --- 1,2 ---- | |
48 > + a | |
49 > + b | |
50 > \ No newline at end of file | |
51 > *** a/a Sat Oct 16 16:35:51 2010 | |
52 > --- b/a Sat Oct 16 16:35:51 2010 | |
53 > *************** | |
54 > *** 3,12 **** | |
55 > A | |
56 > A | |
57 > A | |
58 > ! B | |
59 > C | |
60 > C | |
61 > C | |
62 > C | |
63 > C | |
64 > ! D | |
65 > \ No newline at end of file | |
66 > --- 3,13 ---- | |
67 > A | |
68 > A | |
69 > A | |
70 > ! E | |
71 > C | |
72 > C | |
73 > C | |
74 > C | |
75 > C | |
76 > ! F | |
77 > ! F | |
78 > | |
79 > *** a/b 2010-10-16 18:40:38.000000000 +0200 | |
80 > --- /dev/null 2010-10-16 18:05:49.000000000 +0200 | |
81 > *************** | |
82 > *** 1,2 **** | |
83 > - A | |
84 > - B | |
85 > --- 0 ---- | |
86 > *** a/c Sat Oct 16 21:34:26 2010 | |
87 > --- b/c Sat Oct 16 21:34:27 2010 | |
88 > *************** | |
89 > *** 3,5 **** | |
90 > --- 3,7 ---- | |
91 > A | |
92 > A | |
93 > A | |
94 > + B | |
95 > + B | |
96 > *** a/d Sat Oct 16 21:47:20 2010 | |
97 > --- b/d Sat Oct 16 21:47:22 2010 | |
98 > *************** | |
99 > *** 2,6 **** | |
100 > A | |
101 > A | |
102 > A | |
103 > - A | |
104 > - B | |
105 > --- 2,4 ---- | |
106 > EOF | |
107 applying patch from stdin | |
108 $ hg st | |
109 M a | |
110 M c | |
111 M d | |
112 A newnoeol | |
113 R b | |
114 | |
115 What's in a | |
116 | |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
117 $ $PYTHON ../cat.py a |
12825 | 118 'A\nA\nA\nA\nA\nE\nC\nC\nC\nC\nC\nF\nF\n' |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
119 $ $PYTHON ../cat.py newnoeol |
12825 | 120 'a\nb' |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
121 $ $PYTHON ../cat.py c |
12825 | 122 'A\nA\nA\nA\nA\nB\nB\n' |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
16913
diff
changeset
|
123 $ $PYTHON ../cat.py d |
12825 | 124 'A\nA\nA\nA\n' |
125 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12825
diff
changeset
|
126 $ cd .. |