hg-stable: tests/test-bookmarks-current.t@e0313b0a6f7e (annotated)

copies-rust: parse the changed-file sidedata directly in rust It does not make much sense to parse the data into python object using slow python code to later turn them into rust object. We directly pass the binary blob and use it directly in Rust. Ideally we could directly read the sidedata in Rust, using a revlog in Rust. However we do not have this ready to use yet. This more direct approach provides a nice speedup over the board. Especially five cases that we previously too slow to return in the previous changeset are not able to finish. Notably, we are now significantly faster than the Python version of this code in all the meaningful cases. I looked at the various cases that remains significantly slower then the filelog version and they are currently 3 main source of slowness: * The isancestor computation: even if we cache them, if the revs spawn over a large amount of history the ancestry checking is still quite expensive. Using a different approach more centered on the graph we are currently considering might yield significant speed. * Merging of the map from the two parents: in some case, this climb up to ⅔ of the time spent in copy tracing. See inline comment for idea to handle this better. * Extracting data from the filelog. I would like to think this mostly comes from the fact my test repositories pre-date Valentin Gatien-Baron improvement of the `files` field (99ebde4fec99) and that more recent revisions will be faster to fetch. Further testing on this aspect is needed. This revision compared to the previous one: =========================================== Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev -------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000047 s, 0.000049 s, +0.000002 s, × 1.0426, 49 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000181 s, 0.000114 s, -0.000067 s, × 0.6298, 19 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.005852 s, 0.004223 s, -0.001629 s, × 0.7216, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000229 s, 0.000305 s, +0.000076 s, × 1.3319, 33 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000058 s, 0.000060 s, +0.000002 s, × 1.0345, 60 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000146 s, 0.000173 s, +0.000027 s, × 1.1849, 24 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.001206 s, 0.000446 s, -0.000760 s, × 0.3698, 446 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.025275 s, 0.010360 s, -0.014915 s, × 0.4099, 1726 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.080303 s, 0.048002 s, -0.032301 s, × 0.5978, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.152641 s, 0.075705 s, -0.076936 s, × 0.4960, 11 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.099107 s, 0.056705 s, -0.042402 s, × 0.5722, 10 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43646 revs, 2.137894 s, 0.794685 s, -1.343209 s, × 0.3717, 18 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 26389 revs, 0.022202 s, 0.020209 s, -0.001993 s, × 0.9102, 0 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.228946 s, 0.122475 s, -0.106471 s, × 0.5350, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000186 s, 0.000142 s, -0.000044 s, × 0.7634, 71 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000133 s, 0.000113 s, -0.000020 s, × 0.8496, 56 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000320 s, 0.000241 s, -0.000079 s, × 0.7531, 80 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.001339 s, 0.000729 s, -0.000610 s, × 0.5444, 81 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.015694 s, 0.010198 s, -0.005496 s, × 0.6498, 7 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.018457 s, 0.015312 s, -0.003145 s, × 0.8296, 9 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.111691 s, 0.060517 s, -0.051174 s, × 0.5418, 10 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 67005 revs, 1.166017 s, 0.611102 s, -0.554915 s, × 0.5241, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000197 s, 0.000164 s, -0.000033 s, × 0.8325, 82 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000626 s, 0.000334 s, -0.000292 s, × 0.5335, 41 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000303 s, 0.000463 s, +0.000160 s, × 1.5281, 51 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.001679 s, 0.000730 s, -0.000949 s, × 0.4348, 104 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.006947 s, 0.003522 s, -0.003425 s, × 0.5070, 1174 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.133070 s, 0.072518 s, -0.060552 s, × 0.5450, 12086 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.008705 s, 0.005760 s, -0.002945 s, × 0.6617, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.005913 s, 0.005720 s, -0.000193 s, × 0.9674, 0 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.101373 s, 0.063310 s, -0.038063 s, × 0.6245, 8 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 0.046526 s, 0.043608 s, -0.002918 s, × 0.9373, 0 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.313954 s, 0.204831 s, -0.109123 s, × 0.6524, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 3.367395 s, 2.161906 s, -1.205489 s, × 0.6420, 14 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 210546 revs, 4.691820 s, 3.291831 s, -1.399989 s, × 0.7016, 15 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001199 s, 0.001213 s, +0.000014 s, × 1.0117, 606 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001216 s, 0.001225 s, +0.000009 s, × 1.0074, 612 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000613 s, 0.000564 s, -0.000049 s, × 0.9201, 141 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001906 s, 0.001549 s, -0.000357 s, × 0.8127, 774 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.092766 s, 0.035918 s, -0.056848 s, × 0.3872, 35918 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.136074 s, 0.073788 s, -0.062286 s, × 0.5423, 12298 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.009067 s, 0.006151 s, -0.002916 s, × 0.6784, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.006243 s, 0.006165 s, -0.000078 s, × 0.9875, 0 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.114463 s, 0.065421 s, -0.049042 s, × 0.5715, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.433683 s, 0.313749 s, -0.119934 s, × 0.7235, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.411278 s, 0.297867 s, -0.113411 s, × 0.7242, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 54487 revs, 0.155133 s, 0.111300 s, -0.043833 s, × 0.7174, 2 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 0.048933 s, 0.046202 s, -0.002731 s, × 0.9442, 1 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 8.100385 s, 1.999640 s, -6.100745 s, × 0.2469, 20 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 1.446720 s, 0.809134 s, -0.637586 s, × 0.5593, 15 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, killed , 47.406785 s, , , 130 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 444327 revs, 1.369537 s, 0.996219 s, -0.373318 s, × 0.7274, 2 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, killed , 47.273399 s, , , 130 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, killed , 47.419099 s, , , 131 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 5.186079 s, 3.512653 s, -1.673426 s, × 0.6773, 18 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed , 44.459049 s, , , 187 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 391148 revs, killed , 52.837926 s, , , 135 µs/rev This revision compared to the python code: ========================================== Repo Case Source-Rev Dest-Rev # of revisions Python-Time Rust-Time Difference Factor time per rev -------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000044 s, 0.000049 s, +0.000005 s, × 1.1136, 49 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000138 s, 0.000114 s, -0.000024 s, × 0.8261, 19 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.005052 s, 0.004223 s, -0.000829 s, × 0.8359, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000219 s, 0.000305 s, +0.000086 s, × 1.3927, 33 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000055 s, 0.000060 s, +0.000005 s, × 1.0909, 60 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000128 s, 0.000173 s, +0.000045 s, × 1.3516, 24 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.001089 s, 0.000446 s, -0.000643 s, × 0.4096, 446 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.017407 s, 0.010360 s, -0.007047 s, × 0.5952, 1726 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.094175 s, 0.048002 s, -0.046173 s, × 0.5097, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.238009 s, 0.075705 s, -0.162304 s, × 0.3181, 11 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.125876 s, 0.056705 s, -0.069171 s, × 0.4505, 10 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43646 revs, 3.581556 s, 0.794685 s, -2.786871 s, × 0.2219, 18 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 26389 revs, 0.016721 s, 0.020209 s, +0.003488 s, × 1.2086, 0 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.242367 s, 0.122475 s, -0.119892 s, × 0.5053, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000165 s, 0.000142 s, -0.000023 s, × 0.8606, 71 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000113 s, -0.000001 s, × 0.9912, 56 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000296 s, 0.000241 s, -0.000055 s, × 0.8142, 80 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.001124 s, 0.000729 s, -0.000395 s, × 0.6486, 81 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.013060 s, 0.010198 s, -0.002862 s, × 0.7809, 7 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.017112 s, 0.015312 s, -0.001800 s, × 0.8948, 9 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.660350 s, 0.060517 s, -0.599833 s, × 0.0916, 10 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 67005 revs, 10.032499 s, 0.611102 s, -9.421397 s, × 0.0609, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000189 s, 0.000164 s, -0.000025 s, × 0.8677, 82 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000462 s, 0.000334 s, -0.000128 s, × 0.7229, 41 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000270 s, 0.000463 s, +0.000193 s, × 1.7148, 51 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.001474 s, 0.000730 s, -0.000744 s, × 0.4953, 104 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.004806 s, 0.003522 s, -0.001284 s, × 0.7328, 1174 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.085150 s, 0.072518 s, -0.012632 s, × 0.8517, 12086 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.007064 s, 0.005760 s, -0.001304 s, × 0.8154, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.004741 s, 0.005720 s, +0.000979 s, × 1.2065, 0 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.190133 s, 0.063310 s, -0.126823 s, × 0.3330, 8 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 0.035651 s, 0.043608 s, +0.007957 s, × 1.2232, 0 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.440694 s, 0.204831 s, -0.235863 s, × 0.4648, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 18.454163 s, 2.161906 s, -16.292257 s, × 0.1172, 14 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 210546 revs, 31.562719 s, 3.291831 s, -28.270888 s, × 0.1043, 15 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001189 s, 0.001213 s, +0.000024 s, × 1.0202, 606 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001204 s, 0.001225 s, +0.000021 s, × 1.0174, 612 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000586 s, 0.000564 s, -0.000022 s, × 0.9625, 141 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001845 s, 0.001549 s, -0.000296 s, × 0.8396, 774 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.063822 s, 0.035918 s, -0.027904 s, × 0.5628, 35918 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.088038 s, 0.073788 s, -0.014250 s, × 0.8381, 12298 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.007389 s, 0.006151 s, -0.001238 s, × 0.8325, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.004868 s, 0.006165 s, +0.001297 s, × 1.2664, 0 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.222450 s, 0.065421 s, -0.157029 s, × 0.2941, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.370675 s, 0.313749 s, -0.056926 s, × 0.8464, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.358020 s, 0.297867 s, -0.060153 s, × 0.8320, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 54487 revs, 0.145235 s, 0.111300 s, -0.033935 s, × 0.7663, 2 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 0.037606 s, 0.046202 s, +0.008596 s, × 1.2286, 1 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 7.382439 s, 1.999640 s, -5.382799 s, × 0.2709, 20 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 7.273506 s, 0.809134 s, -6.464372 s, × 0.1112, 15 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, killed , 47.406785 s, , , 130 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 444327 revs, 1.074593 s, 0.996219 s, -0.078374 s, × 0.9271, 2 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, killed , 47.273399 s, , , 130 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, killed , 47.419099 s, , , 131 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 27.746195 s, 3.512653 s, -24.233542 s, × 0.1266, 18 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, killed , 44.459049 s, , , 187 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 391148 revs, killed , 52.837926 s, , , 135 µs/rev This revision compared to the filelog algorithm: ================================================ Repo Case Source-Rev Dest-Rev # of revisions filelog sidedata Difference Factor time per rev -------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000906 s, 0.000049 s, -0.000857 s, × 0.0540, 48 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.001844 s, 0.000114 s, -0.001730 s, × 0.0618, 18 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.018577 s, 0.004223 s, -0.014354 s, × 0.2273, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.005009 s, 0.000305 s, -0.004704 s, × 0.0608, 33 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.209606 s, 0.000060 s, -0.209546 s, × 0.0002, 59 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.017008 s, 0.000173 s, -0.016835 s, × 0.0101, 24 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.019227 s, 0.000446 s, -0.018781 s, × 0.0231, 445 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.765782 s, 0.010360 s, -0.755422 s, × 0.0135, 1726 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 1.186068 s, 0.048002 s, -1.138066 s, × 0.0404, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 1.266745 s, 0.075705 s, -1.191040 s, × 0.0597, 11 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 1.666389 s, 0.056705 s, -1.609684 s, × 0.0340, 10 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43646 revs, 0.001070 s, 0.794685 s, +0.793615 s, × 742.69, 18 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 26389 revs, 1.076269 s, 0.020209 s, -1.056060 s, × 0.0187, 0 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 1.355085 s, 0.122475 s, -1.232610 s, × 0.0903, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.028551 s, 0.000142 s, -0.028409 s, × 0.0049, 70 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.157319 s, 0.000113 s, -0.157206 s, × 0.0007, 56 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.025722 s, 0.000241 s, -0.025481 s, × 0.0093, 80 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.053374 s, 0.000729 s, -0.052645 s, × 0.0136, 80 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.038146 s, 0.010198 s, -0.027948 s, × 0.2673, 7 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.229215 s, 0.015312 s, -0.213903 s, × 0.0668, 9 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.974484 s, 0.060517 s, -0.913967 s, × 0.0621, 10 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 67005 revs, 3.924308 s, 0.611102 s, -3.313206 s, × 0.1557, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.035563 s, 0.000164 s, -0.035399 s, × 0.0046, 81 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.145766 s, 0.000334 s, -0.145432 s, × 0.0022, 41 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.026283 s, 0.000463 s, -0.025820 s, × 0.0176, 51 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.087403 s, 0.000730 s, -0.086673 s, × 0.0083, 104 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.209484 s, 0.003522 s, -0.205962 s, × 0.0168, 1173 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 2.197867 s, 0.072518 s, -2.125349 s, × 0.0329, 12084 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.090142 s, 0.005760 s, -0.084382 s, × 0.0638, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.742658 s, 0.005720 s, -0.736938 s, × 0.0077, 0 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 1.166159 s, 0.063310 s, -1.102849 s, × 0.0542, 8 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 6.721719 s, 0.043608 s, -6.678111 s, × 0.0064, 0 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 3.356523 s, 0.204831 s, -3.151692 s, × 0.0610, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 15.880822 s, 2.161906 s, -13.718916 s, × 0.1361, 14 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 210546 revs, 20.781275 s, 3.291831 s, -17.489444 s, × 0.1584, 15 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.084165 s, 0.001213 s, -0.082952 s, × 0.0144, 606 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.503744 s, 0.001225 s, -0.502519 s, × 0.0024, 612 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.021545 s, 0.000564 s, -0.020981 s, × 0.0261, 140 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.240699 s, 0.001549 s, -0.239150 s, × 0.0064, 774 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 1.100682 s, 0.035918 s, -1.064764 s, × 0.0326, 35882 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 2.234809 s, 0.073788 s, -2.161021 s, × 0.0330, 12295 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.091222 s, 0.006151 s, -0.085071 s, × 0.0674, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 8315 revs, 0.764722 s, 0.006165 s, -0.758557 s, × 0.0080, 0 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 1.185655 s, 0.065421 s, -1.120234 s, × 0.0551, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.089736 s, 0.313749 s, +0.224013 s, × 3.4963, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.084132 s, 0.297867 s, +0.213735 s, × 3.5404, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 54487 revs, 7.581932 s, 0.111300 s, -7.470632 s, × 0.0146, 2 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 45299 revs, 6.671144 s, 0.046202 s, -6.624942 s, × 0.0069, 1 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 7.674771 s, 1.999640 s, -5.675131 s, × 0.2605, 20 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 9.870343 s, 0.809134 s, -9.061209 s, × 0.0819, 15 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 0.094781 s, 47.406785 s, +47.312004 s, × 500.17, 130 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 444327 revs, 26.690029 s, 0.996219 s, -25.693810 s, × 0.0373, 2 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 0.094941 s, 47.273399 s, +47.178458 s, × 497.92, 130 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 0.233811 s, 47.419099 s, +47.185288 s, × 202.80, 131 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 19.321750 s, 3.512653 s, -15.809097 s, × 0.1817, 18 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 237259 revs, 21.358350 s, 44.459049 s, +23.100699 s, × 2.0815, 187 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 391148 revs, 25.328737 s, 52.837926 s, +27.509189 s, × 2.0860, 135 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9307

