Kiln » Unity3D Unity 3D's proposed fixes and extensions to Kiln BFiles
Clone URL:  
/ tests
test-rebase.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
#!/usr/bin/python # # Test rebasing # import os import common hgt = common.BfilesTester() hgt.updaterc() hgt.announce('test') os.mkdir('repo1') os.chdir('repo1') hgt.hg(['init']) hgt.writefile('n1', 'n1') hgt.hg(['add'], stdout=('adding n1\n')) hgt.hg(['commit', '-m', 'Add n1 repo1']) hgt.writefile('b1', 'b1') hgt.hg(['add', '--bf', 'b1']) hgt.hg(['commit', '-m', 'Add bfile b1 in repo1']) os.chdir('..') hgt.hg(['clone', 'repo1', 'repo2'], stdout=('updating to branch default\n' '2 files updated, 0 files merged, 0 files removed, 0 files unresolved\n' 'Getting changed bfiles\n' '1 big files updated, 0 removed\n')) os.chdir('repo1') hgt.writefile('b1', 'b11') hgt.hg(['commit', '-m', 'Modify bfile b1 in repo1']) os.chdir('../repo2') hgt.writefile('n1', 'n11') hgt.hg(['commit', '-m', 'Modify n1 in repo2']) hgt.hg(['pull', '--rebase'], stdout=('pulling from $HGTMP/test-rebase.py/repo1\n' 'searching for changes\n' 'adding changesets\n' 'adding manifests\n' 'adding file changes\n' 'added 1 changesets with 1 changes to 1 files (+1 heads)\n' 'Getting changed bfiles\n' '1 big files updated, 0 removed\n' 'saved backup bundle to $HGTMP/test-rebase.py/repo2/.hg/strip-backup/5d80f03f644c-backup.hg\n' 'nothing to rebase\n')) hgt.hg(['out', '--bf'], stdout=('comparing with $HGTMP/test-rebase.py/repo1\n' 'searching for changes\n' 'changeset: 3:168bfc518870\n' 'tag: tip\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1 in repo2\n' '\n' 'searching for changes\n' 'kbfiles to upload:\n' '\n')) hgt.writefile('n1', 'n111'); hgt.hg(['commit', '-m', 'Modify n1']) hgt.hg(['out', '--bf'], stdout=('comparing with $HGTMP/test-rebase.py/repo1\n' 'searching for changes\n' 'changeset: 3:168bfc518870\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1 in repo2\n' '\n' 'changeset: 4:76fa4c6125bc\n' 'tag: tip\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1\n' '\n' 'searching for changes\n' 'kbfiles to upload:\n' '\n')) hgt.hg(['update', '--clean'], stdout=('0 files updated, 0 files merged, 0 files removed, 0 files unresolved\n' 'Getting changed bfiles\n' '0 big files updated, 0 removed\n')) hgt.asserttrue(hgt.readfile('b1') == 'b11', "file contents don't match") # Now do the exact same thing with the rebase command instead of pull --rebase os.chdir('..') os.mkdir('repo3') os.chdir('repo3') hgt.hg(['init']) hgt.writefile('n1', 'n1') hgt.hg(['add'], stdout=('adding n1\n')) hgt.hg(['commit', '-m', 'Add n1 repo3']) hgt.writefile('b1', 'b1') hgt.hg(['add', '--bf', 'b1']) hgt.hg(['commit', '-m', 'Add bfile b1 in repo3']) os.chdir('..') hgt.hg(['clone', 'repo3', 'repo4'], stdout=('updating to branch default\n' '2 files updated, 0 files merged, 0 files removed, 0 files unresolved\n' 'Getting changed bfiles\n' '1 big files updated, 0 removed\n')) os.chdir('repo3') hgt.writefile('b1', 'b11') hgt.hg(['commit', '-m', 'Modify bfile b1 in repo3']) os.chdir('../repo4') hgt.writefile('n1', 'n11') hgt.hg(['commit', '-m', 'Modify n1 in repo4']) hgt.hg(['pull'], stdout=('pulling from $HGTMP/test-rebase.py/repo3\n' 'searching for changes\n' 'adding changesets\n' 'adding manifests\n' 'adding file changes\n' 'added 1 changesets with 1 changes to 1 files (+1 heads)\n' '(run \'hg heads\' to see heads, \'hg merge\' to merge)\n')) hgt.hg(['rebase'], stdout=('Getting changed bfiles\n' '1 big files updated, 0 removed\n' 'saved backup bundle to $HGTMP/test-rebase.py/repo4/.hg/strip-backup/589266dab166-backup.hg\n')) hgt.hg(['out', '--bf'], stdout=('comparing with $HGTMP/test-rebase.py/repo3\n' 'searching for changes\n' 'changeset: 3:e4dbf8fdf868\n' 'tag: tip\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1 in repo4\n' '\n' 'searching for changes\n' 'kbfiles to upload:\n' '\n')) hgt.writefile('n1', 'n111'); hgt.hg(['commit', '-m', 'Modify n1']) hgt.hg(['out', '--bf'], stdout=('comparing with $HGTMP/test-rebase.py/repo3\n' 'searching for changes\n' 'changeset: 3:e4dbf8fdf868\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1 in repo4\n' '\n' 'changeset: 4:26ba7897b44d\n' 'tag: tip\n' 'user: test\n' 'date: Thu Jan 01 00:00:00 1970 +0000\n' 'summary: Modify n1\n' '\n' 'searching for changes\n' 'kbfiles to upload:\n' '\n')) hgt.hg(['update', '--clean'], stdout=('0 files updated, 0 files merged, 0 files removed, 0 files unresolved\n' 'Getting changed bfiles\n' '0 big files updated, 0 removed\n')) hgt.asserttrue(hgt.readfile('b1') == 'b11', "file contents don't match")