Kiln » Fog Creek
Clone URL:  

Keep capitalization consistent.

Changeset cb7fd20c752c…

Parent 2032dd08b000…

by David Golub

Changes to 4 files · Browse files at cb7fd20c752c Showing diff from parent 2032dd08b000 Diff from another changeset...

Change 1 of 14 Show Entire File tests/​test-kiln.py Stacked
 
43
44
45
46
 
47
48
49
 
70
71
72
73
 
74
75
76
77
78
79
 
80
81
82
 
97
98
99
100
 
101
102
103
104
105
 
106
107
108
 
112
113
114
115
 
116
117
118
 
126
127
128
129
 
130
131
132
133
134
135
136
 
137
138
139
 
143
144
145
146
 
147
148
149
150
151
152
153
 
154
155
156
 
167
168
169
170
 
171
172
173
 
185
186
187
188
 
189
190
191
 
215
216
217
218
 
219
220
221
222
223
224
225
 
226
227
228
229
230
231
 
232
233
234
 
245
246
247
248
 
249
250
251
 
254
255
256
257
 
258
259
260
 
270
271
272
273
 
274
275
276
 
302
303
304
305
 
306
307
308
 
332
333
334
335
 
336
337
338
339
340
341
342
 
343
344
345
 
43
44
45
 
46
47
48
49
 
70
71
72
 
73
74
75
76
77
78
 
79
80
81
82
 
97
98
99
 
100
101
102
103
104
 
105
106
107
108
 
112
113
114
 
115
116
117
118
 
126
127
128
 
129
130
131
132
133
134
135
 
136
137
138
139
 
143
144
145
 
146
147
148
149
150
151
152
 
153
154
155
156
 
167
168
169
 
170
171
172
173
 
185
186
187
 
188
189
190
191
 
215
216
217
 
218
219
220
221
222
223
224
 
225
226
227
228
229
230
 
231
232
233
234
 
245
246
247
 
248
249
250
251
 
254
255
256
 
257
258
259
260
 
270
271
272
 
273
274
275
276
 
302
303
304
 
305
306
307
308
 
332
333
334
 
335
336
337
338
339
340
341
 
