forked from bloomreach/zinc
-
Notifications
You must be signed in to change notification settings - Fork 0
/
tests-clean.log
1300 lines (1180 loc) · 58.8 KB
/
tests-clean.log
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
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Running test against repository: _REPO_ROOT_://repo
Work directory: /tmp/zinc-testing/work
# Record Python version.
python -V
Python 2.7.5
### Setup
zinc init $root_uri
zinc newscope -R $root_uri -u user0 test_scope
new scope 'test_scope' at revision _REV_
zinc checkout -s test_scope $root_uri work_dir
initialized new working directory at: work_dir
checkout: scope 'test_scope' at revision _REV_ (0 files total)
zinc newscope -R $root_uri -u user0 another_scope --date '2010-01-01'
new scope 'another_scope' at revision _REV_
zinc checkout -s another_scope $root_uri work_dir
checkout: scope 'another_scope' at revision _REV_ (0 files total)
cd work_dir
### First working dir
mkdir test_scope/subdir1
create_file test_scope/file1 "contents of file1"
create_file test_scope/subdir1/file2 "contents of file2"
# S3 has a minimum filesize of 5MB for part size in multipart
create_file_of_size 50 test_scope/subdir1/bigfile
50+0 records in
50+0 records out
zinc status -s test_scope
A test_scope//file1
A test_scope//subdir1/bigfile
A test_scope//subdir1/file2
cd test_scope
zinc status
A test_scope//file1
A test_scope//subdir1/bigfile
A test_scope//subdir1/file2
cd subdir1
zinc status
A test_scope//file1
A test_scope//subdir1/bigfile
A test_scope//subdir1/file2
cd ../..
zinc commit -s test_scope -u user1 -m "first commit" --date '2010-01-01 9:00am'
committing changes (3 adds, 0 rms, 0 mods)
A test_scope//file1
A test_scope//subdir1/bigfile
A test_scope//subdir1/file2
uploading: /tmp/zinc-testing/work/work_dir/test_scope/.tmp.compressed.file1._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file1.lzo
uploading: /tmp/zinc-testing/work/work_dir/test_scope/subdir1/.tmp.compressed.bigfile._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
uploading: /tmp/zinc-testing/work/work_dir/test_scope/subdir1/.tmp.compressed.file2._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
sleep 1
mkdir test_scope/subdir2
create_file test_scope/subdir1/file3 "more contents"
create_file test_scope/subdir2/file4 "contents of file4, a different size"
rm test_scope/file1
create_file test_scope/file5 "more contents"
zinc status -s test_scope
R test_scope//file1
A test_scope//file5
A test_scope//subdir1/file3
A test_scope//subdir2/file4
zinc commit -s test_scope -u user2 -m "second commit"
committing changes (3 adds, 1 rms, 0 mods)
R test_scope//file1
A test_scope//file5
A test_scope//subdir1/file3
A test_scope//subdir2/file4
uploading: /tmp/zinc-testing/work/work_dir/test_scope/.tmp.compressed.file5._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file5.lzo
uploading: /tmp/zinc-testing/work/work_dir/test_scope/subdir1/.tmp.compressed.file3._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
uploading: /tmp/zinc-testing/work/work_dir/test_scope/subdir2/.tmp.compressed.file4._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
zinc tags -s test_scope
zinc tag -s test_scope my-first-tag
tagging scope 'test_scope' with tag 'my-first-tag' at revision _REV_
sleep 1
create_file test_scope/subdir1/file2 "new contents"
create_file test_scope/file6 "file6 contents"
rm test_scope/file5
zinc status -s test_scope
R test_scope//file5
A test_scope//file6
M test_scope//subdir1/file2
zinc commit -s test_scope -u user3 -m "another commit!
with multiple lines"
committing changes (1 adds, 1 rms, 1 mods)
R test_scope//file5
A test_scope//file6
M test_scope//subdir1/file2
uploading: /tmp/zinc-testing/work/work_dir/test_scope/.tmp.compressed.file6._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file6.lzo
uploading: /tmp/zinc-testing/work/work_dir/test_scope/subdir1/.tmp.compressed.file2._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
sleep 2
# Try MD5 checks for file of unchanged size
touch test_scope/file6
zinc status -s test_scope
create_file test_scope/file6 "file6 contentX"
touch -d 2000-01-01 test_scope/file6
zinc status -s test_scope
M test_scope//file6
create_file test_scope/file6 "file6 contents"
touch -d 2000-01-01 test_scope/file6
zinc status -s test_scope
sleep 1
zinc tag -s test_scope my-second-tag
tagging scope 'test_scope' with tag 'my-second-tag' at revision _REV_
zinc tag -s test_scope my-second-tag-duplicate
tagging scope 'test_scope' with tag 'my-second-tag-duplicate' at revision _REV_
# Testing reverts
rm test_scope/subdir1/file2
create_file test_scope/file6 "modified contents"
create_file test_scope/file7 "new file7"
create_file test_scope/file8 "new file8"
zinc revert -s test_scope file6
downloading: /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file6.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file6._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo
zinc status -s test_scope
A test_scope//file7
A test_scope//file8
R test_scope//subdir1/file2
ls -1 test_scope
file6
file6.orig
file7
file8
subdir1
subdir2
zinc revert -s test_scope subdir1/file2
downloading: /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
invalid argument: item not found in rev _REV_ of scope 'test_scope': bad_filename
Traceback (most recent call last):
run_command(command, command_args, options)
work.revert(options.scope, path_list=command_args)
ret = fn(*params, **kwargs)
raise InvalidArgument("item not found in rev %s of scope '%s': %s" % (rev, scope, path_list[items.index(None)]))
InvalidArgument: item not found in rev _REV_ of scope 'test_scope': bad_filename
(got expected error: status 1)
zinc status -s test_scope
A test_scope//file7
A test_scope//file8
zinc revert -s test_scope
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file7
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file8
zinc status -s test_scope
ls -1 test_scope
file6
file6.orig
file7.orig
file8.orig
subdir1
subdir2
invalid operation: nothing to commit at scope 'test_scope'
Traceback (most recent call last):
run_command(command, command_args, options)
work.commit(options.scope, user=options.user, message=options.message, time=commit_time, mod_all=options.mod_all)
ret = fn(*params, **kwargs)
raise InvalidOperation("nothing to commit at scope '%s'" % scope, suppressable=True)
InvalidOperation: nothing to commit at scope 'test_scope'
(got expected error: status 1)
zinc commit --suppress -s test_scope -u user3 -m "empty commit, will be ignored"
warning: nothing to commit at scope 'test_scope'
create_file test_scope/file7 "new file7, take 2"
zinc commit -s test_scope -u user3 -m "another commit"
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//file7
uploading: /tmp/zinc-testing/work/work_dir/test_scope/.tmp.compressed.file7._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
test_scope_rev=`zinc id -s test_scope`
zinc id -s test_scope
zinc tag -s test_scope -r $test_scope_rev my-third-tag
tagging scope 'test_scope' with tag 'my-third-tag' at revision _REV_
zinc status -s test_scope
zinc log -s test_scope
rev: _REV_ _DATE_
user: user3
message: another commit
changes: A file7
rev: _REV_ _DATE_
user: user3
message: another commit!
with multiple lines
changes: R file5, A file6, M subdir1/file2
rev: _REV_ _DATE_
user: user2
message: second commit
changes: R file1, A file5, A subdir1/file3, A subdir2/file4
rev: _REV_ _DATE_
user: user1
message: first commit
changes: A file1, A subdir1/bigfile, A subdir1/file2
rev: _REV_ _DATE_
user: user0
message: new scope at 'test_scope'
changes:
zinc tags -s test_scope
my-third-tag _REV_
my-second-tag _REV_
my-second-tag-duplicate _REV_
my-first-tag _REV_
zinc id -s test_scope
_REV_
zinc ids
another_scope _REV_
test_scope _REV_
zinc scopes
another_scope
test_scope
# Testing diff
create_file test_scope/file1 "contents of file1"
create_file test_scope/subdir1/file2 "contents of file2"
rm test_scope/subdir1/file3
zinc status -s test_scope
A test_scope//file1
M test_scope//subdir1/file2
R test_scope//subdir1/file3
zinc diff -s test_scope
diff --zinc between checkedout revision and uncommited local changes
scope: test_scope
--- /dev/null
+++ test_scope/file1
@@ -0,0 +1 @@
+contents of file1
--- test_scope/subdir1/file3
+++ /dev/null
@@ -1 +0,0 @@
-more contents
--- test_scope/subdir1/file2
+++ test_scope/subdir1/file2
@@ -1 +1 @@
-new contents
+contents of file2
zinc diff -s test_scope file1
diff --zinc between checkedout revision and uncommited local changes
scope: test_scope
paths: ['file1']
--- /dev/null
+++ test_scope/file1
@@ -0,0 +1 @@
+contents of file1
zinc diff -s test_scope subdir1/file4
zinc diff -s test_scope file1 subdir1/file2
diff --zinc between checkedout revision and uncommited local changes
scope: test_scope
paths: ['file1', 'subdir1/file2']
--- /dev/null
+++ test_scope/file1
@@ -0,0 +1 @@
+contents of file1
--- test_scope/subdir1/file2
+++ test_scope/subdir1/file2
@@ -1 +1 @@
-new contents
+contents of file2
zinc revert -s test_scope
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file1
zinc status -s test_scope
zinc diff -s test_scope -r my-first-tag
diff --zinc between --rev 'my-first-tag' and checkedout revision
scope: test_scope
--- /dev/null
+++ test_scope/file7
@@ -0,0 +1 @@
+new file7, take 2
--- /dev/null
+++ test_scope/file6
@@ -0,0 +1 @@
+file6 contents
--- test_scope/file5
+++ /dev/null
@@ -1 +0,0 @@
-more contents
--- test_scope/subdir1/file2
+++ test_scope/subdir1/file2
@@ -1 +1 @@
-contents of file2
+new contents
create_file test_scope/file1 "contents of file1"
create_file test_scope/subdir1/file2 "contents of file2"
rm test_scope/subdir1/file3
zinc status -s test_scope
A test_scope//file1
M test_scope//subdir1/file2
R test_scope//subdir1/file3
zinc diff -s test_scope -r my-first-tag
diff --zinc between --rev 'my-first-tag' and uncommitted local changes
scope: test_scope
--- /dev/null
+++ test_scope/file1
@@ -0,0 +1 @@
+contents of file1
--- /dev/null
+++ test_scope/file7
@@ -0,0 +1 @@
+new file7, take 2
--- /dev/null
+++ test_scope/file6
@@ -0,0 +1 @@
+file6 contents
--- test_scope/subdir1/file3
+++ /dev/null
@@ -1 +0,0 @@
-more contents
--- test_scope/file5
+++ /dev/null
@@ -1 +0,0 @@
-more contents
zinc diff -s test_scope -r my-first-tag file1
diff --zinc between --rev 'my-first-tag' and uncommitted local changes
scope: test_scope
paths: ['file1']
--- /dev/null
+++ test_scope/file1
@@ -0,0 +1 @@
+contents of file1
zinc diff -s test_scope -r my-first-tag subdir1/file3
diff --zinc between --rev 'my-first-tag' and uncommitted local changes
scope: test_scope
paths: ['subdir1/file3']
--- test_scope/subdir1/file3
+++ /dev/null
@@ -1 +0,0 @@
-more contents
zinc diff -s test_scope -r my-first-tag:my-second-tag
diff --zinc between --rev 'my-first-tag' and --rev 'my-second-tag'
scope: test_scope
--- /dev/null
+++ test_scope/file6
@@ -0,0 +1 @@
+file6 contents
--- test_scope/file5
+++ /dev/null
@@ -1 +0,0 @@
-more contents
--- test_scope/subdir1/file2
+++ test_scope/subdir1/file2
@@ -1 +1 @@
-contents of file2
+new contents
zinc diff -s test_scope -r my-first-tag:my-second-tag file1
zinc status -s test_scope
A test_scope//file1
M test_scope//subdir1/file2
R test_scope//subdir1/file3
zinc diff -s test_scope > test.patch
zinc revert -s test_scope
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file1
zinc status -s test_scope
patch -p0 < test.patch
patching file test_scope/file1
patching file test_scope/subdir1/file3
patching file test_scope/subdir1/file2
zinc status -s test_scope
A test_scope//file1
M test_scope//subdir1/file2
R test_scope//subdir1/file3
zinc revert -s test_scope
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file1
zinc diff -s test_scope
rm test_scope/file1.orig
rm test_scope/subdir1/file2.orig
### Second working dir
cd $work
# show the log starting from tip even without checking out
zinc log -R $root_uri -s test_scope
rev: _REV_ _DATE_
user: user3
message: another commit
changes: A file7
rev: _REV_ _DATE_
user: user3
message: another commit!
with multiple lines
changes: R file5, A file6, M subdir1/file2
rev: _REV_ _DATE_
user: user2
message: second commit
changes: R file1, A file5, A subdir1/file3, A subdir2/file4
rev: _REV_ _DATE_
user: user1
message: first commit
changes: A file1, A subdir1/bigfile, A subdir1/file2
rev: _REV_ _DATE_
user: user0
message: new scope at 'test_scope'
changes:
zinc checkout -s test_scope -r my-first-tag $root_uri work_dir_alt
initialized new working directory at: work_dir_alt
checkout: scope 'test_scope' at revision _REV_ (5 files total)
updating files: 5 adds, 0 rms, 0 mods (no conflicting local changes)
downloading: work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file5.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file5.lzo
copying from cache: work_dir_alt/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file5._REV_ from work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file5.lzo
downloading: work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
copying from cache: work_dir_alt/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.bigfile._REV_ from work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
downloading: work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: work_dir_alt/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
downloading: work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
copying from cache: work_dir_alt/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
downloading: work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
copying from cache: work_dir_alt/test_scope/.tmp-copy._REV_/subdir2/.tmp.compressed-download.file4._REV_ from work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
cd work_dir_alt
zinc ids
test_scope _REV_
zinc update -s test_scope -r my-second-tag
update: scope 'test_scope' at revision _REV_ (5 files total)
updating files: 1 adds, 1 rms, 1 mods (no conflicting local changes)
downloading: /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file6.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_alt/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file6._REV_ from /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo
downloading: /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_alt/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
deleting: /tmp/zinc-testing/work/work_dir_alt/test_scope/file5
zinc update -s test_scope
update: scope 'test_scope' at revision _REV_ (6 files total)
updating files: 1 adds, 0 rms, 0 mods (no conflicting local changes)
downloading: /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_alt/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file7._REV_ from /tmp/zinc-testing/work/work_dir_alt/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo
create_file test_scope/added_file "an added file"
zinc commit -s test_scope -u user4 -m "commit from a different working dir"
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//added_file
uploading: /tmp/zinc-testing/work/work_dir_alt/test_scope/.tmp.compressed.added_file._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/added_file.lzo
zinc ids
test_scope _REV_
diff -r --brief test_scope/subdir1 $work/work_dir/test_scope/subdir1
### Third working dir
cd $work
zinc checkout --all $root_uri work_dir_all
initialized new working directory at: work_dir_all
checking out 2 scopes
checkout: scope 'another_scope' at revision _REV_ (0 files total)
checkout: scope 'test_scope' at revision _REV_ (7 files total)
updating files: 7 adds, 0 rms, 0 mods (no conflicting local changes)
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/added_file.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/.tmp.compressed-download.added_file._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file6.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file6._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file7._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.bigfile._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
downloading: work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
copying from cache: work_dir_all/test_scope/.tmp-copy._REV_/subdir2/.tmp.compressed-download.file4._REV_ from work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
cd work_dir_all
zinc tag --work tagging-things-at-once
tagging scope 'another_scope' with tag 'tagging-things-at-once' at revision _REV_
tagging scope 'test_scope' with tag 'tagging-things-at-once' at revision _REV_
zinc update --work
updating 2 scopes
update: scope 'another_scope' at revision _REV_ (0 files total)
update: scope 'test_scope' at revision _REV_ (7 files total)
zinc update --all
updating 2 scopes and checking out 0 new scopes
update: scope 'another_scope' at revision _REV_ (0 files total)
update: scope 'test_scope' at revision _REV_ (7 files total)
### First working dir again
cd $work
cd work_dir
create_file test_scope/new_file_from_another_work_dir "contents"
# show the log starting from the checkedout rev
zinc log -s test_scope
rev: _REV_ _DATE_
user: user3
message: another commit
changes: A file7
rev: _REV_ _DATE_
user: user3
message: another commit!
with multiple lines
changes: R file5, A file6, M subdir1/file2
rev: _REV_ _DATE_
user: user2
message: second commit
changes: R file1, A file5, A subdir1/file3, A subdir2/file4
rev: _REV_ _DATE_
user: user1
message: first commit
changes: A file1, A subdir1/bigfile, A subdir1/file2
rev: _REV_ _DATE_
user: user0
message: new scope at 'test_scope'
changes:
zinc update -s test_scope
update: scope 'test_scope' at revision _REV_ (7 files total)
updating files: 1 adds, 0 rms, 0 mods (have 1 adds, 0 rms, 0 mods of non-conflicting local changes)
downloading: /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/added_file.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/.tmp.compressed-download.added_file._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo
# show the log starting from tip
zinc log -s test_scope
rev: _REV_ _DATE_
user: user4
message: commit from a different working dir
changes: A added_file
rev: _REV_ _DATE_
user: user3
message: another commit
changes: A file7
rev: _REV_ _DATE_
user: user3
message: another commit!
with multiple lines
changes: R file5, A file6, M subdir1/file2
rev: _REV_ _DATE_
user: user2
message: second commit
changes: R file1, A file5, A subdir1/file3, A subdir2/file4
rev: _REV_ _DATE_
user: user1
message: first commit
changes: A file1, A subdir1/bigfile, A subdir1/file2
rev: _REV_ _DATE_
user: user0
message: new scope at 'test_scope'
changes:
zinc commit -s test_scope -u user5 -m "committing from original working dir"
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//new_file_from_another_work_dir
uploading: /tmp/zinc-testing/work/work_dir/test_scope/.tmp.compressed.new_file_from_another_work_dir._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
create_file test_scope/non_conflicting_file "modifying this file should be fine since it is new"
zinc update -s test_scope -r my-first-tag
update: scope 'test_scope' at revision _REV_ (5 files total)
updating files: 1 adds, 4 rms, 1 mods (have 1 adds, 0 rms, 0 mods of non-conflicting local changes)
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file5._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_f/_REV_/file5.lzo
copying from cache: /tmp/zinc-testing/work/work_dir/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
deleting: /tmp/zinc-testing/work/work_dir/test_scope/added_file
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file6
deleting: /tmp/zinc-testing/work/work_dir/test_scope/file7
deleting: /tmp/zinc-testing/work/work_dir/test_scope/new_file_from_another_work_dir
create_file test_scope/file6 "modifying this file locally so next update will have conflicts"
local changes conflict with update for scope 'test_scope':
A file6
invalid operation: Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge
Traceback (most recent call last):
run_command(command, command_args, options)
work.update(options.scope, rev, force=options.force)
ret = fn(*params, **kwargs)
raise InvalidOperation("Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge")
InvalidOperation: Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge
(got expected error: status 1)
cat .zinc/checkout-state
# znval 1.0
# Checkout state for this working directory, for all currently checked out scopes.
%%>>checkouts
mode=auto;rev=_REV_;scope=another_scope
mode=auto;rev=_REV_;scope=test_scope
%%>>fingerprints
test_scope/file5 md5=1a9849d8795ab13d6e9eac9bff73d0eb;mtime=_MTIME_;size=14;state=tracked;type=file
test_scope/subdir1/bigfile md5=6c89658d051ac5d1938ae1b749700753;mtime=_MTIME_;size=50000000;state=tracked;type=file
test_scope/subdir1/file2 md5=4c6a3c4dc7a6778f52f5d424a0bbb1b0;mtime=_MTIME_;size=18;state=tracked;type=file
test_scope/subdir1/file3 md5=1a9849d8795ab13d6e9eac9bff73d0eb;mtime=_MTIME_;size=14;state=tracked;type=file
test_scope/subdir2/file4 md5=0764db4c531b547fbffd01e2341d0851;mtime=_MTIME_;size=36;state=tracked;type=file
### Third working dir again
cd $work
cd work_dir_all
zinc newscope -u user5 -R $root_uri new_scope
new scope 'new_scope' at revision _REV_
zinc update --all
updating 2 scopes and checking out 1 new scopes
update: scope 'another_scope' at revision _REV_ (0 files total)
update: scope 'test_scope' at revision _REV_ (8 files total)
updating files: 1 adds, 0 rms, 0 mods (no conflicting local changes)
downloading: /tmp/zinc-testing/work/work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp-copy._REV_/.tmp.compressed-download.new_file_from_another_work_dir._REV_ from /tmp/zinc-testing/work/work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
checkout: scope 'new_scope' at revision _REV_ (0 files total)
rm test_scope/file6
create_file test_scope/file7 "modifying file7"
create_file test_scope/file8 "creating a new file"
create_file new_scope/file_in_new_scope "creating a new file in second scope"
zinc status --work
A new_scope//file_in_new_scope
R test_scope//file6
M test_scope//file7
A test_scope//file8
zinc commit --work -u user6 -m "committing multiple scopes at once"
committing scope 'another_scope'
committing scope 'new_scope'
committing changes (1 adds, 0 rms, 0 mods)
A new_scope//file_in_new_scope
uploading: /tmp/zinc-testing/work/work_dir_all/new_scope/.tmp.compressed.file_in_new_scope._REV_ to _REPO_ROOT_://repo/_s/new_scope/_f/_REV_/file_in_new_scope.lzo
committing scope 'test_scope'
committing changes (1 adds, 1 rms, 1 mods)
R test_scope//file6
M test_scope//file7
A test_scope//file8
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file7._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file8._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file8.lzo
cat .zinc/checkout-state
# znval 1.0
# Checkout state for this working directory, for all currently checked out scopes.
%%>>checkouts
mode=auto;rev=_REV_;scope=another_scope
mode=auto;rev=_REV_;scope=new_scope
mode=auto;rev=_REV_;scope=test_scope
%%>>fingerprints
new_scope/file_in_new_scope md5=ed16d1427acf76edbe88f69cf015cff1;mtime=_MTIME_;size=36;state=tracked;type=file
test_scope/added_file md5=57d565c800694cc54b8783feeafb85e2;mtime=_MTIME_;size=14;state=tracked;type=file
test_scope/file7 md5=6071875417947adc75eb2129e49bcca3;mtime=_MTIME_;size=16;state=tracked;type=file
test_scope/file8 md5=5a28465185cf35544be29d42a74c3f5f;mtime=_MTIME_;size=20;state=tracked;type=file
test_scope/new_file_from_another_work_dir md5=e66545a2155380046fce3fdbd32a6b4f;mtime=_MTIME_;size=9;state=tracked;type=file
test_scope/subdir1/bigfile md5=6c89658d051ac5d1938ae1b749700753;mtime=_MTIME_;size=50000000;state=tracked;type=file
test_scope/subdir1/file2 md5=9eb25d3d6dbffd757fc09b4f879bafda;mtime=_MTIME_;size=13;state=tracked;type=file
test_scope/subdir1/file3 md5=1a9849d8795ab13d6e9eac9bff73d0eb;mtime=_MTIME_;size=14;state=tracked;type=file
test_scope/subdir2/file4 md5=0764db4c531b547fbffd01e2341d0851;mtime=_MTIME_;size=36;state=tracked;type=file
# Test error suppression
invalid operation: scope already exists: new_scope
Traceback (most recent call last):
run_command(command, command_args, options)
repo.create_scope(scope, user=options.user, message=options.message, time=commit_time)
ret = fn(*params, **kwargs)
raise InvalidOperation("scope already exists: %s" % path, suppressable=True)
InvalidOperation: scope already exists: new_scope
(got expected error: status 1)
zinc newscope -u user5 -R $root_uri --suppress new_scope
warning: scope already exists: new_scope
### Compression
create_file test_scope/file9 "another file for compression"
zinc commit --work --compression=lzo -u user6 -m "committing with compression on"
committing scope 'another_scope'
committing scope 'new_scope'
committing scope 'test_scope'
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//file9
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file9._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file9.lzo
create_file test_scope/file10 "another file no compression"
zinc commit --work --compression=raw -u user6 -m "committing with compression off"
committing scope 'another_scope'
committing scope 'new_scope'
committing scope 'test_scope'
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//file10
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/file10 to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file10
zinc tag --work mixed-compression
tagging scope 'another_scope' with tag 'mixed-compression' at revision _REV_
tagging scope 'new_scope' with tag 'mixed-compression' at revision _REV_
tagging scope 'test_scope' with tag 'mixed-compression' at revision _REV_
zinc status --work --mod-all
M new_scope//file_in_new_scope
M test_scope//added_file
M test_scope//file10
M test_scope//file7
M test_scope//file8
M test_scope//file9
M test_scope//new_file_from_another_work_dir
M test_scope//subdir1/bigfile
M test_scope//subdir1/file2
M test_scope//subdir1/file3
M test_scope//subdir2/file4
zinc status -s test_scope --mod-all
M test_scope//added_file
M test_scope//file10
M test_scope//file7
M test_scope//file8
M test_scope//file9
M test_scope//new_file_from_another_work_dir
M test_scope//subdir1/bigfile
M test_scope//subdir1/file2
M test_scope//subdir1/file3
M test_scope//subdir2/file4
zinc commit --work --mod-all --compression=lzo -u user7 -m "recommitting with compression on for all files"
committing scope 'another_scope'
committing scope 'new_scope'
committing changes (0 adds, 0 rms, 1 mods)
M new_scope//file_in_new_scope
uploading: /tmp/zinc-testing/work/work_dir_all/new_scope/.tmp.compressed.file_in_new_scope._REV_ to _REPO_ROOT_://repo/_s/new_scope/_f/_REV_/file_in_new_scope.lzo
committing scope 'test_scope'
committing changes (0 adds, 0 rms, 10 mods)
M test_scope//added_file
M test_scope//file10
M test_scope//file7
M test_scope//file8
M test_scope//file9
M test_scope//new_file_from_another_work_dir
M test_scope//subdir1/bigfile
M test_scope//subdir1/file2
M test_scope//subdir1/file3
M test_scope//subdir2/file4
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.added_file._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/added_file.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file10._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file10.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file7._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file8._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file8.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.file9._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file9.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/.tmp.compressed.new_file_from_another_work_dir._REV_ to _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/subdir1/.tmp.compressed.bigfile._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/subdir1/.tmp.compressed.file2._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/subdir1/.tmp.compressed.file3._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
uploading: /tmp/zinc-testing/work/work_dir_all/test_scope/subdir2/.tmp.compressed.file4._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
### Ignore files
create_file test_scope/junk1.orig "this file should be ignored"
create_file test_scope/junk2.bak "this file should be ignored"
create_file test_scope/.junk3 "this file should be ignored"
create_file test_scope/.tmp.junk4 "this file should be ignored"
mkdir -p test_scope/.tmp-copy._REV_/some-path
create_file test_scope/.tmp-copy._REV_/some-path/junk5 "this whole directory should be ignored"
zinc status --work
### Test track, untrack, and checkout --mode partial, and status --full
cd $work
zinc checkout -s test_scope --mode partial $root_uri work_dir_track
initialized new working directory at: work_dir_track
checkout: scope 'test_scope' at revision _REV_ (10 files total)
cd work_dir_track
zinc tag -s test_scope my-fourth-tag
tagging scope 'test_scope' with tag 'my-fourth-tag' at revision _REV_
zinc track -s test_scope subdir1/file3
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
no conflicting local changes
updating files: 1 adds, 0 rms, 0 mods
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
zinc status -s test_scope --full
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
create_file test_scope/subdir1/file3 "modify contents"
zinc status -s test_scope --full
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
M test_scope//subdir1/file3
zinc commit -s test_scope -u user8 -m "partial commiting"
committing changes (0 adds, 0 rms, 1 mods)
M test_scope//subdir1/file3
uploading: /tmp/zinc-testing/work/work_dir_track/test_scope/subdir1/.tmp.compressed.file3._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
zinc status -s test_scope --full
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
zinc untrack -s test_scope subdir1/file3
zinc track -s test_scope subdir1/file3
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
preserving files: 1 adds, 0 rms, 0 mods (assuming these changes in working directory are ahead of those in repository)
zinc status -s test_scope --full #=> should not say that subdir1/file3 is modifiled since it is not modified
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
no conflicting local changes
invalid operation: missing file: '/tmp/zinc-testing/work/work_dir_track/test_scope/subdir1/file11'
Traceback (most recent call last):
run_command(command, command_args, options)
work.track(checkout.scope, track_path_list=command_args, mode=options.mode, no_download=options.no_download, recursive=options.recursive)
ret = fn(*params, **kwargs)
self.checkout_state._check_file_exists(local_path) # sanity check
raise InvalidOperation("missing file: '%s'" % full_path)
InvalidOperation: missing file: '/tmp/zinc-testing/work/work_dir_track/test_scope/subdir1/file11'
(got expected error: status 1)
create_file test_scope/subdir1/file11 "new file"
zinc track -s test_scope subdir1/file11
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
no conflicting local changes
newly tracking: 1 adds, 0 rms, 0 mods (files that are not in repository yet)
create_file test_scope/untracked "this files is not tracked"
zinc status -s test_scope --full #=> test_scope/untracked is not tracked yet
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
Untracked local file: test_scope/untracked
A test_scope//subdir1/file11
zinc track -s test_scope --mode auto #=> switch to auto mode
track: scope 'test_scope' at revision _REV_ in tracking mode 'auto'
no conflicting local changes
updating files: 9 adds, 0 rms, 0 mods
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/added_file.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.added_file._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file10.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file10.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file10._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file10.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file7.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file7._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file8.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file8.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file8._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file8.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file9.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file9.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file9._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/file9.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/.tmp.compressed-download.new_file_from_another_work_dir._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.bigfile._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir2/.tmp.compressed-download.file4._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
invalid operation: scope test_scope is not in partial tracking mode; cannot untrack files
Traceback (most recent call last):
run_command(command, command_args, options)
work.untrack(checkout.scope, command_args, options.mode, recursive=options.recursive)
ret = fn(*params, **kwargs)
raise InvalidOperation("scope %s is not in %s tracking mode; cannot untrack files" % (scope, Mode.PARTIAL))
InvalidOperation: scope test_scope is not in partial tracking mode; cannot untrack files
(got expected error: status 1)
zinc status -s test_scope --full #=> test_scope/untracked will show up as well as other changes
status: scope 'test_scope' at revision _REV_ in tracking mode 'auto'
A test_scope//subdir1/file11
A test_scope//untracked
zinc track -s test_scope --mode partial #=> switch back to partial mode
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
no conflicting local changes
zinc commit -s test_scope -u user8 -m "partial commiting2"
committing changes (1 adds, 0 rms, 0 mods)
A test_scope//subdir1/file11
uploading: /tmp/zinc-testing/work/work_dir_track/test_scope/subdir1/.tmp.compressed.file11._REV_ to _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file11.lzo
zinc status -s test_scope
rm test_scope/untracked
zinc untrack -s test_scope subdir1/file11
rm test_scope/subdir1/file11
zinc track -s test_scope subdir1/file11 --no-download #=> does not perform download
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
no conflicting local changes
updating files: 1 adds, 0 rms, 0 mods
zinc status -s test_scope #=> shows that subdir1/file11 is deleted
R test_scope//subdir1/file11
zinc commit -s test_scope -u user8 -m "partial commiting3" #=> delete subdir1/file11 without downloading it
committing changes (0 adds, 1 rms, 0 mods)
R test_scope//subdir1/file11
zinc update -s test_scope -r my-fourth-tag #=> go back to previous rev
update: scope 'test_scope' at revision _REV_ (10 files total)
updating files: 0 adds, 0 rms, 1 mods (no conflicting local changes)
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
zinc untrack -s test_scope subdir1/file3
zinc update -s test_scope
update: scope 'test_scope' at revision _REV_ (10 files total)
zinc track -s test_scope subdir1/file3
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
preserving files: 1 adds, 0 rms, 0 mods (assuming these changes in working directory are ahead of those in repository)
zinc status -s test_scope #=> shows that subdir1/file3 is modifiled
M test_scope//subdir1/file3
local changes conflict with update for scope 'test_scope':
M subdir1/file3
invalid operation: Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge
Traceback (most recent call last):
run_command(command, command_args, options)
work.update(options.scope, rev, force=options.force)
ret = fn(*params, **kwargs)
raise InvalidOperation("Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge")
InvalidOperation: Zinc does not currently support automatic merges: must revert locally changed files, update, and then manually merge
(got expected error: status 1)
cat test_scope/subdir1/file3 #=> should be "more contents"
more contents
zinc revert -s test_scope #=> this should download the newest version of subdir1/file3
downloading: /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
copying from cache: /tmp/zinc-testing/work/work_dir_track/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from /tmp/zinc-testing/work/work_dir_track/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
cat test_scope/subdir1/file3 #=> should be "modify contents"
modify contents
zinc status -s test_scope
#### wildcard test
zinc untrack -s test_scope "subdir1/*"
zinc status -s test_scope --full
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
Untracked local file: test_scope/subdir1/bigfile
Untracked local file: test_scope/subdir1/file2
Untracked local file: test_scope/subdir1/file3
zinc track -s test_scope "*file*" --recursive
track: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
Warning: scope test_scope path added_file is already tracked
Warning: scope test_scope path file10 is already tracked
Warning: scope test_scope path file7 is already tracked
Warning: scope test_scope path file8 is already tracked
Warning: scope test_scope path file9 is already tracked
Warning: scope test_scope path new_file_from_another_work_dir is already tracked
Warning: scope test_scope path subdir2/file4 is already tracked
preserving files: 3 adds, 0 rms, 0 mods (assuming these changes in working directory are ahead of those in repository)
zinc status -s test_scope --full
status: scope 'test_scope' at revision _REV_ in tracking mode 'partial'
### Another working dir, but no caching
cd $work
zinc checkout --no-cache -s test_scope -r my-first-tag $root_uri work_dir_no_cache
initialized new working directory at: work_dir_no_cache
checkout: scope 'test_scope' at revision _REV_ (5 files total)
updating files: 5 adds, 0 rms, 0 mods (no conflicting local changes)
downloading: work_dir_no_cache/test_scope/.tmp-copy._REV_/.tmp.compressed-download.file5._REV_ from _REPO_ROOT_://repo/_s/test_scope/_f/_REV_/file5.lzo
downloading: work_dir_no_cache/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.bigfile._REV_ from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
downloading: work_dir_no_cache/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file2._REV_ from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
downloading: work_dir_no_cache/test_scope/.tmp-copy._REV_/subdir1/.tmp.compressed-download.file3._REV_ from _REPO_ROOT_://repo/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
downloading: work_dir_no_cache/test_scope/.tmp-copy._REV_/subdir2/.tmp.compressed-download.file4._REV_ from _REPO_ROOT_://repo/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
### Check internal .zinc state
ls_pretty work_dir_all/.zinc
78 work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/added_file.lzo
74 work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file6.lzo
77 work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/file7.lzo
93 work_dir_all/.zinc/cache/contents/_s/test_scope/_f/_REV_/new_file_from_another_work_dir.lzo
271854 work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/bigfile.lzo
72 work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file2.lzo
73 work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir1/_f/_REV_/file3.lzo
95 work_dir_all/.zinc/cache/contents/_s/test_scope/_s/subdir2/_f/_REV_/file4.lzo
1293 work_dir_all/.zinc/cache/state
1134 work_dir_all/.zinc/cache/state.orig
1555 work_dir_all/.zinc/checkout-state
1555 work_dir_all/.zinc/checkout-state.orig
49 work_dir_all/.zinc/config
ls_pretty work_dir_no_cache/.zinc
762 work_dir_no_cache/.zinc/checkout-state
49 work_dir_no_cache/.zinc/config
### Repo-only commands
cd $work
zinc list -R $root_uri -s test_scope
test_scope//added_file
test_scope//file10
test_scope//file7
test_scope//file8
test_scope//file9
test_scope//new_file_from_another_work_dir
zinc list -R $root_uri -s test_scope subdir1
test_scope//subdir1/bigfile
test_scope//subdir1/file2
test_scope//subdir1/file3
zinc list -R $root_uri -s test_scope --short-paths subdir1
subdir1/bigfile
subdir1/file2
subdir1/file3
zinc list -R $root_uri -s test_scope -a
test_scope//added_file
test_scope//file10
test_scope//file7
test_scope//file8
test_scope//file9
test_scope//new_file_from_another_work_dir
test_scope//subdir1/bigfile
test_scope//subdir1/file2
test_scope//subdir1/file3
test_scope//subdir2/file4
zinc list -R $root_uri -s test_scope -a --short-paths
added_file
file10
file7
file8
file9