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
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
|
====================
Bazaar Release Notes
====================
.. contents::
IN DEVELOPMENT
==============
NOTES WHEN UPGRADING:
CHANGES:
FEATURES:
* New ``authentication.conf`` file holding the password or other credentials
for remote servers. This can be used for ssh, sftp, smtp and other
supported transports.
(Vincent Ladeuil)
PERFORMANCE:
* Commit updates the state of the working tree via a delta rather than
supplying entirely new basis trees. For commit of a single specified file
this reduces the wall clock time for commit by roughly a 30%.
(Robert Collins, Martin Pool)
* Fetch with pack repositories will no longer read the entire history graph.
(Robert Collins, #88319)
* Revert takes out an appropriate lock when reverting to a basis tree, and
does not read the basis inventory twice. (Robert Collins)
IMPROVEMENTS:
* ``bzr tags`` now prints the revision number for each tag, instead of
the revision id, unless --show-ids is passed. In addition, tags can be
sorted chronologically instead of lexicographically with --sort=time.
(Adeodato Simó, #120231)
DOCUMENTATION:
BUG FIXES:
* A progress bar has been added for knitpack -> knitpack fetching.
(Robert Collins, #157789)
* Do no use timeout in HttpServer anymore.
(Vincent Ladeuil, #158972).
* Don't catch the exceptions related to the http pipeline status before
retrying an http request or some programming errors may be masked.
(Vincent Ladeuil, #160012)
* Don't use timeout in HttpServer anymore.
(Vincent Ladeuil, #158972).
* FTP server errors don't error in the error handling code.
(Robert Collins, #161240)
* Obsolete packs are now cleaned up by pack and autopack operations.
(Robert Collins, #153789)
* Reconcile now shows progress bars. (Robert Collins, #159351)
* ``RemoteBranch`` was not initializing ``self._revision_id_to_revno_map``
properly. (John Arbash Meinel, #162486)
* Unicode-safe output from ``bzr info``. The output will be encoded
using the terminal encoding and unrepresentable characters will be
replaced by '?'. (Lukáš Lalinský, #151844)
* Wrap medusa ftp test server as an FTPServer feature.
(Vincent Ladeuil, #157752)
* Fix exception when ScopeReplacer is assigned to before any members have
been retrieved. (Aaron Bentley)
API BREAKS:
* ``osutils.backup_file`` is deprecated. Actually it's not used in bzrlib
during very long time. (Alexander Belchenko)
INTERNALS:
TESTING:
bzr 0.92rc1 2007-10-29
======================
NOTES WHEN UPGRADING:
CHANGES:
* ``bzr`` now returns exit code 4 if an internal error occurred, and
3 if a normal error occurred. (Martin Pool)
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
repository index errors that occured as a result of the Weave disk format.
Instead the ``reconcile`` command needs to be run to correct those
problems if they exist (and it has been able to fix most such problems
since bzr 0.8). Some new problems have been identified during this release
and you should run ``bzr check`` once on every repository to see if you
need to reconcile. If you cannot ``pull`` or ``merge`` from a remote
repository due to mismatched parent errors - a symptom of index errors -
you should simply take a full copy of that remote repository to a clean
directory outside any local repositories, then run reconcile on it, and
finally pull from it locally. (And naturally email the repositories owner
to ask them to upgrade and run reconcile).
(Robert Collins)
FEATURES:
* New ``knitpack-experimental`` repository format. This is interoperable with
the ``dirstate-tags`` format but uses a smarter storage design that greatly
speeds up many operations, both local and remote. This new format can be
used as an option to the ``init``, ``init-repository`` and ``upgrade``
commands. See http://doc.bazaar-vcs.org/latest/developers/knitpack.html
for further details. (Robert Collins)
* For users of bzr-svn (and those testing the prototype subtree support) that
wish to try packs, a new ``knitpack-subtree-experimental`` format has also
been added. This is interoperable with the ``dirstate-subtrees`` format.
(Robert Collins)
* New ``reconfigure`` command. (Aaron Bentley)
* New ``revert --forget-merges`` command, which removes the record of a pending
merge without affecting the working tree contents. (Martin Pool)
* New ``bzr_remote_path`` configuration variable allows finer control of
remote bzr locations than BZR_REMOTE_PATH environment variable.
(Aaron Bentley)
* New ``launchpad-login`` command to tell Bazaar your Launchpad
user ID. This can then be used by other functions of the
Launchpad plugin. (James Henstridge)
PERFORMANCE:
* Commit in quiet mode is now slightly faster as the information to
output is no longer calculated. (Ian Clatworthy)
* Commit no longer checks for new text keys during insertion when the
revision id was deterministically unique. (Robert Collins)
* Committing a change which is not a merge and does not change the number of
files in the tree is faster by utilising the data about whether files are
changed to determine if the tree is unchanged rather than recalculating
it at the end of the commit process. (Robert Collins)
* Inventory serialisation no longer double-sha's the content.
(Robert Collins)
* Knit text reconstruction now avoids making copies of the lines list for
interim texts when building a single text. The new ``apply_delta`` method
on ``KnitContent`` aids this by allowing modification of the revision id
such objects represent. (Robert Collins)
* Pack indices are now partially parsed for specific key lookup using a
bisection approach. (Robert Collins)
* Partial commits are now approximately 40% faster by walking over the
unselected current tree more efficiently. (Robert Collins)
* XML inventory serialisation takes 20% less time while being stricter about
the contents. (Robert Collins)
* Graph ``heads()`` queries have been fixed to no longer access all history
unnecessarily. (Robert Collins)
IMPROVEMENTS:
* ``bzr+https://`` smart server across https now supported.
(John Ferlito, Martin Pool, #128456)
* Mutt is now a supported mail client; set ``mail_client=mutt`` in your
bazaar.conf and ``send`` will use mutt. (Keir Mierle)
* New option ``-c``/``--change`` for ``merge`` command for cherrypicking
changes from one revision. (Alexander Belchenko, #141368)
* Show encodings, locale and list of plugins in the traceback message.
(Martin Pool, #63894)
* Experimental directory formats can now be marked with
``experimental = True`` during registration. (Ian Clatworthy)
DOCUMENTATION:
* New *Bazaar in Five Minutes* guide. (Matthew Revell)
* The hooks reference documentation is now converted to html as expected.
(Ian Clatworthy)
BUG FIXES:
* Connection error reporting for the smart server has been fixed to
display a user friendly message instead of a traceback.
(Ian Clatworthy, #115601)
* Make sure to use ``O_BINARY`` when opening files to check their
sha1sum. (Alexander Belchenko, John Arbash Meinel, #153493)
* Fix a problem with Win32 handling of the executable bit.
(John Arbash Meinel, #149113)
* ``bzr+ssh://`` and ``sftp://`` URLs that do not specify ports explicitly
no longer assume that means port 22. This allows people using OpenSSH to
override the default port in their ``~/.ssh/config`` if they wish. This
fixes a bug introduced in bzr 0.91. (Andrew Bennetts, #146715)
* Commands reporting exceptions can now be profiled and still have their
data correctly dumped to a file. For example, a ``bzr commit`` with
no changes still reports the operation as pointless but doing so no
longer throws away the profiling data if this command is run with
``--lsprof-file callgrind.out.ci`` say. (Ian Clatworthy)
* Fallback to ftp when paramiko is not installed and sftp can't be used for
``tests/commands`` so that the test suite is still usable without
paramiko.
(Vincent Ladeuil, #59150)
* Fix commit ordering in corner case. (Aaron Bentley, #94975)
* Fix long standing bug in partial commit when there are renames
left in tree. (Robert Collins, #140419)
* Fix selftest semi-random noise during http related tests.
(Vincent Ladeuil, #140614)
* Fix typo in ftp.py making the reconnection fail on temporary errors.
(Vincent Ladeuil, #154259)
* Fix failing test by comparing real paths to cover the case where the TMPDIR
contains a symbolic link.
(Vincent Ladeuil, #141382).
* Fix log against smart server branches that don't support tags.
(James Westby, #140615)
* Fix pycurl http implementation by defining error codes from
pycurl instead of relying on an old curl definition.
(Vincent Ladeuil, #147530)
* Fix 'unprintable error' message when displaying BzrCheckError and
some other exceptions on Python 2.5.
(Martin Pool, #144633)
* Fix ``Inventory.copy()`` and add test for it. (Jelmer Vernooij)
* Handles default value for ListOption in cmd_commit.
(Vincent Ladeuil, #140432)
* HttpServer and FtpServer need to be closed properly or a listening socket
will remain opened.
(Vincent Ladeuil, #140055)
* Monitor the .bzr directory created in the top level test
directory to detect leaking tests.
(Vincent Ladeuil, #147986)
* The basename, not the full path, is now used when checking whether
the profiling dump file begins with ``callgrind.out`` or not. This
fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
* Trivial fix for invoking command ``reconfigure`` without arguments.
(Rob Weir, #141629)
* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
new path causes bzr to be unable to access the file. (Robert Collins)
* Correctly detect a NoSuchFile when using a filezilla server. (Gary van der
Merwe)
API BREAKS:
* ``bzrlib.index.GraphIndex`` now requires a size parameter to the
constructor, for enabling bisection searches. (Robert Collins)
* ``CommitBuilder.record_entry_contents`` now requires the root entry of a
tree be supplied to it, previously failing to do so would trigger a
deprecation warning. (Robert Collins)
* ``KnitVersionedFile.add*`` will no longer cache added records even when
enable_cache() has been called - the caching feature is now exclusively for
reading existing data. (Robert Collins)
* ``ReadOnlyLockError`` is deprecated; ``LockFailed`` is usually more
appropriate. (Martin Pool)
* Removed ``bzrlib.transport.TransportLogger`` - please see the new
``trace+`` transport instead. (Robert Collins)
* Removed previously deprecated varargs interface to ``TestCase.run_bzr`` and
deprecated methods ``TestCase.capture`` and ``TestCase.run_bzr_captured``.
(Martin Pool)
* Removed previous deprecated ``basis_knit`` parameter to the
``KnitVersionedFile`` constructor. (Robert Collins)
* Special purpose method ``TestCase.run_bzr_decode`` is moved to the test_non_ascii
class that needs it.
(Martin Pool)
* The class ``bzrlib.repofmt.knitrepo.KnitRepository3`` has been folded into
``KnitRepository`` by parameters to the constructor. (Robert Collins)
* The ``VersionedFile`` interface now allows content checks to be bypassed
by supplying check_content=False. This saves nearly 30% of the minimum
cost to store a version of a file. (Robert Collins)
* Tree's with bad state such as files with no length or sha will no longer
be silently accepted by the repository XML serialiser. To serialise
inventories without such data, pass working=True to write_inventory.
(Robert Collins)
* ``VersionedFile.fix_parents`` has been removed as a harmful API.
``VersionedFile.join`` will no longer accept different parents on either
side of a join - it will either ignore them, or error, depending on the
implementation. See notes when upgrading for more information.
(Robert Collins)
INTERNALS:
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
put by the method call, to allow avoiding stat-after-write or
housekeeping in callers. (Robert Collins)
* ``bzrlib.xml_serializer.Serializer`` is now responsible for checking that
mandatory attributes are present on serialisation and deserialisation.
This fixes some holes in API usage and allows better separation between
physical storage and object serialisation. (Robert Collins)
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient
shorthand for deriving from BzrError and setting internal_error = True.
(Robert Collins)
* New method ``bzrlib.mutabletree.update_to_one_parent_via_delta`` for
moving the state of a parent tree to a new version via a delta rather than
a complete replacement tree. (Robert Collins)
* New method ``bzrlib.osutils.minimum_path_selection`` useful for removing
duplication from user input, when a user mentions both a path and an item
contained within that path. (Robert Collins)
* New method ``bzrlib.repository.Repository.is_write_locked`` useful for
determining if a repository is write locked. (Robert Collins)
* New method on ``bzrlib.tree.Tree`` ``path_content_summary`` provides a
tuple containing the key information about a path for commit processing
to complete. (Robert Collins)
* New method on xml serialisers, write_inventory_to_lines, which matches the
API used by knits for adding content. (Robert Collins)
* New module ``bzrlib.bisect_multi`` with generic multiple-bisection-at-once
logic, currently only available for byte-based lookup
(``bisect_multi_bytes``). (Robert Collins)
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
and returns a gzipped version of the same. This is used to avoid a bunch
of api friction during adding of knit hunks. (Robert Collins)
* New parameter on ``bzrlib.transport.Transport.readv``
``adjust_for_latency`` which changes readv from returning strictly the
requested data to inserted return larger ranges and in forward read order
to reduce the effect of network latency. (Robert Collins)
* New parameter yield_parents on ``Inventory.iter_entries_by_dir`` which
causes the parents of a selected id to be returned recursively, so all the
paths from the root down to each element of selected_file_ids are
returned. (Robert Collins)
* Knit joining has been enhanced to support plain to annotated conversion
and annotated to plain conversion. (Ian Clatworthy)
* The CommitBuilder method ``record_entry_contents`` now returns summary
information about the effect of the commit on the repository. This tuple
contains an inventory delta item if the entry changed from the basis, and a
boolean indicating whether a new file graph node was recorded.
(Robert Collins)
* The python path used in the Makefile can now be overridden.
(Andrew Bennetts, Ian Clatworthy)
TESTING:
* New transport implementation ``trace+`` which is useful for testing,
logging activity taken to its _activity attribute. (Robert Collins)
* When running bzr commands within the test suite, internal exceptions are
not caught and reported in the usual way, but rather allowed to propagate
up and be visible to the test suite. A new API ``run_bzr_catch_user_errors``
makes this behavior available to other users.
(Martin Pool)
* New method ``TestCase.call_catch_warnings`` for testing methods that
raises a Python warning. (Martin Pool)
bzr 0.91 2007-09-26
===================
BUG FIXES:
* Print a warning instead of aborting the ``python setup.py install``
process if building of a C extension is not possible.
(Lukáš Lalinský, Alexander Belchenko)
* Fix commit ordering in corner case (Aaron Bentley, #94975)
* Fix ''bzr info bzr://host/'' and other operations on ''bzr://' URLs with
an implicit port. We were incorrectly raising PathNotChild due to
inconsistent treatment of the ''_port'' attribute on the Transport object.
(Andrew Bennetts, #133965)
* Make RemoteRepository.sprout cope gracefully with servers that don't
support the ``Repository.tarball`` request.
(Andrew Bennetts)
bzr 0.91rc2 2007-09-11
======================
* Replaced incorrect tarball for previous release; a debug statement was left
in bzrlib/remote.py.
bzr 0.91rc1 2007-09-11
======================
CHANGES:
* The default branch and repository format has changed to
``dirstate-tags``, so tag commands are active by default.
This format is compatible with Bazaar 0.15 and later.
This incidentally fixes bug #126141.
(Martin Pool)
* ``--quiet`` or ``-q`` is no longer a global option. If present, it
must now appear after the command name. Scripts doing things like
``bzr -q missing`` need to be rewritten as ``bzr missing -q``.
(Ian Clatworthy)
FEATURES:
* New option ``--author`` in ``bzr commit`` to specify the author of the
change, if it's different from the committer. ``bzr log`` and
``bzr annotate`` display the author instead of the committer.
(Lukáš Lalinský)
* In addition to global options and command specific options, a set of
standard options are now supported. Standard options are legal for
all commands. The initial set of standard options are:
* ``--help`` or ``-h`` - display help message
* ``--verbose`` or ``-v`` - display additional information
* ``--quiet`` or ``-q`` - only output warnings and errors.
Unlike global options, standard options can be used in aliases and
may have command-specific help. (Ian Clatworthy)
* Verbosity level processing has now been unified. If ``--verbose``
or ``-v`` is specified on the command line multiple times, the
verbosity level is made positive the first time then increased.
If ``--quiet`` or ``-q`` is specified on the command line
multiple times, the verbosity level is made negative the first
time then decreased. To get the default verbosity level of zero,
either specify none of the above , ``--no-verbose`` or ``--no-quiet``.
Note that most commands currently ignore the magnitude of the
verbosity level but do respect *quiet vs normal vs verbose* when
generating output. (Ian Clatworthy)
* ``Branch.hooks`` now supports ``pre_commit`` hook. The hook's signature
is documented in BranchHooks constructor. (Nam T. Nguyen, #102747)
* New ``Repository.stream_knit_data_for_revisions`` request added to the
network protocol for greatly reduced roundtrips when retrieving a set of
revisions. (Andrew Bennetts)
BUG FIXES:
* ``bzr plugins`` now lists the version number for each plugin in square
brackets after the path. (Robert Collins, #125421)
* Pushing, pulling and branching branches with subtree references was not
copying the subtree weave, preventing the file graph from being accessed
and causing errors in commits in clones. (Robert Collins)
* Suppress warning "integer argument expected, got float" from Paramiko,
which sometimes caused false test failures. (Martin Pool)
* Fix bug in bundle 4 that could cause attempts to write data to wrong
versionedfile. (Aaron Bentley)
* Diffs generated using "diff -p" no longer break the patch parser.
(Aaron Bentley)
* get_transport treats an empty possible_transports list the same as a non-
empty one. (Aaron Bentley)
* patch verification for merge directives is reactivated, and works with
CRLF and CR files. (Aaron Bentley)
* Accept ..\ as a path in revision specifiers. This fixes for example
"-r branch:..\other-branch" on Windows. (Lukáš Lalinský)
* ``BZR_PLUGIN_PATH`` may now contain trailing slashes.
(Blake Winton, #129299)
* man page no longer lists hidden options (#131667, Aaron Bentley)
* ``uncommit --help`` now explains the -r option adequately. (Daniel
Watkins, #106726)
* Error messages are now better formatted with parameters (such as
filenames) quoted when necessary. This avoids confusion when directory
names ending in a '.' at the end of messages were confused with a
full stop that may or not have been there. (Daniel Watkins, #129791)
* Fix ``status FILE -r X..Y``. (Lukáš Lalinský)
* If a particular command is an alias, ``help`` will show the alias
instead of claiming there is no help for said alias. (Daniel Watkins,
#133548)
* TreeTransform-based operations, like pull, merge, revert, and branch,
now roll back if they encounter an error. (Aaron Bentley, #67699)
* ``bzr commit`` now exits cleanly if a character unsupported by the
current encoding is used in the commit message. (Daniel Watkins,
#116143)
* bzr send uses default values for ranges when only half of an elipsis
is specified ("-r..5" or "-r5.."). (#61685, Aaron Bentley)
* Avoid trouble when Windows ssh calls itself 'plink' but no plink
binary is present. (Martin Albisetti, #107155)
* ``bzr remove`` should remove clean subtrees. Now it will remove (without
needing ``--force``) subtrees that contain no files with text changes or
modified files. With ``--force`` it removes the subtree regardless of
text changes or unknown files. Directories with renames in or out (but
not changed otherwise) will now be removed without needing ``--force``.
Unknown ignored files will be deleted without needing ``--force``.
(Marius Kruger, #111665)
* When two plugins conflict, the source of both the losing and now the
winning definition is shown. (Konstantin Mikhaylov, #5454)
* When committing to a branch, the location being committed to is
displayed. (Daniel Watkins, #52479)
* ``bzr --version`` takes care about encoding of stdout, especially
when output is redirected. (Alexander Belchenko, #131100)
* Prompt for an ftp password if none is provided.
(Vincent Ladeuil, #137044)
* Reuse bound branch associated transport to avoid multiple
connections.
(Vincent Ladeuil, #128076, #131396)
* Overwrite conflicting tags by ``push`` and ``pull`` if the
``--overwrite`` option is specified. (Lukáš Lalinský, #93947)
* In checkouts, tags are copied into the master branch when created,
changed or deleted, and are copied into the checkout when it is
updated. (Martin Pool, #93856, #93860)
* Print a warning instead of aborting the ``python setup.py install``
process if building of a C extension is not possible.
(Lukáš Lalinský, Alexander Belchenko)
IMPROVEMENTS:
* Add the option "--show-diff" to the commit command in order to display
the diff during the commit log creation. (Goffredo Baroncelli)
* ``pull`` and ``merge`` are much faster at installing bundle format 4.
(Aaron Bentley)
* ``pull -v`` no longer includes deltas, making it much faster.
(Aaron Bentley)
* ``send`` now sends the directive as an attachment by default.
(Aaron Bentley, Lukáš Lalinský, Alexander Belchenko)
* Documentation updates (Martin Albisetti)
* Help on debug flags is now included in ``help global-options``.
(Daniel Watkins, #124853)
* Parameters passed on the command line are checked to ensure they are
supported by the encoding in use. (Daniel Watkins)
* The compression used within the bzr repository has changed from zlib
level 9 to the zlib default level. This improves commit performance with
only a small increase in space used (and in some cases a reduction in
space). (Robert Collins)
* Initial commit no longer SHAs files twice and now reuses the path
rather than looking it up again, making it faster.
(Ian Clatworthy)
* New option ``-c``/``--change`` for ``diff`` and ``status`` to show
changes in one revision. (Lukáš Lalinský)
* If versioned files match a given ignore pattern, a warning is now
given. (Daniel Watkins, #48623)
* ``bzr status`` now has -S as a short name for --short and -V as a
short name for --versioned. These have been added to assist users
migrating from Subversion: ``bzr status -SV`` is now like
``svn status -q``. (Daniel Watkins, #115990)
* Added C implementation of ``PatienceSequenceMatcher``, which is about
10x faster than the Python version. This speeds up commands that
need file diffing, such as ``bzr commit`` or ``bzr diff``.
(Lukáš Lalinský)
* HACKING has been extended with a large section on core developer tasks.
(Ian Clatworthy)
* Add ``branches`` and ``standalone-trees`` as online help topics and
include them as Concepts within the User Reference.
(Paul Moore, Ian Clatworthy)
* ``check`` can detect versionedfile parent references that are
inconsistent with revision and inventory info, and ``reconcile`` can fix
them. These faulty references were generated by 0.8-era releases,
so repositories which were manipulated by old bzrs should be
checked, and possibly reconciled ASAP. (Aaron Bentley, Andrew Bennetts)
API BREAKS:
* ``Branch.append_revision`` is removed altogether; please use
``Branch.set_last_revision_info`` instead. (Martin Pool)
* CommitBuilder now advertises itself as requiring the root entry to be
supplied. This only affects foreign repository implementations which reuse
CommitBuilder directly and have changed record_entry_contents to require
that the root not be supplied. This should be precisely zero plugins
affected. (Robert Collins)
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed
its return value to include the sha1 and length of the inserted text. This
allows the avoidance of double-sha1 calculations during commit.
(Robert Collins)
* ``Transport.should_cache`` has been removed. It was not called in the
previous release. (Martin Pool)
TESTING:
* Tests may now raise TestNotApplicable to indicate they shouldn't be
run in a particular scenario. (Martin Pool)
* New function multiply_tests_from_modules to give a simpler interface
to test parameterization. (Martin Pool, Robert Collins)
* ``Transport.should_cache`` has been removed. It was not called in the
previous release. (Martin Pool)
* NULL_REVISION is returned to indicate the null revision, not None.
(Aaron Bentley)
* Use UTF-8 encoded StringIO for log tests to avoid failures on
non-ASCII committer names. (Lukáš Lalinský)
INTERNALS:
* ``bzrlib.plugin.all_plugins`` has been deprecated in favour of
``bzrlib.plugin.plugins()`` which returns PlugIn objects that provide
useful functionality for determining the path of a plugin, its tests, and
its version information. (Robert Collins)
* Add the option user_encoding to the function 'show_diff_trees()'
in order to move the user encoding at the UI level. (Goffredo Baroncelli)
* Add the function make_commit_message_template_encoded() and the function
edit_commit_message_encoded() which handle encoded strings.
This is done in order to mix the commit messages (which is a unicode
string), and the diff which is a raw string. (Goffredo Baroncelli)
* CommitBuilder now defaults to using add_lines_with_ghosts, reducing
overhead on non-weave repositories which don't require all parents to be
present. (Robert Collins)
* Deprecated method ``find_previous_heads`` on
``bzrlib.inventory.InventoryEntry``. This has been superseded by the use
of ``parent_candidates`` and a separate heads check via the repository
API. (Robert Collins)
* New trace function ``mutter_callsite`` will print out a subset of the
stack to the log, which can be useful for gathering debug details.
(Robert Collins)
* ``bzrlib.pack.ContainerWriter`` now tracks how many records have been
added via a public attribute records_written. (Robert Collins)
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
This provides a hint to users of transports as to the reasonable
minimum data to read. In principle this can take latency and
bandwidth into account on a per-connection basis, but for now it
just has hard coded values based on the url. (e.g. http:// has a large
page size, file:// has a small one.) (Robert Collins)
* New method on ``bzrlib.transport.Transport`` ``open_write_stream`` allows
incremental addition of data to a file without requiring that all the
data be buffered in memory. (Robert Collins)
* New methods on ``bzrlib.knit.KnitVersionedFile``:
``get_data_stream(versions)``, ``insert_data_stream(stream)`` and
``get_format_signature()``. These provide some infrastructure for
efficiently streaming the knit data for a set of versions over the smart
protocol.
* Knits with no annotation cache still produce correct annotations.
(Aaron Bentley)
* Three new methods have been added to ``bzrlib.trace``:
``set_verbosity_level``, ``get_verbosity_level`` and ``is_verbose``.
``set_verbosity_level`` expects a numeric value: negative for quiet,
zero for normal, positive for verbose. The size of the number can be
used to determine just how quiet or verbose the application should be.
The existing ``be_quiet`` and ``is_quiet`` routines have been
integrated into this new scheme. (Ian Clatworthy)
* Options can now be delcared with a ``custom_callback`` parameter. If
set, this routine is called after the option is processed. This feature
is now used by the standard options ``verbose`` and ``quiet`` so that
setting one implicitly resets the other. (Ian Clatworthy)
* Rather than declaring a new option from scratch in order to provide
custom help, a centrally registered option can be decorated using the
new ``bzrlib.Option.custom_help`` routine. In particular, this routine
is useful when declaring better help for the ``verbose`` and ``quiet``
standard options as the base definition of these is now more complex
than before thanks to their use of a custom callback. (Ian Clatworthy)
* Tree._iter_changes(specific_file=[]) now iterates through no files,
instead of iterating through all files. None is used to iterate through
all files. (Aaron Bentley)
* WorkingTree.revert() now accepts None to revert all files. The use of
[] to revert all files is deprecated. (Aaron Bentley)
bzr 0.90 2007-08-28
===================
IMPROVEMENTS:
* Documentation is now organized into multiple directories with a level
added for different languages or locales. Added the Mini Tutorial
and Quick Start Summary (en) documents from the Wiki, improving the
content and readability of the former. Formatted NEWS as Release Notes
complete with a Table of Conents, one heading per release. Moved the
Developer Guide into the main document catalog and provided a link
from the developer document catalog back to the main one.
(Ian Clatworthy, Sabin Iacob, Alexander Belchenko)
API CHANGES:
* The static convenience method ``BzrDir.create_repository``
is deprecated. Callers should instead create a ``BzrDir`` instance
and call ``create_repository`` on that. (Martin Pool)
bzr 0.90rc1 2007-08-14
======================
BUGFIXES:
* ``bzr init`` should connect to the remote location one time only. We
have been connecting several times because we forget to pass around the
Transport object. This modifies ``BzrDir.create_branch_convenience``,
so that we can give it the Transport we already have.
(John Arbash Meinel, Vincent Ladeuil, #111702)
* Get rid of sftp connection cache (get rid of the FTP one too).
(Vincent Ladeuil, #43731)
* bzr branch {local|remote} remote don't try to create a working tree
anymore.
(Vincent Ladeuil, #112173)
* All identified multiple connections for a single bzr command have been
fixed. See bzrlib/tests/commands directory.
(Vincent Ladeuil)
* ``bzr rm`` now does not insist on ``--force`` to delete files that
have been renamed but not otherwise modified. (Marius Kruger,
#111664)
* ``bzr selftest --bench`` no longer emits deprecation warnings
(Lukáš Lalinský)
* ``bzr status`` now honours FILE parameters for conflict lists
(Aaron Bentley, #127606)
* ``bzr checkout`` now honours -r when reconstituting a working tree.
It also honours -r 0. (Aaron Bentley, #127708)
* ``bzr add *`` no more fails on Windows if working tree contains
non-ascii file names. (Kuno Meyer, #127361)
* allow ``easy_install bzr`` runs without fatal errors.
(Alexander Belchenko, #125521)
* Graph._filter_candidate_lca does not raise KeyError if a candidate
is eliminated just before it would normally be examined. (Aaron Bentley)
* SMTP connection failures produce a nice message, not a traceback.
(Aaron Bentley)
IMPROVEMENTS:
* Don't show "dots" progress indicators when run non-interactively, such
as from cron. (Martin Pool)
* ``info`` now formats locations more nicely and lists "submit" and
"public" branches (Aaron Bentley)
* New ``pack`` command that will trigger database compression within
the repository (Robert Collins)
* Implement ``_KnitIndex._load_data`` in a pyrex extension. The pyrex
version is approximately 2-3x faster at parsing a ``.kndx`` file.
Which yields a measurable improvement for commands which have to
read from the repository, such as a 1s => 0.75s improvement in
``bzr diff`` when there are changes to be shown. (John Arbash Meinel)
* Merge is now faster. Depending on the scenario, it can be more than 2x
faster. (Aaron Bentley)
* Give a clearer warning, and allow ``python setup.py install`` to
succeed even if pyrex is not available.
(John Arbash Meinel)
* ``DirState._read_dirblocks`` now has an optional Pyrex
implementation. This improves the speed of any command that has to
read the entire DirState. (``diff``, ``status``, etc, improve by
about 10%).
``bisect_dirblocks`` has also been improved, which helps all
``_get_entry`` type calls (whenever we are searching for a
particular entry in the in-memory DirState).
(John Arbash Meinel)
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
branch revision history for ui display unless -v is supplied.
(Robert Collins)
* ``bzr log -rA..B`` output shifted to the left margin if the log only
contains merge revisions. (Kent Gibson)
* The ``plugins`` command is now public with improved help.
(Ian Clatworthy)
* New bundle and merge directive formats are faster to generate, and
* Annotate merge now works when there are local changes. (Aaron Bentley)
* Commit now only shows the progress in terms of directories instead of
entries. (Ian Clatworthy)
* Fix ``KnitRepository.get_revision_graph`` to not request the graph 2
times. This makes ``get_revision_graph`` 2x faster. (John Arbash
Meinel)
* Fix ``VersionedFile.get_graph()`` to avoid using
``set.difference_update(other)``, which has bad scaling when
``other`` is large. This improves ``VF.get_graph([version_id])`` for
a 12.5k graph from 2.9s down to 200ms. (John Arbash Meinel)
* The ``--lsprof-file`` option now generates output for KCacheGrind if
the file starts with ``callgrind.out``. This matches the default file
filtering done by KCacheGrind's Open Dialog. (Ian Clatworthy)
* Fix ``bzr update`` to avoid an unnecessary
``branch.get_master_branch`` call, which avoids 1 extra connection
to the remote server. (Partial fix for #128076, John Arbash Meinel)
* Log errors from the smart server in the trace file, to make debugging
test failures (and live failures!) easier. (Andrew Bennetts)
* The HTML version of the man page has been superceded by a more
comprehensive manual called the Bazaar User Reference. This manual
is completed generated from the online help topics. As part of this
change, limited reStructuredText is now explicitly supported in help
topics and command help with 'unnatural' markup being removed prior
to display by the online help or inclusion in the man page.
(Ian Clatworthy)
* HTML documentation now use files extension ``*.html``
(Alexander Belchenko)
* The cache of ignore definitions is now cleared in WorkingTree.unlock()
so that changes to .bzrignore aren't missed. (#129694, Daniel Watkins)
* ``bzr selftest --strict`` fails if there are any missing features or
expected test failures. (Daniel Watkins, #111914)
* Link to registration survey added to README. (Ian Clatworthy)
* Windows standalone installer show link to registration survey
when installation finished. (Alexander Belchenko)
LIBRARY API BREAKS:
* Deprecated dictionary ``bzrlib.option.SHORT_OPTIONS`` removed.
Options are now required to provide a help string and it must
comply with the style guide by being one or more sentences with an
initial capital and final period. (Martin Pool)
* KnitIndex.get_parents now returns tuples. (Robert Collins)
* Ancient unused ``Repository.text_store`` attribute has been removed.
(Robert Collins)
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
rather than just bytestrings, making it easier to represent multiple
element names. As this interface was not used by any internal facilities
since it was introduced in 0.18 no API compatibility is being preserved.
The serialised form of these packs is identical with 0.18 when a single
element tuple is in use. (Robert Collins)
INTERNALS:
* merge now uses ``iter_changes`` to calculate changes, which makes room for
future performance increases. It is also more consistent with other
operations that perform comparisons, and reduces reliance on
Tree.inventory. (Aaron Bentley)
* Refactoring of transport classes connected to a remote server.
ConnectedTransport is a new class that serves as a basis for all
transports needing to connect to a remote server. transport.split_url
have been deprecated, use the static method on the object instead. URL
tests have been refactored too.
(Vincent Ladeuil)
* Better connection sharing for ConnectedTransport objects.
transport.get_transport() now accepts a 'possible_transports' parameter.
If a newly requested transport can share a connection with one of the
list, it will.
(Vincent Ladeuil)
* Most functions now accept ``bzrlib.revision.NULL_REVISION`` to indicate
the null revision, and consider using ``None`` for this purpose
deprecated. (Aaron Bentley)
* New ``index`` module with abstract index functionality. This will be
used during the planned changes in the repository layer. Currently the
index layer provides a graph aware immutable index, a builder for the
same index type to allow creating them, and finally a composer for
such indices to allow the use of many indices in a single query. The
index performance is not optimised, however the API is stable to allow
development on top of the index. (Robert Collins)
* ``bzrlib.dirstate.cmp_by_dirs`` can be used to compare two paths by
their directory sections. This is equivalent to comparing
``path.split('/')``, only without having to split the paths.
This has a Pyrex implementation available.
(John Arbash Meinel)
* New transport decorator 'unlistable+' which disables the list_dir
functionality for testing.
* Deprecated ``change_entry`` in transform.py. (Ian Clatworthy)
* RevisionTree.get_weave is now deprecated. Tree.plan_merge is now used
for performing annotate-merge. (Aaron Bentley)
* New EmailMessage class to create email messages. (Adeodato Simó)
* Unused functions on the private interface KnitIndex have been removed.
(Robert Collins)
* New ``knit.KnitGraphIndex`` which provides a ``KnitIndex`` layered on top
of a ``index.GraphIndex``. (Robert Collins)
* New ``knit.KnitVersionedFile.iter_parents`` method that allows querying
the parents of many knit nodes at once, reducing round trips to the
underlying index. (Robert Collins)
* Graph now has an is_ancestor method, various bits use it.
(Aaron Bentley)
* The ``-Dhpss`` flag now includes timing information. As well as
logging when a new connection is opened. (John Arbash Meinel)
* ``bzrlib.pack.ContainerWriter`` now returns an offset, length tuple to
callers when inserting data, allowing generation of readv style access
during pack creation, without needing a separate pass across the output
pack to gather such details. (Robert Collins)
* ``bzrlib.pack.make_readv_reader`` allows readv based access to pack
files that are stored on a transport. (Robert Collins)
* New ``Repository.has_same_location`` method that reports if two
repository objects refer to the same repository (although with some risk
of false negatives). (Andrew Bennetts)
* InterTree.compare now passes require_versioned on correctly.
(Marius Kruger)
* New methods on Repository - ``start_write_group``,
``commit_write_group``, ``abort_write_group`` and ``is_in_write_group`` -
which provide a clean hook point for transactional Repositories - ones
where all the data for a fetch or commit needs to be made atomically
available in one step. This allows the write lock to remain while making
a series of data insertions. (e.g. data conversion). (Robert Collins)
* In ``bzrlib.knit`` the internal interface has been altered to use
3-tuples (index, pos, length) rather than two-tuples (pos, length) to
describe where data in a knit is, allowing knits to be split into
many files. (Robert Collins)
* ``bzrlib.knit._KnitData`` split into cache management and physical access
with two access classes - ``_PackAccess`` and ``_KnitAccess`` defined.
The former provides access into a .pack file, and the latter provides the
current production repository form of .knit files. (Robert Collins)
TESTING:
* Remove selftest ``--clean-output``, ``--numbered-dirs`` and
``--keep-output`` options, which are obsolete now that tests
are done within directories in $TMPDIR. (Martin Pool)
* The SSH_AUTH_SOCK environment variable is now reset to avoid
interaction with any running ssh agents. (Jelmer Vernooij, #125955)
* run_bzr_subprocess handles parameters the same way as run_bzr:
either a string or a list of strings should be passed as the first
parameter. Varargs-style parameters are deprecated. (Aaron Bentley)
bzr 0.18 2007-07-17
====================
BUGFIXES:
* Fix 'bzr add' crash under Win32 (Kuno Meyer)
bzr 0.18rc1 2007-07-10
=======================
BUGFIXES:
* Do not suppress pipe errors, etc. in non-display commands
(Alexander Belchenko, #87178)
* Display a useful error message when the user requests to annotate
a file that is not present in the specified revision.
(James Westby, #122656)
* Commands that use status flags now have a reference to 'help
status-flags'. (Daniel Watkins, #113436)
* Work around python-2.4.1 inhability to correctly parse the
authentication header.
(Vincent Ladeuil, #121889)
* Use exact encoding for merge directives. (Adeodato Simó, #120591)
* Fix tempfile permissions error in smart server tar bundling under
Windows. (Martin _, #119330)
* Fix detection of directory entries in the inventory. (James Westby)
* Fix handling of http code 400: Bad Request When issuing too many ranges.
(Vincent Ladeuil, #115209)
* Issue a CONNECT request when connecting to an https server
via a proxy to enable SSL tunneling.
(Vincent Ladeuil, #120678)
* Fix ``bzr log -r`` to support selecting merge revisions, both
individually and as part of revision ranges.
(Kent Gibson, #4663)
* Don't leave cruft behind when failing to acquire a lockdir.
(Martin Pool, #109169)
* Don't use the '-f' strace option during tests.
(Vincent Ladeuil, #102019).
* Warn when setting ``push_location`` to a value that will be masked by
locations.conf. (Aaron Bentley, #122286)
* Fix commit ordering in corner case (Aaron Bentley, #94975)
* Make annotate behave in a non-ASCII world (Adeodato Simó).
IMPROVEMENTS:
* The --lsprof-file option now dumps a text rendering of the profiling
information if the filename ends in ".txt". It will also convert the
profiling information to a format suitable for KCacheGrind if the
output filename ends in ".callgrind". Fixes to the lsprofcalltree
conversion process by Jean Paul Calderone and Itamar were also merged.
See http://ddaa.net/blog/python/lsprof-calltree. (Ian Clatworthy)
* ``info`` now defaults to non-verbose mode, displaying only paths and
abbreviated format info. ``info -v`` displays all the information
formerly displayed by ``info``. (Aaron Bentley, Adeodato Simó)
* ``bzr missing`` now has better option names ``--this`` and ``--other``.
(Elliot Murphy)
* The internal ``weave-list`` command has become ``versionedfile-list``,
and now lists knits as well as weaves. (Aaron Bentley)
* Automatic merge base selection uses a faster algorithm that chooses
better bases in criss-cross merge situations (Aaron Bentley)
* Progress reporting in ``commit`` has been improved. The various logical
stages are now reported on as follows, namely:
* Collecting changes [Entry x/y] - Stage n/m
* Saving data locally - Stage n/m
* Uploading data to master branch - Stage n/m
* Updating the working tree - Stage n/m
* Running post commit hooks - Stage n/m
If there is no master branch, the 3rd stage is omitted and the total
number of stages is adjusted accordingly.
Each hook that is run after commit is listed with a name (as hooks
can be slow it is useful feedback).
(Ian Clatworthy, Robert Collins)
* Various operations that are now faster due to avoiding unnecessary
topological sorts. (Aaron Bentley)
* Make merge directives robust against broken bundles. (Aaron Bentley)
* The lsprof filename note is emitted via trace.note(), not standard
output. (Aaron Bentley)
* ``bzrlib`` now exports explicit API compatibility information to assist
library users and plugins. See the ``bzrlib.api`` module for details.
(Robert Collins)
* Remove unnecessary lock probes when acquiring a lockdir.
(Martin Pool)
* ``bzr --version`` now shows the location of the bzr log file, which
is especially useful on Windows. (Martin Pool)
* -D now supports hooks to get debug tracing of hooks (though its currently
minimal in nature). (Robert Collins)
* Long log format reports deltas on merge revisions.
(John Arbash Meinel, Kent Gibson)
* Make initial push over ftp more resilient. (John Arbash Meinel)
* Print a summary of changes for update just like pull does.
(Daniel Watkins, #113990)
* Add a -Dhpss option to trace smart protocol requests and responses.
(Andrew Bennetts)
LIBRARY API BREAKS:
* Testing cleanups -
``bzrlib.repository.RepositoryTestProviderAdapter`` has been moved
to ``bzrlib.tests.repository_implementations``;
``bzrlib.repository.InterRepositoryTestProviderAdapter`` has been moved
to ``bzrlib.tests.interrepository_implementations``;
``bzrlib.transport.TransportTestProviderAdapter`` has moved to
``bzrlib.tests.test_transport_implementations``.
``bzrlib.branch.BranchTestProviderAdapter`` has moved to
``bzrlib.tests.branch_implementations``.
``bzrlib.bzrdir.BzrDirTestProviderAdapter`` has moved to
``bzrlib.tests.bzrdir_implementations``.
``bzrlib.versionedfile.InterVersionedFileTestProviderAdapter`` has moved
to ``bzrlib.tests.interversionedfile_implementations``.
``bzrlib.store.revision.RevisionStoreTestProviderAdapter`` has moved to
``bzrlib.tests.revisionstore_implementations``.
``bzrlib.workingtree.WorkingTreeTestProviderAdapter`` has moved to
``bzrlib.tests.workingtree_implementations``.
These changes are an API break in the testing infrastructure only.
(Robert Collins)
* Relocate TestCaseWithRepository to be more central. (Robert Collins)
* ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on
win32. Callers of the function should do this and use the new
``MutableTree.smart_add`` method instead. (Robert Collins)
* ``bzrlib.add.glob_expand_for_win32`` is now
``bzrlib.win32utils.glob_expand``. (Robert Collins)
* ``bzrlib.add.FastPath`` is now private and moved to
``bzrlib.mutabletree._FastPath``. (Robert Collins, Martin Pool)
* ``LockDir.wait`` removed. (Martin Pool)
* The ``SmartServer`` hooks API has changed for the ``server_started`` and
``server_stopped`` hooks. The first parameter is now an iterable of
backing URLs rather than a single URL. This is to reflect that many
URLs may map to the external URL of the server. E.g. the server interally
may have a chrooted URL but also the local file:// URL will be at the
same location. (Robert Collins)
INTERNALS:
* New SMTPConnection class to unify email handling. (Adeodato Simó)
* Fix documentation of BzrError. (Adeodato Simó)
* Make BzrBadParameter an internal error. (Adeodato Simó)
* Remove use of 'assert False' to raise an exception unconditionally.
(Martin Pool)
* Give a cleaner error when failing to decode knit index entry.
(Martin Pool)
* TreeConfig would mistakenly search the top level when asked for options
from a section. It now respects the section argument and only
searches the specified section. (James Westby)
* Improve ``make api-docs`` output. (John Arbash Meinel)
* Use os.lstat rather than os.stat for osutils.make_readonly and
osutils.make_writeable. This makes the difftools plugin more
robust when dangling symlinks are found. (Elliot Murphy)
* New ``-Dlock`` option to log (to ~/.bzr.log) information on when
lockdirs are taken or released. (Martin Pool)
* ``bzrlib`` Hooks are now nameable using ``Hooks.name_hook``. This
allows a nicer UI when hooks are running as the current hook can
be displayed. (Robert Collins)
* ``Transport.get`` has had its interface made more clear for ease of use.
Retrieval of a directory must now fail with either 'PathError' at open
time, or raise 'ReadError' on a read. (Robert Collins)
* New method ``_maybe_expand_globs`` on the ``Command`` class for
dealing with unexpanded glob lists - e.g. on the win32 platform. This
was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)
* ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now
deprecated in favour of ``MutableTree.smart_add``. (Robert Collins,
Martin Pool)
* New method ``external_url`` on Transport for obtaining the url to
hand to external processes. (Robert Collins)
* Teach windows installers to build pyrex/C extensions.
(Alexander Belchenko)
TESTING:
* Removed the ``--keep-output`` option from selftest and clean up test
directories as they're used. This reduces the IO load from
running the test suite and cuts the time by about half.
(Andrew Bennetts, Martin Pool)
* Add scenarios as a public attribute on the TestAdapter classes to allow
modification of the generated scenarios before adaption and easier
testing. (Robert Collins)
* New testing support class ``TestScenarioApplier`` which multiplies
out a single teste by a list of supplied scenarios. (RobertCollins)
* Setting ``repository_to_test_repository`` on a repository_implementations
test will cause it to be called during repository creation, allowing the
testing of repository classes which are not based around the Format
concept. For example a repository adapter can be tested in this manner,
by altering the repository scenarios to include a scenario that sets this
attribute during the test parameterisation in
``bzrlib.tests.repository.repository_implementations``. (Robert Collins)
* Clean up many of the APIs for blackbox testing of Bazaar. The standard
interface is now self.run_bzr. The command to run can be passed as
either a list of parameters, a string containing the command line, or
(deprecated) varargs parameters. (Martin Pool)
* The base TestCase now isolates tests from -D parameters by clearing
``debug.debug_flags`` and restores it afterwards. (Robert Collins)
* Add a relpath parameter to get_transport methods in test framework to
avoid useless cloning.
(Vincent Ladeuil, #110448)
bzr 0.17 2007-06-18
====================
BUGFIXES:
* Fix crash of commit due to wrong lookup of filesystem encoding.
(Colin Watson, #120647)
* Revert logging just to stderr in commit as broke unicode filenames.
(Aaron Bentley, Ian Clatworthy, #120930)
bzr 0.17rc1 2007-06-12
=======================
NOTES WHEN UPGRADING:
* The kind() and is_executable() APIs on the WorkingTree interface no
longer implicitly (read) locks and unlocks the tree. This *might*
impact some plug-ins and tools using this part of the API. If you find
an issue that may be caused by this change, please let us know,
particularly the plug-in/tool maintainer. If encountered, the API
fix is to surround kind() and is_executable() calls with lock_read()
and unlock() like so::
work_tree.lock_read()
try:
kind = work_tree.kind(...)
finally:
work_tree.unlock()
INTERNALS:
* Rework of LogFormatter API to provide beginning/end of log hooks and to
encapsulate the details of the revision to be logged in a LogRevision
object.
In long log formats, merge revision ids are only shown when --show-ids
is specified, and are labelled "revision-id:", as per mainline
revisions, instead of "merged:". (Kent Gibson)
* New ``BranchBuilder`` API which allows the construction of particular
histories quickly. Useful for testing and potentially other applications
too. (Robert Collins)
IMPROVEMENTS:
* There are two new help topics, working-trees and repositories that
attempt to explain these concepts. (James Westby, John Arbash Meinel,
Aaron Bentley)
* Added ``bzr log --limit`` to report a limited number of revisions.
(Kent Gibson, #3659)
* Revert does not try to preserve file contents that were originally
produced by reverting to a historical revision. (Aaron Bentley)
* ``bzr log --short`` now includes ``[merge]`` for revisions which
have more than one parent. This is a small improvement to help
understanding what changes have occurred
(John Arbash Meinel, #83887)
* TreeTransform avoids many renames when contructing large trees,
improving speed. 3.25x speedups have been observed for construction of
kernel-sized-trees, and checkouts are 1.28x faster. (Aaron Bentley)
* Commit on large trees is now faster. In my environment, a commit of
a small change to the Mozilla tree (55k files) has dropped from
66 seconds to 32 seconds. For a small tree of 600 files, commit of a
small change is 33% faster. (Ian Clatworthy)
* New --create-prefix option to bzr init, like for push. (Daniel Watkins,
#56322)
BUGFIXES:
* ``bzr push`` should only connect to the remote location one time.
We have been connecting 3 times because we forget to pass around
the Transport object. This adds ``BzrDir.clone_on_transport()``, so
that we can pass in the Transport that we already have.
(John Arbash Meinel, #75721)
* ``DirState.set_state_from_inventory()`` needs to properly order
based on split paths, not just string paths.
(John Arbash Meinel, #115947)
* Let TestUIFactoy encode the password prompt with its own stdout.
(Vincent Ladeuil, #110204)
* pycurl should take use the range header that takes the range hint
into account.
(Vincent Ladeuil, #112719)
* WorkingTree4.get_file_sha1 no longer raises an exception when invoked
on a missing file. (Aaron Bentley, #118186)
* WorkingTree.remove works correctly with tree references, and when pwd is
not the tree root. (Aaron Bentley)
* Merge no longer fails when a file is renamed in one tree and deleted
in the other. (Aaron Bentley, #110279)
* ``revision-info`` now accepts dotted revnos, doesn't require a tree,
and defaults to the last revision (Matthew Fuller, #90048)
* Tests no longer fail when BZR_REMOTE_PATH is set in the environment.
(Daniel Watkins, #111958)
* ``bzr branch -r revid:foo`` can be used to branch any revision in
your repository. (Previously Branch6 only supported revisions in your
mainline). (John Arbash Meinel, #115343)
bzr 0.16 2007-05-07
====================
BUGFIXES:
* Handle when you have 2 directories with similar names, but one has a
hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
iterator was using direct comparison and ``'abc/a'`` sorts after
``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
(John Arbash Meinel, #111227)
* Handle when someone renames a file on disk without telling bzr.
Previously we would report the first file as missing, but not show
the new unknown file. (John Arbash Meinel, #111288)
* Avoid error when running hooks after pulling into or pushing from
a branch bound to a smartserver branch. (Martin Pool, #111968)
IMPROVEMENTS:
* Move developer documentation to doc/developers/. This reduces clutter in
the root of the source tree and allows HACKING to be split into multiple
files. (Robert Collins, Alexander Belchenko)
* Clean up the ``WorkingTree4._iter_changes()`` internal loops as well as
``DirState.update_entry()``. This optimizes the core logic for ``bzr
diff`` and ``bzr status`` significantly improving the speed of
both. (John Arbash Meinel)
bzr 0.16rc2 2007-04-30
=======================
BUGFIXES:
* Handle the case when you delete a file, and then rename another file
on top of it. Also handle the case of ``bzr rm --keep foo``. ``bzr
status`` should show the removed file and an unknown file in its
place. (John Arbash Meinel, #109993)
* Bundles properly read and write revision properties that have an
empty value. And when the value is not ASCII.
(John Arbash Meinel, #109613)
* Fix the bzr commit message to be in text mode.
(Alexander Belchenko, #110901)
* Also handle when you rename a file and create a file where it used
to be. (John Arbash Meinel, #110256)
* ``WorkingTree4._iter_changes`` should not descend into unversioned
directories. (John Arbash Meinel, #110399)
bzr 0.16rc1 2007-04-26
=======================
NOTES WHEN UPGRADING:
* ``bzr remove`` and ``bzr rm`` will now remove the working file, if
it could be recovered again.
This has been done for consistency with svn and the unix rm command.
The old ``remove`` behaviour has been retained in the new option
``bzr remove --keep``, which will just stop versioning the file,
but not delete it.
``bzr remove --force`` have been added which will always delete the
files.
``bzr remove`` is also more verbose.
(Marius Kruger, #82602)
IMPROVEMENTS:
* Merge directives can now be supplied as input to `merge` and `pull`,
like bundles can. (Aaron Bentley)
* Sending the SIGQUIT signal to bzr, which can be done on Unix by
pressing Control-Backslash, drops bzr into a debugger. Type ``'c'``
to continue. This can be disabled by setting the environment variable
``BZR_SIGQUIT_PDB=0``. (Martin Pool)
* selftest now supports --list-only to list tests instead of running
them. (Ian Clatworthy)
* selftest now supports --exclude PATTERN (or -x PATTERN) to exclude
tests with names that match that regular expression.
(Ian Clatworthy, #102679)
* selftest now supports --randomize SEED to run tests in a random order.
SEED is typically the value 'now' meaning 'use the current time'.
(Ian Clatworthy, #102686)
* New option ``--fixes`` to commit, which stores bug fixing annotations as
revision properties. Built-in support for Launchpad, Debian, Trac and
Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)
* New API, ``bzrlib.bugtracker.tracker_registry``, for adding support for
other bug trackers to ``fixes``. (Jonathan Lange, James Henstridge,
Robert Collins)
* ``selftest`` has new short options ``-f`` and ``-1``. (Martin
Pool)
* ``bzrlib.tsort.MergeSorter`` optimizations. Change the inner loop
into using local variables instead of going through ``self._var``.
Improves the time to ``merge_sort`` a 10k revision graph by
approximately 40% (~700->400ms). (John Arbash Meinel)
* ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)
* ``bzr help`` now provides cross references to other help topics using
the _see_also facility on command classes. Likewise the bzr_man
documentation, and the bzr.1 man page also include this information.
(Robert Collins)
* Tags are now included in logs, that use the long log formatter.
(Erik BÃ¥gfors, Alexander Belchenko)
* ``bzr help`` provides a clearer message when a help topic cannot be
found. (Robert Collins, #107656)
* ``bzr help`` now accepts optional prefixes for command help. The help
for all commands can now be found at ``bzr help commands/COMMANDNAME``
as well as ``bzr help COMMANDNAME`` (which only works for commands
where the name is not the same as a more general help topic).
(Robert Collins)
* ``bzr help PLUGINNAME`` will now return the module docstring from the
plugin PLUGINNAME. (Robert Collins, #50408)
* New help topic ``urlspec`` which lists the availables transports.
(Goffredo Baroncelli)
* doc/server.txt updated to document the default bzr:// port
and also update the blurb about the hpss' current status.
(Robert Collins, #107125).
* ``bzr serve`` now listens on interface 0.0.0.0 by default, making it
serve out to the local LAN (and anyone in the world that can reach the
machine running ``bzr serve``. (Robert Collins, #98918)
* A new smart server protocol version has been added. It prefixes requests
and responses with an explicit version identifier so that future protocol
revisions can be dealt with gracefully. (Andrew Bennetts, Robert Collins)
* The bzr protocol version 2 indicates success or failure in every response
without depending on particular commands encoding that consistently,
allowing future client refactorings to be much more robust about error
handling. (Robert Collins, Martin Pool, Andrew Bennetts)
* The smart protocol over HTTP client has been changed to always post to the
same ``.bzr/smart`` URL under the original location when it can. This allows
HTTP servers to only have to pass URLs ending in .bzr/smart to the smart
server handler, and not arbitrary ``.bzr/*/smart`` URLs. (Andrew Bennetts)
* digest authentication is now supported for proxies and HTTP by the urllib
based http implementation. Tested against Apache 2.0.55 and Squid
2.6.5. Basic and digest authentication are handled coherently for HTTP
and proxy: if the user is provided in the url (bzr command line for HTTP,
proxy environment variables for proxies), the password is prompted for
(only once). If the password is provided, it is taken into account. Once
the first authentication is successful, all further authentication
roundtrips are avoided by preventively setting the right authentication
header(s).
(Vincent Ladeuil).
INTERNALS:
* bzrlib API compatability with 0.8 has been dropped, cleaning up some
code paths. (Robert Collins)
* Change the format of chroot urls so that they can be safely manipulated
by generic url utilities without causing the resulting urls to have
escaped the chroot. A side effect of this is that creating a chroot
requires an explicit action using a ChrootServer.
(Robert Collins, Andrew Bennetts)
* Deprecate ``Branch.get_root_id()`` because branches don't have root ids,
rather than fixing bug #96847. (Aaron Bentley)
* ``WorkingTree.apply_inventory_delta`` provides a better alternative to
``WorkingTree._write_inventory``. (Aaron Bentley)
* Convenience method ``TestCase.expectFailure`` ensures that known failures
do not silently pass. (Aaron Bentley)
* ``Transport.local_abspath`` now raises ``NotLocalUrl`` rather than
``TransportNotPossible``. (Martin Pool, Ian Clatworthy)
* New SmartServer hooks facility. There are two initial hooks documented
in ``bzrlib.transport.smart.SmartServerHooks``. The two initial hooks allow
plugins to execute code upon server startup and shutdown.
(Robert Collins).
* SmartServer in standalone mode will now close its listening socket
when it stops, rather than waiting for garbage collection. This primarily
fixes test suite hangs when a test tries to connect to a shutdown server.
It may also help improve behaviour when dealing with a server running
on a specific port (rather than dynamically assigned ports).
(Robert Collins)
* Move most SmartServer code into a new package, bzrlib/smart.
bzrlib/transport/remote.py contains just the Transport classes that used
to be in bzrlib/transport/smart.py. (Andrew Bennetts)
* urllib http implementation avoid roundtrips associated with
401 (and 407) errors once the authentication succeeds.
(Vincent Ladeuil).
* urlib http now supports querying the user for a proxy password if
needed. Realm is shown in the prompt for both HTTP and proxy
authentication when the user is required to type a password.
(Vincent Ladeuil).
* Renamed SmartTransport (and subclasses like SmartTCPTransport) to
RemoteTransport (and subclasses to RemoteTCPTransport, etc). This is more
consistent with its new home in ``bzrlib/transport/remote.py``, and because
it's not really a "smart" transport, just one that does file operations
via remote procedure calls. (Andrew Bennetts)
* The ``lock_write`` method of ``LockableFiles``, ``Repository`` and
``Branch`` now accept a ``token`` keyword argument, so that separate
instances of those objects can share a lock if it has the right token.
(Andrew Bennetts, Robert Collins)
* New method ``get_branch_reference`` on ``BzrDir`` allows the detection of
branch references - which the smart server component needs.
* The Repository API ``make_working_trees`` is now permitted to return
False when ``set_make_working_trees`` is not implemented - previously
an unimplemented ``set_make_working_trees`` implied the result True
from ``make_working_trees``. This has been changed to accomodate the
smart server, where it does not make sense (at this point) to ever
make working trees by default. (Robert Collins)
* Command objects can now declare related help topics by having _see_also
set to a list of related topic. (Robert Collins)
* ``bzrlib.help`` now delegates to the Command class for Command specific
help. (Robert Collins)
* New class ``TransportListRegistry``, derived from the Registry class, which
simplifies tracking the available Transports. (Goffredo Baroncelli)
* New function ``Branch.get_revision_id_to_revno_map`` which will
return a dictionary mapping revision ids to dotted revnos. Since
dotted revnos are defined in the context of the branch tip, it makes
sense to generate them from a ``Branch`` object.
(John Arbash Meinel)
* Fix the 'Unprintable error' message display to use the repr of the
exception that prevented printing the error because the str value
for it is often not useful in debugging (e.g. KeyError('foo') has a
str() of 'foo' but a repr of 'KeyError('foo')' which is much more
useful. (Robert Collins)
* ``urlutils.normalize_url`` now unescapes unreserved characters, such as "~".
(Andrew Bennetts)
BUGFIXES:
* Don't fail bundle selftest if email has 'two' embedded.
(Ian Clatworthy, #98510)
* Remove ``--verbose`` from ``bzr bundle``. It didn't work anyway.
(Robert Widhopf-Fenk, #98591)
* Remove ``--basis`` from the checkout/branch commands - it didn't work
properly and is no longer beneficial.
(Robert Collins, #53675, #43486)
* Don't produce encoding error when adding duplicate files.
(Aaron Bentley)
* Fix ``bzr log <file>`` so it only logs the revisions that changed
the file, and does it faster.
(Kent Gibson, John Arbash Meinel, #51980, #69477)
* Fix ``InterDirstateTre._iter_changes`` to handle when we come across
an empty versioned directory, which now has files in it.
(John Arbash Meinel, #104257)
* Teach ``common_ancestor`` to shortcut when the tip of one branch is
inside the ancestry of the other. Saves a lot of graph processing
(with an ancestry of 16k revisions, ``bzr merge ../already-merged``
changes from 2m10s to 13s). (John Arbash Meinel, #103757)
* Fix ``show_diff_trees`` to handle the case when a file is modified,
and the containing directory is renamed. (The file path is different
in this versus base, but it isn't marked as a rename).
(John Arbash Meinel, #103870)
* FTP now works even when the FTP server does not support atomic rename.
(Aaron Bentley, #89436)
* Correct handling in bundles and merge directives of timezones with
that are not an integer number of hours offset from UTC. Always
represent the epoch time in UTC to avoid problems with formatting
earlier times on win32. (Martin Pool, Alexander Belchenko, John
Arbash Meinel)
* Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
* "dirstate" and "dirstate-tags" formats now produce branches compatible
with old versions of bzr. (Aaron Bentley, #107168))
* Handle moving a directory when children have been added, removed,
and renamed. (John Arbash Meinel, #105479)
* Don't preventively use basic authentication for proxy before receiving a
407 error. Otherwise people willing to use other authentication schemes
may expose their password in the clear (or nearly). This add one
roundtrip in case basic authentication should be used, but plug the
security hole.
(Vincent Ladeuil)
* Handle http and proxy digest authentication.
(Vincent Ladeuil, #94034).
TESTING:
* Added ``bzrlib.strace.strace`` which will strace a single callable and
return a StraceResult object which contains just the syscalls involved
in running it. (Robert Collins)
* New test method ``reduceLockdirTimeout`` to drop the default (ui-centric)
default time down to one suitable for tests. (Andrew Bennetts)
* Add new ``vfs_transport_factory`` attribute on tests which provides the
common vfs backing for both the readonly and readwrite transports.
This allows the RemoteObject tests to back onto local disk or memory,
and use the existing ``transport_server`` attribute all tests know about
to be the smart server transport. This in turn allows tests to
differentiate between 'transport to access the branch', and
'transport which is a VFS' - which matters in Remote* tests.
(Robert Collins, Andrew Bennetts)
* The ``make_branch_and_tree`` method for tests will now create a
lightweight checkout for the tree if the ``vfs_transport_factory`` is not
a LocalURLServer. (Robert Collins, Andrew Bennetts)
* Branch implementation tests have been audited to ensure that all urls
passed to Branch APIs use proper urls, except when local-disk paths
are intended. This is so that tests correctly access the test transport
which is often not equivalent to local disk in Remote* tests. As part
of this many tests were adjusted to remove dependencies on local disk
access.
(Robert Collins, Andrew Bennetts)
* Mark bzrlib.tests and bzrlib.tests.TestUtil as providing assertFOO helper
functions by adding a ``__unittest`` global attribute. (Robert Collins,
Andrew Bennetts, Martin Pool, Jonathan Lange)
* Refactored proxy and authentication handling to simplify the
implementation of new auth schemes for both http and proxy.
(Vincent Ladeuil)
bzr 0.15 2007-04-01
===================
BUGFIXES:
* Handle incompatible repositories as a user issue when fetching.
(Aaron Bentley)
* Don't give a recommendation to upgrade when branching or
checking out a branch that contains an old-format working tree.
(Martin Pool)
bzr 0.15rc3 2007-03-26
=======================
CHANGES:
* A warning is now displayed when opening working trees in older
formats, to encourage people to upgrade to WorkingTreeFormat4.
(Martin Pool)
IMPROVEMENTS:
* HTTP redirections are now taken into account when a branch (or a
bundle) is accessed for the first time. A message is issued at each
redirection to inform the user. In the past, http redirections were
silently followed for each request which significantly degraded the
performances. The http redirections are not followed anymore by
default, instead a RedirectRequested exception is raised. For bzrlib
users needing to follow http redirections anyway,
``bzrlib.transport.do_catching_redirections`` provide an easy transition
path. (vila)
INTERNALS:
* Added ``ReadLock.temporary_write_lock()`` to allow upgrading an OS read
lock to an OS write lock. Linux can do this without unlocking, Win32
needs to unlock in between. (John Arbash Meinel)
* New parameter ``recommend_upgrade`` to ``BzrDir.open_workingtree``
to silence (when false) warnings about opening old formats.
(Martin Pool)
* Fix minor performance regression with bzr-0.15 on pre-dirstate
trees. (We were reading the working inventory too many times).
(John Arbash Meinel)
* Remove ``Branch.get_transaction()`` in favour of a simple cache of
``revision_history``. Branch subclasses should override
``_gen_revision_history`` rather than ``revision_history`` to make use of
this cache, and call ``_clear_revision_history_cache`` and
``_cache_revision_history`` at appropriate times. (Andrew Bennetts)
BUGFIXES:
* Take ``smtp_server`` from user config into account.
(vila, #92195)
* Restore Unicode filename handling for versioned and unversioned files.
(John Arbash Meinel, #92608)
* Don't fail during ``bzr commit`` if a file is marked removed, and
the containing directory is auto-removed. (John Arbash Meinel, #93681)
* ``bzr status FILENAME`` failed on Windows because of an uncommon
errno. (``ERROR_DIRECTORY == 267 != ENOTDIR``).
(Wouter van Heyst, John Arbash Meinel, #90819)
* ``bzr checkout source`` should create a local branch in the same
format as source. (John Arbash Meinel, #93854)
* ``bzr commit`` with a kind change was failing to update the
last-changed-revision for directories. The
InventoryDirectory._unchanged only looked at the ``parent_id`` and name,
ignoring the fact that the kind could have changed, too.
(John Arbash Meinel, #90111)
* ``bzr mv dir/subdir other`` was incorrectly updating files inside
the directory. So that there was a chance it would break commit,
etc. (John Arbash Meinel, #94037)
* Correctly handles mutiple permanent http redirections.
(vila, #88780)
bzr 0.15rc2 2007-03-14
=======================
NOTES WHEN UPGRADING:
* Release 0.15rc2 of bzr changes the ``bzr init-repo`` command to
default to ``--trees`` instead of ``--no-trees``.
Existing shared repositories are not affected.
IMPROVEMENTS:
* New ``merge-directive`` command to generate machine- and human-readable
merge requests. (Aaron Bentley)
* New ``submit:`` revision specifier makes it easy to diff against the
common ancestor with the submit location (Aaron Bentley)
* Added support for Putty's SSH implementation. (Dmitry Vasiliev)
* Added ``bzr status --versioned`` to report only versioned files,
not unknowns. (Kent Gibson)
* Merge now autodetects the correct line-ending style for its conflict
markers. (Aaron Bentley)
INTERNALS:
* Refactored SSH vendor registration into SSHVendorManager class.
(Dmitry Vasiliev)
BUGFIXES:
* New ``--numbered-dirs`` option to ``bzr selftest`` to use
numbered dirs for TestCaseInTempDir. This is default behavior
on Windows. Anyone can force named dirs on Windows
with ``--no-numbered-dirs``. (Alexander Belchenko)
* Fix ``RevisionSpec_revid`` to handle the Unicode strings passed in
from the command line. (Marien Zwart, #90501)
* Fix ``TreeTransform._iter_changes`` when both the source and
destination are missing. (Aaron Bentley, #88842)
* Fix commit of merges with symlinks in dirstate trees.
(Marien Zwart)
* Switch the ``bzr init-repo`` default from --no-trees to --trees.
(Wouter van Heyst, #53483)
bzr 0.15rc1 2007-03-07
=======================
SURPRISES:
* The default disk format has changed. Please run 'bzr upgrade' in your
working trees to upgrade. This new default is compatible for network
operations, but not for local operations. That is, if you have two
versions of bzr installed locally, after upgrading you can only use the
bzr 0.15 version. This new default does not enable tags or nested-trees
as they are incompatible with bzr versions before 0.15 over the network.
* For users of bzrlib: Two major changes have been made to the working tree
api in bzrlib. The first is that many methods and attributes, including
the inventory attribute, are no longer valid for use until one of
``lock_read``/``lock_write``/``lock_tree_write`` has been called,
and become invalid again after unlock is called. This has been done
to improve performance and correctness as part of the dirstate
development.
(Robert Collins, John A Meinel, Martin Pool, and others).
* For users of bzrlib: The attribute 'tree.inventory' should be considered
readonly. Previously it was possible to directly alter this attribute, or
its contents, and have the tree notice this. This has been made
unsupported - it may work in some tree formats, but in the newer dirstate
format such actions will have no effect and will be ignored, or even
cause assertions. All operations possible can still be carried out by a
combination of the tree API, and the bzrlib.transform API. (Robert
Collins, John A Meinel, Martin Pool, and others).
IMPROVEMENTS:
* Support for OS Windows 98. Also .bzr.log on any windows system
saved in My Documents folder. (Alexander Belchenko)
* ``bzr mv`` enhanced to support already moved files.
In the past the mv command would have failed if the source file doesn't
exist. In this situation ``bzr mv`` would now detect that the file has
already moved and update the repository accordingly, if the target file
does exist.
A new option ``--after`` has been added so that if two files already
exist, you could notify Bazaar that you have moved a (versioned) file
and replaced it with another. Thus in this case ``bzr move --after``
will only update the Bazaar identifier.
(Steffen Eichenberg, Marius Kruger)
* ``ls`` now works on treeless branches and remote branches.
(Aaron Bentley)
* ``bzr help global-options`` describes the global options.
(Aaron Bentley)
* ``bzr pull --overwrite`` will now correctly overwrite checkouts.
(Robert Collins)
* Files are now allowed to change kind (e.g. from file to symlink).
Supported by ``commit``, ``revert`` and ``status``
(Aaron Bentley)
* ``inventory`` and ``unknowns`` hidden in favour of ``ls``
(Aaron Bentley)
* ``bzr help checkouts`` descibes what checkouts are and some possible
uses of them. (James Westby, Aaron Bentley)
* A new ``-d`` option to push, pull and merge overrides the default
directory. (Martin Pool)
* Branch format 6: smaller, and potentially faster than format 5. Supports
``append_history_only`` mode, where the log view and revnos do not change,
except by being added to. Stores policy settings in
".bzr/branch/branch.conf".
* ``append_only`` branches: Format 6 branches may be configured so that log
view and revnos are always consistent. Either create the branch using
"bzr init --append-revisions-only" or edit the config file as descriped
in docs/configuration.txt.
* rebind: Format 6 branches retain the last-used bind location, so if you
"bzr unbind", you can "bzr bind" to bind to the previously-selected
bind location.
* Builtin tags support, created and deleted by the ``tag`` command and
stored in the branch. Tags can be accessed with the revisionspec
``-rtag:``, and listed with ``bzr tags``. Tags are not versioned
at present. Tags require a network incompatible upgrade. To perform this
upgrade, run ``bzr upgrade --dirstate-tags`` in your branch and
repositories. (Martin Pool)
* The ``bzr://`` transport now has a well-known port number, 4155,
which it will use by default. (Andrew Bennetts, Martin Pool)
* Bazaar now looks for user-installed plugins before looking for site-wide
plugins. (Jonathan Lange)
* ``bzr resolve`` now detects and marks resolved text conflicts.
(Aaron Bentley)
INTERNALS:
* Internally revision ids and file ids are now passed around as utf-8
bytestrings, rather than treating them as Unicode strings. This has
performance benefits for Knits, since we no longer need to decode the
revision id for each line of content, nor for each entry in the index.
This will also help with the future dirstate format.
(John Arbash Meinel)
* Reserved ids (any revision-id ending in a colon) are rejected by
versionedfiles, repositories, branches, and working trees
(Aaron Bentley)
* Minor performance improvement by not creating a ProgressBar for
every KnitIndex we create. (about 90ms for a bzr.dev tree)
(John Arbash Meinel)
* New easier to use Branch hooks facility. There are five initial hooks,
all documented in bzrlib.branch.BranchHooks.__init__ - ``'set_rh'``,
``'post_push'``, ``'post_pull'``, ``'post_commit'``,
``'post_uncommit'``. These hooks fire after the matching operation
on a branch has taken place, and were originally added for the
branchrss plugin. (Robert Collins)
* New method ``Branch.push()`` which should be used when pushing from a
branch as it makes performance and policy decisions to match the UI
level command ``push``. (Robert Collins).
* Add a new method ``Tree.revision_tree`` which allows access to cached
trees for arbitrary revisions. This allows the in development dirstate
tree format to provide access to the callers to cached copies of
inventory data which are cheaper to access than inventories from the
repository.
(Robert Collins, Martin Pool)
* New ``Branch.last_revision_info`` method, this is being done to allow
optimization of requests for both the number of revisions and the last
revision of a branch with smartservers and potentially future branch
formats. (Wouter van Heyst, Robert Collins)
* Allow ``'import bzrlib.plugins.NAME'`` to work when the plugin NAME has not
yet been loaded by ``load_plugins()``. This allows plugins to depend on each
other for code reuse without requiring users to perform file-renaming
gymnastics. (Robert Collins)
* New Repository method ``'gather_stats'`` for statistic data collection.
This is expected to grow to cover a number of related uses mainly
related to bzr info. (Robert Collins)
* Log formatters are now managed with a registry.
``log.register_formatter`` continues to work, but callers accessing
the FORMATTERS dictionary directly will not.
* Allow a start message to be passed to the ``edit_commit_message``
function. This will be placed in the message offered to the user
for editing above the separator. It allows a template commit message
to be used more easily. (James Westby)
* ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
you pass a Unicode string rather than an 8-bit string. Callers need
to be updated to encode first. (John Arbash Meinel)
* Branch.push, pull, merge now return Result objects with information
about what happened, rather than a scattering of various methods. These
are also passed to the post hooks. (Martin Pool)
* File formats and architecture is in place for managing a forest of trees
in bzr, and splitting up existing trees into smaller subtrees, and
finally joining trees to make a larger tree. This is the first iteration
of this support, and the user-facing aspects still require substantial
work. If you wish to experiment with it, use ``bzr upgrade
--dirstate-with-subtree`` in your working trees and repositories.
You can use the hidden commands ``split`` and ``join`` and to create
and manipulate nested trees, but please consider using the nested-trees
branch, which contains substantial UI improvements, instead.
http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/
(Aaron Bentley, Martin Pool, Robert Collins).
BUGFIXES:
* ``bzr annotate`` now uses dotted revnos from the viewpoint of the
branch, rather than the last changed revision of the file.
(John Arbash Meinel, #82158)
* Lock operations no longer hang if they encounter a permission problem.
(Aaron Bentley)
* ``bzr push`` can resume a push that was canceled before it finished.
Also, it can push even if the target directory exists if you supply
the ``--use-existing-dir`` flag.
(John Arbash Meinel, #30576, #45504)
* Fix http proxy authentication when user and an optional
password appears in the ``*_proxy`` vars. (Vincent Ladeuil,
#83954).
* ``bzr log branch/file`` works for local treeless branches
(Aaron Bentley, #84247)
* Fix problem with UNC paths on Windows 98. (Alexander Belchenko, #84728)
* Searching location of CA bundle for PyCurl in env variable
(``CURL_CA_BUNDLE``), and on win32 along the PATH.
(Alexander Belchenko, #82086)
* ``bzr init`` works with unicode argument LOCATION.
(Alexander Belchenko, #85599)
* Raise ``DependencyNotPresent`` if pycurl do not support https.
(Vincent Ladeuil, #85305)
* Invalid proxy env variables should not cause a traceback.
(Vincent Ladeuil, #87765)
* Ignore patterns normalised to use '/' path separator.
(Kent Gibson, #86451)
* bzr rocks. It sure does! Fix case. (Vincent Ladeuil, #78026)
* Fix bzrtools shelve command for removed lines beginning with "--"
(Johan Dahlberg, #75577)
TESTING:
* New ``--first`` option to ``bzr selftest`` to run specified tests
before the rest of the suite. (Martin Pool)
bzr 0.14 2007-01-23
====================
IMPROVEMENTS:
* ``bzr help global-options`` describes the global options. (Aaron Bentley)
BUG FIXES:
* Skip documentation generation tests if the tools to do so are not
available. Fixes running selftest for installled copies of bzr.
(John Arbash Meinel, #80330)
* Fix the code that discovers whether bzr is being run from it's
working tree to handle the case when it isn't but the directory
it is in is below a repository. (James Westby, #77306)
bzr 0.14rc1 2007-01-16
=======================
IMPROVEMENTS:
* New connection: ``bzr+http://`` which supports tunnelling the smart
protocol over an HTTP connection. If writing is enabled on the bzr
server, then you can write over the http connection.
(Andrew Bennetts, John Arbash Meinel)
* Aliases now support quotation marks, so they can contain whitespace
(Marius Kruger)
* PyCurlTransport now use a single curl object. By specifying explicitly
the 'Range' header, we avoid the need to use two different curl objects
(and two connections to the same server). (Vincent Ladeuil)
* ``bzr commit`` does not prompt for a message until it is very likely to
succeed. (Aaron Bentley)
* ``bzr conflicts`` now takes --text to list pathnames of text conflicts
(Aaron Bentley)
* Fix ``iter_lines_added_or_present_in_versions`` to use a set instead
of a list while checking if a revision id was requested. Takes 10s
off of the ``fileids_affected_by_revision_ids`` time, which is 10s
of the ``bzr branch`` time. Also improve ``fileids_...`` time by
filtering lines with a regex rather than multiple ``str.find()``
calls. (saves another 300ms) (John Arbash Meinel)
* Policy can be set for each configuration key. This allows keys to be
inherited properly across configuration entries. For example, this
should enable you to do::
[/home/user/project]
push_location = sftp://host/srv/project/
push_location:policy = appendpath
And then a branch like ``/home/user/project/mybranch`` should get an
automatic push location of ``sftp://host/srv/project/mybranch``.
(James Henstridge)
* Added ``bzr status --short`` to make status report svn style flags
for each file. For example::
$ bzr status --short
A foo
A bar
D baz
? wooley
* 'bzr selftest --clean-output' allows easily clean temporary tests
directories without running tests. (Alexander Belchenko)
* ``bzr help hidden-commands`` lists all hidden commands. (Aaron Bentley)
* ``bzr merge`` now has an option ``--pull`` to fall back to pull if
local is fully merged into remote. (Jan Hudec)
* ``bzr help formats`` describes available directory formats. (Aaron Bentley)
INTERNALS:
* A few tweaks directly to ``fileids_affected_by_revision_ids`` to
help speed up processing, as well allowing to extract unannotated
lines. Between the two ``fileids_affected_by_revision_ids`` is
improved by approx 10%. (John Arbash Meinel)
* Change Revision serialization to only write out millisecond
resolution. Rather than expecting floating point serialization to
preserve more resolution than we need. (Henri Weichers, Martin Pool)
* Test suite ends cleanly on Windows. (Vincent Ladeuil)
* When ``encoding_type`` attribute of class Command is equal to 'exact',
force sys.stdout to be a binary stream on Windows, and therefore
keep exact line-endings (without LF -> CRLF conversion).
(Alexander Belchenko)
* Single-letter short options are no longer globally declared. (Martin
Pool)
* Before using detected user/terminal encoding bzr should check
that Python has corresponding codec. (Alexander Belchenko)
* Formats for end-user selection are provided via a FormatRegistry (Aaron Bentley)
BUG FIXES:
* ``bzr missing --verbose`` was showing adds/removals in the wrong
direction. (John Arbash Meinel)
* ``bzr annotate`` now defaults to showing dotted revnos for merged
revisions. It cuts them off at a depth of 12 characters, but you can
supply ``--long`` to see the full number. You can also use
``--show-ids`` to display the original revision ids, rather than
revision numbers and committer names. (John Arbash Meinel, #75637)
* bzr now supports Win32 UNC path (e.g. ``\HOST\path``.
(Alexander Belchenko, #57869)
* Win32-specific: output of cat, bundle and diff commands don't mangle
line-endings (Alexander Belchenko, #55276)
* Replace broken fnmatch based ignore pattern matching with custom pattern
matcher.
(Kent Gibson, Jan Hudec #57637)
* pycurl and urllib can detect short reads at different places. Update
the test suite to test more cases. Also detect http error code 416
which was raised for that specific bug. Also enhance the urllib
robustness by detecting invalid ranges (and pycurl's one by detecting
short reads during the initial GET). (Vincent Ladeuil, #73948)
* The urllib connection sharing interacts badly with urllib2
proxy setting (the connections didn't go thru the proxy
anymore). Defining a proper ProxyHandler solves the
problem. (Vincent Ladeuil, #74759)
* Use urlutils to generate relative URLs, not osutils
(Aaron Bentley, #76229)
* ``bzr status`` in a readonly directory should work without giving
lots of errors. (John Arbash Meinel, #76299)
* Mention the revisionspec topic for the revision option help.
(Wouter van Heyst, #31663)
* Allow plugins import from zip archives.
(Alexander Belchenko, #68124)
bzr 0.13 2006-12-05
====================
No changes from 0.13rc1
bzr 0.13rc1 2006-11-27
=======================
IMPROVEMENTS:
* New command ``bzr remove-tree`` allows the removal of the working
tree from a branch.
(Daniel Silverstone)
* urllib uses shared keep-alive connections, so http
operations are substantially faster.
(Vincent Ladeuil, #53654)
* ``bzr export`` allows an optional branch parameter, to export a bzr
tree from some other url. For example:
``bzr export bzr.tar.gz http://bazaar-vcs.org/bzr/bzr.dev``
(Daniel Silverstone)
* Added ``bzr help topics`` to the bzr help system. This gives a
location for general information, outside of a specific command.
This includes updates for ``bzr help revisionspec`` the first topic
included. (Goffredo Baroncelli, John Arbash Meinel, #42714)
* WSGI-compatible HTTP smart server. See ``doc/http_smart_server.txt``.
(Andrew Bennetts)
* Knit files will now cache full texts only when the size of the
deltas is as large as the size of the fulltext. (Or after 200
deltas, whichever comes first). This has the most benefit on large
files with small changes, such as the inventory for a large project.
(eg For a project with 2500 files, and 7500 revisions, it changes
the size of inventory.knit from 11MB to 5.4MB) (John Arbash Meinel)
INTERNALS:
* New -D option given before the command line turns on debugging output
for particular areas. -Derror shows tracebacks on all errors.
(Martin Pool)
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
and remove benchmarks that take longer than 10min to run.
(John Arbash Meinel)
* Use ``time.time()`` instead of ``time.clock()`` to decide on
progress throttling. Because ``time.clock()`` is actually CPU time,
so over a high-latency connection, too many updates get throttled.
(John Arbash Meinel)
* ``MemoryTransport.list_dir()`` would strip the first character for
files or directories in root directory. (John Arbash Meinel)
* New method ``get_branch_reference`` on 'BzrDir' allows the detection of
branch references - which the smart server component needs.
* New ``ChrootTransportDecorator``, accessible via the ``chroot+`` url
prefix. It disallows any access to locations above a set URL. (Andrew
Bennetts)
BUG FIXES:
* Now ``_KnitIndex`` properly decode revision ids when loading index data.
And optimize the knit index parsing code.
(Dmitry Vasiliev, John Arbash Meinel)
* ``bzrlib/bzrdir.py`` was directly referencing ``bzrlib.workingtree``,
without importing it. This prevented ``bzr upgrade`` from working
unless a plugin already imported ``bzrlib.workingtree``
(John Arbash Meinel, #70716)
* Suppress the traceback on invalid URLs (Vincent Ladeuil, #70803).
* Give nicer error message when an http server returns a 403
error code. (Vincent Ladeuil, #57644).
* When a multi-range http GET request fails, try a single
range one. If it fails too, forget about ranges. Remember that until
the death of the transport and propagates that to the clones.
(Vincent Ladeuil, #62276, #62029).
* Handles user/passwords supplied in url from command
line (for the urllib implementation). Don't request already
known passwords (Vincent Ladeuil, #42383, #44647, #48527)
* ``_KnitIndex.add_versions()`` dictionary compresses revision ids as they
are added. This fixes bug where fetching remote revisions records
them as full references rather than integers.
(John Arbash Meinel, #64789)
* ``bzr ignore`` strips trailing slashes in patterns.
Also ``bzr ignore`` rejects absolute paths. (Kent Gibson, #4559)
* ``bzr ignore`` takes multiple arguments. (Cheuksan Edward Wang, #29488)
* mv correctly handles paths that traverse symlinks.
(Aaron Bentley, #66964)
* Give nicer looking error messages when failing to connect over ssh.
(John Arbash Meinel, #49172)
* Pushing to a remote branch does not currently update the remote working
tree. After a remote push, ``bzr status`` and ``bzr diff`` on the remote
machine now show that the working tree is out of date.
(Cheuksan Edward Wang #48136)
* Use patiencediff instead of difflib for determining deltas to insert
into knits. This avoids the O(N^3) behavior of difflib. Patience
diff should be O(N^2). (Cheuksan Edward Wang, #65714)
* Running ``bzr log`` on nonexistent file gives an error instead of the
entire log history. (Cheuksan Edward Wang #50793)
* ``bzr cat`` can look up contents of removed or renamed files. If the
pathname is ambiguous, i.e. the files in the old and new trees have
different id's, the default is the file in the new tree. The user can
use "--name-from-revision" to select the file in the old tree.
(Cheuksan Edward Wang, #30190)
TESTING:
* TestingHTTPRequestHandler really handles the Range header
(previously it was ignoring it and returning the whole file,).
bzr 0.12 2006-10-30
====================
INTERNALS:
* Clean up ``bzr selftest --benchmark bundle`` to correct an import,
and remove benchmarks that take longer than 10min to run.
(John Arbash Meinel)
bzr 0.12rc1 2006-10-23
=======================
IMPROVEMENTS:
* ``bzr log`` now shows dotted-decimal revision numbers for all revisions,
rather than just showing a decimal revision number for revisions on the
mainline. These revision numbers are not yet accepted as input into bzr
commands such as log, diff etc. (Robert Collins)
* revisions can now be specified using dotted-decimal revision numbers.
For instance, ``bzr diff -r 1.2.1..1.2.3``. (Robert Collins)
* ``bzr help commands`` output is now shorter (Aaron Bentley)
* ``bzr`` now uses lazy importing to reduce the startup time. This has
a moderate effect on lots of actions, especially ones that have
little to do. For example ``bzr rocks`` time is down to 116ms from
283ms. (John Arbash Meinel)
* New Registry class to provide name-to-object registry-like support,
for example for schemes where plugins can register new classes to
do certain tasks (e.g. log formatters). Also provides lazy registration
to allow modules to be loaded on request.
(John Arbash Meinel, Adeodato Simó)
API INCOMPATABILITY:
* LogFormatter subclasses show now expect the 'revno' parameter to
show() to be a string rather than an int. (Robert Collins)
INTERNALS:
* ``TestCase.run_bzr``, ``run_bzr_captured``, and ``run_bzr_subprocess``
can take a ``working_dir='foo'`` parameter, which will change directory
for the command. (John Arbash Meinel)
* ``bzrlib.lazy_regex.lazy_compile`` can be used to create a proxy
around a regex, which defers compilation until first use.
(John Arbash Meinel)
* ``TestCase.run_bzr_subprocess`` defaults to supplying the
``--no-plugins`` parameter to ensure test reproducability, and avoid
problems with system-wide installed plugins. (John Arbash Meinel)
* Unique tree root ids are now supported. Newly created trees still
use the common root id for compatibility with bzr versions before 0.12.
(Aaron Bentley)
* ``WorkingTree.set_root_id(None)`` is now deprecated. Please
pass in ``inventory.ROOT_ID`` if you want the default root id value.
(Robert Collins, John Arbash Meinel)
* New method ``WorkingTree.flush()`` which will write the current memory
inventory out to disk. At the same time, ``read_working_inventory`` will
no longer trash the current tree inventory if it has been modified within
the current lock, and the tree will now ``flush()`` automatically on
``unlock()``. ``WorkingTree.set_root_id()`` has been updated to take
advantage of this functionality. (Robert Collins, John Arbash Meinel)
* ``bzrlib.tsort.merge_sorted`` now accepts ``generate_revnos``. This
parameter will cause it to add another column to its output, which
contains the dotted-decimal revno for each revision, as a tuple.
(Robert Collins)
* ``LogFormatter.show_merge`` is deprecated in favour of
``LogFormatter.show_merge_revno``. (Robert Collins)
BUG FIXES:
* Avoid circular imports by creating a deprecated function for
``bzrlib.tree.RevisionTree``. Callers should have been using
``bzrlib.revisontree.RevisionTree`` anyway. (John Arbash Meinel,
#63360, #66349)
* Don't use ``socket.MSG_WAITALL`` as it doesn't exist on all
platforms. (Martin Pool, #66356)
* Don't require ``Content-Type`` in range responses. Assume they are a
single range if ``Content-Type`` does not exist.
(John Arbash Meinel, #62473)
* bzr branch/pull no longer complain about progress bar cleanup when
interrupted during fetch. (Aaron Bentley, #54000)
* ``WorkingTree.set_parent_trees()`` uses the trees to directly write
the basis inventory, rather than going through the repository. This
allows us to have 1 inventory read, and 2 inventory writes when
committing a new tree. (John Arbash Meinel)
* When reverting, files that are not locally modified that do not exist
in the target are deleted, not just unversioned (Aaron Bentley)
* When trying to acquire a lock, don't fail immediately. Instead, try
a few times (up to 1 hour) before timing out. Also, report why the
lock is unavailable (John Arbash Meinel, #43521, #49556)
* Leave HttpTransportBase daughter classes decides how they
implement cloning. (Vincent Ladeuil, #61606)
* diff3 does not indicate conflicts on clean merge. (Aaron Bentley)
* If a commit fails, the commit message is stored in a file at the root of
the tree for later commit. (Cheuksan Edward Wang, Stefan Metzmacher,
#32054)
TESTING:
* New test base class TestCaseWithMemoryTransport offers memory-only
testing facilities: its not suitable for tests that need to mutate disk
state, but most tests should not need that and should be converted to
TestCaseWithMemoryTransport. (Robert Collins)
* ``TestCase.make_branch_and_memory_tree`` now takes a format
option to set the BzrDir, Repository and Branch formats of the
created objects. (Robert Collins, John Arbash Meinel)
bzr 0.11 2006-10-02
====================
* Smart server transport test failures on windows fixed. (Lukáš Lalinský).
bzr 0.11rc2 2006-09-27
=======================
BUG FIXES:
* Test suite hangs on windows fixed. (Andrew Bennets, Alexander Belchenko).
* Commit performance regression fixed. (Aaron Bentley, Robert Collins, John
Arbash Meinel).
bzr 0.11rc1 2006-09-25
=======================
IMPROVEMENTS:
* Knit files now wait to create their contents until the first data is
added. The old code used to create an empty .knit and a .kndx with just
the header. However, this caused a lot of extra round trips over sftp.
This can change the time for ``bzr push`` to create a new remote branch
from 160s down to 100s. This also affects ``bzr commit`` performance when
adding new files, ``bzr commit`` on a new kernel-like tree drops from 50s
down to 40s (John Arbash Meinel, #44692)
* When an entire subtree has been deleted, commit will now report that
just the top of the subtree has been deleted, rather than reporting
all the individual items. (Robert Collins)
* Commit performs one less XML parse. (Robert Collins)
* ``bzr checkout`` now operates on readonly branches as well
as readwrite branches. This fixes bug #39542. (Robert Collins)
* ``bzr bind`` no longer synchronises history with the master branch.
Binding should be followed by an update or push to synchronise the
two branches. This is closely related to the fix for bug #39542.
(Robert Collins)
* ``bzrlib.lazy_import.lazy_import`` function to create on-demand
objects. This allows all imports to stay at the global scope, but
modules will not actually be imported if they are not used.
(John Arbash Meinel)
* Support ``bzr://`` and ``bzr+ssh://`` urls to work with the new RPC-based
transport which will be used with the upcoming high-performance smart
server. The new command ``bzr serve`` will invoke bzr in server mode,
which processes these requests. (Andrew Bennetts, Robert Collins, Martin
Pool)
* New command ``bzr version-info`` which can be used to get a summary
of the current state of the tree. This is especially useful as part
of a build commands. See ``doc/version_info.txt`` for more information
(John Arbash Meinel)
BUG FIXES:
* ``'bzr inventory [FILE...]'`` allows restricting the file list to a
specific set of files. (John Arbash Meinel, #3631)
* Don't abort when annotating empty files (John Arbash Meinel, #56814)
* Add ``Stanza.to_unicode()`` which can be passed to another Stanza
when nesting stanzas. Also, add ``read_stanza_unicode`` to handle when
reading a nested Stanza. (John Arbash Meinel)
* Transform._set_mode() needs to stat the right file.
(John Arbash Meinel, #56549)
* Raise WeaveFormatError rather than StopIteration when trying to read
an empty Weave file. (John Arbash Meinel, #46871)
* Don't access e.code for generic URLErrors, only HTTPErrors have .code.
(Vincent Ladeuil, #59835)
* Handle boundary="" lines properly to allow access through a Squid proxy.
(John Arbash Meinel, #57723)
* revert now removes newly-added directories (Aaron Bentley, #54172)
* ``bzr upgrade sftp://`` shouldn't fail to upgrade v6 branches if there
isn't a working tree. (David Allouche, #40679)
* Give nicer error messages when a user supplies an invalid --revision
parameter. (John Arbash Meinel, #55420)
* Handle when LANG is not recognized by python. Emit a warning, but
just revert to using 'ascii'. (John Arbash Meinel, #35392)
* Don't use ``preexec_fn`` on win32, as it is not supported by subprocess.
(John Arbash Meinel)
* Skip specific tests when the dependencies aren't met. This includes
some ``setup.py`` tests when ``python-dev`` is not available, and
some tests that depend on paramiko. (John Arbash Meinel, Mattheiu Moy)
* Fallback to Paramiko properly, if no ``ssh`` executable exists on
the system. (Andrew Bennetts, John Arbash Meinel)
* ``Branch.bind(other_branch)`` no longer takes a write lock on the
other branch, and will not push or pull between the two branches.
API users will need to perform a push or pull or update operation if they
require branch synchronisation to take place. (Robert Collins, #47344)
* When creating a tarball or zipfile export, export unicode names as utf-8
paths. This may not work perfectly on all platforms, but has the best
chance of working in the common case. (John Arbash Meinel, #56816)
* When committing, only files that exist in working tree or basis tree
may be specified (Aaron Bentley, #50793)
PORTABILITY:
* Fixes to run on Python 2.5 (Brian M. Carlson, Martin Pool, Marien Zwart)
INTERNALS:
* TestCaseInTempDir now creates a separate directory for HOME, rather
than having HOME set to the same location as the working directory.
(John Arbash Meinel)
* ``run_bzr_subprocess()`` can take an optional ``env_changes={}`` parameter,
which will update os.environ inside the spawned child. It also can
take a ``universal_newlines=True``, which helps when checking the output
of the command. (John Arbash Meinel)
* Refactor SFTP vendors to allow easier re-use when ssh is used.
(Andrew Bennetts)
* ``Transport.list_dir()`` and ``Transport.iter_files_recursive()`` should always
return urlescaped paths. This is now tested (there were bugs in a few
of the transports) (Andrew Bennetts, David Allouche, John Arbash Meinel)
* New utility function ``symbol_versioning.deprecation_string``. Returns the
formatted string for a callable, deprecation format pair. (Robert Collins)
* New TestCase helper applyDeprecated. This allows you to call a callable
which is deprecated without it spewing to the screen, just by supplying
the deprecation format string issued for it. (Robert Collins)
* Transport.append and Transport.put have been deprecated in favor of
``.append_bytes``, ``.append_file``, ``.put_bytes``, and
``.put_file``. This removes the ambiguity in what type of object the
functions take. ``Transport.non_atomic_put_{bytes,file}`` has also
been added. Which works similarly to ``Transport.append()`` except for
SFTP, it doesn't have a round trip when opening the file. Also, it
provides functionality for creating a parent directory when trying
to create a file, rather than raise NoSuchFile and forcing the
caller to repeat their request.
(John Arbash Meinel)
* WorkingTree has a new api ``unversion`` which allow the unversioning of
entries by their file id. (Robert Collins)
* ``WorkingTree.pending_merges`` is deprecated. Please use the
``get_parent_ids`` (introduced in 0.10) method instead. (Robert Collins)
* WorkingTree has a new ``lock_tree_write`` method which locks the branch for
read rather than write. This is appropriate for actions which only need
the branch data for reference rather than mutation. A new decorator
``needs_tree_write_lock`` is provided in the workingtree module. Like the
``needs_read_lock`` and ``needs_write_lock`` decorators this allows static
declaration of the locking requirements of a function to ensure that
a lock is taken out for casual scripts. (Robert Collins, #54107)
* All WorkingTree methods which write to the tree, but not to the branch
have been converted to use ``needs_tree_write_lock`` rather than
``needs_write_lock``. Also converted is the revert, conflicts and tree
transform modules. This provides a modest performance improvement on
metadir style trees, due to the reduce lock-acquisition, and a more
significant performance improvement on lightweight checkouts from
remote branches, where trivial operations used to pay a significant
penalty. It also provides the basis for allowing readonly checkouts.
(Robert Collins)
* Special case importing the standard library 'copy' module. This shaves
off 40ms of startup time, while retaining compatibility. See:
``bzrlib/inspect_for_copy.py`` for more details. (John Arbash Meinel)
* WorkingTree has a new parent class MutableTree which represents the
specialisations of Tree which are able to be altered. (Robert Collins)
* New methods mkdir and ``put_file_bytes_non_atomic`` on MutableTree that
mutate the tree and its contents. (Robert Collins)
* Transport behaviour at the root of the URL is now defined and tested.
(Andrew Bennetts, Robert Collins)
TESTING:
* New test helper classs MemoryTree. This is typically accessed via
``self.make_branch_and_memory_tree()`` in test cases. (Robert Collins)
* Add ``start_bzr_subprocess`` and ``stop_bzr_subprocess`` to allow test
code to continue running concurrently with a subprocess of bzr.
(Andrew Bennetts, Robert Collins)
* Add a new method ``Transport.get_smart_client()``. This is provided to
allow upgrades to a richer interface than the VFS one provided by
Transport. (Andrew Bennetts, Martin Pool)
bzr 0.10 2006-08-29
====================
IMPROVEMENTS:
* 'merge' now takes --uncommitted, to apply uncommitted changes from a
tree. (Aaron Bentley)
* 'bzr add --file-ids-from' can be used to specify another path to use
for creating file ids, rather than generating all new ones. Internally,
the 'action' passed to ``smart_add_tree()`` can return ``file_ids`` that
will be used, rather than having bzrlib generate new ones.
(John Arbash Meinel, #55781)
* ``bzr selftest --benchmark`` now allows a ``--cache-dir`` parameter.
This will cache some of the intermediate trees, and decrease the
setup time for benchmark tests. (John Arbash Meinel)
* Inverse forms are provided for all boolean options. For example,
--strict has --no-strict, --no-recurse has --recurse (Aaron Bentley)
* Serialize out Inventories directly, rather than using ElementTree.
Writing out a kernel sized inventory drops from 2s down to ~350ms.
(Robert Collins, John Arbash Meinel)
BUG FIXES:
* Help diffutils 2.8.4 get along with binary tests (Marien Zwart: #57614)
* Change LockDir so that if the lock directory doesn't exist when
``lock_write()`` is called, an attempt will be made to create it.
(John Arbash Meinel, #56974)
* ``bzr uncommit`` preserves pending merges. (John Arbash Meinel, #57660)
* Active FTP transport now works as intended. (ghozzy, #56472)
* Really fix mutter() so that it won't ever raise a UnicodeError.
It means it is possible for ~/.bzr.log to contain non UTF-8 characters.
But it is a debugging log, not a real user file.
(John Arbash Meinel, #56947, #53880)
* Change Command handle to allow Unicode command and options.
At present we cannot register Unicode command names, so we will get
BzrCommandError('unknown command'), or BzrCommandError('unknown option')
But that is better than a UnicodeError + a traceback.
(John Arbash Meinel, #57123)
* Handle TZ=UTC properly when reading/writing revisions.
(John Arbash Meinel, #55783, #56290)
* Use ``GPG_TTY`` to allow gpg --cl to work with gpg-agent in a pipeline,
(passing text to sign in on stdin). (John Arbash Meinel, #54468)
* External diff does the right thing for binaries even in foreign
languages. (John Arbash Meinel, #56307)
* Testament handles more cases when content is unicode. Specific bug was
in handling of revision properties.
(John Arbash Meinel, Holger Krekel, #54723)
* The bzr selftest was failing on installed versions due to a bug in a new
test helper. (John Arbash Meinel, Robert Collins, #58057)
INTERNALS:
* ``bzrlib.cache_utf8`` contains ``encode()`` and ``decode()`` functions
which can be used to cache the conversion between utf8 and Unicode.
Especially helpful for some of the knit annotation code, which has to
convert revision ids to utf8 to annotate lines in storage.
(John Arbash Meinel)
* ``setup.py`` now searches the filesystem to find all packages which
need to be installed. This should help make the life of packagers
easier. (John Arbash Meinel)
bzr 0.9.0 2006-08-11
=====================
SURPRISES:
* The hard-coded built-in ignore rules have been removed. There are
now two rulesets which are enforced. A user global one in
``~/.bazaar/ignore`` which will apply to every tree, and the tree
specific one '.bzrignore'.
``~/.bazaar/ignore`` will be created if it does not exist, but with
a more conservative list than the old default.
This fixes bugs with default rules being enforced no matter what.
The old list of ignore rules from bzr is available by
running 'bzr ignore --old-default-rules'.
(Robert Collins, Martin Pool, John Arbash Meinel)
* 'branches.conf' has been changed to 'locations.conf', since it can apply
to more locations than just branch locations.
(Aaron Bentley)
IMPROVEMENTS:
* The revision specifier "revno:" is extended to accept the syntax
revno:N:branch. For example,
revno:42:http://bazaar-vcs.org/bzr/bzr.dev/ means revision 42 in
bzr.dev. (Matthieu Moy)
* Tests updates to ensure proper URL handling, UNICODE support, and
proper printing when the user's terminal encoding cannot display
the path of a file that has been versioned.
``bzr branch`` can take a target URL rather than only a local directory.
``Branch.get_parent()/set_parent()`` now save a relative path if possible,
and normalize the parent based on root, allowing access across
different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
(Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
#42517, #42514)
* On Unix, detect terminal width using an ioctl not just $COLUMNS.
Use terminal width for single-line logs from ``bzr log --line`` and
pending-merge display. (Robert Widhopf-Fenk, Gustavo Niemeyer)
(Malone #3507)
* On Windows, detect terminal width using GetConsoleScreenBufferInfo.
(Alexander Belchenko)
* Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
* Show the correct number of revisions pushed when pushing a new branch.
(Robert Collins).
* 'bzr selftest' now shows a progress bar with the number of tests, and
progress made. 'make check' shows tests in -v mode, to be more useful
for the PQM status window. (Robert Collins).
When using a progress bar, failed tests are printed out, rather than
being overwritten by the progress bar until the suite finishes.
(John Arbash Meinel)
* 'bzr selftest --benchmark' will run a new benchmarking selftest.
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
profile data for the individual profiled calls, allowing for fine
grained analysis of performance.
(Robert Collins, Martin Pool).
* 'bzr commit' shows a progress bar. This is useful for commits over sftp
where commit can take an appreciable time. (Robert Collins)
* 'bzr add' is now less verbose in telling you what ignore globs were
matched by files being ignored. Instead it just tells you how many
were ignored (because you might reasonably be expecting none to be
ignored). 'bzr add -v' is unchanged and will report every ignored
file. (Robert Collins).
* ftp now has a test server if medusa is installed. As part of testing,
ftp support has been improved, including support for supplying a
non-standard port. (John Arbash Meinel).
* 'bzr log --line' shows the revision number, and uses only the
first line of the log message (#5162, Alexander Belchenko;
Matthieu Moy)
* 'bzr status' has had the --all option removed. The 'bzr ls' command
should be used to retrieve all versioned files. (Robert Collins)
* 'bzr bundle OTHER/BRANCH' will create a bundle which can be sent
over email, and applied on the other end, while maintaining ancestry.
This bundle can be applied with either 'bzr merge' or 'bzr pull',
the same way you would apply another branch.
(John Arbash Meinel, Aaron Bentley)
* 'bzr whoami' can now be used to set your identity from the command line,
for a branch or globally. (Robey Pointer)
* 'bzr checkout' now aliased to 'bzr co', and 'bzr annotate' to 'bzr ann'.
(Michael Ellerman)
* 'bzr revert DIRECTORY' now reverts the contents of the directory as well.
(Aaron Bentley)
* 'bzr get sftp://foo' gives a better error when paramiko is not present.
Also updates things like 'http+pycurl://' if pycurl is not present.
(John Arbash Meinel) (Malone #47821, #52204)
* New env variable ``BZR_PROGRESS_BAR``, sets the default progress bar type.
Can be set to 'none' or 'dummy' to disable the progress bar, 'dots' or
'tty' to create the respective type. (John Arbash Meinel, #42197, #51107)
* Improve the help text for 'bzr diff' to explain what various options do.
(John Arbash Meinel, #6391)
* 'bzr uncommit -r 10' now uncommits revisions 11.. rather than uncommitting
revision 10. This makes -r10 more in line with what other commands do.
'bzr uncommit' also now saves the pending merges of the revisions that
were removed. So it is safe to uncommit after a merge, fix something,
and commit again. (John Arbash Meinel, #32526, #31426)
* 'bzr init' now also works on remote locations.
(Wouter van Heyst, #48904)
* HTTP support has been updated. When using pycurl we now support
connection keep-alive, which reduces dns requests and round trips.
And for both urllib and pycurl we support multi-range requests,
which decreases the number of round-trips. Performance results for
``bzr branch http://bazaar-vcs.org/bzr/bzr.dev/`` indicate
http branching is now 2-3x faster, and ``bzr pull`` in an existing
branch is as much as 4x faster.
(Michael Ellerman, Johan Rydberg, John Arbash Meinel, #46768)
* Performance improvements for sftp. Branching and pulling are now up to
2x faster. Utilize paramiko.readv() support for async requests if it
is available (paramiko > 1.6) (John Arbash Meinel)
BUG FIXES:
* Fix shadowed definition of TestLocationConfig that caused some
tests not to run.
(Erik BÃ¥gfors, Michael Ellerman, Martin Pool, #32587)
* Fix unnecessary requirement of sign-my-commits that it be run from
a working directory. (Martin Pool, Robert Collins)
* 'bzr push location' will only remember the push location if it succeeds
in connecting to the remote location. (John Arbash Meinel, #49742)
* 'bzr revert' no longer toggles the executable bit on win32
(John Arbash Meinel, #45010)
* Handle broken pipe under win32 correctly. (John Arbash Meinel)
* sftp tests now work correctly on win32 if you have a newer paramiko
(John Arbash Meinel)
* Cleanup win32 test suite, and general cleanup of places where
file handles were being held open. (John Arbash Meinel)
* When specifying filenames for 'diff -r x..y', the name of the file in the
working directory can be used, even if its name is different in both x
and y.
* File-ids containing single- or double-quotes are handled correctly by
push. (Aaron Bentley, #52227)
* Normalize unicode filenames to ensure cross-platform consistency.
(John Arbash Meinel, #43689)
* The argument parser can now handle '-' as an argument. Currently
no code interprets it specially (it is mostly handled as a file named
'-'). But plugins, and future operations can use it.
(John Arbash meinel, #50984)
* Bundles can properly read binary files with a plain '\r' in them.
(John Arbash Meinel, #51927)
* Tuning ``iter_entries()`` to be more efficient (John Arbash Meinel, #5444)
* Lots of win32 fixes (the test suite passes again).
(John Arbash Meinel, #50155)
* Handle openbsd returning None for sys.getfilesystemencoding() (#41183)
* Support ftp APPE (append) to allow Knits to be used over ftp (#42592)
* Removals are only committed if they match the filespec (or if there is
no filespec). (#46635, Aaron Bentley)
* smart-add recurses through all supplied directories
(John Arbash Meinel, #52578)
* Make the bundle reader extra lines before and after the bundle text.
This allows you to parse an email with the bundle inline.
(John Arbash Meinel, #49182)
* Change the file id generator to squash a little bit more. Helps when
working with long filenames on windows. (Also helps for unicode filenames
not generating hidden files). (John Arbash Meinel, #43801)
* Restore terminal mode on C-c while reading sftp password. (#48923,
Nicholas Allen, Martin Pool)
* Timestamps are rounded to 1ms, and revision entries can be recreated
exactly. (John Arbash Meinel, Jamie Wilkinson, #40693)
* Branch.base has changed to a URL, but ~/.bazaar/locations.conf should
use local paths, since it is user visible (John Arbash Meinel, #53653)
* ``bzr status foo`` when foo was unversioned used to cause a full delta
to be generated (John Arbash Meinel, #53638)
* When reading revision properties, an empty value should be considered
the empty string, not None (John Arbash Meinel, #47782)
* ``bzr diff --diff-options`` can now handle binary files being changed.
Also, the output is consistent when --diff-options is not supplied.
(John Arbash Meinel, #54651, #52930)
* Use the right suffixes for loading plugins (John Arbash Meinel, #51810)
* Fix ``Branch.get_parent()`` to handle the case when the parent is not
accessible (John Arbash Meinel, #52976)
INTERNALS:
* Combine the ignore rules into a single regex rather than looping over
them to reduce the threshold where N^2 behaviour occurs in operations
like status. (Jan Hudec, Robert Collins).
* Appending to ``bzrlib.DEFAULT_IGNORE`` is now deprecated. Instead, use
one of the add functions in bzrlib.ignores. (John Arbash Meinel)
* 'bzr push' should only push the ancestry of the current revision, not
all of the history in the repository. This is especially important for
shared repositories. (John Arbash Meinel)
* ``bzrlib.delta.compare_trees`` now iterates in alphabetically sorted order,
rather than randomly walking the inventories. (John Arbash Meinel)
* Doctests are now run in temporary directories which are cleaned up when
they finish, rather than using special ScratchDir/ScratchBranch objects.
(Martin Pool)
* Split ``check`` into separate methods on the branch and on the repository,
so that it can be specialized in ways that are useful or efficient for
different formats. (Martin Pool, Robert Collins)
* Deprecate ``Repository.all_revision_ids``; most methods don't really need
the global revision graph but only that part leading up to a particular
revision. (Martin Pool, Robert Collins)
* Add a BzrDirFormat ``control_formats`` list which allows for control formats
that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
(Robert Collins, Jelmer Vernooij).
* ``bzrlib.diff.external_diff`` can be redirected to any file-like object.
Uses subprocess instead of spawnvp.
(James Henstridge, John Arbash Meinel, #4047, #48914)
* New command line option '--profile-imports', which will install a custom
importer to log time to import modules and regex compilation time to
sys.stderr (John Arbash Meinel)
* 'EmptyTree' is now deprecated, please use ``repository.revision_tree(None)``
instead. (Robert Collins)
* "RevisionTree" is now in bzrlib/revisiontree.py. (Robert Collins)
bzr 0.8.2 2006-05-17
=====================
BUG FIXES:
* setup.py failed to install launchpad plugin. (Martin Pool)
bzr 0.8.1 2006-05-16
=====================
BUG FIXES:
* Fix failure to commit a merge in a checkout. (Martin Pool,
Robert Collins, Erik BÃ¥gfors, #43959)
* Nicer messages from 'commit' in the case of renames, and correct
messages when a merge has occured. (Robert Collins, Martin Pool)
* Separate functionality from assert statements as they are skipped in
optimized mode of python. Add the same check to pending merges.
(Olaf Conradi, #44443)
CHANGES:
* Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
* Add info on standalone branches without a working tree.
(Olaf Conradi, #44155)
* Fix bug in knits when raising InvalidRevisionId. (Olaf Conradi, #44284)
CHANGES:
* Make editor invocation comply with Debian Policy. First check
environment variables VISUAL and EDITOR, then try editor from
alternatives system. If that all fails, fall back to the pre-defined
list of editors. (Olaf Conradi, #42904)
NEW FEATURES:
* New 'register-branch' command registers a public branch into
Launchpad.net, where it can be associated with bugs, etc.
(Martin Pool, Bjorn Tillenius, Robert Collins)
INTERNALS:
* New public api in InventoryEntry - ``describe_change(old, new)`` which
provides a human description of the changes between two old and
new. (Robert Collins, Martin Pool)
TESTING:
* Fix test case for bzr info in upgrading a standalone branch to metadir,
uses bzrlib api now. (Olaf Conradi)
bzr 0.8 2006-05-08
===================
NOTES WHEN UPGRADING:
Release 0.8 of bzr introduces a new format for history storage, called
'knit', as an evolution of to the 'weave' format used in 0.7. Local
and remote operations are faster using knits than weaves. Several
operations including 'init', 'init-repo', and 'upgrade' take a
--format option that controls this. Branching from an existing branch
will keep the same format.
It is possible to merge, pull and push between branches of different
formats but this is slower than moving data between homogenous
branches. It is therefore recommended (but not required) that you
upgrade all branches for a project at the same time. Information on
formats is shown by 'bzr info'.
bzr 0.8 now allows creation of 'repositories', which hold the history
of files and revisions for several branches. Previously bzr kept all
the history for a branch within the .bzr directory at the root of the
branch, and this is still the default. To create a repository, use
the new 'bzr init-repo' command. Branches exist as directories under
the repository and contain just a small amount of information
indicating the current revision of the branch.
bzr 0.8 also supports 'checkouts', which are similar to in cvs and
subversion. Checkouts are associated with a branch (optionally in a
repository), which contains all the historical information. The
result is that a checkout can be deleted without losing any
already-committed revisions. A new 'update' command is also available.
Repositories and checkouts are not supported with the 0.7 storage
format. To use them you must upgrad to either knits, or to the
'metaweave' format, which uses weaves but changes the .bzr directory
arrangement.
IMPROVEMENTS:
* Sftp paths can now be relative, or local, according to the lftp
convention. Paths now take the form::
sftp://user:pass@host:port/~/relative/path
or
sftp://user:pass@host:port/absolute/path
* The FTP transport now tries to reconnect after a temporary
failure. ftp put is made atomic. (Matthieu Moy)
* The FTP transport now maintains a pool of connections, and
reuses them to avoid multiple connections to the same host (like
sftp did). (Daniel Silverstone)
* The ``bzr_man.py`` file has been removed. To create the man page now,
use ``./generate_docs.py man``. The new program can also create other files.
Run ``python generate_docs.py --help`` for usage information.
(Hans Ulrich Niedermann & James Blackwell).
* Man Page now gives full help (James Blackwell).
Help also updated to reflect user config now being stored in .bazaar
(Hans Ulrich Niedermann)
* It's now possible to set aliases in bazaar.conf (Erik BÃ¥gfors)
* Pull now accepts a --revision argument (Erik BÃ¥gfors)
* ``bzr re-sign`` now allows multiple revisions to be supplied on the command
line. You can now use the following command to sign all of your old
commits::
find .bzr/revision-store// -name my@email-* \
| sed 's/.*\/\/..\///' \
| xargs bzr re-sign
* Upgrade can now upgrade over the network. (Robert Collins)
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
behaviour. By default they will cache history in the checkout, but
with --lightweight almost all data is kept in the master branch.
(Robert Collins)
* 'revert' unversions newly-versioned files, instead of deleting them.
* 'merge' is more robust. Conflict messages have changed.
* 'merge' and 'revert' no longer clobber existing files that end in '~' or
'.moved'.
* Default log format can be set in configuration and plugins can register
their own formatters. (Erik BÃ¥gfors)
* New 'reconcile' command will check branch consistency and repair indexes
that can become out of sync in pre 0.8 formats. (Robert Collins,
Daniel Silverstone)
* New 'bzr init --format' and 'bzr upgrade --format' option to control
what storage format is created or produced. (Robert Collins,
Martin Pool)
* Add parent location to 'bzr info', if there is one. (Olaf Conradi)
* New developer commands 'weave-list' and 'weave-join'. (Martin Pool)
* New 'init-repository' command, plus support for repositories in 'init'
and 'branch' (Aaron Bentley, Erik BÃ¥gfors, Robert Collins)
* Improve output of 'info' command. Show all relevant locations related to
working tree, branch and repository. Use kibibytes for binary quantities.
Fix off-by-one error in missing revisions of working tree. Make 'info'
work on branches, repositories and remote locations. Show locations
relative to the shared repository, if applicable. Show locking status
of locations. (Olaf Conradi)
* Diff and merge now safely handle binary files. (Aaron Bentley)
* 'pull' and 'push' now normalise the revision history, so that any two
branches with the same tip revision will have the same output from 'log'.
(Robert Collins)
* 'merge' accepts --remember option to store parent location, like 'push'
and 'pull'. (Olaf Conradi)
* bzr status and diff when files given as arguments do not exist
in the relevant trees. (Martin Pool, #3619)
* Add '.hg' to the default ignore list. (Martin Pool)
* 'knit' is now the default disk format. This improves disk performance and
utilization, increases incremental pull performance, robustness with SFTP
and allows checkouts over SFTP to perform acceptably.
The initial Knit code was contributed by Johan Rydberg based on a
specification by Martin Pool.
(Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
* New tool to generate all-in-one html version of the manual. (Alexander
Belchenko)
* Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
to be left in the SFTP repository. (Robert Collins, Martin Pool).
* New option 'diff --prefix' to control how files are named in diff
output, with shortcuts '-p0' and '-p1' corresponding to the options for
GNU patch. (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
* Add --revision option to 'annotate' command. (Olaf Conradi)
* If bzr shows an unexpected revision-history after pulling (perhaps due
to a reweave) it can now be corrected by 'bzr reconcile'.
(Robert Collins)
CHANGES:
* Commit is now verbose by default, and shows changed filenames and the
new revision number. (Robert Collins, Martin Pool)
* Unify 'mv', 'move', 'rename'. (Matthew Fuller, #5379)
* 'bzr -h' shows help. (Martin Pool, Ian Bicking, #35940)
* Make 'pull' and 'push' remember location on failure using --remember.
(Olaf Conradi)
* For compatibility, make old format for using weaves inside metadir
available as 'metaweave' format. Rename format 'metadir' to 'default'.
Clean up help for option --format in commands 'init', 'init-repo' and
'upgrade'. (Olaf Conradi)
INTERNALS:
* The internal storage of history, and logical branch identity have now
been split into Branch, and Repository. The common locking and file
management routines are now in bzrlib.lockablefiles.
(Aaron Bentley, Robert Collins, Martin Pool)
* Transports can now raise DependencyNotPresent if they need a library
which is not installed, and then another implementation will be
tried. (Martin Pool)
* Remove obsolete (and no-op) `decode` parameter to `Transport.get`.
(Martin Pool)
* Using Tree Transform for merge, revert, tree-building
* WorkingTree.create, Branch.create, ``WorkingTree.create_standalone``,
Branch.initialize are now deprecated. Please see ``BzrDir.create_*`` for
replacement API's. (Robert Collins)
* New BzrDir class represents the .bzr control directory and manages
formatting issues. (Robert Collins)
* New repository.InterRepository class encapsulates Repository to
Repository actions and allows for clean selection of optimised code
paths. (Robert Collins)
* ``bzrlib.fetch.fetch`` and ``bzrlib.fetch.greedy_fetch`` are now
deprecated, please use ``branch.fetch`` or ``repository.fetch``
depending on your needs. (Robert Collins)
* deprecated methods now have a ``is_deprecated`` flag on them that can
be checked, if you need to determine whether a given callable is
deprecated at runtime. (Robert Collins)
* Progress bars are now nested - see
``bzrlib.ui.ui_factory.nested_progress_bar``.
(Robert Collins, Robey Pointer)
* New API call ``get_format_description()`` for each type of format.
(Olaf Conradi)
* Changed ``branch.set_parent()`` to accept None to remove parent.
(Olaf Conradi)
* Deprecated BzrError AmbiguousBase. (Olaf Conradi)
* WorkingTree.branch is now a read only property. (Robert Collins)
* bzrlib.ui.text.TextUIFactory now accepts a ``bar_type`` parameter which
can be None or a factory that will create a progress bar. This is
useful for testing or for overriding the bzrlib.progress heuristic.
(Robert Collins)
* New API method ``get_physical_lock_status()`` to query locks present on a
transport. (Olaf Conradi)
* Repository.reconcile now takes a thorough keyword parameter to allow
requesting an indepth reconciliation, rather than just a data-loss
check. (Robert Collins)
* ``bzrlib.ui.ui_factory protocol`` now supports ``get_boolean`` to prompt
the user for yes/no style input. (Robert Collins)
TESTING:
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
for testing SFTP protocol support. (Robey Pointer)
* Branch formats are now tested once per implementation (see ``bzrlib.
tests.branch_implementations``. This is analagous to the transport
interface tests, and has been followed up with working tree,
repository and BzrDir tests. (Robert Collins)
* New test base class TestCaseWithTransport provides a transport aware
test environment, useful for testing any transport-interface using
code. The test suite option --transport controls the transport used
by this class (when its not being used as part of implementation
contract testing). (Robert Collins)
* Close logging handler on disabling the test log. This will remove the
handler from the internal list inside python's logging module,
preventing shutdown from closing it twice. (Olaf Conradi)
* Move test case for uncommit to blackbox tests. (Olaf Conradi)
* ``run_bzr`` and ``run_bzr_captured`` now accept a 'stdin="foo"'
parameter which will provide String("foo") to the command as its stdin.
bzr 0.7 2006-01-09
==================
CHANGES:
* .bzrignore is excluded from exports, on the grounds that it's a bzr
internal-use file and may not be wanted. (Jamie Wilkinson)
* The "bzr directories" command were removed in favor of the new
--kind option to the "bzr inventory" command. To list all
versioned directories, now use "bzr inventory --kind directory".
(Johan Rydberg)
* Under Windows configuration directory is now ``%APPDATA%\bazaar\2.0``
by default. (John Arbash Meinel)
* The parent of Bzr configuration directory can be set by ``BZR_HOME``
environment variable. Now the path for it is searched in ``BZR_HOME``,
then in HOME. Under Windows the order is: ``BZR_HOME``, ``APPDATA``
(usually points to ``C:\Documents and Settings\User Name\Application Data``),
``HOME``. (John Arbash Meinel)
* Plugins with the same name in different directories in the bzr plugin
path are no longer loaded: only the first successfully loaded one is
used. (Robert Collins)
* Use systems' external ssh command to open connections if possible.
This gives better integration with user settings such as ProxyCommand.
(James Henstridge)
* Permissions on files underneath .bzr/ are inherited from the .bzr
directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
will mean that future file will be created with group write permissions.
* configure.in and config.guess are no longer in the builtin default
ignore list.
* '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
files. (John Arbash Meinel, Martin Pool)
IMPROVEMENTS:
* "bzr INIT dir" now initializes the specified directory, and creates
it if it does not exist. (John Arbash Meinel)
* New remerge command (Aaron Bentley)
* Better zsh completion script. (Steve Borho)
* 'bzr diff' now returns 1 when there are changes in the working
tree. (Robert Collins)
* 'bzr push' now exists and can push changes to a remote location.
This uses the transport infrastructure, and can store the remote
location in the ~/.bazaar/branches.conf configuration file.
(Robert Collins)
* Test directories are only kept if the test fails and the user requests
that they be kept.
* Tweaks to short log printing
* Added branch nicks, new nick command, printing them in log output.
(Aaron Bentley)
* If ``$BZR_PDB`` is set, pop into the debugger when an uncaught exception
occurs. (Martin Pool)
* Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
the same as Subversion. (Martin Pool)
* New ftp transport support (on ftplib), for ftp:// and aftp://
URLs. (Daniel Silverstone)
* Commit editor temporary files now start with ``bzr_log.``, to allow
text editors to match the file name and set up appropriate modes or
settings. (Magnus Therning)
* Improved performance when integrating changes from a remote weave.
(Goffredo Baroncelli)
* Sftp will attempt to cache the connection, so it is more likely that
a connection will be reused, rather than requiring multiple password
requests.
* bzr revno now takes an optional argument indicating the branch whose
revno should be printed. (Michael Ellerman)
* bzr cat defaults to printing the last version of the file.
(Matthieu Moy, #3632)
* New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof
profiler. (Denys Duchier)
* Faster commits by reading only the headers of affected weave files.
(Denys Duchier)
* 'bzr add' now takes a --dry-run parameter which shows you what would be
added, but doesn't actually add anything. (Michael Ellerman)
* 'bzr add' now lists how many files were ignored per glob. add --verbose
lists the specific files. (Aaron Bentley)
* 'bzr missing' now supports displaying changes in diverged trees and can
be limited to show what either end of the comparison is missing.
(Aaron Bently, with a little prompting from Daniel Silverstone)
BUG FIXES:
* SFTP can walk up to the root path without index errors. (Robert Collins)
* Fix bugs in running bzr with 'python -O'. (Martin Pool)
* Error when run with -OO
* Fix bug in reporting http errors that don't have an http error code.
(Martin Pool)
* Handle more cases of pipe errors in display commands
* Change status to 3 for all errors
* Files that are added and unlinked before committing are completely
ignored by diff and status
* Stores with some compressed texts and some uncompressed texts are now
able to be used. (John A Meinel)
* Fix for bzr pull failing sometimes under windows
* Fix for sftp transport under windows when using interactive auth
* Show files which are both renamed and modified as such in 'bzr
status' output. (Daniel Silverstone, #4503)
* Make annotate cope better with revisions committed without a valid
email address. (Marien Zwart)
* Fix representation of tab characters in commit messages.
(Harald Meland)
* List of plugin directories in ``BZR_PLUGIN_PATH`` environment variable is
now parsed properly under Windows. (Alexander Belchenko)
* Show number of revisions pushed/pulled/merged. (Robey Pointer)
* Keep a cached copy of the basis inventory to speed up operations
that need to refer to it. (Johan Rydberg, Martin Pool)
* Fix bugs in bzr status display of non-ascii characters.
(Martin Pool)
* Remove Makefile.in from default ignore list.
(Tollef Fog Heen, Martin Pool, #6413)
* Fix failure in 'bzr added'. (Nathan McCallum, Martin Pool)
TESTING:
* Fix selftest asking for passwords when there are no SFTP keys.
(Robey Pointer, Jelmer Vernooij)
* Fix selftest run with 'python -O'. (Martin Pool)
* Fix HTTP tests under Windows. (John Arbash Meinel)
* Make tests work even if HOME is not set (Aaron Bentley)
* Updated ``build_tree`` to use fixed line-endings for tests which read
the file cotents and compare. Make some tests use this to pass under
Windows. (John Arbash Meinel)
* Skip stat and symlink tests under Windows. (Alexander Belchenko)
* Delay in selftest/testhashcash is now issued under win32 and Cygwin.
(John Arbash Meinel)
* Use terminal width to align verbose test output. (Martin Pool)
* Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
If adding a new test script please add that to
``bzrlib.tests.blackbox.__init__``. (Robert Collins)
* Much better error message if one of the test suites can't be
imported. (Martin Pool)
* Make check now runs the test suite twice - once with the default locale,
and once with all locales forced to C, to expose bugs. This is not
trivially done within python, so for now its only triggered by running
Make check. Integrators and packagers who wish to check for full
platform support should run 'make check' to test the source.
(Robert Collins)
* Tests can now run TestSkipped if they can't execute for any reason.
(Martin Pool) (NB: TestSkipped should only be raised for correctable
reasons - see the wiki spec ImprovingBzrTestSuite).
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
paths for the transport tests. Introduce blackbox remote sftp tests that
test the same permutations. (Robert Collins, Robey Pointer)
* Transport implementation tests are now independent of the local file
system, which allows tests for esoteric transports, and for features
not available in the local file system. They also repeat for variations
on the URL scheme that can introduce issues in the transport code,
see bzrlib.transport.TransportTestProviderAdapter() for this.
(Robert Collins).
* ``TestCase.build_tree`` uses the transport interface to build trees,
pass in a transport parameter to give it an existing connection.
(Robert Collins).
INTERNALS:
* WorkingTree.pull has been split across Branch and WorkingTree,
to allow Branch only pulls. (Robert Collins)
* ``commands.display_command`` now returns the result of the decorated
function. (Robert Collins)
* LocationConfig now has a ``set_user_option(key, value)`` call to save
a setting in its matching location section (a new one is created
if needed). (Robert Collins)
* Branch has two new methods, ``get_push_location`` and
``set_push_location`` to respectively, get and set the push location.
(Robert Collins)
* ``commands.register_command`` now takes an optional flag to signal that
the registrant is planning to decorate an existing command. When
given multiple plugins registering a command is not an error, and
the original command class (whether built in or a plugin based one) is
returned to the caller. There is a new error 'MustUseDecorated' for
signalling when a wrapping command should switch to the original
version. (Robert Collins)
* Some option parsing errors will raise 'BzrOptionError', allowing
granular detection for decorating commands. (Robert Collins).
* ``Branch.read_working_inventory`` has moved to
``WorkingTree.read_working_inventory``. This necessitated changes to
``Branch.get_root_id``, and a move of ``Branch.set_inventory`` to
WorkingTree as well. To make it clear that a WorkingTree cannot always
be obtained ``Branch.working_tree()`` will raise
``errors.NoWorkingTree`` if one cannot be obtained. (Robert Collins)
* All pending merges operations from Branch are now on WorkingTree.
(Robert Collins)
* The follow operations from Branch have moved to WorkingTree::
add()
commit()
move()
rename_one()
unknowns()
(Robert Collins)
* ``bzrlib.add.smart_add_branch`` is now ``smart_add_tree``. (Robert Collins)
* New "rio" serialization format, similar to rfc-822. (Martin Pool)
* Rename selftests to ``bzrlib.tests.test_foo``. (John A Meinel, Martin
Pool)
* ``bzrlib.plugin.all_plugins`` has been changed from an attribute to a
query method. (Robert Collins)
* New options to read only the table-of-contents of a weave.
(Denys Duchier)
* Raise NoSuchFile when someone tries to add a non-existant file.
(Michael Ellerman)
* Simplify handling of DivergedBranches in ``cmd_pull()``.
(Michael Ellerman)
* Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
is exposed as ``Branch().control_files``. Also this has been altered with the
controlfile pre/suffix replaced by simple method names like 'get' and
'put'. (Aaron Bentley, Robert Collins).
* Deprecated functions and methods can now be marked as such using the
``bzrlib.symbol_versioning`` module. Marked method have their docstring
updated and will issue a DeprecationWarning using the warnings module
when they are used. (Robert Collins)
* ``bzrlib.osutils.safe_unicode`` now exists to provide parameter coercion
for functions that need unicode strings. (Robert Collins)
bzr 0.6 2005-10-28
==================
IMPROVEMENTS:
* pull now takes --verbose to show you what revisions are added or removed
(John A Meinel)
* merge now takes a --show-base option to include the base text in
conflicts.
(Aaron Bentley)
* The config files are now read using ConfigObj, so '=' should be used as
a separator, not ':'.
(Aaron Bentley)
* New 'bzr commit --strict' option refuses to commit if there are
any unknown files in the tree. To commit, make sure all files are
either ignored, added, or deleted. (Michael Ellerman)
* The config directory is now ~/.bazaar, and there is a single file
~/.bazaar/bazaar.conf storing email, editor and other preferences.
(Robert Collins)
* 'bzr add' no longer takes a --verbose option, and a --quiet option
has been added that suppresses all output.
* Improved zsh completion support in contrib/zsh, from Clint
Adams.
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
Goffredo Baroncelli.
* 'bzr check' now accepts -v for verbose reporting, and checks for
ghosts in the branch. (Robert Collins)
* New command 're-sign' which will regenerate the gpg signature for
a revision. (Robert Collins)
* If you set ``check_signatures=require`` for a path in
``~/.bazaar/branches.conf`` then bzr will invoke your
``gpg_signing_command`` (defaults to gpg) and record a digital signature
of your commit. (Robert Collins)
* New sftp transport, based on Paramiko. (Robey Pointer)
* 'bzr pull' now accepts '--clobber' which will discard local changes
and make this branch identical to the source branch. (Robert Collins)
* Just give a quieter warning if a plugin can't be loaded, and
put the details in .bzr.log. (Martin Pool)
* 'bzr branch' will now set the branch-name to the last component of the
output directory, if one was supplied.
* If the option ``post_commit`` is set to one (or more) python function
names (must be in the bzrlib namespace), then they will be invoked
after the commit has completed, with the branch and ``revision_id`` as
parameters. (Robert Collins)
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
* --merge-type weave is now supported for file contents. Tree-shape
changes are still three-way based. (Martin Pool, Aaron Bentley)
* 'bzr check' allows the first revision on revision-history to have
parents - something that is expected for cheap checkouts, and occurs
when conversions from baz do not have all history. (Robert Collins).
* 'bzr merge' can now graft unrelated trees together, if your specify
0 as a base. (Aaron Bentley)
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
(Aaron Bentley)
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
* 'bzr merge --reprocess' minimizes conflicts
TESTING:
* The 'bzr selftest --pattern' option for has been removed, now
test specifiers on the command line can be simple strings, or
regexps, or both. (Robert Collins)
* Passing -v to selftest will now show the time each test took to
complete, which will aid in analysing performance regressions and
related questions. (Robert Collins)
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
is given. (Martin Pool)
* There is a new method for TestCaseInTempDir, assertFileEqual, which
will check that a given content is equal to the content of the named
file. (Robert Collins)
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
(Martin Pool)
INTERNALS:
* New 'testament' command and concept for making gpg-signatures
of revisions that are not tied to a particular internal
representation. (Martin Pool).
* Per-revision properties ('revprops') as key-value associated
strings on each revision created when the revision is committed.
Intended mainly for the use of external tools. (Martin Pool).
* Config options have moved from bzrlib.osutils to bzrlib.config.
(Robert Collins)
* Improved command line option definitions allowing explanations
for individual options, among other things. Contributed by
Magnus Therning.
* Config options have moved from bzrlib.osutils to bzrlib.config.
Configuration is now done via the config.Config interface:
Depending on whether you have a Branch, a Location or no information
available, construct a ``*Config``, and use its ``signature_checking``,
``username`` and ``user_email`` methods. (Robert Collins)
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
they are made available for other plugins to use. You should not
import other plugins during the ``__init__`` of your plugin though, as
no ordering is guaranteed, and the plugins directory is not on the
python path. (Robert Collins)
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
no longer takes an inventory, rather it takes an option branch
parameter, and if None is given will open the branch at basedir
implicitly. (Robert Collins)
* Cleaner exception structure and error reporting. Suggested by
Scott James Remnant. (Martin Pool)
* Branch.remove has been moved to WorkingTree, which has also gained
``lock_read``, ``lock_write`` and ``unlock`` methods for convenience.
(Robert Collins)
* Two decorators, ``needs_read_lock`` and ``needs_write_lock`` have been
added to the branch module. Use these to cause a function to run in a
read or write lock respectively. (Robert Collins)
* ``Branch.open_containing`` now returns a tuple (Branch, relative-path),
which allows direct access to the common case of 'get me this file
from its branch'. (Robert Collins)
* Transports can register using ``register_lazy_transport``, and they
will be loaded when first used. (Martin Pool)
* 'pull' has been factored out of the command as ``WorkingTree.pull()``.
A new option to WorkingTree.pull has been added, clobber, which will
ignore diverged history and pull anyway.
(Robert Collins)
* config.Config has a ``get_user_option`` call that accepts an option name.
This will be looked up in branches.conf and bazaar.conf as normal.
It is intended that this be used by plugins to support options -
options of built in programs should have specific methods on the config.
(Robert Collins)
* ``merge.merge_inner`` now has tempdir as an optional parameter.
(Robert Collins)
* Tree.kind is not recorded at the top level of the hierarchy, as it was
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
(Robert Collins)
* ``WorkingTree.__del__`` has been removed, it was non deterministic and not
doing what it was intended to. See ``WorkingTree.__init__`` for a comment
about future directions. (Robert Collins/Martin Pool)
* bzrlib.transport.http has been modified so that only 404 urllib errors
are returned as NoSuchFile. Other exceptions will propogate as normal.
This allows debuging of actual errors. (Robert Collins)
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
to apis like 'put', 'get' and 'has'. This is to provide consistent
behaviour - it operates on url's only. (Robert Collins)
* Transports can register using ``register_lazy_transport``, and they
will be loaded when first used. (Martin Pool)
* ``merge_flex`` no longer calls ``conflict_handler.finalize()``, instead that
is called by ``merge_inner``. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of ``merge_inner``. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
* ``revision.revision_graph`` can handle having only partial history for
a revision - that is no revisions in the graph with no parents.
(Robert Collins).
* New ``builtins.branch_files`` uses the standard ``file_list`` rules to
produce a branch and a list of paths, relative to that branch
(Aaron Bentley)
* New TestCase.addCleanup facility.
* New ``bzrlib.version_info`` tuple (similar to ``sys.version_info``),
which can be used by programs importing bzrlib.
BUG FIXES:
* Better handling of branches in directories with non-ascii names.
(Joel Rosdahl, Panagiotis Papadakos)
* Upgrades of trees with no commits will not fail due to accessing
[-1] in the revision-history. (Andres Salomon)
bzr 0.1.1 2005-10-12
====================
BUG FIXES:
* Fix problem in pulling over http from machines that do not
allow directories to be listed.
* Avoid harmless warning about invalid hash cache after
upgrading branch format.
PERFORMANCE:
* Avoid some unnecessary http operations in branch and pull.
bzr 0.1 2005-10-11
==================
NOTES:
* 'bzr branch' over http initially gives a very high estimate
of completion time but it should fall as the first few
revisions are pulled in. branch is still slow on
high-latency connections.
BUG FIXES:
* bzr-man.py has been updated to work again. Contributed by
Rob Weir.
* Locking is now done with fcntl.lockf which works with NFS
file systems. Contributed by Harald Meland.
* When a merge encounters a file that has been deleted on
one side and modified on the other, the old contents are
written out to foo.BASE and foo.SIDE, where SIDE is this
or OTHER. Contributed by Aaron Bentley.
* Export was choosing incorrect file paths for the content of
the tarball, this has been fixed by Aaron Bentley.
* Commit will no longer commit without a log message, an
error is returned instead. Contributed by Jelmer Vernooij.
* If you commit a specific file in a sub directory, any of its
parent directories that are added but not listed will be
automatically included. Suggested by Michael Ellerman.
* bzr commit and upgrade did not correctly record new revisions
for files with only a change to their executable status.
bzr will correct this when it encounters it. Fixed by
Robert Collins
* HTTP tests now force off the use of ``http_proxy`` for the duration.
Contributed by Gustavo Niemeyer.
* Fix problems in merging weave-based branches that have
different partial views of history.
* Symlink support: working with symlinks when not in the root of a
bzr tree was broken, patch from Scott James Remnant.
IMPROVEMENTS:
* 'branch' now accepts a --basis parameter which will take advantage
of local history when making a new branch. This allows faster
branching of remote branches. Contributed by Aaron Bentley.
* New tree format based on weave files, called version 5.
Existing branches can be upgraded to this format using
'bzr upgrade'.
* Symlinks are now versionable. Initial patch by
Erik Toubro Nielsen, updated to head by Robert Collins.
* Executable bits are tracked on files. Patch from Gustavo
Niemeyer.
* 'bzr status' now shows unknown files inside a selected directory.
Patch from Heikki Paajanen.
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
and 'resolve' have needed added, which list and remove those
merge conflicts respectively. A conflicted tree cannot be committed
in. Contributed by Aaron Bentley.
* 'rm' is now an alias for 'remove'.
* Stores now split out their content in a single byte prefixed hash,
dropping the density of files per directory by 256. Contributed by
Gustavo Niemeyer.
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
Contributed by Robert Collins.
* 'bzr log' with the default formatter will show merged revisions,
indented to the right. Initial implementation contributed by Gustavo
Niemeyer, made incremental by Robert Collins.
INTERNALS:
* Test case failures have the exception printed after the log
for your viewing pleasure.
* InventoryEntry is now an abstract base class, use one of the
concrete InventoryDirectory etc classes instead.
* Branch raises an UnsupportedFormatError when it detects a
bzr branch it cannot understand. This allows for precise
handling of such circumstances.
* Remove RevisionReference class; ``Revision.parent_ids`` is now simply a
list of their ids and ``parent_sha1s`` is a list of their corresponding
sha1s (for old branches only at the moment.)
* New method-object style interface for Commit() and Fetch().
* Renamed ``Branch.last_patch()`` to ``Branch.last_revision()``, since
we call them revisions not patches.
* Move ``copy_branch`` to ``bzrlib.clone.copy_branch``. The destination
directory is created if it doesn't exist.
* Inventories now identify the files which were present by
giving the revision *of that file*.
* Inventory and Revision XML contains a version identifier.
This must be consistent with the overall branch version
but allows for more flexibility in future upgrades.
TESTING:
* Removed testsweet module so that tests can be run after
bzr installed by 'bzr selftest'.
* 'bzr selftest' command-line arguments can now be partial ids
of tests to run, e.g. ``bzr selftest test_weave``
bzr 0.0.9 2005-09-23
====================
BUG FIXES:
* Fixed "branch -r" option.
* Fix remote access to branches containing non-compressed history.
(Robert Collins).
* Better reliability of http server tests. (John Arbash-Meinel)
* Merge graph maximum distance calculation fix. (Aaron Bentley)
* Various minor bug in windows support have been fixed, largely in the
test suite. Contributed by Alexander Belchenko.
IMPROVEMENTS:
* Status now accepts a -r argument to give status between chosen
revisions. Contributed by Heikki Paajanen.
* Revision arguments no longer use +/-/= to control ranges, instead
there is a 'before' namespace, which limits the successive namespace.
For example '$ bzr log -r date:yesterday..before:date:today' will
select everything from yesterday and before today. Contributed by
Robey Pointer
* There is now a bzr.bat file created by distutils when building on
Windows. Contributed by Alexander Belchenko.
INTERNALS:
* Removed uuid() as it was unused.
* Improved 'fetch' code for pulling revisions from one branch into
another (used by pull, merged, etc.)
bzr 0.0.8 2005-09-20
====================
IMPROVEMENTS:
* Adding a file whose parent directory is not versioned will
implicitly add the parent, and so on up to the root. This means
you should never need to explictly add a directory, they'll just
get added when you add a file in the directory. Contributed by
Michael Ellerman.
* Ignore ``.DS_Store`` (contains Mac metadata) by default.
(Nir Soffer)
* If you set ``BZR_EDITOR`` in the environment, it is checked in
preference to EDITOR and the config file for the interactive commit
editing program. Related to this is a bugfix where a missing program
set in EDITOR would cause editing to fail, now the fallback program
for the operating system is still tried.
* Files that are not directories/symlinks/regular files will no longer
cause bzr to fail, it will just ignore them by default. You cannot add
them to the tree though - they are not versionable.
INTERNALS:
* Refactor xml packing/unpacking.
BUG FIXES:
* Fixed 'bzr mv' by Ollie Rutherfurd.
* Fixed strange error when trying to access a nonexistent http
branch.
* Make sure that the hashcache gets written out if it can't be
read.
PORTABILITY:
* Various Windows fixes from Ollie Rutherfurd.
* Quieten warnings about locking; patch from Matt Lavin.
bzr-0.0.7 2005-09-02
====================
NEW FEATURES:
* ``bzr shell-complete`` command contributed by Clint Adams to
help with intelligent shell completion.
* New expert command ``bzr find-merge-base`` for debugging merges.
ENHANCEMENTS:
* Much better merge support.
* merge3 conflicts are now reported with markers like '<<<<<<<'
(seven characters) which is the same as CVS and pleases things
like emacs smerge.
BUG FIXES:
* ``bzr upgrade`` no longer fails when trying to fix trees that
mention revisions that are not present.
* Fixed bugs in listing plugins from ``bzr plugins``.
* Fix case of $EDITOR containing options for the editor.
* Fix log -r refusing to show the last revision.
(Patch from Goffredo Baroncelli.)
CHANGES:
* ``bzr log --show-ids`` shows the revision ids of all parents.
* Externally provided commands on your $BZRPATH no longer need
to recognize --bzr-usage to work properly, and can just handle
--help themselves.
LIBRARY:
* Changed trace messages to go through the standard logging
framework, so that they can more easily be redirected by
libraries.
bzr-0.0.6 2005-08-18
====================
NEW FEATURES:
* Python plugins, automatically loaded from the directories on
``BZR_PLUGIN_PATH`` or ``~/.bzr.conf/plugins`` by default.
* New 'bzr mkdir' command.
* Commit mesage is fetched from an editor if not given on the
command line; patch from Torsten Marek.
* ``bzr log -m FOO`` displays commits whose message matches regexp
FOO.
* ``bzr add`` with no arguments adds everything under the current directory.
* ``bzr mv`` does move or rename depending on its arguments, like
the Unix command.
* ``bzr missing`` command shows a summary of the differences
between two trees. (Merged from John Arbash-Meinel.)
* An email address for commits to a particular tree can be
specified by putting it into .bzr/email within a branch. (Based
on a patch from Heikki Paajanen.)
ENHANCEMENTS:
* Faster working tree operations.
CHANGES:
* 3rd-party modules shipped with bzr are copied within the bzrlib
python package, so that they can be installed by the setup
script without clashing with anything already existing on the
system. (Contributed by Gustavo Niemeyer.)
* Moved plugins directory to bzrlib/, so that there's a standard
plugin directory which is not only installed with bzr itself but
is also available when using bzr from the development tree.
``BZR_PLUGIN_PATH`` and ``DEFAULT_PLUGIN_PATH`` are then added to the
standard plugins directory.
* When exporting to a tarball with ``bzr export --format tgz``, put
everything under a top directory rather than dumping it into the
current directory. This can be overridden with the ``--root``
option. Patch from William Dodé and John Meinel.
* New ``bzr upgrade`` command to upgrade the format of a branch,
replacing ``bzr check --update``.
* Files within store directories are no longer marked readonly on
disk.
* Changed ``bzr log`` output to a more compact form suggested by
John A Meinel. Old format is available with the ``--long`` or
``-l`` option, patched by William Dodé.
* By default the commit command refuses to record a revision with
no changes unless the ``--unchanged`` option is given.
* The ``--no-plugins``, ``--profile`` and ``--builtin`` command
line options must come before the command name because they
affect what commands are available; all other options must come
after the command name because their interpretation depends on
it.
* ``branch`` and ``clone`` added as aliases for ``branch``.
* Default log format is back to the long format; the compact one
is available with ``--short``.
BUG FIXES:
* Fix bugs in committing only selected files or within a subdirectory.
bzr-0.0.5 2005-06-15
=====================
CHANGES:
* ``bzr`` with no command now shows help rather than giving an
error. Suggested by Michael Ellerman.
* ``bzr status`` output format changed, because svn-style output
doesn't really match the model of bzr. Now files are grouped by
status and can be shown with their IDs. ``bzr status --all``
shows all versioned files and unknown files but not ignored files.
* ``bzr log`` runs from most-recent to least-recent, the reverse
of the previous order. The previous behaviour can be obtained
with the ``--forward`` option.
* ``bzr inventory`` by default shows only filenames, and also ids
if ``--show-ids`` is given, in which case the id is the second
field.
ENHANCEMENTS:
* New 'bzr whoami --email' option shows only the email component
of the user identification, from Jo Vermeulen.
* New ``bzr ignore PATTERN`` command.
* Nicer error message for broken pipe, interrupt and similar
conditions that don't indicate an internal error.
* Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
* Per-branch locks keyed on ``.bzr/branch-lock``, available in
either read or write mode.
* New option ``bzr log --show-ids`` shows revision and file ids.
* New usage ``bzr log FILENAME`` shows only revisions that
affected that file.
* Changed format for describing changes in ``bzr log -v``.
* New option ``bzr commit --file`` to take a message from a file,
suggested by LarstiQ.
* New syntax ``bzr status [FILE...]`` contributed by Bartosz
Oler. File may be in a branch other than the working directory.
* ``bzr log`` and ``bzr root`` can be given an http URL instead of
a filename.
* Commands can now be defined by external programs or scripts
in a directory on $BZRPATH.
* New "stat cache" avoids reading the contents of files if they
haven't changed since the previous time.
* If the Python interpreter is too old, try to find a better one
or give an error. Based on a patch from Fredrik Lundh.
* New optional parameter ``bzr info [BRANCH]``.
* New form ``bzr commit SELECTED`` to commit only selected files.
* New form ``bzr log -r FROM:TO`` shows changes in selected
range; contributed by John A Meinel.
* New option ``bzr diff --diff-options 'OPTS'`` allows passing
options through to an external GNU diff.
* New option ``bzr add --no-recurse`` to add a directory but not
their contents.
* ``bzr --version`` now shows more information if bzr is being run
from a branch.
BUG FIXES:
* Fixed diff format so that added and removed files will be
handled properly by patch. Fix from Lalo Martins.
* Various fixes for files whose names contain spaces or other
metacharacters.
TESTING:
* Converted black-box test suites from Bourne shell into Python;
now run using ``./testbzr``. Various structural improvements to
the tests.
* testbzr by default runs the version of bzr found in the same
directory as the tests, or the one given as the first parameter.
* testbzr also runs the internal tests, so the only command
required to check is just ``./testbzr``.
* testbzr requires python2.4, but can be used to test bzr running
under a different version.
* Tests added for many other changes in this release.
INTERNAL:
* Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
* Refactor command functions into Command objects based on HCT by
Scott James Remnant.
* Better help messages for many commands.
* Expose ``bzrlib.open_tracefile()`` to start the tracefile; until
this is called trace messages are just discarded.
* New internal function ``find_touching_revisions()`` and hidden
command touching-revisions trace the changes to a given file.
* Simpler and faster ``compare_inventories()`` function.
* ``bzrlib.open_tracefile()`` takes a tracefilename parameter.
* New AtomicFile class.
* New developer commands ``added``, ``modified``.
PORTABILITY:
* Cope on Windows on python2.3 by using the weaker random seed.
2.4 is now only recommended.
bzr-0.0.4 2005-04-22
=====================
ENHANCEMENTS:
* 'bzr diff' optionally takes a list of files to diff. Still a bit
basic. Patch from QuantumG.
* More default ignore patterns.
* New 'bzr log --verbose' shows a list of files changed in the
changeset. Patch from Sebastian Cote.
* Roll over ~/.bzr.log if it gets too large.
* Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
by Jason Diamon.
* New 'bzr help commands' based on a patch from Denys Duchier.
CHANGES:
* User email is determined by looking at $BZREMAIL or ~/.bzr.email
or $EMAIL. All are decoded by the locale preferred encoding.
If none of these are present user@hostname is used. The host's
fully-qualified name is not used because that tends to fail when
there are DNS problems.
* New 'bzr whoami' command instead of username user-email.
BUG FIXES:
* Make commit safe for hardlinked bzr trees.
* Some Unicode/locale fixes.
* Partial workaround for ``difflib.unified_diff`` not handling
trailing newlines properly.
INTERNAL:
* Allow docstrings for help to be in PEP0257 format. Patch from
Matt Brubeck.
* More tests in test.sh.
* Write profile data to a temporary file not into working
directory and delete it when done.
* Smaller .bzr.log with process ids.
PORTABILITY:
* Fix opening of ~/.bzr.log on Windows. Patch from Andrew
Bennetts.
* Some improvements in handling paths on Windows, based on a patch
from QuantumG.
bzr-0.0.3 2005-04-06
=====================
ENHANCEMENTS:
* New "directories" internal command lists versioned directories
in the tree.
* Can now say "bzr commit --help".
* New "rename" command to rename one file to a different name
and/or directory.
* New "move" command to move one or more files into a different
directory.
* New "renames" command lists files renamed since base revision.
* New cat command contributed by janmar.
CHANGES:
* .bzr.log is placed in $HOME (not pwd) and is always written in
UTF-8. (Probably not a completely good long-term solution, but
will do for now.)
PORTABILITY:
* Workaround for difflib bug in Python 2.3 that causes an
exception when comparing empty files. Reported by Erik Toubro
Nielsen.
INTERNAL:
* Refactored inventory storage to insert a root entry at the top.
TESTING:
* Start of shell-based black-box testing in test.sh.
bzr-0.0.2.1
===========
PORTABILITY:
* Win32 fixes from Steve Brown.
bzr-0.0.2 "black cube" 2005-03-31
===================================
ENHANCEMENTS:
* Default ignore list extended (see bzrlib/__init__.py).
* Patterns in .bzrignore are now added to the default ignore list,
rather than replacing it.
* Ignore list isn't reread for every file.
* More help topics.
* Reinstate the 'bzr check' command to check invariants of the
branch.
* New 'ignored' command lists which files are ignored and why;
'deleted' lists files deleted in the current working tree.
* Performance improvements.
* New global --profile option.
* Ignore patterns like './config.h' now correctly match files in
the root directory only.
bzr-0.0.1 2005-03-26
=====================
ENHANCEMENTS:
* More information from info command.
* Can now say "bzr help COMMAND" for more detailed help.
* Less file flushing and faster performance when writing logs and
committing to stores.
* More useful verbose output from some commands.
BUG FIXES:
* Fix inverted display of 'R' and 'M' during 'commit -v'.
PORTABILITY:
* Include a subset of ElementTree-1.2.20040618 to make
installation easier.
* Fix time.localtime call to work with Python 2.3 (the minimum
supported).
bzr-0.0.0.69 2005-03-22
========================
ENHANCEMENTS:
* First public release.
* Storage of local versions: init, add, remove, rm, info, log,
diff, status, etc.
|