342
343
344
345
@@ -43,7 +43,7 @@
 ''')  hgt.hg(['commit', '-m', 'add files'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 0:da6857b8d2bf  tag: tip @@ -70,13 +70,13 @@
 kbfiles: 4 to upload  ''')  hgt.hg(['push'], - stdout='''pushing to %s/Repo/Test/Test/test + stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed one changeset  ''' % kilntest.KILNURL)  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  searching for changes @@ -97,12 +97,12 @@
 ''')  os.chdir('repo2')  hgt.hg(['in'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  ''' % kilntest.KILNURL, status=1)  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  searching for changes @@ -112,7 +112,7 @@
 hgt.writefile('b4', 'b44')  hgt.hg(['commit', '-m', 'edit n4 and b4'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 1:8499483c24d0  tag: tip @@ -126,14 +126,14 @@
   ''' % kilntest.KILNURL)  hgt.hg(['push'], - stdout='''pushing to %s/Repo/Test/Test/test + stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed one changeset  ''' % kilntest.KILNURL)  os.chdir('../repo1')  hgt.hg(['in'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 1:8499483c24d0  tag: tip @@ -143,14 +143,14 @@
   ''' % kilntest.KILNURL)  hgt.hg(['out'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  ''' % kilntest.KILNURL)  hgt.hg(['mv', 'n4', 'b4', 'a'])  hgt.hg(['commit', '-m', 'move n4 and b4'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 1:6b693340d9c6  tag: tip @@ -167,7 +167,7 @@
 # to stderr at some version after Mercurial 1.6. Just don't check stdout/stderr.  hgt.hg(['push'], stdout=hgtest.ANYTHING, stderr=hgtest.ANYTHING, status=[1, 255])  hgt.hg(['pull'], - stdout='''pulling from %s/Repo/Test/Test/test + stdout='''pulling from %s/Repo/Test/Test/Test  searching for changes  adding changesets  adding manifests @@ -185,7 +185,7 @@
 ''')  hgt.hg(['commit', '-m', 'merge'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 1:6b693340d9c6  user: test @@ -215,20 +215,20 @@
 searching for changes  kbfiles: 1 to upload  ''') -hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/test +hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed 2 changesets  ''' % kilntest.KILNURL)  os.chdir('../repo2')  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  searching for changes  kbfiles: No remote repo  ''' % kilntest.KILNURL) -hgt.hg(['in'], stdout='''comparing with %s/Repo/Test/Test/test +hgt.hg(['in'], stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 2:6b693340d9c6  parent: 0:da6857b8d2bf @@ -245,7 +245,7 @@
 summary: merge    ''' % kilntest.KILNURL) -hgt.hg(['pull'], stdout='''pulling from %s/Repo/Test/Test/test +hgt.hg(['pull'], stdout='''pulling from %s/Repo/Test/Test/Test  searching for changes  adding changesets  adding manifests @@ -254,7 +254,7 @@
 (run 'hg update' to get a working copy)  ''' % kilntest.KILNURL)  hgt.hg(['in'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  no changes found  ''' % kilntest.KILNURL, status=1) @@ -270,7 +270,7 @@
 hgt.writefile('a/b1', 'b11')  hgt.hg(['commit', '-m', 'edit n1 and b1'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 4:fdb0cdc62a97  tag: tip @@ -302,7 +302,7 @@
 hgt.writefile('a/b/b2', 'b22')  hgt.hg(['commit', '-m', 'edit n22 and b22'])  hgt.hg(['out', '--bf'], - stdout='''comparing with %s/Repo/Test/Test/test + stdout='''comparing with %s/Repo/Test/Test/Test  searching for changes  changeset: 4:fdb0cdc62a97  user: test @@ -332,14 +332,14 @@
 kbfiles: 2 to upload  ''')  hgt.hg(['push'], - stdout='''pushing to %s/Repo/Test/Test/test + stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed 2 changesets  ''' % kilntest.KILNURL)  os.chdir('../repo2')  hgt.hg(['pull'], - stdout='''pulling from %s/Repo/Test/Test/test + stdout='''pulling from %s/Repo/Test/Test/Test  searching for changes  adding changesets  adding manifests
Change 1 of 2 Show Entire File tests/​test-kilnnobfiles.py Stacked
 
43
44
45
46
 
47
48
49
 
62
63
64
65
 
66
67
68
 
43
44
45
 
46
47
48
49
 
62
63
64
 
65
66
67
68
@@ -43,7 +43,7 @@
 ''')  hgt.hg(['commit', '-m', 'add files'])  hgt.hg(['push'], - stdout='''pushing to %s/Repo/Test/Test/test + stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed one changeset @@ -62,7 +62,7 @@
  stdout='requesting all changes\n', log=False,   stderr='abort: HTTP Error 400: To access this repository, install the kiln-bfiles extension from %s/Tools\n' % kilntest.KILNURL, status=255)  os.chdir('repo1') -hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/test +hgt.hg(['push'], stdout='''pushing to %s/Repo/Test/Test/Test  searching for changes  remote: ERROR: Big file a/b1 at revision 1 has not been uploaded to the kiln server.  remote: ERROR: All big files must be uploaded to the kiln server before the repository is changed.
Change 1 of 1 Show Entire File tests/​test-schemes.py Stacked
 
42
43
44
45
 
46
47
48
 
42
43
44
 
45
46
47
48
@@ -42,7 +42,7 @@
 ''')  hgt.hg(['commit', '-m', 'add files'])  hgt.hg(['push'], - stdout='''pushing to localkiln://Repo/Test/Test/test + stdout='''pushing to localkiln://Repo/Test/Test/Test  searching for changes  searching for changes  remote: kiln: successfully pushed one changeset
Change 1 of 1 Show Entire File tests/​test-schemes.py.out Stacked
 
1
2
 
3
4
5
 
1
 
2
3
4
5
@@ -1,5 +1,5 @@
 % setup -hg clone localkiln://Repo/Test/Test/test repo1 +hg clone localkiln://Repo/Test/Test/Test repo1  hg add n1 b/n2 b/c/n3 ../n4  hg add --bf  hg commit -m 'add files'