11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	1	$ hg init
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	2
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	3	no bookmarks
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	4
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	5	$ hg bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	6	no bookmarks set
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	7
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	8	set bookmark X
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	9
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	10	$ hg bookmark X
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	11
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	12	list bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	13
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	14	$ hg bookmark
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	15	* X -1:000000000000
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	16
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	17	list bookmarks with color
7816 f420eafe59cd bookmarks: Set current bookmark if we create a new one on the tip David Soria Parra <dsp@php.net> parents: 7551 diff changeset	18
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	19	$ hg --config extensions.color= --config color.mode=ansi \
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	20	> bookmark --color=always
22775 b59c2c8c45df bookmarks: split ui.write() so that it can be easily ported to formatter api Yuya Nishihara <yuya@tcha.org> parents: 21503 diff changeset	21	\x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc)
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	22
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	23	update to bookmark X
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	24
28500 2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28385 diff changeset	25	$ hg bookmarks
2e1bceeea520 update: omit redundant activating message for already active bookmark FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28385 diff changeset	26	* X -1:000000000000
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	27	$ hg update X
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	28	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 7817 diff changeset	29
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	30	list bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	31
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	32	$ hg bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	33	* X -1:000000000000
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	34
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	35	rename
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	36
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	37	$ hg bookmark -m X Z
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	38
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	39	list bookmarks
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	40
13620 8ee4b00ddfd8 bookmarks: fix update of the current bookmark during rename Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	41	$ cat .hg/bookmarks.current
8ee4b00ddfd8 bookmarks: fix update of the current bookmark during rename Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	42	Z (no-eol)
8ee4b00ddfd8 bookmarks: fix update of the current bookmark during rename Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	43	$ cat .hg/bookmarks
8ee4b00ddfd8 bookmarks: fix update of the current bookmark during rename Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13469 diff changeset	44	0000000000000000000000000000000000000000 Z
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	45	$ hg bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	46	* Z -1:000000000000
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	47
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	48	new bookmarks X and Y, first one made active
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	49
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	50	$ hg bookmark Y X
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	51
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	52	list bookmarks
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	53
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	54	$ hg bookmark
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	55	X -1:000000000000
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	56	* Y -1:000000000000
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	57	Z -1:000000000000
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	58
19147 5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	59	$ hg bookmark -d X
5b1835485442 bookmarks: allow bookmark command to take multiple arguments Kevin Bullock <kbullock@ringworld.org> parents: 19112 diff changeset	60
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	61	commit
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	62
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	63	$ echo 'b' > b
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	64	$ hg add b
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	65	$ hg commit -m'test'
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	66
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	67	list bookmarks
7551 cab1cf26ca58 bookmarks: tests for track.current option David Soria Parra <dsp@php.net> parents: diff changeset	68
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	69	$ hg bookmark
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	70	* Y 0:719295282060
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	71	Z -1:000000000000
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	72
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 22775 diff changeset	73	Verify that switching to Z updates the active bookmark:
13433 0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	74	$ hg update Z
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	75	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21024 diff changeset	76	(activating bookmark Z)
13433 0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	77	$ hg bookmark
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	78	Y 0:719295282060
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	79	* Z -1:000000000000
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	80
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	81	Switch back to Y for the remaining tests in this file:
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	82	$ hg update Y
0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	83	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21024 diff changeset	84	(activating bookmark Y)
13433 0b1bbc46516e bookmarks: verify switching bookmarks works properly Augie Fackler <durin42@gmail.com> parents: 13416 diff changeset	85
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	86	delete bookmarks
7817 cb516e788238 bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set Alex Unden <alu@zpuppet.org> parents: 7816 diff changeset	87
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	88	$ hg bookmark -d Y
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	89	$ hg bookmark -d Z
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	90
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	91	list bookmarks
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	92
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	93	$ hg bookmark
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	94	no bookmarks set
7817 cb516e788238 bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set Alex Unden <alu@zpuppet.org> parents: 7816 diff changeset	95
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	96	update to tip
7817 cb516e788238 bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set Alex Unden <alu@zpuppet.org> parents: 7816 diff changeset	97
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	98	$ hg update tip
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	99	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	100
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	101	set bookmark Y using -r . but make sure that the active
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	102	bookmark is not activated
7817 cb516e788238 bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set Alex Unden <alu@zpuppet.org> parents: 7816 diff changeset	103
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	104	$ hg bookmark -r . Y
11561 e5aaaef91a27 bookmarks: ensure current bookmark is updated when specified with -r . Brodie Rao <brodie@bitheap.org> parents: 11141 diff changeset	105
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	106	list bookmarks, Y should not be active
11862 cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	107
cad06c8d2073 tests: unify test-bookmarks-current Martin Geisler <mg@lazybytes.net> parents: 11561 diff changeset	108	$ hg bookmark
19112 23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	109	Y 0:719295282060
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	110
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	111	now, activate Y
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	112
23f785b38af3 bookmarks: fix bug that activated a bookmark even with -r passed Sean Farley <sean.michael.farley@gmail.com> parents: 19110 diff changeset	113	$ hg up -q Y
14188 9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	114
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	115	set bookmark Z using -i
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	116
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	117	$ hg bookmark -r . -i Z
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	118	$ hg bookmarks
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	119	* Y 0:719295282060
9029b1a38c30 bookmarks: allow to create/move bookmark without making it current (issue2788) Kevin Bullock <kbullock@ringworld.org> parents: 13620 diff changeset	120	Z 0:719295282060
14189 328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	121
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 22775 diff changeset	122	deactivate active bookmark using -i
14189 328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	123
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	124	$ hg bookmark -i Y
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	125	$ hg bookmarks
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	126	Y 0:719295282060
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	127	Z 0:719295282060
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	128
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	129	$ hg up -q Y
17735 605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	130	$ hg bookmark -i
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	131	$ hg bookmarks
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	132	Y 0:719295282060
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	133	Z 0:719295282060
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	134	$ hg bookmark -i
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	135	no active bookmark
605fe310691f bookmarks: deactivate current bookmark if no name is given Kevin Bullock <kbullock@ringworld.org> parents: 16742 diff changeset	136	$ hg up -q Y
14189 328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	137	$ hg bookmarks
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	138	* Y 0:719295282060
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	139	Z 0:719295282060
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	140
25349 62da2d7745f9 commands: rename current to active in variables and comments Ryan McElroy <rmcelroy@fb.com> parents: 22775 diff changeset	141	deactivate active bookmark while renaming
14189 328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	142
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	143	$ hg bookmark -i -m Y X
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	144	$ hg bookmarks
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	145	X 0:719295282060
328422b0380d bookmarks: allow deactivating current bookmark with -i Kevin Bullock <kbullock@ringworld.org> parents: 14188 diff changeset	146	Z 0:719295282060
16191 7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	147
19110 741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	148	bare update moves the active bookmark forward and clear the divergent bookmarks
16742 973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	149
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	150	$ echo a > a
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	151	$ hg ci -Am1
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	152	adding a
19110 741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	153	$ echo b >> a
741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	154	$ hg ci -Am2
741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	155	$ hg bookmark X@1 -r 1
741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	156	$ hg bookmark X@2 -r 2
16742 973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	157	$ hg update X
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	158	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21503 10f15e34d86c update: show message when a bookmark is activated by update Stephen Lee <sphen.lee@gmail.com> parents: 21024 diff changeset	159	(activating bookmark X)
16742 973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	160	$ hg bookmarks
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	161	* X 0:719295282060
19110 741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	162	X@1 1:cc586d725fbe
741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	163	X@2 2:49e1c4e84c58
16742 973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	164	Z 0:719295282060
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	165	$ hg update
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	166	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	167	updating bookmark X
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	168	$ hg bookmarks
19110 741d94aa92e4 bookmarks: resolve divergent bookmarks when moving active bookmark forward Sean Farley <sean.michael.farley@gmail.com> parents: 17735 diff changeset	169	* X 2:49e1c4e84c58
16742 973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	170	Z 0:719295282060
973671fc0804 bookmarks: test that bare update forwards active bookmark Kevin Bullock <kbullock@ringworld.org> parents: 16191 diff changeset	171
16191 7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	172	test deleting .hg/bookmarks.current when explicitly updating
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	173	to a revision
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	174
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	175	$ echo a >> b
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	176	$ hg ci -m.
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	177	$ hg up -q X
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	178	$ test -f .hg/bookmarks.current
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	179
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	180	try to update to it again to make sure we don't
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	181	set and then unset it
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	182
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	183	$ hg up -q X
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	184	$ test -f .hg/bookmarks.current
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	185
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	186	$ hg up -q 1
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	187	$ test -f .hg/bookmarks.current
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	188	[1]
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	189
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	190	when a bookmark is active, hg up -r . is
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 19147 diff changeset	191	analogous to hg book -i <active bookmark>
16191 7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	192
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	193	$ hg up -q X
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	194	$ hg up -q .
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	195	$ test -f .hg/bookmarks.current
7c75924a6926 update: delete bookmarks.current when explicitly updating to a rev (issue3276) Idan Kamara <idankk86@gmail.com> parents: 14189 diff changeset	196	[1]
25387 390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	197
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	198	issue 4552 -- simulate a pull moving the active bookmark
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	199
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	200	$ hg up -q X
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	201	$ printf "Z" > .hg/bookmarks.current
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	202	$ hg log -T '{activebookmark}\n' -r Z
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	203	Z
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	204	$ hg log -T '{bookmarks % "{active}\n"}' -r Z
390a10b7843b templatekw: display active bookmark more consistently (issue4552) (BC) Ryan McElroy <rmcelroy@fb.com> parents: 25349 diff changeset	205	Z
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	206
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	207	test that updating to closed branch head also advances active bookmark
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	208
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	209	$ hg commit --close-branch -m "closed"
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	210	$ hg update -q ".^1"
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	211	$ hg bookmark Y
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	212	$ hg bookmarks
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	213	X 3:4d6bd4bfb1ae
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	214	* Y 3:4d6bd4bfb1ae
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	215	Z 0:719295282060
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	216	$ hg update
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	217	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	218	updating bookmark Y
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	219	$ hg bookmarks
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	220	X 3:4d6bd4bfb1ae
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	221	* Y 4:8fa964221e8e
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	222	Z 0:719295282060
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	223	$ hg parents -q
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 25387 diff changeset	224	4:8fa964221e8e
39303 337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	225
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	226	Checks command to retrieve active bookmark
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	227	------------------------------------------
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	228
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	229	display how "{activebookmark}" template is unsuitable for the task
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	230
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	231	$ hg book -T '- {activebookmark}\n'
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	232	-
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	233	- Y
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	234	-
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	235
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	236	$ hg book -r . W
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	237	$ hg book -T '- {activebookmark}\n'
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	238	- Y
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	239	-
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	240	- Y
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	241	-
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	242
39770 c48738923dba bookmarks: remove --active in favor of --list Yuya Nishihara <yuya@tcha.org> parents: 39303 diff changeset	243	$ hg bookmarks -ql .
39303 337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	244	Y
337443f09fc8 bookmark: add an --active flag to display the active bookmark Boris Feld <boris.feld@octobus.net> parents: 28500 diff changeset	245	$ hg bookmarks --inactive
39770 c48738923dba bookmarks: remove --active in favor of --list Yuya Nishihara <yuya@tcha.org> parents: 39303 diff changeset	246	$ hg bookmarks -ql .
45921 95c4cca641f6 errors: remove trailing "!" from some error messages for consistency Martin von Zweigbergk <martinvonz@google.com> parents: 39770 diff changeset	247	abort: no active bookmark
39770 c48738923dba bookmarks: remove --active in favor of --list Yuya Nishihara <yuya@tcha.org> parents: 39303 diff changeset	248	[255]

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Thu, 12 Nov 2020 15:54:10 +0100
changeset 46061	e0313b0a6f7e
parent 45921	95c4cca641f6
child 48416	8c4881c07f57
permissions	-rw-r--r--