##// END OF EJS Templates
branching: merge stable into default
Raphaël Gomès -
r51611:0ab39565 merge default
parent child Browse files
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -1,247 +1,248 b''
1 1 35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0 iD8DBQBEYmO2ywK+sNU5EO8RAnaYAKCO7x15xUn5mnhqWNXqk/ehlhRt2QCfRDfY0LrUq2q4oK/KypuJYPHgq1A=
2 2 2be3001847cb18a23c403439d9e7d0ace30804e9 0 iD8DBQBExUbjywK+sNU5EO8RAhzxAKCtyHAQUzcTSZTqlfJ0by6vhREwWQCghaQFHfkfN0l9/40EowNhuMOKnJk=
3 3 36a957364b1b89c150f2d0e60a99befe0ee08bd3 0 iD8DBQBFfL2QywK+sNU5EO8RAjYFAKCoGlaWRTeMsjdmxAjUYx6diZxOBwCfY6IpBYsKvPTwB3oktnPt5Rmrlys=
4 4 27230c29bfec36d5540fbe1c976810aefecfd1d2 0 iD8DBQBFheweywK+sNU5EO8RAt7VAKCrqJQWT2/uo2RWf0ZI4bLp6v82jACgjrMdsaTbxRsypcmEsdPhlG6/8F4=
5 5 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0 iD8DBQBGgHicywK+sNU5EO8RAgNxAJ0VG8ixAaeudx4sZbhngI1syu49HQCeNUJQfWBgA8bkJ2pvsFpNxwYaX3I=
6 6 23889160905a1b09fffe1c07378e9fc1827606eb 0 iD8DBQBHGTzoywK+sNU5EO8RAr/UAJ0Y8s4jQtzgS+G9vM8z6CWBThZ8fwCcCT5XDj2XwxKkz/0s6UELwjsO3LU=
7 7 bae2e9c838e90a393bae3973a7850280413e091a 0 iD8DBQBH6DO5ywK+sNU5EO8RAsfrAJ0e4r9c9GF/MJsM7Xjd3NesLRC3+ACffj6+6HXdZf8cswAoFPO+DY00oD0=
8 8 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 0 iD8DBQBINdwsywK+sNU5EO8RAjIUAKCPmlFJSpsPAAUKF+iNHAwVnwmzeQCdEXrL27CWclXuUKdbQC8De7LICtE=
9 9 d2375bbee6d47e62ba8e415c86e83a465dc4dce9 0 iD8DBQBIo1wpywK+sNU5EO8RAmRNAJ94x3OFt6blbqu/yBoypm/AJ44fuACfUaldXcV5z9tht97hSp22DVTEPGc=
10 10 2a67430f92f15ea5159c26b09ec4839a0c549a26 0 iEYEABECAAYFAkk1hykACgkQywK+sNU5EO85QACeNJNUanjc2tl4wUoPHNuv+lSj0ZMAoIm93wSTc/feyYnO2YCaQ1iyd9Nu
11 11 3773e510d433969e277b1863c317b674cbee2065 0 iEYEABECAAYFAklNbbAACgkQywK+sNU5EO8o+gCfeb2/lfIJZMvyDA1m+G1CsBAxfFsAoIa6iAMG8SBY7hW1Q85Yf/LXEvaE
12 12 11a4eb81fb4f4742451591489e2797dc47903277 0 iEYEABECAAYFAklcAnsACgkQywK+sNU5EO+uXwCbBVHNNsLy1g7BlAyQJwadYVyHOXoAoKvtAVO71+bv7EbVoukwTzT+P4Sx
13 13 11efa41037e280d08cfb07c09ad485df30fb0ea8 0 iEYEABECAAYFAkmvJRQACgkQywK+sNU5EO9XZwCeLMgDgPSMWMm6vgjL4lDs2pEc5+0AnRxfiFbpbBfuEFTqKz9nbzeyoBlx
14 14 02981000012e3adf40c4849bd7b3d5618f9ce82d 0 iEYEABECAAYFAknEH3wACgkQywK+sNU5EO+uXwCeI+LbLMmhjU1lKSfU3UWJHjjUC7oAoIZLvYDGOL/tNZFUuatc3RnZ2eje
15 15 196d40e7c885fa6e95f89134809b3ec7bdbca34b 0 iEYEABECAAYFAkpL2X4ACgkQywK+sNU5EO9FOwCfXJycjyKJXsvQqKkHrglwOQhEKS4An36GfKzptfN8b1qNc3+ya/5c2WOM
16 16 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA
17 17 31ec469f9b556f11819937cf68ee53f2be927ebf 0 iEYEABECAAYFAksBuxAACgkQywK+sNU5EO+mBwCfagB+A0txzWZ6dRpug3LEoK7Z1QsAoKpbk8vsLjv6/oRDicSk/qBu33+m
18 18 439d7ea6fe3aa4ab9ec274a68846779153789de9 0 iEYEABECAAYFAksVw0kACgkQywK+sNU5EO/oZwCfdfBEkgp38xq6wN2F4nj+SzofrJIAnjmxt04vaJSeOOeHylHvk6lzuQsw
19 19 296a0b14a68621f6990c54fdba0083f6f20935bf 0 iEYEABECAAYFAks+jCoACgkQywK+sNU5EO9J8wCeMUGF9E/gS2UBsqIz56WS4HMPRPUAoI5J95mwEIK8Clrl7qFRidNI6APq
20 20 4aa619c4c2c09907034d9824ebb1dd0e878206eb 0 iEYEABECAAYFAktm9IsACgkQywK+sNU5EO9XGgCgk4HclRQhexEtooPE5GcUCdB6M8EAn2ptOhMVbIoO+JncA+tNACPFXh0O
21 21 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 0 iEYEABECAAYFAkuRoSQACgkQywK+sNU5EO//3QCeJDc5r2uFyFCtAlpSA27DEE5rrxAAn2FSwTy9fhrB3QAdDQlwkEZcQzDh
22 22 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW
23 23 39f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk
24 24 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO
25 25 24fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
26 26 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
27 27 bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
28 28 c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
29 29 ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
30 30 93d8bff78c96fe7e33237b257558ee97290048a4 0 iD8DBQBMpfvdywK+sNU5EO8RAsxVAJ0UaL1XB51C76JUBhafc9GBefuMxwCdEWkTOzwvE0SarJBe9i008jhbqW4=
31 31 333421b9e0f96c7bc788e5667c146a58a9440a55 0 iD8DBQBMz0HOywK+sNU5EO8RAlsEAJ0USh6yOG7OrWkADGunVt9QimBQnwCbBqeMnKgSbwEw8jZwE3Iz1mdrYlo=
32 32 4438875ec01bd0fc32be92b0872eb6daeed4d44f 0 iD8DBQBM4WYUywK+sNU5EO8RAhCVAJ0dJswachwFAHALmk1x0RJehxzqPQCbBNskP9n/X689jB+btNTZTyKU/fw=
33 33 6aff4f144ad356311318b0011df0bb21f2c97429 0 iD8DBQBM9uxXywK+sNU5EO8RAv+4AKCDj4qKP16GdPaq1tP6BUwpM/M1OACfRyzLPp/qiiN8xJTWoWYSe/XjJug=
34 34 e3bf16703e2601de99e563cdb3a5d50b64e6d320 0 iD8DBQBNH8WqywK+sNU5EO8RAiQTAJ9sBO+TeiGro4si77VVaQaA6jcRUgCfSA28dBbjj0oFoQwvPoZjANiZBH8=
35 35 a6c855c32ea081da3c3b8ff628f1847ff271482f 0 iD8DBQBNSJJ+ywK+sNU5EO8RAoJaAKCweDEF70fu+r1Zn7pYDXdlk5RuSgCeO9gK/eit8Lin/1n3pO7aYguFLok=
36 36 2b2155623ee2559caf288fd333f30475966c4525 0 iD8DBQBNSJeBywK+sNU5EO8RAm1KAJ4hW9Cm9nHaaGJguchBaPLlAr+O3wCgqgmMok8bdAS06N6PL60PSTM//Gg=
37 37 2616325766e3504c8ae7c84bd15ee610901fe91d 0 iD8DBQBNbWy9ywK+sNU5EO8RAlWCAJ4mW8HbzjJj9GpK98muX7k+7EvEHwCfaTLbC/DH3QEsZBhEP+M8tzL6RU4=
38 38 aa1f3be38ab127280761889d2dca906ca465b5f4 0 iD8DBQBNeQq7ywK+sNU5EO8RAlEOAJ4tlEDdetE9lKfjGgjbkcR8PrC3egCfXCfF3qNVvU/2YYjpgvRwevjvDy0=
39 39 b032bec2c0a651ca0ddecb65714bfe6770f67d70 0 iD8DBQBNlg5kywK+sNU5EO8RAnGEAJ9gmEx6MfaR4XcG2m/93vwtfyzs3gCgltzx8/YdHPwqDwRX/WbpYgi33is=
40 40 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 0 iD8DBQBNvTy4ywK+sNU5EO8RAmp8AJ9QnxK4jTJ7G722MyeBxf0UXEdGwACgtlM7BKtNQfbEH/fOW5y+45W88VI=
41 41 733af5d9f6b22387913e1d11350fb8cb7c1487dd 0 iD8DBQBN5q/8ywK+sNU5EO8RArRGAKCNGT94GKIYtSuwZ57z1sQbcw6uLACfffpbMV4NAPMl8womAwg+7ZPKnIU=
42 42 de9eb6b1da4fc522b1cab16d86ca166204c24f25 0 iD8DBQBODhfhywK+sNU5EO8RAr2+AJ4ugbAj8ae8/K0bYZzx3sascIAg1QCeK3b+zbbVVqd3b7CDpwFnaX8kTd4=
43 43 4a43e23b8c55b4566b8200bf69fe2158485a2634 0 iD8DBQBONzIMywK+sNU5EO8RAj5SAJ0aPS3+JHnyI6bHB2Fl0LImbDmagwCdGbDLp1S7TFobxXudOH49bX45Iik=
44 44 d629f1e89021103f1753addcef6b310e4435b184 0 iD8DBQBOWAsBywK+sNU5EO8RAht4AJwJl9oNFopuGkj5m8aKuf7bqPkoAQCeNrEm7UhFsZKYT5iUOjnMV7s2LaM=
45 45 351a9292e430e35766c552066ed3e87c557b803b 0 iD8DBQBOh3zUywK+sNU5EO8RApFMAKCD3Y/u3avDFndznwqfG5UeTHMlvACfUivPIVQZyDZnhZMq0UhC6zhCEQg=
46 46 384082750f2c51dc917d85a7145748330fa6ef4d 0 iD8DBQBOmd+OywK+sNU5EO8RAgDgAJ9V/X+G7VLwhTpHrZNiOHabzSyzYQCdE2kKfIevJUYB9QLAWCWP6DPwrwI=
47 47 41453d55b481ddfcc1dacb445179649e24ca861d 0 iD8DBQBOsFhpywK+sNU5EO8RAqM6AKCyfxUae3/zLuiLdQz+JR78690eMACfQ6JTBQib4AbE+rUDdkeFYg9K/+4=
48 48 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 0 iD8DBQBO1/fWywK+sNU5EO8RAmoPAKCR5lpv1D6JLURHD8KVLSV4GRVEBgCgnd0Sy78ligNfqAMafmACRDvj7vo=
49 49 6344043924497cd06d781d9014c66802285072e4 0 iD8DBQBPALgmywK+sNU5EO8RAlfhAJ9nYOdWnhfVDHYtDTJAyJtXBAQS9wCgnefoSQt7QABkbGxM+Q85UYEBuD0=
50 50 db33555eafeaf9df1e18950e29439eaa706d399b 0 iD8DBQBPGdzxywK+sNU5EO8RAppkAJ9jOXhUVE/97CPgiMA0pMGiIYnesQCfengAszcBiSiKGugiI8Okc9ghU+Y=
51 51 2aa5b51f310fb3befd26bed99c02267f5c12c734 0 iD8DBQBPKZ9bywK+sNU5EO8RAt1TAJ45r1eJ0YqSkInzrrayg4TVCh0SnQCgm0GA/Ua74jnnDwVQ60lAwROuz1Q=
52 52 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 0 iD8DBQBPT/fvywK+sNU5EO8RAnfYAKCn7d0vwqIb100YfWm1F7nFD5B+FACeM02YHpQLSNsztrBCObtqcnfod7Q=
53 53 b9bd95e61b49c221c4cca24e6da7c946fc02f992 0 iD8DBQBPeLsIywK+sNU5EO8RAvpNAKCtKe2gitz8dYn52IRF0hFOPCR7AQCfRJL/RWCFweu2T1vH/mUOCf8SXXc=
54 54 d9e2f09d5488c395ae9ddbb320ceacd24757e055 0 iD8DBQBPju/dywK+sNU5EO8RArBYAJ9xtifdbk+hCOJO8OZa4JfHX8OYZQCeKPMBaBWiT8N/WHoOm1XU0q+iono=
55 55 00182b3d087909e3c3ae44761efecdde8f319ef3 0 iD8DBQBPoFhIywK+sNU5EO8RAhzhAKCBj1n2jxPTkZNJJ5pSp3soa+XHIgCgsZZpAQxOpXwCp0eCdNGe0+pmxmg=
56 56 5983de86462c5a9f42a3ad0f5e90ce5b1d221d25 0 iD8DBQBPovNWywK+sNU5EO8RAhgiAJ980T91FdPTRMmVONDhpkMsZwVIMACgg3bKvoWSeuCW28llUhAJtUjrMv0=
57 57 85a358df5bbbe404ca25730c9c459b34263441dc 0 iD8DBQBPyZsWywK+sNU5EO8RAnpLAJ48qrGDJRT+pteS0mSQ11haqHstPwCdG4ccGbk+0JHb7aNy8/NRGAOqn9w=
58 58 b013baa3898e117959984fc64c29d8c784d2f28b 0 iD8DBQBP8QOPywK+sNU5EO8RAqimAKCFRSx0lvG6y8vne2IhNG062Hn0dACeMLI5/zhpWpHBIVeAAquYfx2XFeA=
59 59 7f5094bb3f423fc799e471aac2aee81a7ce57a0b 0 iD8DBQBQGiL8ywK+sNU5EO8RAq5oAJ4rMMCPx6O+OuzNXVOexogedWz/QgCeIiIxLd76I4pXO48tdXhr0hQcBuM=
60 60 072209ae4ddb654eb2d5fd35bff358c738414432 0 iD8DBQBQQkq0ywK+sNU5EO8RArDTAJ9nk5CySnNAjAXYvqvx4uWCw9ThZwCgqmFRehH/l+oTwj3f8nw8u8qTCdc=
61 61 b3f0f9a39c4e1d0250048cd803ab03542d6f140a 0 iD8DBQBQamltywK+sNU5EO8RAlsqAJ4qF/m6aFu4mJCOKTiAP5RvZFK02ACfawYShUZO6OXEFfveU0aAxDR0M1k=
62 62 d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 0 iD8DBQBQgPV5ywK+sNU5EO8RArylAJ0abcx5NlDjyv3ZDWpAfRIHyRsJtQCgn4TMuEayqgxzrvadQZHdTEU2g38=
63 63 195ad823b5d58c68903a6153a25e3fb4ed25239d 0 iD8DBQBQkuT9ywK+sNU5EO8RAhB4AKCeerItoK2Jipm2cVf4euGofAa/WACeJj3TVd4pFILpb+ogj7ebweFLJi0=
64 64 0c10cf8191469e7c3c8844922e17e71a176cb7cb 0 iD8DBQBQvQWoywK+sNU5EO8RAnq3AJoCn98u4geFx5YaQaeh99gFhCd7bQCgjoBwBSUyOvGd0yBy60E3Vv3VZhM=
65 65 a4765077b65e6ae29ba42bab7834717b5072d5ba 0 iD8DBQBQ486sywK+sNU5EO8RAhmJAJ90aLfLKZhmcZN7kqphigQJxiFOQACeJ5IUZxjGKH4xzi3MrgIcx9n+dB0=
66 66 f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 0 iD8DBQBQ+yuYywK+sNU5EO8RAm9JAJoD/UciWvpGeKBcpGtZJBFJVcL/HACghDXSgQ+xQDjB+6uGrdgAQsRR1Lg=
67 67 a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 0 iD8DBQBRDDROywK+sNU5EO8RAh75AJ9uJCGoCWnP0Lv/+XuYs4hvUl+sAgCcD36QgAnuw8IQXrvv684BAXAnHcA=
68 68 7511d4df752e61fe7ae4f3682e0a0008573b0402 0 iD8DBQBRFYaoywK+sNU5EO8RAuErAJoDyhXn+lptU3+AevVdwAIeNFyR2gCdHzPHyWd+JDeWCUR+pSOBi8O2ppM=
69 69 5b7175377babacce80a6c1e12366d8032a6d4340 0 iD8DBQBRMCYgywK+sNU5EO8RAq1/AKCWKlt9ysibyQgYwoxxIOZv5J8rpwCcDSHQaaf1fFZUTnQsOePwcM2Y/Sg=
70 70 50c922c1b5145dab8baefefb0437d363b6a6c21c 0 iD8DBQBRWnUnywK+sNU5EO8RAuQRAJwM42cJqJPeqJ0jVNdMqKMDqr4dSACeP0cRVGz1gitMuV0x8f3mrZrqc7I=
71 71 8a7bd2dccd44ed571afe7424cd7f95594f27c092 0 iD8DBQBRXfBvywK+sNU5EO8RAn+LAKCsMmflbuXjYRxlzFwId5ptm8TZcwCdGkyLbZcASBOkzQUm/WW1qfknJHU=
72 72 292cd385856d98bacb2c3086f8897bc660c2beea 0 iD8DBQBRcM0BywK+sNU5EO8RAjp4AKCJBykQbvXhKuvLSMxKx3a2TBiXcACfbr/kLg5GlZTF/XDPmY+PyHgI/GM=
73 73 23f785b38af38d2fca6b8f3db56b8007a84cd73a 0 iD8DBQBRgZwNywK+sNU5EO8RAmO4AJ4u2ILGuimRP6MJgE2t65LZ5dAdkACgiENEstIdrlFC80p+sWKD81kKIYI=
74 74 ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 0 iD8DBQBRkswvywK+sNU5EO8RAiYYAJsHTHyHbJeAgmGvBTmDrfcKu4doUgCeLm7eGBjx7yAPUvEtxef8rAkQmXI=
75 75 cceaf7af4c9e9e6fa2dbfdcfe9856c5da69c4ffd 0 iD8DBQBRqnFLywK+sNU5EO8RAsWNAJ9RR6t+y1DLFc2HeH0eN9VfZAKF9gCeJ8ezvhtKq/LMs0/nvcgKQc/d5jk=
76 76 009794acc6e37a650f0fae37872e733382ac1c0c 0 iD8DBQBR0guxywK+sNU5EO8RArNkAKCq9pMihVzP8Os5kCmgbWpe5C37wgCgqzuPZTHvAsXF5wTyaSTMVa9Ccq4=
77 77 f0d7721d7322dcfb5af33599c2543f27335334bb 0 iD8DBQBR8taaywK+sNU5EO8RAqeEAJ4idDhhDuEsgsUjeQgWNj498matHACfT67gSF5w0ylsrBx1Hb52HkGXDm0=
78 78 f37b5a17e6a0ee17afde2cdde5393dd74715fb58 0 iD8DBQBR+ymFywK+sNU5EO8RAuSdAJkBMcd9DAZ3rWE9WGKPm2YZ8LBoXACfXn/wbEsVy7ZgJoUwiWmHSnQaWCI=
79 79 335a558f81dc73afeab4d7be63617392b130117f 0 iQIVAwUAUiZrIyBXgaxoKi1yAQK2iw//cquNqqSkc8Re5/TZT9I6NH+lh6DbOKjJP0Xl1Wqq0K+KSIUgZG4G32ovaEb2l5X0uY+3unRPiZ0ebl0YSw4Fb2ZiPIADXLBTOYRrY2Wwd3tpJeGI6wEgZt3SfcITV/g7NJrCjT3FlYoSOIayrExM80InSdcEM0Q3Rx6HKzY2acyxzgZeAtAW5ohFvHilSvY6p5Gcm4+QptMxvw45GPdreUmjeXZxNXNXZ8P+MjMz/QJbai/N7PjmK8lqnhkBsT48Ng/KhhmOkGntNJ2/ImBWLFGcWngSvJ7sfWwnyhndvGhe0Hq1NcCf7I8TjNDxU5TR+m+uW7xjXdLoDbUjBdX4sKXnh8ZjbYiODKBOrrDq25cf8nA/tnpKyE/qsVy60kOk6loY4XKiYmn1V49Ta0emmDx0hqo3HgxHHsHX0NDnGdWGol7cPRET0RzVobKq1A0jnrhPooWidvLh9bPzLonrWDo+ib+DuySoRkuYUK4pgZJ2mbg6daFOBEZygkSyRB8bo1UQUP7EgQDrWe4khb/5GHEfDkrQz3qu/sXvc0Ir1mOUWBFPHC2DjjCn/oMJuUkG1SwM8l2Bfv7h67ssES6YQ2+RjOix4yid7EXS/Ogl45PzCIPSI5+BbNs10JhE0w5uErBHlF53EDTe/TSLc+GU6DB6PP6dH912Njdr3jpNSUQ=
80 80 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
@@ -1,263 +1,264 b''
1 1 d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f
2 2 1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e
3 3 7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d
4 4 b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c
5 5 f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5
6 6 0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b
7 7 12e0fdbc57a0be78f0e817fd1d170a3615cd35da 0.6
8 8 4ccf3de52989b14c3d84e1097f59e39a992e00bd 0.6b
9 9 eac9c8efcd9bd8244e72fb6821f769f450457a32 0.6c
10 10 979c049974485125e1f9357f6bbe9c1b548a64c3 0.7
11 11 3a56574f329a368d645853e0f9e09472aee62349 0.8
12 12 6a03cff2b0f5d30281e6addefe96b993582f2eac 0.8.1
13 13 35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0.9
14 14 2be3001847cb18a23c403439d9e7d0ace30804e9 0.9.1
15 15 36a957364b1b89c150f2d0e60a99befe0ee08bd3 0.9.2
16 16 27230c29bfec36d5540fbe1c976810aefecfd1d2 0.9.3
17 17 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0.9.4
18 18 23889160905a1b09fffe1c07378e9fc1827606eb 0.9.5
19 19 bae2e9c838e90a393bae3973a7850280413e091a 1.0
20 20 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1
21 21 d2375bbee6d47e62ba8e415c86e83a465dc4dce9 1.0.2
22 22 2a67430f92f15ea5159c26b09ec4839a0c549a26 1.1
23 23 3773e510d433969e277b1863c317b674cbee2065 1.1.1
24 24 11a4eb81fb4f4742451591489e2797dc47903277 1.1.2
25 25 11efa41037e280d08cfb07c09ad485df30fb0ea8 1.2
26 26 02981000012e3adf40c4849bd7b3d5618f9ce82d 1.2.1
27 27 196d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3
28 28 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1
29 29 31ec469f9b556f11819937cf68ee53f2be927ebf 1.4
30 30 439d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1
31 31 296a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2
32 32 4aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3
33 33 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5
34 34 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1
35 35 39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2
36 36 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3
37 37 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
38 38 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
39 39 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
40 40 c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
41 41 ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3
42 42 93d8bff78c96fe7e33237b257558ee97290048a4 1.6.4
43 43 333421b9e0f96c7bc788e5667c146a58a9440a55 1.7
44 44 4438875ec01bd0fc32be92b0872eb6daeed4d44f 1.7.1
45 45 6aff4f144ad356311318b0011df0bb21f2c97429 1.7.2
46 46 e3bf16703e2601de99e563cdb3a5d50b64e6d320 1.7.3
47 47 a6c855c32ea081da3c3b8ff628f1847ff271482f 1.7.4
48 48 2b2155623ee2559caf288fd333f30475966c4525 1.7.5
49 49 2616325766e3504c8ae7c84bd15ee610901fe91d 1.8
50 50 aa1f3be38ab127280761889d2dca906ca465b5f4 1.8.1
51 51 b032bec2c0a651ca0ddecb65714bfe6770f67d70 1.8.2
52 52 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 1.8.3
53 53 733af5d9f6b22387913e1d11350fb8cb7c1487dd 1.8.4
54 54 de9eb6b1da4fc522b1cab16d86ca166204c24f25 1.9
55 55 4a43e23b8c55b4566b8200bf69fe2158485a2634 1.9.1
56 56 d629f1e89021103f1753addcef6b310e4435b184 1.9.2
57 57 351a9292e430e35766c552066ed3e87c557b803b 1.9.3
58 58 384082750f2c51dc917d85a7145748330fa6ef4d 2.0-rc
59 59 41453d55b481ddfcc1dacb445179649e24ca861d 2.0
60 60 195dbd1cef0c2f9f8bcf4ea303238105f716bda3 2.0.1
61 61 6344043924497cd06d781d9014c66802285072e4 2.0.2
62 62 db33555eafeaf9df1e18950e29439eaa706d399b 2.1-rc
63 63 2aa5b51f310fb3befd26bed99c02267f5c12c734 2.1
64 64 53e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 2.1.1
65 65 b9bd95e61b49c221c4cca24e6da7c946fc02f992 2.1.2
66 66 d9e2f09d5488c395ae9ddbb320ceacd24757e055 2.2-rc
67 67 00182b3d087909e3c3ae44761efecdde8f319ef3 2.2
68 68 5983de86462c5a9f42a3ad0f5e90ce5b1d221d25 2.2.1
69 69 85a358df5bbbe404ca25730c9c459b34263441dc 2.2.2
70 70 b013baa3898e117959984fc64c29d8c784d2f28b 2.2.3
71 71 a06e2681dd1786e2354d84a5fa9c1c88dd4fa3e0 2.3-rc
72 72 7f5094bb3f423fc799e471aac2aee81a7ce57a0b 2.3
73 73 072209ae4ddb654eb2d5fd35bff358c738414432 2.3.1
74 74 b3f0f9a39c4e1d0250048cd803ab03542d6f140a 2.3.2
75 75 d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 2.4-rc
76 76 195ad823b5d58c68903a6153a25e3fb4ed25239d 2.4
77 77 0c10cf8191469e7c3c8844922e17e71a176cb7cb 2.4.1
78 78 a4765077b65e6ae29ba42bab7834717b5072d5ba 2.4.2
79 79 f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 2.5-rc
80 80 a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5
81 81 7511d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1
82 82 5b7175377babacce80a6c1e12366d8032a6d4340 2.5.2
83 83 50c922c1b5145dab8baefefb0437d363b6a6c21c 2.5.3
84 84 8a7bd2dccd44ed571afe7424cd7f95594f27c092 2.5.4
85 85 292cd385856d98bacb2c3086f8897bc660c2beea 2.6-rc
86 86 23f785b38af38d2fca6b8f3db56b8007a84cd73a 2.6
87 87 ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 2.6.1
88 88 cceaf7af4c9e9e6fa2dbfdcfe9856c5da69c4ffd 2.6.2
89 89 009794acc6e37a650f0fae37872e733382ac1c0c 2.6.3
90 90 f0d7721d7322dcfb5af33599c2543f27335334bb 2.7-rc
91 91 f37b5a17e6a0ee17afde2cdde5393dd74715fb58 2.7
92 92 335a558f81dc73afeab4d7be63617392b130117f 2.7.1
93 93 e7fa36d2ad3a7944a52dca126458d6f482db3524 2.7.2
94 94 1596f2d8f2421314b1ddead8f7d0c91009358994 2.8-rc
95 95 d825e4025e39d1c39db943cdc89818abd0a87c27 2.8
96 96 209e04a06467e2969c0cc6501335be0406d46ef0 2.8.1
97 97 ca387377df7a3a67dbb90b6336b781cdadc3ef41 2.8.2
98 98 8862469e16f9236208581b20de5f96bd13cc039d 2.9-rc
99 99 3cec5134e9c4bceab6a00c60f52a4f80677a78f2 2.9
100 100 b96cb15ec9e04d8ac5ee08b34fcbbe4200588965 2.9.1
101 101 3f83fc5cfe715d292069ee8417c83804f6c6c1e4 2.9.2
102 102 564f55b251224f16508dd1311452db7780dafe2b 3.0-rc
103 103 2195ac506c6ababe86985b932f4948837c0891b5 3.0
104 104 269c80ee5b3cb3684fa8edc61501b3506d02eb10 3.0.1
105 105 2d8cd3d0e83c7336c0cb45a9f88638363f993848 3.0.2
106 106 6c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 3.1-rc
107 107 3178e49892020336491cdc6945885c4de26ffa8b 3.1
108 108 5dc91146f35369949ea56b40172308158b59063a 3.1.1
109 109 f768c888aaa68d12dd7f509dcc7f01c9584357d0 3.1.2
110 110 7f8d16af8cae246fa5a48e723d48d58b015aed94 3.2-rc
111 111 ced632394371a36953ce4d394f86278ae51a2aae 3.2
112 112 643c58303fb0ec020907af28b9e486be299ba043 3.2.1
113 113 902554884335e5ca3661d63be9978eb4aec3f68a 3.2.2
114 114 6dad422ecc5adb63d9fa649eeb8e05a5f9bc4900 3.2.3
115 115 1265a3a71d75396f5d4cf6935ae7d9ba5407a547 3.2.4
116 116 db8e3f7948b1fdeb9ad12d448fc3525759908b9f 3.3-rc
117 117 fbdd5195528fae4f41feebc1838215c110b25d6a 3.3
118 118 5b4ed033390bf6e2879c8f5c28c84e1ee3b87231 3.3.1
119 119 07a92bbd02e5e3a625e0820389b47786b02b2cea 3.3.2
120 120 2e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 3.3.3
121 121 e89f909edffad558b56f4affa8239e4832f88de0 3.4-rc
122 122 8cc6036bca532e06681c5a8fa37efaa812de67b5 3.4
123 123 ed18f4acf435a2824c6f49fba40f42b9df5da7ad 3.4.1
124 124 540cd0ddac49c1125b2e013aa2ff18ecbd4dd954 3.4.2
125 125 96a38d44ba093bd1d1ecfd34119e94056030278b 3.5-rc
126 126 21aa1c313b05b1a85f8ffa1120d51579ddf6bf24 3.5
127 127 1a45e49a6bed023deb229102a8903234d18054d3 3.5.1
128 128 9a466b9f9792e3ad7ae3fc6c43c3ff2e136b718d 3.5.2
129 129 b66e3ca0b90c3095ea28dfd39aa24247bebf5c20 3.6-rc
130 130 47dd34f2e7272be9e3b2a5a83cd0d20be44293f4 3.6
131 131 1aa5083cbebbe7575c88f3402ab377539b484897 3.6.1
132 132 2d437a0f3355834a9485bbbeb30a52a052c98f19 3.6.2
133 133 ea389970c08449440587712117f178d33bab3f1e 3.6.3
134 134 158bdc8965720ca4061f8f8d806563cfc7cdb62e 3.7-rc
135 135 2408645de650d8a29a6ce9e7dce601d8dd0d1474 3.7
136 136 b698abf971e7377d9b7ec7fc8c52df45255b0329 3.7.1
137 137 d493d64757eb45ada99fcb3693e479a51b7782da 3.7.2
138 138 ae279d4a19e9683214cbd1fe8298cf0b50571432 3.7.3
139 139 740156eedf2c450aee58b1a90b0e826f47c5da64 3.8-rc
140 140 f85de28eae32e7d3064b1a1321309071bbaaa069 3.8
141 141 a56296f55a5e1038ea5016dace2076b693c28a56 3.8.1
142 142 aaabed77791a75968a12b8c43ad263631a23ee81 3.8.2
143 143 a9764ab80e11bcf6a37255db7dd079011f767c6c 3.8.3
144 144 26a5d605b8683a292bb89aea11f37a81b06ac016 3.8.4
145 145 519bb4f9d3a47a6e83c2b414d58811ed38f503c2 3.9-rc
146 146 299546f84e68dbb9bd026f0f3a974ce4bdb93686 3.9
147 147 ccd436f7db6d5d7b9af89715179b911d031d44f1 3.9.1
148 148 149433e68974eb5c63ccb03f794d8b57339a80c4 3.9.2
149 149 438173c415874f6ac653efc1099dec9c9150e90f 4.0-rc
150 150 eab27446995210c334c3d06f1a659e3b9b5da769 4.0
151 151 b3b1ae98f6a0e14c1e1ba806a6c18e193b6dae5c 4.0.1
152 152 e69874dc1f4e142746ff3df91e678a09c6fc208c 4.0.2
153 153 a1dd2c0c479e0550040542e392e87bc91262517e 4.1-rc
154 154 e1526da1e6d84e03146151c9b6e6950fe9a83d7d 4.1
155 155 25703b624d27e3917d978af56d6ad59331e0464a 4.1.1
156 156 ed5b25874d998ababb181a939dd37a16ea644435 4.1.2
157 157 77eaf9539499a1b8be259ffe7ada787d07857f80 4.1.3
158 158 616e788321cc4ae9975b7f0c54c849f36d82182b 4.2-rc
159 159 bb96d4a497432722623ae60d9bc734a1e360179e 4.2
160 160 c850f0ed54c1d42f9aa079ad528f8127e5775217 4.2.1
161 161 26c49ed51a698ec016d2b4c6b44ca3c3f73cc788 4.2.2
162 162 857876ebaed4e315f63157bd157d6ce553c7ab73 4.3-rc
163 163 5544af8622863796a0027566f6b646e10d522c4c 4.3
164 164 943c91326b23954e6e1c6960d0239511f9530258 4.2.3
165 165 3fee7f7d2da04226914c2258cc2884dc27384fd7 4.3.1
166 166 920977f72c7b70acfdaf56ab35360584d7845827 4.3.2
167 167 2f427b57bf9019c6dc3750baa539dc22c1be50f6 4.3.3
168 168 1e2454b60e5936f5e77498cab2648db469504487 4.4-rc
169 169 0ccb43d4cf01d013ae05917ec4f305509f851b2d 4.4
170 170 cabc840ffdee8a72f3689fb77dd74d04fdc2bc04 4.4.1
171 171 a92b9f8e11ba330614cdfd6af0e03b15c1ff3797 4.4.2
172 172 27b6df1b5adbdf647cf5c6675b40575e1b197c60 4.5-rc
173 173 d334afc585e29577f271c5eda03378736a16ca6b 4.5
174 174 369aadf7a3264b03c8b09efce715bc41e6ab4a9b 4.5.1
175 175 8bba684efde7f45add05f737952093bb2aa07155 4.5.2
176 176 7de7bd407251af2bc98e5b809c8598ee95830daf 4.5.3
177 177 ed5448edcbfa747b9154099e18630e49024fd47b 4.6rc0
178 178 1ec874717d8a93b19e0d50628443e0ee5efab3a9 4.6rc1
179 179 6614cac550aea66d19c601e45efd1b7bd08d7c40 4.6
180 180 9c5ced5276d6e7d54f7c3dadf5247b7ee98ec79c 4.6.1
181 181 0b63a6743010dfdbf8a8154186e119949bdaa1cc 4.6.2
182 182 e90130af47ce8dd53a3109aed9d15876b3e7dee8 4.7rc0
183 183 33ac6a72308a215e6086fbced347ec10aa963b0a 4.7
184 184 ede3bf31fe63677fdf5bd8db687977d4e3d792ed 4.7.1
185 185 5405cb1a79010ac50c58cd84e6f50c4556bf2a4c 4.7.2
186 186 956ec6f1320df26f3133ec40f3de866ea0695fd7 4.8rc0
187 187 a91a2837150bdcb27ae76b3646e6c93cd6a15904 4.8
188 188 1c8c54cf97256f4468da2eb4dbee24f7f3888e71 4.8.1
189 189 197f092b2cd9691e2a55d198f717b231af9be6f9 4.8.2
190 190 593718ff5844cad7a27ee3eb5adad89ac8550949 4.9rc0
191 191 83377b4b4ae0e9a6b8e579f7b0a693b8cf5c3b10 4.9
192 192 4ea21df312ec7159c5b3633096b6ecf68750b0dd 4.9.1
193 193 4a8d9ed864754837a185a642170cde24392f9abf 5.0rc0
194 194 07e479ef7c9639be0029f00e6a722b96dcc05fee 5.0
195 195 c3484ddbdb9621256d597ed86b90d229c59c2af9 5.0.1
196 196 97ada9b8d51bef24c5cb4cdca4243f0db694ab6e 5.0.2
197 197 e386b5f4f8360dbb43a576dd9b1368e386fefa5b 5.1rc0
198 198 e91930d712e8507d1bc1b2dffd96c83edc4cbed3 5.1
199 199 a4e32fd539ab41489a51b2aa88bda9a73b839562 5.1.1
200 200 181e52f2b62f4768aa0d988936c929dc7c4a41a0 5.1.2
201 201 59338f9561099de77c684c00f76507f11e46ebe8 5.2rc0
202 202 ca3dca416f8d5863ca6f5a4a6a6bb835dcd5feeb 5.2
203 203 a50fecefa691c9b72a99e49aa6fe9dd13943c2bf 5.2.1
204 204 b4c82b70418022e67cc0e69b1aa3c3aa43aa1d29 5.2.2
205 205 84a0102c05c7852c8215ef6cf21d809927586b69 5.3rc0
206 206 e4344e463c0c888a2f437b78b5982ecdf3f6650a 5.3rc1
207 207 7f5410dfc8a64bb587d19637deb95d378fd1eb5c 5.3
208 208 6d121acbb82e65fe4dd3c2318a1b61981b958492 5.3.1
209 209 8fca7e8449a847e3cf1054f2c07b51237699fad3 5.3.2
210 210 26ce8e7515036d3431a03aaeb7bc72dd96cb1112 5.4rc0
211 211 cf3e07d7648a4371ce584d15dd692e7a6845792f 5.4
212 212 065704cbdbdbb05dcd6bb814eb9bbdd982211b28 5.4.1
213 213 0ea9c86fac8974cd74dc12ea681c8986eb6da6c4 5.4.2
214 214 28163c5de797e5416f9b588940f4608269b4d50a 5.5rc0
215 215 7fc3c5fbc65f6fe85d70ea63923b8767dda4f2e0 5.5
216 216 f62bb5d07848ca598aa860a517394130b61bf2ee 5.5.1
217 217 07731064ac41dacdf0ec869ebd05c2e848c14fbf 5.5.2
218 218 0e06a7ab9e0d5c65af4e511aee1e0342998799df 5.6rc0
219 219 18c17d63fdabd009e70bf994e5efb7db422f4f7f 5.6
220 220 1d5189a57405ceca5aa244052c9f948977f4699b 5.6.1
221 221 9da65e3cf3706ff41e08b311381c588440c27baf 5.7rc0
222 222 0e2e7300f4302b02412b0b734717697049494c4c 5.7
223 223 d5d9177c0045d206db575bae6daa98e2cb2fe5bc 5.7.1
224 224 f67b8946bb1b6cfa8328dbf8d6a9128b69ccdcb4 5.8rc0
225 225 8d2b62d716b095507effaa8d56f87cd27ba659ab 5.8rc1
226 226 067f2c53fb24506c9e9fb4639871b13b19a85f8a 5.8
227 227 411dc27fd9fd076d6a031a08fcaace659afe2fe3 5.8.1
228 228 d7515d29761d5ada7d9c765f517db67db75dea9a 5.9rc0
229 229 2813d406b03607cdb8c06cb04c44efcc9a79d9a2 5.9rc1
230 230 53221078e0de65d1a821ce5311dec45a7a978301 5.9
231 231 86a60679cf619e14cee9442f865fcf31b142cb9f 5.9.1
232 232 750920b18aaaddd654756be40dec59d90f2643be 5.9.2
233 233 6ee0244fc1cf889ae543d2ce0ec45201ae0be6e1 5.9.3
234 234 a44bb185f6bdbecc754996d8386722e2f0123b0a 6.0rc0
235 235 5d08b289e2e526259d7d5ea32b70fe76d5b327d7 6.0
236 236 799fdf4cca80cb9ae40537a90995e6bd163ebc0b 6.0.1
237 237 75676122c2bf7594ac732b7388db4c74c648b365 6.0.2
238 238 dcec16e799ddb6d33fcd11b04af530250a417a58 6.0.3
239 239 c00d3ce4e94bb0ee8d809e25e1dcb2a5fab84e2c 6.1rc0
240 240 d4486810a1795fba9521449b8885ced034f3a6dd 6.1
241 241 5bd6bcd31dd1ebb63b8914b00064f96297267af7 6.1.1
242 242 0ddd5e1f5f67438af85d12e4ce6c39021dde9916 6.1.2
243 243 6b10151b962108f65bfa12b3918b1021ca334f73 6.1.3
244 244 0cc5f74ff7f0f4ac2427096bddbe102dbc2453ae 6.1.4
245 245 288de6f5d724bba7bf1669e2838f196962bb7528 6.2rc0
246 246 094a5fa3cf52f936e0de3f1e507c818bee5ece6b 6.2
247 247 f69bffd00abe3a1b94d1032eb2c92e611d16a192 6.2.1
248 248 b5c8524827d20fe2e0ca8fb1234a0fe35a1a36c7 6.2.2
249 249 dbdee8ac3e3fcdda1fa55b90c0a235125b7f8e6f 6.2.3
250 250 a3356ab610fc50000cf0ba55c424a4d96da11db7 6.3rc0
251 251 04f1dba53c961dfdb875c8469adc96fa999cfbed 6.3.0
252 252 04f1dba53c961dfdb875c8469adc96fa999cfbed 6.3
253 253 04f1dba53c961dfdb875c8469adc96fa999cfbed 6.3.0
254 254 0000000000000000000000000000000000000000 6.3.0
255 255 c890d8b8bc59b18e5febf60caada629df5356ee2 6.3.1
256 256 59466b13a3ae0e29a5d4f485393e516cfbb057d0 6.3.2
257 257 8830004967ad865ead89c28a410405a6e71e0796 6.3.3
258 258 05de4896508e8ec387b33eb30d8aab78d1c8e9e4 6.4rc0
259 259 f14864fffdcab725d9eac6d4f4c07be05a35f59a 6.4
260 260 83ea6ce48b4fd09fb79c4e34cc5750c805699a53 6.4.1
261 261 f952be90b0514a576dcc8bbe758ce3847faba9bb 6.4.2
262 262 fc445f8abcf90b33db7c463816a1b3560681767f 6.4.3
263 263 da372c745e0f053bb7a64e74cccd15810d96341d 6.4.4
264 271a4ab29605ffa0bae5d3208eaa21a95427ff92 6.4.5
@@ -1,8057 +1,8054 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8
9 9 import os
10 10 import re
11 11 import sys
12 12
13 13 from .i18n import _
14 14 from .node import (
15 15 hex,
16 16 nullid,
17 17 nullrev,
18 18 short,
19 19 wdirrev,
20 20 )
21 21 from .pycompat import open
22 22 from . import (
23 23 archival,
24 24 bookmarks,
25 25 bundle2,
26 26 bundlecaches,
27 27 changegroup,
28 28 cmdutil,
29 29 copies,
30 30 debugcommands as debugcommandsmod,
31 31 destutil,
32 32 discovery,
33 33 encoding,
34 34 error,
35 35 exchange,
36 36 extensions,
37 37 filemerge,
38 38 formatter,
39 39 graphmod,
40 40 grep as grepmod,
41 41 hbisect,
42 42 help,
43 43 hg,
44 44 logcmdutil,
45 45 merge as mergemod,
46 46 mergestate as mergestatemod,
47 47 narrowspec,
48 48 obsolete,
49 49 obsutil,
50 50 patch,
51 51 phases,
52 52 pycompat,
53 53 rcutil,
54 54 registrar,
55 55 requirements,
56 56 revsetlang,
57 57 rewriteutil,
58 58 scmutil,
59 59 server,
60 60 shelve as shelvemod,
61 61 state as statemod,
62 62 streamclone,
63 63 tags as tagsmod,
64 64 ui as uimod,
65 65 util,
66 66 verify as verifymod,
67 67 vfs as vfsmod,
68 68 wireprotoserver,
69 69 )
70 70 from .utils import (
71 71 dateutil,
72 72 procutil,
73 73 stringutil,
74 74 urlutil,
75 75 )
76 76
77 77 table = {}
78 78 table.update(debugcommandsmod.command._table)
79 79
80 80 command = registrar.command(table)
81 81 INTENT_READONLY = registrar.INTENT_READONLY
82 82
83 83 # common command options
84 84
85 85 globalopts = [
86 86 (
87 87 b'R',
88 88 b'repository',
89 89 b'',
90 90 _(b'repository root directory or name of overlay bundle file'),
91 91 _(b'REPO'),
92 92 ),
93 93 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
94 94 (
95 95 b'y',
96 96 b'noninteractive',
97 97 None,
98 98 _(
99 99 b'do not prompt, automatically pick the first choice for all prompts'
100 100 ),
101 101 ),
102 102 (b'q', b'quiet', None, _(b'suppress output')),
103 103 (b'v', b'verbose', None, _(b'enable additional output')),
104 104 (
105 105 b'',
106 106 b'color',
107 107 b'',
108 108 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
109 109 # and should not be translated
110 110 _(b"when to colorize (boolean, always, auto, never, or debug)"),
111 111 _(b'TYPE'),
112 112 ),
113 113 (
114 114 b'',
115 115 b'config',
116 116 [],
117 117 _(b'set/override config option (use \'section.name=value\')'),
118 118 _(b'CONFIG'),
119 119 ),
120 120 (b'', b'debug', None, _(b'enable debugging output')),
121 121 (b'', b'debugger', None, _(b'start debugger')),
122 122 (
123 123 b'',
124 124 b'encoding',
125 125 encoding.encoding,
126 126 _(b'set the charset encoding'),
127 127 _(b'ENCODE'),
128 128 ),
129 129 (
130 130 b'',
131 131 b'encodingmode',
132 132 encoding.encodingmode,
133 133 _(b'set the charset encoding mode'),
134 134 _(b'MODE'),
135 135 ),
136 136 (b'', b'traceback', None, _(b'always print a traceback on exception')),
137 137 (b'', b'time', None, _(b'time how long the command takes')),
138 138 (b'', b'profile', None, _(b'print command execution profile')),
139 139 (b'', b'version', None, _(b'output version information and exit')),
140 140 (b'h', b'help', None, _(b'display help and exit')),
141 141 (b'', b'hidden', False, _(b'consider hidden changesets')),
142 142 (
143 143 b'',
144 144 b'pager',
145 145 b'auto',
146 146 _(b"when to paginate (boolean, always, auto, or never)"),
147 147 _(b'TYPE'),
148 148 ),
149 149 ]
150 150
151 151 dryrunopts = cmdutil.dryrunopts
152 152 remoteopts = cmdutil.remoteopts
153 153 walkopts = cmdutil.walkopts
154 154 commitopts = cmdutil.commitopts
155 155 commitopts2 = cmdutil.commitopts2
156 156 commitopts3 = cmdutil.commitopts3
157 157 formatteropts = cmdutil.formatteropts
158 158 templateopts = cmdutil.templateopts
159 159 logopts = cmdutil.logopts
160 160 diffopts = cmdutil.diffopts
161 161 diffwsopts = cmdutil.diffwsopts
162 162 diffopts2 = cmdutil.diffopts2
163 163 mergetoolopts = cmdutil.mergetoolopts
164 164 similarityopts = cmdutil.similarityopts
165 165 subrepoopts = cmdutil.subrepoopts
166 166 debugrevlogopts = cmdutil.debugrevlogopts
167 167
168 168 # Commands start here, listed alphabetically
169 169
170 170
171 171 @command(
172 172 b'abort',
173 173 dryrunopts,
174 174 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
175 175 helpbasic=True,
176 176 )
177 177 def abort(ui, repo, **opts):
178 178 """abort an unfinished operation (EXPERIMENTAL)
179 179
180 180 Aborts a multistep operation like graft, histedit, rebase, merge,
181 181 and unshelve if they are in an unfinished state.
182 182
183 183 use --dry-run/-n to dry run the command.
184 184 """
185 185 dryrun = opts.get('dry_run')
186 186 abortstate = cmdutil.getunfinishedstate(repo)
187 187 if not abortstate:
188 188 raise error.StateError(_(b'no operation in progress'))
189 189 if not abortstate.abortfunc:
190 190 raise error.InputError(
191 191 (
192 192 _(b"%s in progress but does not support 'hg abort'")
193 193 % (abortstate._opname)
194 194 ),
195 195 hint=abortstate.hint(),
196 196 )
197 197 if dryrun:
198 198 ui.status(
199 199 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
200 200 )
201 201 return
202 202 return abortstate.abortfunc(ui, repo)
203 203
204 204
205 205 @command(
206 206 b'add',
207 207 walkopts + subrepoopts + dryrunopts,
208 208 _(b'[OPTION]... [FILE]...'),
209 209 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
210 210 helpbasic=True,
211 211 inferrepo=True,
212 212 )
213 213 def add(ui, repo, *pats, **opts):
214 214 """add the specified files on the next commit
215 215
216 216 Schedule files to be version controlled and added to the
217 217 repository.
218 218
219 219 The files will be added to the repository at the next commit. To
220 220 undo an add before that, see :hg:`forget`.
221 221
222 222 If no names are given, add all files to the repository (except
223 223 files matching ``.hgignore``).
224 224
225 225 .. container:: verbose
226 226
227 227 Examples:
228 228
229 229 - New (unknown) files are added
230 230 automatically by :hg:`add`::
231 231
232 232 $ ls
233 233 foo.c
234 234 $ hg status
235 235 ? foo.c
236 236 $ hg add
237 237 adding foo.c
238 238 $ hg status
239 239 A foo.c
240 240
241 241 - Specific files to be added can be specified::
242 242
243 243 $ ls
244 244 bar.c foo.c
245 245 $ hg status
246 246 ? bar.c
247 247 ? foo.c
248 248 $ hg add bar.c
249 249 $ hg status
250 250 A bar.c
251 251 ? foo.c
252 252
253 253 Returns 0 if all files are successfully added.
254 254 """
255 255
256 256 with repo.wlock(), repo.dirstate.changing_files(repo):
257 257 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
258 258 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
259 259 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
260 260 return rejected and 1 or 0
261 261
262 262
263 263 @command(
264 264 b'addremove',
265 265 similarityopts + subrepoopts + walkopts + dryrunopts,
266 266 _(b'[OPTION]... [FILE]...'),
267 267 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
268 268 inferrepo=True,
269 269 )
270 270 def addremove(ui, repo, *pats, **opts):
271 271 """add all new files, delete all missing files
272 272
273 273 Add all new files and remove all missing files from the
274 274 repository.
275 275
276 276 Unless names are given, new files are ignored if they match any of
277 277 the patterns in ``.hgignore``. As with add, these changes take
278 278 effect at the next commit.
279 279
280 280 Use the -s/--similarity option to detect renamed files. This
281 281 option takes a percentage between 0 (disabled) and 100 (files must
282 282 be identical) as its parameter. With a parameter greater than 0,
283 283 this compares every removed file with every added file and records
284 284 those similar enough as renames. Detecting renamed files this way
285 285 can be expensive. After using this option, :hg:`status -C` can be
286 286 used to check which files were identified as moved or renamed. If
287 287 not specified, -s/--similarity defaults to 100 and only renames of
288 288 identical files are detected.
289 289
290 290 .. container:: verbose
291 291
292 292 Examples:
293 293
294 294 - A number of files (bar.c and foo.c) are new,
295 295 while foobar.c has been removed (without using :hg:`remove`)
296 296 from the repository::
297 297
298 298 $ ls
299 299 bar.c foo.c
300 300 $ hg status
301 301 ! foobar.c
302 302 ? bar.c
303 303 ? foo.c
304 304 $ hg addremove
305 305 adding bar.c
306 306 adding foo.c
307 307 removing foobar.c
308 308 $ hg status
309 309 A bar.c
310 310 A foo.c
311 311 R foobar.c
312 312
313 313 - A file foobar.c was moved to foo.c without using :hg:`rename`.
314 314 Afterwards, it was edited slightly::
315 315
316 316 $ ls
317 317 foo.c
318 318 $ hg status
319 319 ! foobar.c
320 320 ? foo.c
321 321 $ hg addremove --similarity 90
322 322 removing foobar.c
323 323 adding foo.c
324 324 recording removal of foobar.c as rename to foo.c (94% similar)
325 325 $ hg status -C
326 326 A foo.c
327 327 foobar.c
328 328 R foobar.c
329 329
330 330 Returns 0 if all files are successfully added.
331 331 """
332 332 opts = pycompat.byteskwargs(opts)
333 333 if not opts.get(b'similarity'):
334 334 opts[b'similarity'] = b'100'
335 335 with repo.wlock(), repo.dirstate.changing_files(repo):
336 336 matcher = scmutil.match(repo[None], pats, opts)
337 337 relative = scmutil.anypats(pats, opts)
338 338 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
339 339 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
340 340
341 341
342 342 @command(
343 343 b'annotate|blame',
344 344 [
345 345 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
346 346 (
347 347 b'',
348 348 b'follow',
349 349 None,
350 350 _(b'follow copies/renames and list the filename (DEPRECATED)'),
351 351 ),
352 352 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
353 353 (b'a', b'text', None, _(b'treat all files as text')),
354 354 (b'u', b'user', None, _(b'list the author (long with -v)')),
355 355 (b'f', b'file', None, _(b'list the filename')),
356 356 (b'd', b'date', None, _(b'list the date (short with -q)')),
357 357 (b'n', b'number', None, _(b'list the revision number (default)')),
358 358 (b'c', b'changeset', None, _(b'list the changeset')),
359 359 (
360 360 b'l',
361 361 b'line-number',
362 362 None,
363 363 _(b'show line number at the first appearance'),
364 364 ),
365 365 (
366 366 b'',
367 367 b'skip',
368 368 [],
369 369 _(b'revset to not display (EXPERIMENTAL)'),
370 370 _(b'REV'),
371 371 ),
372 372 ]
373 373 + diffwsopts
374 374 + walkopts
375 375 + formatteropts,
376 376 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
377 377 helpcategory=command.CATEGORY_FILE_CONTENTS,
378 378 helpbasic=True,
379 379 inferrepo=True,
380 380 )
381 381 def annotate(ui, repo, *pats, **opts):
382 382 """show changeset information by line for each file
383 383
384 384 List changes in files, showing the revision id responsible for
385 385 each line.
386 386
387 387 This command is useful for discovering when a change was made and
388 388 by whom.
389 389
390 390 If you include --file, --user, or --date, the revision number is
391 391 suppressed unless you also include --number.
392 392
393 393 Without the -a/--text option, annotate will avoid processing files
394 394 it detects as binary. With -a, annotate will annotate the file
395 395 anyway, although the results will probably be neither useful
396 396 nor desirable.
397 397
398 398 .. container:: verbose
399 399
400 400 Template:
401 401
402 402 The following keywords are supported in addition to the common template
403 403 keywords and functions. See also :hg:`help templates`.
404 404
405 405 :lines: List of lines with annotation data.
406 406 :path: String. Repository-absolute path of the specified file.
407 407
408 408 And each entry of ``{lines}`` provides the following sub-keywords in
409 409 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
410 410
411 411 :line: String. Line content.
412 412 :lineno: Integer. Line number at that revision.
413 413 :path: String. Repository-absolute path of the file at that revision.
414 414
415 415 See :hg:`help templates.operators` for the list expansion syntax.
416 416
417 417 Returns 0 on success.
418 418 """
419 419 opts = pycompat.byteskwargs(opts)
420 420 if not pats:
421 421 raise error.InputError(
422 422 _(b'at least one filename or pattern is required')
423 423 )
424 424
425 425 if opts.get(b'follow'):
426 426 # --follow is deprecated and now just an alias for -f/--file
427 427 # to mimic the behavior of Mercurial before version 1.5
428 428 opts[b'file'] = True
429 429
430 430 if (
431 431 not opts.get(b'user')
432 432 and not opts.get(b'changeset')
433 433 and not opts.get(b'date')
434 434 and not opts.get(b'file')
435 435 ):
436 436 opts[b'number'] = True
437 437
438 438 linenumber = opts.get(b'line_number') is not None
439 439 if (
440 440 linenumber
441 441 and (not opts.get(b'changeset'))
442 442 and (not opts.get(b'number'))
443 443 ):
444 444 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
445 445
446 446 rev = opts.get(b'rev')
447 447 if rev:
448 448 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
449 449 ctx = logcmdutil.revsingle(repo, rev)
450 450
451 451 ui.pager(b'annotate')
452 452 rootfm = ui.formatter(b'annotate', opts)
453 453 if ui.debugflag:
454 454 shorthex = pycompat.identity
455 455 else:
456 456
457 457 def shorthex(h):
458 458 return h[:12]
459 459
460 460 if ui.quiet:
461 461 datefunc = dateutil.shortdate
462 462 else:
463 463 datefunc = dateutil.datestr
464 464 if ctx.rev() is None:
465 465 if opts.get(b'changeset'):
466 466 # omit "+" suffix which is appended to node hex
467 467 def formatrev(rev):
468 468 if rev == wdirrev:
469 469 return b'%d' % ctx.p1().rev()
470 470 else:
471 471 return b'%d' % rev
472 472
473 473 else:
474 474
475 475 def formatrev(rev):
476 476 if rev == wdirrev:
477 477 return b'%d+' % ctx.p1().rev()
478 478 else:
479 479 return b'%d ' % rev
480 480
481 481 def formathex(h):
482 482 if h == repo.nodeconstants.wdirhex:
483 483 return b'%s+' % shorthex(hex(ctx.p1().node()))
484 484 else:
485 485 return b'%s ' % shorthex(h)
486 486
487 487 else:
488 488 formatrev = b'%d'.__mod__
489 489 formathex = shorthex
490 490
491 491 opmap = [
492 492 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
493 493 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
494 494 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
495 495 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
496 496 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
497 497 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
498 498 ]
499 499 opnamemap = {
500 500 b'rev': b'number',
501 501 b'node': b'changeset',
502 502 b'path': b'file',
503 503 b'lineno': b'line_number',
504 504 }
505 505
506 506 if rootfm.isplain():
507 507
508 508 def makefunc(get, fmt):
509 509 return lambda x: fmt(get(x))
510 510
511 511 else:
512 512
513 513 def makefunc(get, fmt):
514 514 return get
515 515
516 516 datahint = rootfm.datahint()
517 517 funcmap = [
518 518 (makefunc(get, fmt), sep)
519 519 for fn, sep, get, fmt in opmap
520 520 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
521 521 ]
522 522 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
523 523 fields = b' '.join(
524 524 fn
525 525 for fn, sep, get, fmt in opmap
526 526 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
527 527 )
528 528
529 529 def bad(x, y):
530 530 raise error.InputError(b"%s: %s" % (x, y))
531 531
532 532 m = scmutil.match(ctx, pats, opts, badfn=bad)
533 533
534 534 follow = not opts.get(b'no_follow')
535 535 diffopts = patch.difffeatureopts(
536 536 ui, opts, section=b'annotate', whitespace=True
537 537 )
538 538 skiprevs = opts.get(b'skip')
539 539 if skiprevs:
540 540 skiprevs = logcmdutil.revrange(repo, skiprevs)
541 541
542 542 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
543 543 for abs in ctx.walk(m):
544 544 fctx = ctx[abs]
545 545 rootfm.startitem()
546 546 rootfm.data(path=abs)
547 547 if not opts.get(b'text') and fctx.isbinary():
548 548 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
549 549 continue
550 550
551 551 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
552 552 lines = fctx.annotate(
553 553 follow=follow, skiprevs=skiprevs, diffopts=diffopts
554 554 )
555 555 if not lines:
556 556 fm.end()
557 557 continue
558 558 formats = []
559 559 pieces = []
560 560
561 561 for f, sep in funcmap:
562 562 l = [f(n) for n in lines]
563 563 if fm.isplain():
564 564 sizes = [encoding.colwidth(x) for x in l]
565 565 ml = max(sizes)
566 566 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
567 567 else:
568 568 formats.append([b'%s'] * len(l))
569 569 pieces.append(l)
570 570
571 571 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
572 572 fm.startitem()
573 573 fm.context(fctx=n.fctx)
574 574 fm.write(fields, b"".join(f), *p)
575 575 if n.skip:
576 576 fmt = b"* %s"
577 577 else:
578 578 fmt = b": %s"
579 579 fm.write(b'line', fmt, n.text)
580 580
581 581 if not lines[-1].text.endswith(b'\n'):
582 582 fm.plain(b'\n')
583 583 fm.end()
584 584
585 585 rootfm.end()
586 586
587 587
588 588 @command(
589 589 b'archive',
590 590 [
591 591 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
592 592 (
593 593 b'p',
594 594 b'prefix',
595 595 b'',
596 596 _(b'directory prefix for files in archive'),
597 597 _(b'PREFIX'),
598 598 ),
599 599 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
600 600 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
601 601 ]
602 602 + subrepoopts
603 603 + walkopts,
604 604 _(b'[OPTION]... DEST'),
605 605 helpcategory=command.CATEGORY_IMPORT_EXPORT,
606 606 )
607 607 def archive(ui, repo, dest, **opts):
608 608 """create an unversioned archive of a repository revision
609 609
610 610 By default, the revision used is the parent of the working
611 611 directory; use -r/--rev to specify a different revision.
612 612
613 613 The archive type is automatically detected based on file
614 614 extension (to override, use -t/--type).
615 615
616 616 .. container:: verbose
617 617
618 618 Examples:
619 619
620 620 - create a zip file containing the 1.0 release::
621 621
622 622 hg archive -r 1.0 project-1.0.zip
623 623
624 624 - create a tarball excluding .hg files::
625 625
626 626 hg archive project.tar.gz -X ".hg*"
627 627
628 628 Valid types are:
629 629
630 630 :``files``: a directory full of files (default)
631 631 :``tar``: tar archive, uncompressed
632 632 :``tbz2``: tar archive, compressed using bzip2
633 633 :``tgz``: tar archive, compressed using gzip
634 634 :``txz``: tar archive, compressed using lzma (only in Python 3)
635 635 :``uzip``: zip archive, uncompressed
636 636 :``zip``: zip archive, compressed using deflate
637 637
638 638 The exact name of the destination archive or directory is given
639 639 using a format string; see :hg:`help export` for details.
640 640
641 641 Each member added to an archive file has a directory prefix
642 642 prepended. Use -p/--prefix to specify a format string for the
643 643 prefix. The default is the basename of the archive, with suffixes
644 644 removed.
645 645
646 646 Returns 0 on success.
647 647 """
648 648
649 649 opts = pycompat.byteskwargs(opts)
650 650 rev = opts.get(b'rev')
651 651 if rev:
652 652 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
653 653 ctx = logcmdutil.revsingle(repo, rev)
654 654 if not ctx:
655 655 raise error.InputError(
656 656 _(b'no working directory: please specify a revision')
657 657 )
658 658 node = ctx.node()
659 659 dest = cmdutil.makefilename(ctx, dest)
660 660 if os.path.realpath(dest) == repo.root:
661 661 raise error.InputError(_(b'repository root cannot be destination'))
662 662
663 663 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
664 664 prefix = opts.get(b'prefix')
665 665
666 666 if dest == b'-':
667 667 if kind == b'files':
668 668 raise error.InputError(_(b'cannot archive plain files to stdout'))
669 669 dest = cmdutil.makefileobj(ctx, dest)
670 670 if not prefix:
671 671 prefix = os.path.basename(repo.root) + b'-%h'
672 672
673 673 prefix = cmdutil.makefilename(ctx, prefix)
674 674 match = scmutil.match(ctx, [], opts)
675 675 archival.archive(
676 676 repo,
677 677 dest,
678 678 node,
679 679 kind,
680 680 not opts.get(b'no_decode'),
681 681 match,
682 682 prefix,
683 683 subrepos=opts.get(b'subrepos'),
684 684 )
685 685
686 686
687 687 @command(
688 688 b'backout',
689 689 [
690 690 (
691 691 b'',
692 692 b'merge',
693 693 None,
694 694 _(b'merge with old dirstate parent after backout'),
695 695 ),
696 696 (
697 697 b'',
698 698 b'commit',
699 699 None,
700 700 _(b'commit if no conflicts were encountered (DEPRECATED)'),
701 701 ),
702 702 (b'', b'no-commit', None, _(b'do not commit')),
703 703 (
704 704 b'',
705 705 b'parent',
706 706 b'',
707 707 _(b'parent to choose when backing out merge (DEPRECATED)'),
708 708 _(b'REV'),
709 709 ),
710 710 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
711 711 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
712 712 ]
713 713 + mergetoolopts
714 714 + walkopts
715 715 + commitopts
716 716 + commitopts2,
717 717 _(b'[OPTION]... [-r] REV'),
718 718 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
719 719 )
720 720 def backout(ui, repo, node=None, rev=None, **opts):
721 721 """reverse effect of earlier changeset
722 722
723 723 Prepare a new changeset with the effect of REV undone in the
724 724 current working directory. If no conflicts were encountered,
725 725 it will be committed immediately.
726 726
727 727 If REV is the parent of the working directory, then this new changeset
728 728 is committed automatically (unless --no-commit is specified).
729 729
730 730 .. note::
731 731
732 732 :hg:`backout` cannot be used to fix either an unwanted or
733 733 incorrect merge.
734 734
735 735 .. container:: verbose
736 736
737 737 Examples:
738 738
739 739 - Reverse the effect of the parent of the working directory.
740 740 This backout will be committed immediately::
741 741
742 742 hg backout -r .
743 743
744 744 - Reverse the effect of previous bad revision 23::
745 745
746 746 hg backout -r 23
747 747
748 748 - Reverse the effect of previous bad revision 23 and
749 749 leave changes uncommitted::
750 750
751 751 hg backout -r 23 --no-commit
752 752 hg commit -m "Backout revision 23"
753 753
754 754 By default, the pending changeset will have one parent,
755 755 maintaining a linear history. With --merge, the pending
756 756 changeset will instead have two parents: the old parent of the
757 757 working directory and a new child of REV that simply undoes REV.
758 758
759 759 Before version 1.7, the behavior without --merge was equivalent
760 760 to specifying --merge followed by :hg:`update --clean .` to
761 761 cancel the merge and leave the child of REV as a head to be
762 762 merged separately.
763 763
764 764 See :hg:`help dates` for a list of formats valid for -d/--date.
765 765
766 766 See :hg:`help revert` for a way to restore files to the state
767 767 of another revision.
768 768
769 769 Returns 0 on success, 1 if nothing to backout or there are unresolved
770 770 files.
771 771 """
772 772 with repo.wlock(), repo.lock():
773 773 return _dobackout(ui, repo, node, rev, **opts)
774 774
775 775
776 776 def _dobackout(ui, repo, node=None, rev=None, **opts):
777 777 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
778 778 opts = pycompat.byteskwargs(opts)
779 779
780 780 if rev and node:
781 781 raise error.InputError(_(b"please specify just one revision"))
782 782
783 783 if not rev:
784 784 rev = node
785 785
786 786 if not rev:
787 787 raise error.InputError(_(b"please specify a revision to backout"))
788 788
789 789 date = opts.get(b'date')
790 790 if date:
791 791 opts[b'date'] = dateutil.parsedate(date)
792 792
793 793 cmdutil.checkunfinished(repo)
794 794 cmdutil.bailifchanged(repo)
795 795 ctx = logcmdutil.revsingle(repo, rev)
796 796 node = ctx.node()
797 797
798 798 op1, op2 = repo.dirstate.parents()
799 799 if not repo.changelog.isancestor(node, op1):
800 800 raise error.InputError(
801 801 _(b'cannot backout change that is not an ancestor')
802 802 )
803 803
804 804 p1, p2 = repo.changelog.parents(node)
805 805 if p1 == repo.nullid:
806 806 raise error.InputError(_(b'cannot backout a change with no parents'))
807 807 if p2 != repo.nullid:
808 808 if not opts.get(b'parent'):
809 809 raise error.InputError(_(b'cannot backout a merge changeset'))
810 810 p = repo.lookup(opts[b'parent'])
811 811 if p not in (p1, p2):
812 812 raise error.InputError(
813 813 _(b'%s is not a parent of %s') % (short(p), short(node))
814 814 )
815 815 parent = p
816 816 else:
817 817 if opts.get(b'parent'):
818 818 raise error.InputError(
819 819 _(b'cannot use --parent on non-merge changeset')
820 820 )
821 821 parent = p1
822 822
823 823 # the backout should appear on the same branch
824 824 branch = repo.dirstate.branch()
825 825 bheads = repo.branchheads(branch)
826 826 rctx = scmutil.revsingle(repo, hex(parent))
827 827 if not opts.get(b'merge') and op1 != node:
828 828 with repo.transaction(b"backout"):
829 829 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
830 830 with ui.configoverride(overrides, b'backout'):
831 831 stats = mergemod.back_out(ctx, parent=repo[parent])
832 832 repo.setparents(op1, op2)
833 833 hg._showstats(repo, stats)
834 834 if stats.unresolvedcount:
835 835 repo.ui.status(
836 836 _(b"use 'hg resolve' to retry unresolved file merges\n")
837 837 )
838 838 return 1
839 839 else:
840 840 hg.clean(repo, node, show_stats=False)
841 841 repo.dirstate.setbranch(branch, repo.currenttransaction())
842 842 cmdutil.revert(ui, repo, rctx)
843 843
844 844 if opts.get(b'no_commit'):
845 845 msg = _(b"changeset %s backed out, don't forget to commit.\n")
846 846 ui.status(msg % short(node))
847 847 return 0
848 848
849 849 def commitfunc(ui, repo, message, match, opts):
850 850 editform = b'backout'
851 851 e = cmdutil.getcommiteditor(
852 852 editform=editform, **pycompat.strkwargs(opts)
853 853 )
854 854 if not message:
855 855 # we don't translate commit messages
856 856 message = b"Backed out changeset %s" % short(node)
857 857 e = cmdutil.getcommiteditor(edit=True, editform=editform)
858 858 return repo.commit(
859 859 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
860 860 )
861 861
862 862 # save to detect changes
863 863 tip = repo.changelog.tip()
864 864
865 865 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
866 866 if not newnode:
867 867 ui.status(_(b"nothing changed\n"))
868 868 return 1
869 869 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
870 870
871 871 def nice(node):
872 872 return b'%d:%s' % (repo.changelog.rev(node), short(node))
873 873
874 874 ui.status(
875 875 _(b'changeset %s backs out changeset %s\n')
876 876 % (nice(newnode), nice(node))
877 877 )
878 878 if opts.get(b'merge') and op1 != node:
879 879 hg.clean(repo, op1, show_stats=False)
880 880 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
881 881 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
882 882 with ui.configoverride(overrides, b'backout'):
883 883 return hg.merge(repo[b'tip'])
884 884 return 0
885 885
886 886
887 887 @command(
888 888 b'bisect',
889 889 [
890 890 (b'r', b'reset', False, _(b'reset bisect state')),
891 891 (b'g', b'good', False, _(b'mark changeset good')),
892 892 (b'b', b'bad', False, _(b'mark changeset bad')),
893 893 (b's', b'skip', False, _(b'skip testing changeset')),
894 894 (b'e', b'extend', False, _(b'extend the bisect range')),
895 895 (
896 896 b'c',
897 897 b'command',
898 898 b'',
899 899 _(b'use command to check changeset state'),
900 900 _(b'CMD'),
901 901 ),
902 902 (b'U', b'noupdate', False, _(b'do not update to target')),
903 903 ],
904 904 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
905 905 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
906 906 )
907 907 def bisect(
908 908 ui,
909 909 repo,
910 910 positional_1=None,
911 911 positional_2=None,
912 912 command=None,
913 913 reset=None,
914 914 good=None,
915 915 bad=None,
916 916 skip=None,
917 917 extend=None,
918 918 noupdate=None,
919 919 ):
920 920 """subdivision search of changesets
921 921
922 922 This command helps to find changesets which introduce problems. To
923 923 use, mark the earliest changeset you know exhibits the problem as
924 924 bad, then mark the latest changeset which is free from the problem
925 925 as good. Bisect will update your working directory to a revision
926 926 for testing (unless the -U/--noupdate option is specified). Once
927 927 you have performed tests, mark the working directory as good or
928 928 bad, and bisect will either update to another candidate changeset
929 929 or announce that it has found the bad revision.
930 930
931 931 As a shortcut, you can also use the revision argument to mark a
932 932 revision as good or bad without checking it out first.
933 933
934 934 If you supply a command, it will be used for automatic bisection.
935 935 The environment variable HG_NODE will contain the ID of the
936 936 changeset being tested. The exit status of the command will be
937 937 used to mark revisions as good or bad: status 0 means good, 125
938 938 means to skip the revision, 127 (command not found) will abort the
939 939 bisection, and any other non-zero exit status means the revision
940 940 is bad.
941 941
942 942 .. container:: verbose
943 943
944 944 Some examples:
945 945
946 946 - start a bisection with known bad revision 34, and good revision 12::
947 947
948 948 hg bisect --bad 34
949 949 hg bisect --good 12
950 950
951 951 - advance the current bisection by marking current revision as good or
952 952 bad::
953 953
954 954 hg bisect --good
955 955 hg bisect --bad
956 956
957 957 - mark the current revision, or a known revision, to be skipped (e.g. if
958 958 that revision is not usable because of another issue)::
959 959
960 960 hg bisect --skip
961 961 hg bisect --skip 23
962 962
963 963 - skip all revisions that do not touch directories ``foo`` or ``bar``::
964 964
965 965 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
966 966
967 967 - forget the current bisection::
968 968
969 969 hg bisect --reset
970 970
971 971 - use 'make && make tests' to automatically find the first broken
972 972 revision::
973 973
974 974 hg bisect --reset
975 975 hg bisect --bad 34
976 976 hg bisect --good 12
977 977 hg bisect --command "make && make tests"
978 978
979 979 - see all changesets whose states are already known in the current
980 980 bisection::
981 981
982 982 hg log -r "bisect(pruned)"
983 983
984 984 - see the changeset currently being bisected (especially useful
985 985 if running with -U/--noupdate)::
986 986
987 987 hg log -r "bisect(current)"
988 988
989 989 - see all changesets that took part in the current bisection::
990 990
991 991 hg log -r "bisect(range)"
992 992
993 993 - you can even get a nice graph::
994 994
995 995 hg log --graph -r "bisect(range)"
996 996
997 997 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
998 998
999 999 Returns 0 on success.
1000 1000 """
1001 1001 rev = []
1002 1002 # backward compatibility
1003 1003 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1004 1004 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1005 1005 cmd = positional_1
1006 1006 rev.append(positional_2)
1007 1007 if cmd == b"good":
1008 1008 good = True
1009 1009 elif cmd == b"bad":
1010 1010 bad = True
1011 1011 else:
1012 1012 reset = True
1013 1013 elif positional_2:
1014 1014 raise error.InputError(_(b'incompatible arguments'))
1015 1015 elif positional_1 is not None:
1016 1016 rev.append(positional_1)
1017 1017
1018 1018 incompatibles = {
1019 1019 b'--bad': bad,
1020 1020 b'--command': bool(command),
1021 1021 b'--extend': extend,
1022 1022 b'--good': good,
1023 1023 b'--reset': reset,
1024 1024 b'--skip': skip,
1025 1025 }
1026 1026
1027 1027 enabled = [x for x in incompatibles if incompatibles[x]]
1028 1028
1029 1029 if len(enabled) > 1:
1030 1030 raise error.InputError(
1031 1031 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1032 1032 )
1033 1033
1034 1034 if reset:
1035 1035 hbisect.resetstate(repo)
1036 1036 return
1037 1037
1038 1038 state = hbisect.load_state(repo)
1039 1039
1040 1040 if rev:
1041 1041 revs = logcmdutil.revrange(repo, rev)
1042 1042 goodnodes = state[b'good']
1043 1043 badnodes = state[b'bad']
1044 1044 if goodnodes and badnodes:
1045 1045 candidates = repo.revs(b'(%ln)::(%ln)', goodnodes, badnodes)
1046 1046 candidates += repo.revs(b'(%ln)::(%ln)', badnodes, goodnodes)
1047 1047 revs = candidates & revs
1048 1048 nodes = [repo.changelog.node(i) for i in revs]
1049 1049 else:
1050 1050 nodes = [repo.lookup(b'.')]
1051 1051
1052 1052 # update state
1053 1053 if good or bad or skip:
1054 1054 if good:
1055 1055 state[b'good'] += nodes
1056 1056 elif bad:
1057 1057 state[b'bad'] += nodes
1058 1058 elif skip:
1059 1059 state[b'skip'] += nodes
1060 1060 hbisect.save_state(repo, state)
1061 1061 if not (state[b'good'] and state[b'bad']):
1062 1062 return
1063 1063
1064 1064 def mayupdate(repo, node, show_stats=True):
1065 1065 """common used update sequence"""
1066 1066 if noupdate:
1067 1067 return
1068 1068 cmdutil.checkunfinished(repo)
1069 1069 cmdutil.bailifchanged(repo)
1070 1070 return hg.clean(repo, node, show_stats=show_stats)
1071 1071
1072 1072 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1073 1073
1074 1074 if command:
1075 1075 changesets = 1
1076 1076 if noupdate:
1077 1077 try:
1078 1078 node = state[b'current'][0]
1079 1079 except LookupError:
1080 1080 raise error.StateError(
1081 1081 _(
1082 1082 b'current bisect revision is unknown - '
1083 1083 b'start a new bisect to fix'
1084 1084 )
1085 1085 )
1086 1086 else:
1087 1087 node, p2 = repo.dirstate.parents()
1088 1088 if p2 != repo.nullid:
1089 1089 raise error.StateError(_(b'current bisect revision is a merge'))
1090 1090 if rev:
1091 1091 if not nodes:
1092 1092 raise error.InputError(_(b'empty revision set'))
1093 1093 node = repo[nodes[-1]].node()
1094 1094 with hbisect.restore_state(repo, state, node):
1095 1095 while changesets:
1096 1096 # update state
1097 1097 state[b'current'] = [node]
1098 1098 hbisect.save_state(repo, state)
1099 1099 status = ui.system(
1100 1100 command,
1101 1101 environ={b'HG_NODE': hex(node)},
1102 1102 blockedtag=b'bisect_check',
1103 1103 )
1104 1104 if status == 125:
1105 1105 transition = b"skip"
1106 1106 elif status == 0:
1107 1107 transition = b"good"
1108 1108 # status < 0 means process was killed
1109 1109 elif status == 127:
1110 1110 raise error.Abort(_(b"failed to execute %s") % command)
1111 1111 elif status < 0:
1112 1112 raise error.Abort(_(b"%s killed") % command)
1113 1113 else:
1114 1114 transition = b"bad"
1115 1115 state[transition].append(node)
1116 1116 ctx = repo[node]
1117 1117 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1118 1118 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1119 1119 hbisect.checkstate(state)
1120 1120 # bisect
1121 1121 nodes, changesets, bgood = hbisect.bisect(repo, state)
1122 1122 # update to next check
1123 1123 node = nodes[0]
1124 1124 mayupdate(repo, node, show_stats=False)
1125 1125 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1126 1126 return
1127 1127
1128 1128 hbisect.checkstate(state)
1129 1129
1130 1130 # actually bisect
1131 1131 nodes, changesets, good = hbisect.bisect(repo, state)
1132 1132 if extend:
1133 1133 if not changesets:
1134 1134 extendctx = hbisect.extendrange(repo, state, nodes, good)
1135 1135 if extendctx is not None:
1136 1136 ui.write(
1137 1137 _(b"Extending search to changeset %s\n")
1138 1138 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1139 1139 )
1140 1140 state[b'current'] = [extendctx.node()]
1141 1141 hbisect.save_state(repo, state)
1142 1142 return mayupdate(repo, extendctx.node())
1143 1143 raise error.StateError(_(b"nothing to extend"))
1144 1144
1145 1145 if changesets == 0:
1146 1146 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1147 1147 else:
1148 1148 assert len(nodes) == 1 # only a single node can be tested next
1149 1149 node = nodes[0]
1150 1150 # compute the approximate number of remaining tests
1151 1151 tests, size = 0, 2
1152 1152 while size <= changesets:
1153 1153 tests, size = tests + 1, size * 2
1154 1154 rev = repo.changelog.rev(node)
1155 1155 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1156 1156 ui.write(
1157 1157 _(
1158 1158 b"Testing changeset %s "
1159 1159 b"(%d changesets remaining, ~%d tests)\n"
1160 1160 )
1161 1161 % (summary, changesets, tests)
1162 1162 )
1163 1163 state[b'current'] = [node]
1164 1164 hbisect.save_state(repo, state)
1165 1165 return mayupdate(repo, node)
1166 1166
1167 1167
1168 1168 @command(
1169 1169 b'bookmarks|bookmark',
1170 1170 [
1171 1171 (b'f', b'force', False, _(b'force')),
1172 1172 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1173 1173 (b'd', b'delete', False, _(b'delete a given bookmark')),
1174 1174 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1175 1175 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1176 1176 (b'l', b'list', False, _(b'list existing bookmarks')),
1177 1177 ]
1178 1178 + formatteropts,
1179 1179 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1180 1180 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1181 1181 )
1182 1182 def bookmark(ui, repo, *names, **opts):
1183 1183 """create a new bookmark or list existing bookmarks
1184 1184
1185 1185 Bookmarks are labels on changesets to help track lines of development.
1186 1186 Bookmarks are unversioned and can be moved, renamed and deleted.
1187 1187 Deleting or moving a bookmark has no effect on the associated changesets.
1188 1188
1189 1189 Creating or updating to a bookmark causes it to be marked as 'active'.
1190 1190 The active bookmark is indicated with a '*'.
1191 1191 When a commit is made, the active bookmark will advance to the new commit.
1192 1192 A plain :hg:`update` will also advance an active bookmark, if possible.
1193 1193 Updating away from a bookmark will cause it to be deactivated.
1194 1194
1195 1195 Bookmarks can be pushed and pulled between repositories (see
1196 1196 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1197 1197 diverged, a new 'divergent bookmark' of the form 'name@path' will
1198 1198 be created. Using :hg:`merge` will resolve the divergence.
1199 1199
1200 1200 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1201 1201 the active bookmark's name.
1202 1202
1203 1203 A bookmark named '@' has the special property that :hg:`clone` will
1204 1204 check it out by default if it exists.
1205 1205
1206 1206 .. container:: verbose
1207 1207
1208 1208 Template:
1209 1209
1210 1210 The following keywords are supported in addition to the common template
1211 1211 keywords and functions such as ``{bookmark}``. See also
1212 1212 :hg:`help templates`.
1213 1213
1214 1214 :active: Boolean. True if the bookmark is active.
1215 1215
1216 1216 Examples:
1217 1217
1218 1218 - create an active bookmark for a new line of development::
1219 1219
1220 1220 hg book new-feature
1221 1221
1222 1222 - create an inactive bookmark as a place marker::
1223 1223
1224 1224 hg book -i reviewed
1225 1225
1226 1226 - create an inactive bookmark on another changeset::
1227 1227
1228 1228 hg book -r .^ tested
1229 1229
1230 1230 - rename bookmark turkey to dinner::
1231 1231
1232 1232 hg book -m turkey dinner
1233 1233
1234 1234 - move the '@' bookmark from another branch::
1235 1235
1236 1236 hg book -f @
1237 1237
1238 1238 - print only the active bookmark name::
1239 1239
1240 1240 hg book -ql .
1241 1241 """
1242 1242 opts = pycompat.byteskwargs(opts)
1243 1243 force = opts.get(b'force')
1244 1244 rev = opts.get(b'rev')
1245 1245 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1246 1246
1247 1247 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1248 1248 if action:
1249 1249 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1250 1250 elif names or rev:
1251 1251 action = b'add'
1252 1252 elif inactive:
1253 1253 action = b'inactive' # meaning deactivate
1254 1254 else:
1255 1255 action = b'list'
1256 1256
1257 1257 cmdutil.check_incompatible_arguments(
1258 1258 opts, b'inactive', [b'delete', b'list']
1259 1259 )
1260 1260 if not names and action in {b'add', b'delete'}:
1261 1261 raise error.InputError(_(b"bookmark name required"))
1262 1262
1263 1263 if action in {b'add', b'delete', b'rename', b'inactive'}:
1264 1264 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1265 1265 if action == b'delete':
1266 1266 names = pycompat.maplist(repo._bookmarks.expandname, names)
1267 1267 bookmarks.delete(repo, tr, names)
1268 1268 elif action == b'rename':
1269 1269 if not names:
1270 1270 raise error.InputError(_(b"new bookmark name required"))
1271 1271 elif len(names) > 1:
1272 1272 raise error.InputError(
1273 1273 _(b"only one new bookmark name allowed")
1274 1274 )
1275 1275 oldname = repo._bookmarks.expandname(opts[b'rename'])
1276 1276 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1277 1277 elif action == b'add':
1278 1278 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1279 1279 elif action == b'inactive':
1280 1280 if len(repo._bookmarks) == 0:
1281 1281 ui.status(_(b"no bookmarks set\n"))
1282 1282 elif not repo._activebookmark:
1283 1283 ui.status(_(b"no active bookmark\n"))
1284 1284 else:
1285 1285 bookmarks.deactivate(repo)
1286 1286 elif action == b'list':
1287 1287 names = pycompat.maplist(repo._bookmarks.expandname, names)
1288 1288 with ui.formatter(b'bookmarks', opts) as fm:
1289 1289 bookmarks.printbookmarks(ui, repo, fm, names)
1290 1290 else:
1291 1291 raise error.ProgrammingError(b'invalid action: %s' % action)
1292 1292
1293 1293
1294 1294 @command(
1295 1295 b'branch',
1296 1296 [
1297 1297 (
1298 1298 b'f',
1299 1299 b'force',
1300 1300 None,
1301 1301 _(b'set branch name even if it shadows an existing branch'),
1302 1302 ),
1303 1303 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1304 1304 (
1305 1305 b'r',
1306 1306 b'rev',
1307 1307 [],
1308 1308 _(b'change branches of the given revs (EXPERIMENTAL)'),
1309 1309 ),
1310 1310 ],
1311 1311 _(b'[-fC] [NAME]'),
1312 1312 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1313 1313 )
1314 1314 def branch(ui, repo, label=None, **opts):
1315 1315 """set or show the current branch name
1316 1316
1317 1317 .. note::
1318 1318
1319 1319 Branch names are permanent and global. Use :hg:`bookmark` to create a
1320 1320 light-weight bookmark instead. See :hg:`help glossary` for more
1321 1321 information about named branches and bookmarks.
1322 1322
1323 1323 With no argument, show the current branch name. With one argument,
1324 1324 set the working directory branch name (the branch will not exist
1325 1325 in the repository until the next commit). Standard practice
1326 1326 recommends that primary development take place on the 'default'
1327 1327 branch.
1328 1328
1329 1329 Unless -f/--force is specified, branch will not let you set a
1330 1330 branch name that already exists.
1331 1331
1332 1332 Use -C/--clean to reset the working directory branch to that of
1333 1333 the parent of the working directory, negating a previous branch
1334 1334 change.
1335 1335
1336 1336 Use the command :hg:`update` to switch to an existing branch. Use
1337 1337 :hg:`commit --close-branch` to mark this branch head as closed.
1338 1338 When all heads of a branch are closed, the branch will be
1339 1339 considered closed.
1340 1340
1341 1341 Returns 0 on success.
1342 1342 """
1343 1343 opts = pycompat.byteskwargs(opts)
1344 1344 revs = opts.get(b'rev')
1345 1345 if label:
1346 1346 label = label.strip()
1347 1347
1348 1348 if not opts.get(b'clean') and not label:
1349 1349 if revs:
1350 1350 raise error.InputError(
1351 1351 _(b"no branch name specified for the revisions")
1352 1352 )
1353 1353 ui.write(b"%s\n" % repo.dirstate.branch())
1354 1354 return
1355 1355
1356 1356 with repo.wlock():
1357 1357 if opts.get(b'clean'):
1358 1358 label = repo[b'.'].branch()
1359 1359 repo.dirstate.setbranch(label, repo.currenttransaction())
1360 1360 ui.status(_(b'reset working directory to branch %s\n') % label)
1361 1361 elif label:
1362 1362
1363 1363 scmutil.checknewlabel(repo, label, b'branch')
1364 1364 if revs:
1365 1365 return cmdutil.changebranch(ui, repo, revs, label, opts)
1366 1366
1367 1367 if not opts.get(b'force') and label in repo.branchmap():
1368 1368 if label not in [p.branch() for p in repo[None].parents()]:
1369 1369 raise error.InputError(
1370 1370 _(b'a branch of the same name already exists'),
1371 1371 # i18n: "it" refers to an existing branch
1372 1372 hint=_(b"use 'hg update' to switch to it"),
1373 1373 )
1374 1374
1375 1375 repo.dirstate.setbranch(label, repo.currenttransaction())
1376 1376 ui.status(_(b'marked working directory as branch %s\n') % label)
1377 1377
1378 1378 # find any open named branches aside from default
1379 1379 for n, h, t, c in repo.branchmap().iterbranches():
1380 1380 if n != b"default" and not c:
1381 1381 return 0
1382 1382 ui.status(
1383 1383 _(
1384 1384 b'(branches are permanent and global, '
1385 1385 b'did you want a bookmark?)\n'
1386 1386 )
1387 1387 )
1388 1388
1389 1389
1390 1390 @command(
1391 1391 b'branches',
1392 1392 [
1393 1393 (
1394 1394 b'a',
1395 1395 b'active',
1396 1396 False,
1397 1397 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1398 1398 ),
1399 1399 (b'c', b'closed', False, _(b'show normal and closed branches')),
1400 1400 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1401 1401 ]
1402 1402 + formatteropts,
1403 1403 _(b'[-c]'),
1404 1404 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1405 1405 intents={INTENT_READONLY},
1406 1406 )
1407 1407 def branches(ui, repo, active=False, closed=False, **opts):
1408 1408 """list repository named branches
1409 1409
1410 1410 List the repository's named branches, indicating which ones are
1411 1411 inactive. If -c/--closed is specified, also list branches which have
1412 1412 been marked closed (see :hg:`commit --close-branch`).
1413 1413
1414 1414 Use the command :hg:`update` to switch to an existing branch.
1415 1415
1416 1416 .. container:: verbose
1417 1417
1418 1418 Template:
1419 1419
1420 1420 The following keywords are supported in addition to the common template
1421 1421 keywords and functions such as ``{branch}``. See also
1422 1422 :hg:`help templates`.
1423 1423
1424 1424 :active: Boolean. True if the branch is active.
1425 1425 :closed: Boolean. True if the branch is closed.
1426 1426 :current: Boolean. True if it is the current branch.
1427 1427
1428 1428 Returns 0.
1429 1429 """
1430 1430
1431 1431 opts = pycompat.byteskwargs(opts)
1432 1432 revs = opts.get(b'rev')
1433 1433 selectedbranches = None
1434 1434 if revs:
1435 1435 revs = logcmdutil.revrange(repo, revs)
1436 1436 getbi = repo.revbranchcache().branchinfo
1437 1437 selectedbranches = {getbi(r)[0] for r in revs}
1438 1438
1439 1439 ui.pager(b'branches')
1440 1440 fm = ui.formatter(b'branches', opts)
1441 1441 hexfunc = fm.hexfunc
1442 1442
1443 1443 allheads = set(repo.heads())
1444 1444 branches = []
1445 1445 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1446 1446 if selectedbranches is not None and tag not in selectedbranches:
1447 1447 continue
1448 1448 isactive = False
1449 1449 if not isclosed:
1450 1450 openheads = set(repo.branchmap().iteropen(heads))
1451 1451 isactive = bool(openheads & allheads)
1452 1452 branches.append((tag, repo[tip], isactive, not isclosed))
1453 1453 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1454 1454
1455 1455 for tag, ctx, isactive, isopen in branches:
1456 1456 if active and not isactive:
1457 1457 continue
1458 1458 if isactive:
1459 1459 label = b'branches.active'
1460 1460 notice = b''
1461 1461 elif not isopen:
1462 1462 if not closed:
1463 1463 continue
1464 1464 label = b'branches.closed'
1465 1465 notice = _(b' (closed)')
1466 1466 else:
1467 1467 label = b'branches.inactive'
1468 1468 notice = _(b' (inactive)')
1469 1469 current = tag == repo.dirstate.branch()
1470 1470 if current:
1471 1471 label = b'branches.current'
1472 1472
1473 1473 fm.startitem()
1474 1474 fm.write(b'branch', b'%s', tag, label=label)
1475 1475 rev = ctx.rev()
1476 1476 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1477 1477 fmt = b' ' * padsize + b' %d:%s'
1478 1478 fm.condwrite(
1479 1479 not ui.quiet,
1480 1480 b'rev node',
1481 1481 fmt,
1482 1482 rev,
1483 1483 hexfunc(ctx.node()),
1484 1484 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1485 1485 )
1486 1486 fm.context(ctx=ctx)
1487 1487 fm.data(active=isactive, closed=not isopen, current=current)
1488 1488 if not ui.quiet:
1489 1489 fm.plain(notice)
1490 1490 fm.plain(b'\n')
1491 1491 fm.end()
1492 1492
1493 1493
1494 1494 @command(
1495 1495 b'bundle',
1496 1496 [
1497 1497 (
1498 1498 b'',
1499 1499 b'exact',
1500 1500 None,
1501 1501 _(b'compute the base from the revision specified'),
1502 1502 ),
1503 1503 (
1504 1504 b'f',
1505 1505 b'force',
1506 1506 None,
1507 1507 _(b'run even when the destination is unrelated'),
1508 1508 ),
1509 1509 (
1510 1510 b'r',
1511 1511 b'rev',
1512 1512 [],
1513 1513 _(b'a changeset intended to be added to the destination'),
1514 1514 _(b'REV'),
1515 1515 ),
1516 1516 (
1517 1517 b'b',
1518 1518 b'branch',
1519 1519 [],
1520 1520 _(b'a specific branch you would like to bundle'),
1521 1521 _(b'BRANCH'),
1522 1522 ),
1523 1523 (
1524 1524 b'',
1525 1525 b'base',
1526 1526 [],
1527 1527 _(b'a base changeset assumed to be available at the destination'),
1528 1528 _(b'REV'),
1529 1529 ),
1530 1530 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1531 1531 (
1532 1532 b't',
1533 1533 b'type',
1534 1534 b'bzip2',
1535 1535 _(b'bundle compression type to use'),
1536 1536 _(b'TYPE'),
1537 1537 ),
1538 1538 ]
1539 1539 + remoteopts,
1540 1540 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1541 1541 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1542 1542 )
1543 1543 def bundle(ui, repo, fname, *dests, **opts):
1544 1544 """create a bundle file
1545 1545
1546 1546 Generate a bundle file containing data to be transferred to another
1547 1547 repository.
1548 1548
1549 1549 To create a bundle containing all changesets, use -a/--all
1550 1550 (or --base null). Otherwise, hg assumes the destination will have
1551 1551 all the nodes you specify with --base parameters. Otherwise, hg
1552 1552 will assume the repository has all the nodes in destination, or
1553 1553 default-push/default if no destination is specified, where destination
1554 1554 is the repositories you provide through DEST option.
1555 1555
1556 1556 You can change bundle format with the -t/--type option. See
1557 1557 :hg:`help bundlespec` for documentation on this format. By default,
1558 1558 the most appropriate format is used and compression defaults to
1559 1559 bzip2.
1560 1560
1561 1561 The bundle file can then be transferred using conventional means
1562 1562 and applied to another repository with the unbundle or pull
1563 1563 command. This is useful when direct push and pull are not
1564 1564 available or when exporting an entire repository is undesirable.
1565 1565
1566 1566 Applying bundles preserves all changeset contents including
1567 1567 permissions, copy/rename information, and revision history.
1568 1568
1569 1569 Returns 0 on success, 1 if no changes found.
1570 1570 """
1571 1571 opts = pycompat.byteskwargs(opts)
1572 1572
1573 1573 revs = None
1574 1574 if b'rev' in opts:
1575 1575 revstrings = opts[b'rev']
1576 1576 revs = logcmdutil.revrange(repo, revstrings)
1577 1577 if revstrings and not revs:
1578 1578 raise error.InputError(_(b'no commits to bundle'))
1579 1579
1580 1580 bundletype = opts.get(b'type', b'bzip2').lower()
1581 1581 try:
1582 1582 bundlespec = bundlecaches.parsebundlespec(
1583 1583 repo, bundletype, strict=False
1584 1584 )
1585 1585 except error.UnsupportedBundleSpecification as e:
1586 1586 raise error.InputError(
1587 1587 pycompat.bytestr(e),
1588 1588 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1589 1589 )
1590 1590 cgversion = bundlespec.params[b"cg.version"]
1591 1591
1592 1592 # Packed bundles are a pseudo bundle format for now.
1593 1593 if cgversion == b's1':
1594 1594 raise error.InputError(
1595 1595 _(b'packed bundles cannot be produced by "hg bundle"'),
1596 1596 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1597 1597 )
1598 1598
1599 1599 if opts.get(b'all'):
1600 1600 if dests:
1601 1601 raise error.InputError(
1602 1602 _(b"--all is incompatible with specifying destinations")
1603 1603 )
1604 1604 if opts.get(b'base'):
1605 1605 ui.warn(_(b"ignoring --base because --all was specified\n"))
1606 1606 if opts.get(b'exact'):
1607 1607 ui.warn(_(b"ignoring --exact because --all was specified\n"))
1608 1608 base = [nullrev]
1609 1609 elif opts.get(b'exact'):
1610 1610 if dests:
1611 1611 raise error.InputError(
1612 1612 _(b"--exact is incompatible with specifying destinations")
1613 1613 )
1614 1614 if opts.get(b'base'):
1615 1615 ui.warn(_(b"ignoring --base because --exact was specified\n"))
1616 1616 base = repo.revs(b'parents(%ld) - %ld', revs, revs)
1617 1617 if not base:
1618 1618 base = [nullrev]
1619 1619 else:
1620 1620 base = logcmdutil.revrange(repo, opts.get(b'base'))
1621 1621 if cgversion not in changegroup.supportedoutgoingversions(repo):
1622 1622 raise error.Abort(
1623 1623 _(b"repository does not support bundle version %s") % cgversion
1624 1624 )
1625 1625
1626 1626 if base:
1627 1627 if dests:
1628 1628 raise error.InputError(
1629 1629 _(b"--base is incompatible with specifying destinations")
1630 1630 )
1631 1631 cl = repo.changelog
1632 1632 common = [cl.node(rev) for rev in base]
1633 1633 heads = [cl.node(r) for r in revs] if revs else None
1634 1634 outgoing = discovery.outgoing(repo, common, heads)
1635 1635 missing = outgoing.missing
1636 1636 excluded = outgoing.excluded
1637 1637 else:
1638 1638 missing = set()
1639 1639 excluded = set()
1640 1640 for path in urlutil.get_push_paths(repo, ui, dests):
1641 1641 other = hg.peer(repo, opts, path)
1642 1642 if revs is not None:
1643 1643 hex_revs = [repo[r].hex() for r in revs]
1644 1644 else:
1645 1645 hex_revs = None
1646 1646 branches = (path.branch, [])
1647 1647 head_revs, checkout = hg.addbranchrevs(
1648 1648 repo, repo, branches, hex_revs
1649 1649 )
1650 1650 heads = (
1651 1651 head_revs
1652 1652 and pycompat.maplist(repo.lookup, head_revs)
1653 1653 or head_revs
1654 1654 )
1655 1655 outgoing = discovery.findcommonoutgoing(
1656 1656 repo,
1657 1657 other,
1658 1658 onlyheads=heads,
1659 1659 force=opts.get(b'force'),
1660 1660 portable=True,
1661 1661 )
1662 1662 missing.update(outgoing.missing)
1663 1663 excluded.update(outgoing.excluded)
1664 1664
1665 1665 if not missing:
1666 1666 scmutil.nochangesfound(ui, repo, not base and excluded)
1667 1667 return 1
1668 1668
1669 1669 # internal changeset are internal implementation details that should not
1670 1670 # leave the repository. Bundling with `hg bundle` create such risk.
1671 1671 bundled_internal = repo.revs(b"%ln and _internal()", missing)
1672 1672 if bundled_internal:
1673 1673 msg = _(b"cannot bundle internal changesets")
1674 1674 hint = _(b"%d internal changesets selected") % len(bundled_internal)
1675 1675 raise error.Abort(msg, hint=hint)
1676 1676
1677 1677 if heads:
1678 1678 outgoing = discovery.outgoing(
1679 1679 repo, missingroots=missing, ancestorsof=heads
1680 1680 )
1681 1681 else:
1682 1682 outgoing = discovery.outgoing(repo, missingroots=missing)
1683 1683 outgoing.excluded = sorted(excluded)
1684 1684
1685 1685 if cgversion == b'01': # bundle1
1686 1686 bversion = b'HG10' + bundlespec.wirecompression
1687 1687 bcompression = None
1688 1688 elif cgversion in (b'02', b'03'):
1689 1689 bversion = b'HG20'
1690 1690 bcompression = bundlespec.wirecompression
1691 1691 else:
1692 1692 raise error.ProgrammingError(
1693 1693 b'bundle: unexpected changegroup version %s' % cgversion
1694 1694 )
1695 1695
1696 1696 # TODO compression options should be derived from bundlespec parsing.
1697 1697 # This is a temporary hack to allow adjusting bundle compression
1698 1698 # level without a) formalizing the bundlespec changes to declare it
1699 1699 # b) introducing a command flag.
1700 1700 compopts = {}
1701 1701 complevel = ui.configint(
1702 1702 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1703 1703 )
1704 1704 if complevel is None:
1705 1705 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1706 1706 if complevel is not None:
1707 1707 compopts[b'level'] = complevel
1708 1708
1709 1709 compthreads = ui.configint(
1710 1710 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1711 1711 )
1712 1712 if compthreads is None:
1713 1713 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1714 1714 if compthreads is not None:
1715 1715 compopts[b'threads'] = compthreads
1716 1716
1717 1717 # Bundling of obsmarker and phases is optional as not all clients
1718 1718 # support the necessary features.
1719 1719 cfg = ui.configbool
1720 1720 obsolescence_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker')
1721 1721 bundlespec.set_param(b'obsolescence', obsolescence_cfg, overwrite=False)
1722 1722 obs_mand_cfg = cfg(b'experimental', b'evolution.bundle-obsmarker:mandatory')
1723 1723 bundlespec.set_param(
1724 1724 b'obsolescence-mandatory', obs_mand_cfg, overwrite=False
1725 1725 )
1726 1726 if not bundlespec.params.get(b'phases', False):
1727 1727 phases_cfg = cfg(b'experimental', b'bundle-phases')
1728 1728 bundlespec.set_param(b'phases', phases_cfg, overwrite=False)
1729 1729
1730 1730 bundle2.writenewbundle(
1731 1731 ui,
1732 1732 repo,
1733 1733 b'bundle',
1734 1734 fname,
1735 1735 bversion,
1736 1736 outgoing,
1737 1737 bundlespec.params,
1738 1738 compression=bcompression,
1739 1739 compopts=compopts,
1740 1740 )
1741 1741
1742 1742
1743 1743 @command(
1744 1744 b'cat',
1745 1745 [
1746 1746 (
1747 1747 b'o',
1748 1748 b'output',
1749 1749 b'',
1750 1750 _(b'print output to file with formatted name'),
1751 1751 _(b'FORMAT'),
1752 1752 ),
1753 1753 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1754 1754 (b'', b'decode', None, _(b'apply any matching decode filter')),
1755 1755 ]
1756 1756 + walkopts
1757 1757 + formatteropts,
1758 1758 _(b'[OPTION]... FILE...'),
1759 1759 helpcategory=command.CATEGORY_FILE_CONTENTS,
1760 1760 inferrepo=True,
1761 1761 intents={INTENT_READONLY},
1762 1762 )
1763 1763 def cat(ui, repo, file1, *pats, **opts):
1764 1764 """output the current or given revision of files
1765 1765
1766 1766 Print the specified files as they were at the given revision. If
1767 1767 no revision is given, the parent of the working directory is used.
1768 1768
1769 1769 Output may be to a file, in which case the name of the file is
1770 1770 given using a template string. See :hg:`help templates`. In addition
1771 1771 to the common template keywords, the following formatting rules are
1772 1772 supported:
1773 1773
1774 1774 :``%%``: literal "%" character
1775 1775 :``%s``: basename of file being printed
1776 1776 :``%d``: dirname of file being printed, or '.' if in repository root
1777 1777 :``%p``: root-relative path name of file being printed
1778 1778 :``%H``: changeset hash (40 hexadecimal digits)
1779 1779 :``%R``: changeset revision number
1780 1780 :``%h``: short-form changeset hash (12 hexadecimal digits)
1781 1781 :``%r``: zero-padded changeset revision number
1782 1782 :``%b``: basename of the exporting repository
1783 1783 :``\\``: literal "\\" character
1784 1784
1785 1785 .. container:: verbose
1786 1786
1787 1787 Template:
1788 1788
1789 1789 The following keywords are supported in addition to the common template
1790 1790 keywords and functions. See also :hg:`help templates`.
1791 1791
1792 1792 :data: String. File content.
1793 1793 :path: String. Repository-absolute path of the file.
1794 1794
1795 1795 Returns 0 on success.
1796 1796 """
1797 1797 opts = pycompat.byteskwargs(opts)
1798 1798 rev = opts.get(b'rev')
1799 1799 if rev:
1800 1800 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1801 1801 ctx = logcmdutil.revsingle(repo, rev)
1802 1802 m = scmutil.match(ctx, (file1,) + pats, opts)
1803 1803 fntemplate = opts.pop(b'output', b'')
1804 1804 if cmdutil.isstdiofilename(fntemplate):
1805 1805 fntemplate = b''
1806 1806
1807 1807 if fntemplate:
1808 1808 fm = formatter.nullformatter(ui, b'cat', opts)
1809 1809 else:
1810 1810 ui.pager(b'cat')
1811 1811 fm = ui.formatter(b'cat', opts)
1812 1812 with fm:
1813 1813 return cmdutil.cat(
1814 1814 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1815 1815 )
1816 1816
1817 1817
1818 1818 @command(
1819 1819 b'clone',
1820 1820 [
1821 1821 (
1822 1822 b'U',
1823 1823 b'noupdate',
1824 1824 None,
1825 1825 _(
1826 1826 b'the clone will include an empty working '
1827 1827 b'directory (only a repository)'
1828 1828 ),
1829 1829 ),
1830 1830 (
1831 1831 b'u',
1832 1832 b'updaterev',
1833 1833 b'',
1834 1834 _(b'revision, tag, or branch to check out'),
1835 1835 _(b'REV'),
1836 1836 ),
1837 1837 (
1838 1838 b'r',
1839 1839 b'rev',
1840 1840 [],
1841 1841 _(
1842 1842 b'do not clone everything, but include this changeset'
1843 1843 b' and its ancestors'
1844 1844 ),
1845 1845 _(b'REV'),
1846 1846 ),
1847 1847 (
1848 1848 b'b',
1849 1849 b'branch',
1850 1850 [],
1851 1851 _(
1852 1852 b'do not clone everything, but include this branch\'s'
1853 1853 b' changesets and their ancestors'
1854 1854 ),
1855 1855 _(b'BRANCH'),
1856 1856 ),
1857 1857 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1858 1858 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1859 1859 (b'', b'stream', None, _(b'clone with minimal data processing')),
1860 1860 ]
1861 1861 + remoteopts,
1862 1862 _(b'[OPTION]... SOURCE [DEST]'),
1863 1863 helpcategory=command.CATEGORY_REPO_CREATION,
1864 1864 helpbasic=True,
1865 1865 norepo=True,
1866 1866 )
1867 1867 def clone(ui, source, dest=None, **opts):
1868 1868 """make a copy of an existing repository
1869 1869
1870 1870 Create a copy of an existing repository in a new directory.
1871 1871
1872 1872 If no destination directory name is specified, it defaults to the
1873 1873 basename of the source.
1874 1874
1875 1875 The location of the source is added to the new repository's
1876 1876 ``.hg/hgrc`` file, as the default to be used for future pulls.
1877 1877
1878 1878 Only local paths and ``ssh://`` URLs are supported as
1879 1879 destinations. For ``ssh://`` destinations, no working directory or
1880 1880 ``.hg/hgrc`` will be created on the remote side.
1881 1881
1882 1882 If the source repository has a bookmark called '@' set, that
1883 1883 revision will be checked out in the new repository by default.
1884 1884
1885 1885 To check out a particular version, use -u/--update, or
1886 1886 -U/--noupdate to create a clone with no working directory.
1887 1887
1888 1888 To pull only a subset of changesets, specify one or more revisions
1889 1889 identifiers with -r/--rev or branches with -b/--branch. The
1890 1890 resulting clone will contain only the specified changesets and
1891 1891 their ancestors. These options (or 'clone src#rev dest') imply
1892 1892 --pull, even for local source repositories.
1893 1893
1894 1894 In normal clone mode, the remote normalizes repository data into a common
1895 1895 exchange format and the receiving end translates this data into its local
1896 1896 storage format. --stream activates a different clone mode that essentially
1897 1897 copies repository files from the remote with minimal data processing. This
1898 1898 significantly reduces the CPU cost of a clone both remotely and locally.
1899 1899 However, it often increases the transferred data size by 30-40%. This can
1900 1900 result in substantially faster clones where I/O throughput is plentiful,
1901 1901 especially for larger repositories. A side-effect of --stream clones is
1902 1902 that storage settings and requirements on the remote are applied locally:
1903 1903 a modern client may inherit legacy or inefficient storage used by the
1904 1904 remote or a legacy Mercurial client may not be able to clone from a
1905 1905 modern Mercurial remote.
1906 1906
1907 1907 .. note::
1908 1908
1909 1909 Specifying a tag will include the tagged changeset but not the
1910 1910 changeset containing the tag.
1911 1911
1912 1912 .. container:: verbose
1913 1913
1914 1914 For efficiency, hardlinks are used for cloning whenever the
1915 1915 source and destination are on the same filesystem (note this
1916 1916 applies only to the repository data, not to the working
1917 1917 directory). Some filesystems, such as AFS, implement hardlinking
1918 1918 incorrectly, but do not report errors. In these cases, use the
1919 1919 --pull option to avoid hardlinking.
1920 1920
1921 1921 Mercurial will update the working directory to the first applicable
1922 1922 revision from this list:
1923 1923
1924 1924 a) null if -U or the source repository has no changesets
1925 1925 b) if -u . and the source repository is local, the first parent of
1926 1926 the source repository's working directory
1927 1927 c) the changeset specified with -u (if a branch name, this means the
1928 1928 latest head of that branch)
1929 1929 d) the changeset specified with -r
1930 1930 e) the tipmost head specified with -b
1931 1931 f) the tipmost head specified with the url#branch source syntax
1932 1932 g) the revision marked with the '@' bookmark, if present
1933 1933 h) the tipmost head of the default branch
1934 1934 i) tip
1935 1935
1936 1936 When cloning from servers that support it, Mercurial may fetch
1937 1937 pre-generated data from a server-advertised URL or inline from the
1938 1938 same stream. When this is done, hooks operating on incoming changesets
1939 1939 and changegroups may fire more than once, once for each pre-generated
1940 1940 bundle and as well as for any additional remaining data. In addition,
1941 1941 if an error occurs, the repository may be rolled back to a partial
1942 1942 clone. This behavior may change in future releases.
1943 1943 See :hg:`help -e clonebundles` for more.
1944 1944
1945 1945 Examples:
1946 1946
1947 1947 - clone a remote repository to a new directory named hg/::
1948 1948
1949 1949 hg clone https://www.mercurial-scm.org/repo/hg/
1950 1950
1951 1951 - create a lightweight local clone::
1952 1952
1953 1953 hg clone project/ project-feature/
1954 1954
1955 1955 - clone from an absolute path on an ssh server (note double-slash)::
1956 1956
1957 1957 hg clone ssh://user@server//home/projects/alpha/
1958 1958
1959 1959 - do a streaming clone while checking out a specified version::
1960 1960
1961 1961 hg clone --stream http://server/repo -u 1.5
1962 1962
1963 1963 - create a repository without changesets after a particular revision::
1964 1964
1965 1965 hg clone -r 04e544 experimental/ good/
1966 1966
1967 1967 - clone (and track) a particular named branch::
1968 1968
1969 1969 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1970 1970
1971 1971 See :hg:`help urls` for details on specifying URLs.
1972 1972
1973 1973 Returns 0 on success.
1974 1974 """
1975 1975 opts = pycompat.byteskwargs(opts)
1976 1976 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1977 1977
1978 1978 # --include/--exclude can come from narrow or sparse.
1979 1979 includepats, excludepats = None, None
1980 1980
1981 1981 # hg.clone() differentiates between None and an empty set. So make sure
1982 1982 # patterns are sets if narrow is requested without patterns.
1983 1983 if opts.get(b'narrow'):
1984 1984 includepats = set()
1985 1985 excludepats = set()
1986 1986
1987 1987 if opts.get(b'include'):
1988 1988 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1989 1989 if opts.get(b'exclude'):
1990 1990 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1991 1991
1992 1992 r = hg.clone(
1993 1993 ui,
1994 1994 opts,
1995 1995 source,
1996 1996 dest,
1997 1997 pull=opts.get(b'pull'),
1998 1998 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1999 1999 revs=opts.get(b'rev'),
2000 2000 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
2001 2001 branch=opts.get(b'branch'),
2002 2002 shareopts=opts.get(b'shareopts'),
2003 2003 storeincludepats=includepats,
2004 2004 storeexcludepats=excludepats,
2005 2005 depth=opts.get(b'depth') or None,
2006 2006 )
2007 2007
2008 2008 return r is None
2009 2009
2010 2010
2011 2011 @command(
2012 2012 b'commit|ci',
2013 2013 [
2014 2014 (
2015 2015 b'A',
2016 2016 b'addremove',
2017 2017 None,
2018 2018 _(b'mark new/missing files as added/removed before committing'),
2019 2019 ),
2020 2020 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
2021 2021 (b'', b'amend', None, _(b'amend the parent of the working directory')),
2022 2022 (b's', b'secret', None, _(b'use the secret phase for committing')),
2023 2023 (b'', b'draft', None, _(b'use the draft phase for committing')),
2024 2024 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
2025 2025 (
2026 2026 b'',
2027 2027 b'force-close-branch',
2028 2028 None,
2029 2029 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
2030 2030 ),
2031 2031 (b'i', b'interactive', None, _(b'use interactive mode')),
2032 2032 ]
2033 2033 + walkopts
2034 2034 + commitopts
2035 2035 + commitopts2
2036 2036 + subrepoopts,
2037 2037 _(b'[OPTION]... [FILE]...'),
2038 2038 helpcategory=command.CATEGORY_COMMITTING,
2039 2039 helpbasic=True,
2040 2040 inferrepo=True,
2041 2041 )
2042 2042 def commit(ui, repo, *pats, **opts):
2043 2043 """commit the specified files or all outstanding changes
2044 2044
2045 2045 Commit changes to the given files into the repository. Unlike a
2046 2046 centralized SCM, this operation is a local operation. See
2047 2047 :hg:`push` for a way to actively distribute your changes.
2048 2048
2049 2049 If a list of files is omitted, all changes reported by :hg:`status`
2050 2050 will be committed.
2051 2051
2052 2052 If you are committing the result of a merge, do not provide any
2053 2053 filenames or -I/-X filters.
2054 2054
2055 2055 If no commit message is specified, Mercurial starts your
2056 2056 configured editor where you can enter a message. In case your
2057 2057 commit fails, you will find a backup of your message in
2058 2058 ``.hg/last-message.txt``.
2059 2059
2060 2060 The --close-branch flag can be used to mark the current branch
2061 2061 head closed. When all heads of a branch are closed, the branch
2062 2062 will be considered closed and no longer listed.
2063 2063
2064 2064 The --amend flag can be used to amend the parent of the
2065 2065 working directory with a new commit that contains the changes
2066 2066 in the parent in addition to those currently reported by :hg:`status`,
2067 2067 if there are any. The old commit is stored in a backup bundle in
2068 2068 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2069 2069 on how to restore it).
2070 2070
2071 2071 Message, user and date are taken from the amended commit unless
2072 2072 specified. When a message isn't specified on the command line,
2073 2073 the editor will open with the message of the amended commit.
2074 2074
2075 2075 It is not possible to amend public changesets (see :hg:`help phases`)
2076 2076 or changesets that have children.
2077 2077
2078 2078 See :hg:`help dates` for a list of formats valid for -d/--date.
2079 2079
2080 2080 Returns 0 on success, 1 if nothing changed.
2081 2081
2082 2082 .. container:: verbose
2083 2083
2084 2084 Examples:
2085 2085
2086 2086 - commit all files ending in .py::
2087 2087
2088 2088 hg commit --include "set:**.py"
2089 2089
2090 2090 - commit all non-binary files::
2091 2091
2092 2092 hg commit --exclude "set:binary()"
2093 2093
2094 2094 - amend the current commit and set the date to now::
2095 2095
2096 2096 hg commit --amend --date now
2097 2097 """
2098 2098 cmdutil.check_at_most_one_arg(opts, 'draft', 'secret')
2099 2099 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2100 2100 with repo.wlock(), repo.lock():
2101 2101 return _docommit(ui, repo, *pats, **opts)
2102 2102
2103 2103
2104 2104 def _docommit(ui, repo, *pats, **opts):
2105 2105 if opts.get('interactive'):
2106 2106 opts.pop('interactive')
2107 2107 ret = cmdutil.dorecord(
2108 2108 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2109 2109 )
2110 2110 # ret can be 0 (no changes to record) or the value returned by
2111 2111 # commit(), 1 if nothing changed or None on success.
2112 2112 return 1 if ret == 0 else ret
2113 2113
2114 2114 if opts.get('subrepos'):
2115 2115 # Let --subrepos on the command line override config setting.
2116 2116 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2117 2117
2118 2118 cmdutil.checkunfinished(repo, commit=True)
2119 2119
2120 2120 branch = repo[None].branch()
2121 2121 bheads = repo.branchheads(branch)
2122 2122 tip = repo.changelog.tip()
2123 2123
2124 2124 extra = {}
2125 2125 if opts.get('close_branch') or opts.get('force_close_branch'):
2126 2126 extra[b'close'] = b'1'
2127 2127
2128 2128 if repo[b'.'].closesbranch():
2129 2129 # Not ideal, but let us do an extra status early to prevent early
2130 2130 # bail out.
2131 2131 matcher = scmutil.match(
2132 2132 repo[None], pats, pycompat.byteskwargs(opts)
2133 2133 )
2134 2134 s = repo.status(match=matcher)
2135 2135 if s.modified or s.added or s.removed:
2136 2136 bheads = repo.branchheads(branch, closed=True)
2137 2137 else:
2138 2138 msg = _(b'current revision is already a branch closing head')
2139 2139 raise error.InputError(msg)
2140 2140
2141 2141 if not bheads:
2142 2142 raise error.InputError(
2143 2143 _(b'branch "%s" has no heads to close') % branch
2144 2144 )
2145 2145 elif (
2146 2146 branch == repo[b'.'].branch()
2147 2147 and repo[b'.'].node() not in bheads
2148 2148 and not opts.get('force_close_branch')
2149 2149 ):
2150 2150 hint = _(
2151 2151 b'use --force-close-branch to close branch from a non-head'
2152 2152 b' changeset'
2153 2153 )
2154 2154 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2155 2155 elif opts.get('amend'):
2156 2156 if (
2157 2157 repo[b'.'].p1().branch() != branch
2158 2158 and repo[b'.'].p2().branch() != branch
2159 2159 ):
2160 2160 raise error.InputError(_(b'can only close branch heads'))
2161 2161
2162 2162 if opts.get('amend'):
2163 2163 if ui.configbool(b'ui', b'commitsubrepos'):
2164 2164 raise error.InputError(
2165 2165 _(b'cannot amend with ui.commitsubrepos enabled')
2166 2166 )
2167 2167
2168 2168 old = repo[b'.']
2169 2169 rewriteutil.precheck(repo, [old.rev()], b'amend')
2170 2170
2171 2171 # Currently histedit gets confused if an amend happens while histedit
2172 2172 # is in progress. Since we have a checkunfinished command, we are
2173 2173 # temporarily honoring it.
2174 2174 #
2175 2175 # Note: eventually this guard will be removed. Please do not expect
2176 2176 # this behavior to remain.
2177 2177 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2178 2178 cmdutil.checkunfinished(repo)
2179 2179
2180 2180 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2181 2181 opts = pycompat.byteskwargs(opts)
2182 2182 if node == old.node():
2183 2183 ui.status(_(b"nothing changed\n"))
2184 2184 return 1
2185 2185 else:
2186 2186
2187 2187 def commitfunc(ui, repo, message, match, opts):
2188 2188 overrides = {}
2189 2189 if opts.get(b'secret'):
2190 2190 overrides[(b'phases', b'new-commit')] = b'secret'
2191 2191 elif opts.get(b'draft'):
2192 2192 overrides[(b'phases', b'new-commit')] = b'draft'
2193 2193
2194 2194 baseui = repo.baseui
2195 2195 with baseui.configoverride(overrides, b'commit'):
2196 2196 with ui.configoverride(overrides, b'commit'):
2197 2197 editform = cmdutil.mergeeditform(
2198 2198 repo[None], b'commit.normal'
2199 2199 )
2200 2200 editor = cmdutil.getcommiteditor(
2201 2201 editform=editform, **pycompat.strkwargs(opts)
2202 2202 )
2203 2203 return repo.commit(
2204 2204 message,
2205 2205 opts.get(b'user'),
2206 2206 opts.get(b'date'),
2207 2207 match,
2208 2208 editor=editor,
2209 2209 extra=extra,
2210 2210 )
2211 2211
2212 2212 opts = pycompat.byteskwargs(opts)
2213 2213 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2214 2214
2215 2215 if not node:
2216 2216 stat = cmdutil.postcommitstatus(repo, pats, opts)
2217 2217 if stat.deleted:
2218 2218 ui.status(
2219 2219 _(
2220 2220 b"nothing changed (%d missing files, see "
2221 2221 b"'hg status')\n"
2222 2222 )
2223 2223 % len(stat.deleted)
2224 2224 )
2225 2225 else:
2226 2226 ui.status(_(b"nothing changed\n"))
2227 2227 return 1
2228 2228
2229 2229 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2230 2230
2231 2231 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2232 2232 status(
2233 2233 ui,
2234 2234 repo,
2235 2235 modified=True,
2236 2236 added=True,
2237 2237 removed=True,
2238 2238 deleted=True,
2239 2239 unknown=True,
2240 2240 subrepos=opts.get(b'subrepos'),
2241 2241 )
2242 2242
2243 2243
2244 2244 @command(
2245 2245 b'config|showconfig|debugconfig',
2246 2246 [
2247 2247 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2248 2248 # This is experimental because we need
2249 2249 # * reasonable behavior around aliases,
2250 2250 # * decide if we display [debug] [experimental] and [devel] section par
2251 2251 # default
2252 2252 # * some way to display "generic" config entry (the one matching
2253 2253 # regexp,
2254 2254 # * proper display of the different value type
2255 2255 # * a better way to handle <DYNAMIC> values (and variable types),
2256 2256 # * maybe some type information ?
2257 2257 (
2258 2258 b'',
2259 2259 b'exp-all-known',
2260 2260 None,
2261 2261 _(b'show all known config option (EXPERIMENTAL)'),
2262 2262 ),
2263 2263 (b'e', b'edit', None, _(b'edit user config')),
2264 2264 (b'l', b'local', None, _(b'edit repository config')),
2265 2265 (b'', b'source', None, _(b'show source of configuration value')),
2266 2266 (
2267 2267 b'',
2268 2268 b'shared',
2269 2269 None,
2270 2270 _(b'edit shared source repository config (EXPERIMENTAL)'),
2271 2271 ),
2272 2272 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2273 2273 (b'g', b'global', None, _(b'edit global config')),
2274 2274 ]
2275 2275 + formatteropts,
2276 2276 _(b'[-u] [NAME]...'),
2277 2277 helpcategory=command.CATEGORY_HELP,
2278 2278 optionalrepo=True,
2279 2279 intents={INTENT_READONLY},
2280 2280 )
2281 2281 def config(ui, repo, *values, **opts):
2282 2282 """show combined config settings from all hgrc files
2283 2283
2284 2284 With no arguments, print names and values of all config items.
2285 2285
2286 2286 With one argument of the form section.name, print just the value
2287 2287 of that config item.
2288 2288
2289 2289 With multiple arguments, print names and values of all config
2290 2290 items with matching section names or section.names.
2291 2291
2292 2292 With --edit, start an editor on the user-level config file. With
2293 2293 --global, edit the system-wide config file. With --local, edit the
2294 2294 repository-level config file.
2295 2295
2296 2296 With --source, the source (filename and line number) is printed
2297 2297 for each config item.
2298 2298
2299 2299 See :hg:`help config` for more information about config files.
2300 2300
2301 2301 .. container:: verbose
2302 2302
2303 2303 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2304 2304 This file is not shared across shares when in share-safe mode.
2305 2305
2306 2306 Template:
2307 2307
2308 2308 The following keywords are supported. See also :hg:`help templates`.
2309 2309
2310 2310 :name: String. Config name.
2311 2311 :source: String. Filename and line number where the item is defined.
2312 2312 :value: String. Config value.
2313 2313
2314 2314 The --shared flag can be used to edit the config file of shared source
2315 2315 repository. It only works when you have shared using the experimental
2316 2316 share safe feature.
2317 2317
2318 2318 Returns 0 on success, 1 if NAME does not exist.
2319 2319
2320 2320 """
2321 2321
2322 2322 opts = pycompat.byteskwargs(opts)
2323 2323 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2324 2324 if any(opts.get(o) for o in editopts):
2325 2325 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2326 2326 if opts.get(b'local'):
2327 2327 if not repo:
2328 2328 raise error.InputError(
2329 2329 _(b"can't use --local outside a repository")
2330 2330 )
2331 2331 paths = [repo.vfs.join(b'hgrc')]
2332 2332 elif opts.get(b'global'):
2333 2333 paths = rcutil.systemrcpath()
2334 2334 elif opts.get(b'shared'):
2335 2335 if not repo.shared():
2336 2336 raise error.InputError(
2337 2337 _(b"repository is not shared; can't use --shared")
2338 2338 )
2339 2339 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2340 2340 raise error.InputError(
2341 2341 _(
2342 2342 b"share safe feature not enabled; "
2343 2343 b"unable to edit shared source repository config"
2344 2344 )
2345 2345 )
2346 2346 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2347 2347 elif opts.get(b'non_shared'):
2348 2348 paths = [repo.vfs.join(b'hgrc-not-shared')]
2349 2349 else:
2350 2350 paths = rcutil.userrcpath()
2351 2351
2352 2352 for f in paths:
2353 2353 if os.path.exists(f):
2354 2354 break
2355 2355 else:
2356 2356 if opts.get(b'global'):
2357 2357 samplehgrc = uimod.samplehgrcs[b'global']
2358 2358 elif opts.get(b'local'):
2359 2359 samplehgrc = uimod.samplehgrcs[b'local']
2360 2360 else:
2361 2361 samplehgrc = uimod.samplehgrcs[b'user']
2362 2362
2363 2363 f = paths[0]
2364 2364 fp = open(f, b"wb")
2365 2365 fp.write(util.tonativeeol(samplehgrc))
2366 2366 fp.close()
2367 2367
2368 2368 editor = ui.geteditor()
2369 2369 ui.system(
2370 2370 b"%s \"%s\"" % (editor, f),
2371 2371 onerr=error.InputError,
2372 2372 errprefix=_(b"edit failed"),
2373 2373 blockedtag=b'config_edit',
2374 2374 )
2375 2375 return
2376 2376 ui.pager(b'config')
2377 2377 fm = ui.formatter(b'config', opts)
2378 2378 for t, f in rcutil.rccomponents():
2379 2379 if t == b'path':
2380 2380 ui.debug(b'read config from: %s\n' % f)
2381 2381 elif t == b'resource':
2382 2382 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2383 2383 elif t == b'items':
2384 2384 # Don't print anything for 'items'.
2385 2385 pass
2386 2386 else:
2387 2387 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2388 2388 untrusted = bool(opts.get(b'untrusted'))
2389 2389
2390 2390 selsections = selentries = []
2391 2391 if values:
2392 2392 selsections = [v for v in values if b'.' not in v]
2393 2393 selentries = [v for v in values if b'.' in v]
2394 2394 uniquesel = len(selentries) == 1 and not selsections
2395 2395 selsections = set(selsections)
2396 2396 selentries = set(selentries)
2397 2397
2398 2398 matched = False
2399 2399 all_known = opts[b'exp_all_known']
2400 2400 show_source = ui.debugflag or opts.get(b'source')
2401 2401 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2402 2402 for section, name, value in entries:
2403 2403 source = ui.configsource(section, name, untrusted)
2404 2404 value = pycompat.bytestr(value)
2405 2405 defaultvalue = ui.configdefault(section, name)
2406 2406 if fm.isplain():
2407 2407 source = source or b'none'
2408 2408 value = value.replace(b'\n', b'\\n')
2409 2409 entryname = section + b'.' + name
2410 2410 if values and not (section in selsections or entryname in selentries):
2411 2411 continue
2412 2412 fm.startitem()
2413 2413 fm.condwrite(show_source, b'source', b'%s: ', source)
2414 2414 if uniquesel:
2415 2415 fm.data(name=entryname)
2416 2416 fm.write(b'value', b'%s\n', value)
2417 2417 else:
2418 2418 fm.write(b'name value', b'%s=%s\n', entryname, value)
2419 2419 if formatter.isprintable(defaultvalue):
2420 2420 fm.data(defaultvalue=defaultvalue)
2421 2421 elif isinstance(defaultvalue, list) and all(
2422 2422 formatter.isprintable(e) for e in defaultvalue
2423 2423 ):
2424 2424 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2425 2425 # TODO: no idea how to process unsupported defaultvalue types
2426 2426 matched = True
2427 2427 fm.end()
2428 2428 if matched:
2429 2429 return 0
2430 2430 return 1
2431 2431
2432 2432
2433 2433 @command(
2434 2434 b'continue',
2435 2435 dryrunopts,
2436 2436 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2437 2437 helpbasic=True,
2438 2438 )
2439 2439 def continuecmd(ui, repo, **opts):
2440 2440 """resumes an interrupted operation (EXPERIMENTAL)
2441 2441
2442 2442 Finishes a multistep operation like graft, histedit, rebase, merge,
2443 2443 and unshelve if they are in an interrupted state.
2444 2444
2445 2445 use --dry-run/-n to dry run the command.
2446 2446 """
2447 2447 dryrun = opts.get('dry_run')
2448 2448 contstate = cmdutil.getunfinishedstate(repo)
2449 2449 if not contstate:
2450 2450 raise error.StateError(_(b'no operation in progress'))
2451 2451 if not contstate.continuefunc:
2452 2452 raise error.StateError(
2453 2453 (
2454 2454 _(b"%s in progress but does not support 'hg continue'")
2455 2455 % (contstate._opname)
2456 2456 ),
2457 2457 hint=contstate.continuemsg(),
2458 2458 )
2459 2459 if dryrun:
2460 2460 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2461 2461 return
2462 2462 return contstate.continuefunc(ui, repo)
2463 2463
2464 2464
2465 2465 @command(
2466 2466 b'copy|cp',
2467 2467 [
2468 2468 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2469 2469 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2470 2470 (
2471 2471 b'',
2472 2472 b'at-rev',
2473 2473 b'',
2474 2474 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2475 2475 _(b'REV'),
2476 2476 ),
2477 2477 (
2478 2478 b'f',
2479 2479 b'force',
2480 2480 None,
2481 2481 _(b'forcibly copy over an existing managed file'),
2482 2482 ),
2483 2483 ]
2484 2484 + walkopts
2485 2485 + dryrunopts,
2486 2486 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2487 2487 helpcategory=command.CATEGORY_FILE_CONTENTS,
2488 2488 )
2489 2489 def copy(ui, repo, *pats, **opts):
2490 2490 """mark files as copied for the next commit
2491 2491
2492 2492 Mark dest as having copies of source files. If dest is a
2493 2493 directory, copies are put in that directory. If dest is a file,
2494 2494 the source must be a single file.
2495 2495
2496 2496 By default, this command copies the contents of files as they
2497 2497 exist in the working directory. If invoked with -A/--after, the
2498 2498 operation is recorded, but no copying is performed.
2499 2499
2500 2500 To undo marking a destination file as copied, use --forget. With that
2501 2501 option, all given (positional) arguments are unmarked as copies. The
2502 2502 destination file(s) will be left in place (still tracked). Note that
2503 2503 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2504 2504
2505 2505 This command takes effect with the next commit by default.
2506 2506
2507 2507 Returns 0 on success, 1 if errors are encountered.
2508 2508 """
2509 2509 opts = pycompat.byteskwargs(opts)
2510 2510
2511 2511 context = lambda repo: repo.dirstate.changing_files(repo)
2512 2512 rev = opts.get(b'at_rev')
2513 2513 ctx = None
2514 2514 if rev:
2515 2515 ctx = logcmdutil.revsingle(repo, rev)
2516 2516 if ctx.rev() is not None:
2517 2517
2518 2518 def context(repo):
2519 2519 return util.nullcontextmanager()
2520 2520
2521 2521 opts[b'at_rev'] = ctx.rev()
2522 2522 with repo.wlock(), context(repo):
2523 2523 return cmdutil.copy(ui, repo, pats, opts)
2524 2524
2525 2525
2526 2526 @command(
2527 2527 b'debugcommands',
2528 2528 [],
2529 2529 _(b'[COMMAND]'),
2530 2530 helpcategory=command.CATEGORY_HELP,
2531 2531 norepo=True,
2532 2532 )
2533 2533 def debugcommands(ui, cmd=b'', *args):
2534 2534 """list all available commands and options"""
2535 2535 for cmd, vals in sorted(table.items()):
2536 2536 cmd = cmd.split(b'|')[0]
2537 2537 opts = b', '.join([i[1] for i in vals[1]])
2538 2538 ui.write(b'%s: %s\n' % (cmd, opts))
2539 2539
2540 2540
2541 2541 @command(
2542 2542 b'debugcomplete',
2543 2543 [(b'o', b'options', None, _(b'show the command options'))],
2544 2544 _(b'[-o] CMD'),
2545 2545 helpcategory=command.CATEGORY_HELP,
2546 2546 norepo=True,
2547 2547 )
2548 2548 def debugcomplete(ui, cmd=b'', **opts):
2549 2549 """returns the completion list associated with the given command"""
2550 2550
2551 2551 if opts.get('options'):
2552 2552 options = []
2553 2553 otables = [globalopts]
2554 2554 if cmd:
2555 2555 aliases, entry = cmdutil.findcmd(cmd, table, False)
2556 2556 otables.append(entry[1])
2557 2557 for t in otables:
2558 2558 for o in t:
2559 2559 if b"(DEPRECATED)" in o[3]:
2560 2560 continue
2561 2561 if o[0]:
2562 2562 options.append(b'-%s' % o[0])
2563 2563 options.append(b'--%s' % o[1])
2564 2564 ui.write(b"%s\n" % b"\n".join(options))
2565 2565 return
2566 2566
2567 2567 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2568 2568 if ui.verbose:
2569 2569 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2570 2570 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2571 2571
2572 2572
2573 2573 @command(
2574 2574 b'diff',
2575 2575 [
2576 2576 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2577 2577 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2578 2578 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2579 2579 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2580 2580 ]
2581 2581 + diffopts
2582 2582 + diffopts2
2583 2583 + walkopts
2584 2584 + subrepoopts,
2585 2585 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2586 2586 helpcategory=command.CATEGORY_FILE_CONTENTS,
2587 2587 helpbasic=True,
2588 2588 inferrepo=True,
2589 2589 intents={INTENT_READONLY},
2590 2590 )
2591 2591 def diff(ui, repo, *pats, **opts):
2592 2592 """diff repository (or selected files)
2593 2593
2594 2594 Show differences between revisions for the specified files.
2595 2595
2596 2596 Differences between files are shown using the unified diff format.
2597 2597
2598 2598 .. note::
2599 2599
2600 2600 :hg:`diff` may generate unexpected results for merges, as it will
2601 2601 default to comparing against the working directory's first
2602 2602 parent changeset if no revisions are specified. To diff against the
2603 2603 conflict regions, you can use `--config diff.merge=yes`.
2604 2604
2605 2605 By default, the working directory files are compared to its first parent. To
2606 2606 see the differences from another revision, use --from. To see the difference
2607 2607 to another revision, use --to. For example, :hg:`diff --from .^` will show
2608 2608 the differences from the working copy's grandparent to the working copy,
2609 2609 :hg:`diff --to .` will show the diff from the working copy to its parent
2610 2610 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2611 2611 show the diff between those two revisions.
2612 2612
2613 2613 Alternatively you can specify -c/--change with a revision to see the changes
2614 2614 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2615 2615 equivalent to :hg:`diff --from 42^ --to 42`)
2616 2616
2617 2617 Without the -a/--text option, diff will avoid generating diffs of
2618 2618 files it detects as binary. With -a, diff will generate a diff
2619 2619 anyway, probably with undesirable results.
2620 2620
2621 2621 Use the -g/--git option to generate diffs in the git extended diff
2622 2622 format. For more information, read :hg:`help diffs`.
2623 2623
2624 2624 .. container:: verbose
2625 2625
2626 2626 Examples:
2627 2627
2628 2628 - compare a file in the current working directory to its parent::
2629 2629
2630 2630 hg diff foo.c
2631 2631
2632 2632 - compare two historical versions of a directory, with rename info::
2633 2633
2634 2634 hg diff --git --from 1.0 --to 1.2 lib/
2635 2635
2636 2636 - get change stats relative to the last change on some date::
2637 2637
2638 2638 hg diff --stat --from "date('may 2')"
2639 2639
2640 2640 - diff all newly-added files that contain a keyword::
2641 2641
2642 2642 hg diff "set:added() and grep(GNU)"
2643 2643
2644 2644 - compare a revision and its parents::
2645 2645
2646 2646 hg diff -c 9353 # compare against first parent
2647 2647 hg diff --from 9353^ --to 9353 # same using revset syntax
2648 2648 hg diff --from 9353^2 --to 9353 # compare against the second parent
2649 2649
2650 2650 Returns 0 on success.
2651 2651 """
2652 2652
2653 2653 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2654 2654 opts = pycompat.byteskwargs(opts)
2655 2655 revs = opts.get(b'rev')
2656 2656 change = opts.get(b'change')
2657 2657 from_rev = opts.get(b'from')
2658 2658 to_rev = opts.get(b'to')
2659 2659 stat = opts.get(b'stat')
2660 2660 reverse = opts.get(b'reverse')
2661 2661
2662 2662 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2663 2663 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2664 2664 if change:
2665 2665 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2666 2666 ctx2 = logcmdutil.revsingle(repo, change, None)
2667 2667 ctx1 = logcmdutil.diff_parent(ctx2)
2668 2668 elif from_rev or to_rev:
2669 2669 repo = scmutil.unhidehashlikerevs(
2670 2670 repo, [from_rev] + [to_rev], b'nowarn'
2671 2671 )
2672 2672 ctx1 = logcmdutil.revsingle(repo, from_rev, None)
2673 2673 ctx2 = logcmdutil.revsingle(repo, to_rev, None)
2674 2674 else:
2675 2675 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2676 2676 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
2677 2677
2678 2678 if reverse:
2679 2679 ctxleft = ctx2
2680 2680 ctxright = ctx1
2681 2681 else:
2682 2682 ctxleft = ctx1
2683 2683 ctxright = ctx2
2684 2684
2685 2685 diffopts = patch.diffallopts(ui, opts)
2686 2686 m = scmutil.match(ctx2, pats, opts)
2687 2687 m = repo.narrowmatch(m)
2688 2688 ui.pager(b'diff')
2689 2689 logcmdutil.diffordiffstat(
2690 2690 ui,
2691 2691 repo,
2692 2692 diffopts,
2693 2693 ctxleft,
2694 2694 ctxright,
2695 2695 m,
2696 2696 stat=stat,
2697 2697 listsubrepos=opts.get(b'subrepos'),
2698 2698 root=opts.get(b'root'),
2699 2699 )
2700 2700
2701 2701
2702 2702 @command(
2703 2703 b'export',
2704 2704 [
2705 2705 (
2706 2706 b'B',
2707 2707 b'bookmark',
2708 2708 b'',
2709 2709 _(b'export changes only reachable by given bookmark'),
2710 2710 _(b'BOOKMARK'),
2711 2711 ),
2712 2712 (
2713 2713 b'o',
2714 2714 b'output',
2715 2715 b'',
2716 2716 _(b'print output to file with formatted name'),
2717 2717 _(b'FORMAT'),
2718 2718 ),
2719 2719 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2720 2720 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2721 2721 ]
2722 2722 + diffopts
2723 2723 + formatteropts,
2724 2724 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2725 2725 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2726 2726 helpbasic=True,
2727 2727 intents={INTENT_READONLY},
2728 2728 )
2729 2729 def export(ui, repo, *changesets, **opts):
2730 2730 """dump the header and diffs for one or more changesets
2731 2731
2732 2732 Print the changeset header and diffs for one or more revisions.
2733 2733 If no revision is given, the parent of the working directory is used.
2734 2734
2735 2735 The information shown in the changeset header is: author, date,
2736 2736 branch name (if non-default), changeset hash, parent(s) and commit
2737 2737 comment.
2738 2738
2739 2739 .. note::
2740 2740
2741 2741 :hg:`export` may generate unexpected diff output for merge
2742 2742 changesets, as it will compare the merge changeset against its
2743 2743 first parent only.
2744 2744
2745 2745 Output may be to a file, in which case the name of the file is
2746 2746 given using a template string. See :hg:`help templates`. In addition
2747 2747 to the common template keywords, the following formatting rules are
2748 2748 supported:
2749 2749
2750 2750 :``%%``: literal "%" character
2751 2751 :``%H``: changeset hash (40 hexadecimal digits)
2752 2752 :``%N``: number of patches being generated
2753 2753 :``%R``: changeset revision number
2754 2754 :``%b``: basename of the exporting repository
2755 2755 :``%h``: short-form changeset hash (12 hexadecimal digits)
2756 2756 :``%m``: first line of the commit message (only alphanumeric characters)
2757 2757 :``%n``: zero-padded sequence number, starting at 1
2758 2758 :``%r``: zero-padded changeset revision number
2759 2759 :``\\``: literal "\\" character
2760 2760
2761 2761 Without the -a/--text option, export will avoid generating diffs
2762 2762 of files it detects as binary. With -a, export will generate a
2763 2763 diff anyway, probably with undesirable results.
2764 2764
2765 2765 With -B/--bookmark changesets reachable by the given bookmark are
2766 2766 selected.
2767 2767
2768 2768 Use the -g/--git option to generate diffs in the git extended diff
2769 2769 format. See :hg:`help diffs` for more information.
2770 2770
2771 2771 With the --switch-parent option, the diff will be against the
2772 2772 second parent. It can be useful to review a merge.
2773 2773
2774 2774 .. container:: verbose
2775 2775
2776 2776 Template:
2777 2777
2778 2778 The following keywords are supported in addition to the common template
2779 2779 keywords and functions. See also :hg:`help templates`.
2780 2780
2781 2781 :diff: String. Diff content.
2782 2782 :parents: List of strings. Parent nodes of the changeset.
2783 2783
2784 2784 Examples:
2785 2785
2786 2786 - use export and import to transplant a bugfix to the current
2787 2787 branch::
2788 2788
2789 2789 hg export -r 9353 | hg import -
2790 2790
2791 2791 - export all the changesets between two revisions to a file with
2792 2792 rename information::
2793 2793
2794 2794 hg export --git -r 123:150 > changes.txt
2795 2795
2796 2796 - split outgoing changes into a series of patches with
2797 2797 descriptive names::
2798 2798
2799 2799 hg export -r "outgoing()" -o "%n-%m.patch"
2800 2800
2801 2801 Returns 0 on success.
2802 2802 """
2803 2803 opts = pycompat.byteskwargs(opts)
2804 2804 bookmark = opts.get(b'bookmark')
2805 2805 changesets += tuple(opts.get(b'rev', []))
2806 2806
2807 2807 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2808 2808
2809 2809 if bookmark:
2810 2810 if bookmark not in repo._bookmarks:
2811 2811 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2812 2812
2813 2813 revs = scmutil.bookmarkrevs(repo, bookmark)
2814 2814 else:
2815 2815 if not changesets:
2816 2816 changesets = [b'.']
2817 2817
2818 2818 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2819 2819 revs = logcmdutil.revrange(repo, changesets)
2820 2820
2821 2821 if not revs:
2822 2822 raise error.InputError(_(b"export requires at least one changeset"))
2823 2823 if len(revs) > 1:
2824 2824 ui.note(_(b'exporting patches:\n'))
2825 2825 else:
2826 2826 ui.note(_(b'exporting patch:\n'))
2827 2827
2828 2828 fntemplate = opts.get(b'output')
2829 2829 if cmdutil.isstdiofilename(fntemplate):
2830 2830 fntemplate = b''
2831 2831
2832 2832 if fntemplate:
2833 2833 fm = formatter.nullformatter(ui, b'export', opts)
2834 2834 else:
2835 2835 ui.pager(b'export')
2836 2836 fm = ui.formatter(b'export', opts)
2837 2837 with fm:
2838 2838 cmdutil.export(
2839 2839 repo,
2840 2840 revs,
2841 2841 fm,
2842 2842 fntemplate=fntemplate,
2843 2843 switch_parent=opts.get(b'switch_parent'),
2844 2844 opts=patch.diffallopts(ui, opts),
2845 2845 )
2846 2846
2847 2847
2848 2848 @command(
2849 2849 b'files',
2850 2850 [
2851 2851 (
2852 2852 b'r',
2853 2853 b'rev',
2854 2854 b'',
2855 2855 _(b'search the repository as it is in REV'),
2856 2856 _(b'REV'),
2857 2857 ),
2858 2858 (
2859 2859 b'0',
2860 2860 b'print0',
2861 2861 None,
2862 2862 _(b'end filenames with NUL, for use with xargs'),
2863 2863 ),
2864 2864 ]
2865 2865 + walkopts
2866 2866 + formatteropts
2867 2867 + subrepoopts,
2868 2868 _(b'[OPTION]... [FILE]...'),
2869 2869 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2870 2870 intents={INTENT_READONLY},
2871 2871 )
2872 2872 def files(ui, repo, *pats, **opts):
2873 2873 """list tracked files
2874 2874
2875 2875 Print files under Mercurial control in the working directory or
2876 2876 specified revision for given files (excluding removed files).
2877 2877 Files can be specified as filenames or filesets.
2878 2878
2879 2879 If no files are given to match, this command prints the names
2880 2880 of all files under Mercurial control.
2881 2881
2882 2882 .. container:: verbose
2883 2883
2884 2884 Template:
2885 2885
2886 2886 The following keywords are supported in addition to the common template
2887 2887 keywords and functions. See also :hg:`help templates`.
2888 2888
2889 2889 :flags: String. Character denoting file's symlink and executable bits.
2890 2890 :path: String. Repository-absolute path of the file.
2891 2891 :size: Integer. Size of the file in bytes.
2892 2892
2893 2893 Examples:
2894 2894
2895 2895 - list all files under the current directory::
2896 2896
2897 2897 hg files .
2898 2898
2899 2899 - shows sizes and flags for current revision::
2900 2900
2901 2901 hg files -vr .
2902 2902
2903 2903 - list all files named README::
2904 2904
2905 2905 hg files -I "**/README"
2906 2906
2907 2907 - list all binary files::
2908 2908
2909 2909 hg files "set:binary()"
2910 2910
2911 2911 - find files containing a regular expression::
2912 2912
2913 2913 hg files "set:grep('bob')"
2914 2914
2915 2915 - search tracked file contents with xargs and grep::
2916 2916
2917 2917 hg files -0 | xargs -0 grep foo
2918 2918
2919 2919 See :hg:`help patterns` and :hg:`help filesets` for more information
2920 2920 on specifying file patterns.
2921 2921
2922 2922 Returns 0 if a match is found, 1 otherwise.
2923 2923
2924 2924 """
2925 2925
2926 2926 opts = pycompat.byteskwargs(opts)
2927 2927 rev = opts.get(b'rev')
2928 2928 if rev:
2929 2929 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2930 2930 ctx = logcmdutil.revsingle(repo, rev, None)
2931 2931
2932 2932 end = b'\n'
2933 2933 if opts.get(b'print0'):
2934 2934 end = b'\0'
2935 2935 fmt = b'%s' + end
2936 2936
2937 2937 m = scmutil.match(ctx, pats, opts)
2938 2938 ui.pager(b'files')
2939 2939 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2940 2940 with ui.formatter(b'files', opts) as fm:
2941 2941 return cmdutil.files(
2942 2942 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2943 2943 )
2944 2944
2945 2945
2946 2946 @command(
2947 2947 b'forget',
2948 2948 [
2949 2949 (b'i', b'interactive', None, _(b'use interactive mode')),
2950 2950 ]
2951 2951 + walkopts
2952 2952 + dryrunopts,
2953 2953 _(b'[OPTION]... FILE...'),
2954 2954 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2955 2955 helpbasic=True,
2956 2956 inferrepo=True,
2957 2957 )
2958 2958 def forget(ui, repo, *pats, **opts):
2959 2959 """forget the specified files on the next commit
2960 2960
2961 2961 Mark the specified files so they will no longer be tracked
2962 2962 after the next commit.
2963 2963
2964 2964 This only removes files from the current branch, not from the
2965 2965 entire project history, and it does not delete them from the
2966 2966 working directory.
2967 2967
2968 2968 To delete the file from the working directory, see :hg:`remove`.
2969 2969
2970 2970 To undo a forget before the next commit, see :hg:`add`.
2971 2971
2972 2972 .. container:: verbose
2973 2973
2974 2974 Examples:
2975 2975
2976 2976 - forget newly-added binary files::
2977 2977
2978 2978 hg forget "set:added() and binary()"
2979 2979
2980 2980 - forget files that would be excluded by .hgignore::
2981 2981
2982 2982 hg forget "set:hgignore()"
2983 2983
2984 2984 Returns 0 on success.
2985 2985 """
2986 2986
2987 2987 opts = pycompat.byteskwargs(opts)
2988 2988 if not pats:
2989 2989 raise error.InputError(_(b'no files specified'))
2990 2990
2991 2991 with repo.wlock(), repo.dirstate.changing_files(repo):
2992 2992 m = scmutil.match(repo[None], pats, opts)
2993 2993 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2994 2994 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2995 2995 rejected = cmdutil.forget(
2996 2996 ui,
2997 2997 repo,
2998 2998 m,
2999 2999 prefix=b"",
3000 3000 uipathfn=uipathfn,
3001 3001 explicitonly=False,
3002 3002 dryrun=dryrun,
3003 3003 interactive=interactive,
3004 3004 )[0]
3005 3005 return rejected and 1 or 0
3006 3006
3007 3007
3008 3008 @command(
3009 3009 b'graft',
3010 3010 [
3011 3011 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
3012 3012 (
3013 3013 b'',
3014 3014 b'base',
3015 3015 b'',
3016 3016 _(b'base revision when doing the graft merge (ADVANCED)'),
3017 3017 _(b'REV'),
3018 3018 ),
3019 3019 (b'c', b'continue', False, _(b'resume interrupted graft')),
3020 3020 (b'', b'stop', False, _(b'stop interrupted graft')),
3021 3021 (b'', b'abort', False, _(b'abort interrupted graft')),
3022 3022 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
3023 3023 (b'', b'log', None, _(b'append graft info to log message')),
3024 3024 (
3025 3025 b'',
3026 3026 b'no-commit',
3027 3027 None,
3028 3028 _(b"don't commit, just apply the changes in working directory"),
3029 3029 ),
3030 3030 (b'f', b'force', False, _(b'force graft')),
3031 3031 (
3032 3032 b'D',
3033 3033 b'currentdate',
3034 3034 False,
3035 3035 _(b'record the current date as commit date'),
3036 3036 ),
3037 3037 (
3038 3038 b'U',
3039 3039 b'currentuser',
3040 3040 False,
3041 3041 _(b'record the current user as committer'),
3042 3042 ),
3043 3043 ]
3044 3044 + commitopts2
3045 3045 + mergetoolopts
3046 3046 + dryrunopts,
3047 3047 _(b'[OPTION]... [-r REV]... REV...'),
3048 3048 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
3049 3049 )
3050 3050 def graft(ui, repo, *revs, **opts):
3051 3051 """copy changes from other branches onto the current branch
3052 3052
3053 3053 This command uses Mercurial's merge logic to copy individual
3054 3054 changes from other branches without merging branches in the
3055 3055 history graph. This is sometimes known as 'backporting' or
3056 3056 'cherry-picking'. By default, graft will copy user, date, and
3057 3057 description from the source changesets.
3058 3058
3059 3059 Changesets that are ancestors of the current revision, that have
3060 3060 already been grafted, or that are merges will be skipped.
3061 3061
3062 3062 If --log is specified, log messages will have a comment appended
3063 3063 of the form::
3064 3064
3065 3065 (grafted from CHANGESETHASH)
3066 3066
3067 3067 If --force is specified, revisions will be grafted even if they
3068 3068 are already ancestors of, or have been grafted to, the destination.
3069 3069 This is useful when the revisions have since been backed out.
3070 3070
3071 3071 If a graft merge results in conflicts, the graft process is
3072 3072 interrupted so that the current merge can be manually resolved.
3073 3073 Once all conflicts are addressed, the graft process can be
3074 3074 continued with the -c/--continue option.
3075 3075
3076 3076 The -c/--continue option reapplies all the earlier options.
3077 3077
3078 3078 .. container:: verbose
3079 3079
3080 3080 The --base option exposes more of how graft internally uses merge with a
3081 3081 custom base revision. --base can be used to specify another ancestor than
3082 3082 the first and only parent.
3083 3083
3084 3084 The command::
3085 3085
3086 3086 hg graft -r 345 --base 234
3087 3087
3088 3088 is thus pretty much the same as::
3089 3089
3090 3090 hg diff --from 234 --to 345 | hg import
3091 3091
3092 3092 but using merge to resolve conflicts and track moved files.
3093 3093
3094 3094 The result of a merge can thus be backported as a single commit by
3095 3095 specifying one of the merge parents as base, and thus effectively
3096 3096 grafting the changes from the other side.
3097 3097
3098 3098 It is also possible to collapse multiple changesets and clean up history
3099 3099 by specifying another ancestor as base, much like rebase --collapse
3100 3100 --keep.
3101 3101
3102 3102 The commit message can be tweaked after the fact using commit --amend .
3103 3103
3104 3104 For using non-ancestors as the base to backout changes, see the backout
3105 3105 command and the hidden --parent option.
3106 3106
3107 3107 .. container:: verbose
3108 3108
3109 3109 Examples:
3110 3110
3111 3111 - copy a single change to the stable branch and edit its description::
3112 3112
3113 3113 hg update stable
3114 3114 hg graft --edit 9393
3115 3115
3116 3116 - graft a range of changesets with one exception, updating dates::
3117 3117
3118 3118 hg graft -D "2085::2093 and not 2091"
3119 3119
3120 3120 - continue a graft after resolving conflicts::
3121 3121
3122 3122 hg graft -c
3123 3123
3124 3124 - show the source of a grafted changeset::
3125 3125
3126 3126 hg log --debug -r .
3127 3127
3128 3128 - show revisions sorted by date::
3129 3129
3130 3130 hg log -r "sort(all(), date)"
3131 3131
3132 3132 - backport the result of a merge as a single commit::
3133 3133
3134 3134 hg graft -r 123 --base 123^
3135 3135
3136 3136 - land a feature branch as one changeset::
3137 3137
3138 3138 hg up -cr default
3139 3139 hg graft -r featureX --base "ancestor('featureX', 'default')"
3140 3140
3141 3141 See :hg:`help revisions` for more about specifying revisions.
3142 3142
3143 3143 Returns 0 on successful completion, 1 if there are unresolved files.
3144 3144 """
3145 3145 with repo.wlock():
3146 3146 return _dograft(ui, repo, *revs, **opts)
3147 3147
3148 3148
3149 3149 def _dograft(ui, repo, *revs, **opts):
3150 3150 if revs and opts.get('rev'):
3151 3151 ui.warn(
3152 3152 _(
3153 3153 b'warning: inconsistent use of --rev might give unexpected '
3154 3154 b'revision ordering!\n'
3155 3155 )
3156 3156 )
3157 3157
3158 3158 revs = list(revs)
3159 3159 revs.extend(opts.get('rev'))
3160 3160 # a dict of data to be stored in state file
3161 3161 statedata = {}
3162 3162 # list of new nodes created by ongoing graft
3163 3163 statedata[b'newnodes'] = []
3164 3164
3165 3165 cmdutil.resolve_commit_options(ui, opts)
3166 3166
3167 3167 editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
3168 3168
3169 3169 cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue')
3170 3170
3171 3171 cont = False
3172 3172 if opts.get('no_commit'):
3173 3173 cmdutil.check_incompatible_arguments(
3174 3174 opts,
3175 3175 'no_commit',
3176 3176 ['edit', 'currentuser', 'currentdate', 'log'],
3177 3177 )
3178 3178
3179 3179 graftstate = statemod.cmdstate(repo, b'graftstate')
3180 3180
3181 3181 if opts.get('stop'):
3182 3182 cmdutil.check_incompatible_arguments(
3183 3183 opts,
3184 3184 'stop',
3185 3185 [
3186 3186 'edit',
3187 3187 'log',
3188 3188 'user',
3189 3189 'date',
3190 3190 'currentdate',
3191 3191 'currentuser',
3192 3192 'rev',
3193 3193 ],
3194 3194 )
3195 3195 return _stopgraft(ui, repo, graftstate)
3196 3196 elif opts.get('abort'):
3197 3197 cmdutil.check_incompatible_arguments(
3198 3198 opts,
3199 3199 'abort',
3200 3200 [
3201 3201 'edit',
3202 3202 'log',
3203 3203 'user',
3204 3204 'date',
3205 3205 'currentdate',
3206 3206 'currentuser',
3207 3207 'rev',
3208 3208 ],
3209 3209 )
3210 3210 return cmdutil.abortgraft(ui, repo, graftstate)
3211 3211 elif opts.get('continue'):
3212 3212 cont = True
3213 3213 if revs:
3214 3214 raise error.InputError(_(b"can't specify --continue and revisions"))
3215 3215 # read in unfinished revisions
3216 3216 if graftstate.exists():
3217 3217 statedata = cmdutil.readgraftstate(repo, graftstate)
3218 3218 if statedata.get(b'date'):
3219 3219 opts['date'] = statedata[b'date']
3220 3220 if statedata.get(b'user'):
3221 3221 opts['user'] = statedata[b'user']
3222 3222 if statedata.get(b'log'):
3223 3223 opts['log'] = True
3224 3224 if statedata.get(b'no_commit'):
3225 3225 opts['no_commit'] = statedata.get(b'no_commit')
3226 3226 if statedata.get(b'base'):
3227 3227 opts['base'] = statedata.get(b'base')
3228 3228 nodes = statedata[b'nodes']
3229 3229 revs = [repo[node].rev() for node in nodes]
3230 3230 else:
3231 3231 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3232 3232 else:
3233 3233 if not revs:
3234 3234 raise error.InputError(_(b'no revisions specified'))
3235 3235 cmdutil.checkunfinished(repo)
3236 3236 cmdutil.bailifchanged(repo)
3237 3237 revs = logcmdutil.revrange(repo, revs)
3238 3238
3239 3239 skipped = set()
3240 3240 basectx = None
3241 3241 if opts.get('base'):
3242 3242 basectx = logcmdutil.revsingle(repo, opts['base'], None)
3243 3243 if basectx is None:
3244 3244 # check for merges
3245 3245 for rev in repo.revs(b'%ld and merge()', revs):
3246 3246 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3247 3247 skipped.add(rev)
3248 3248 revs = [r for r in revs if r not in skipped]
3249 3249 if not revs:
3250 3250 return -1
3251 3251 if basectx is not None and len(revs) != 1:
3252 3252 raise error.InputError(_(b'only one revision allowed with --base '))
3253 3253
3254 3254 # Don't check in the --continue case, in effect retaining --force across
3255 3255 # --continues. That's because without --force, any revisions we decided to
3256 3256 # skip would have been filtered out here, so they wouldn't have made their
3257 3257 # way to the graftstate. With --force, any revisions we would have otherwise
3258 3258 # skipped would not have been filtered out, and if they hadn't been applied
3259 3259 # already, they'd have been in the graftstate.
3260 3260 if not (cont or opts.get('force')) and basectx is None:
3261 3261 # check for ancestors of dest branch
3262 3262 ancestors = repo.revs(b'%ld & (::.)', revs)
3263 3263 for rev in ancestors:
3264 3264 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3265 3265
3266 3266 revs = [r for r in revs if r not in ancestors]
3267 3267
3268 3268 if not revs:
3269 3269 return -1
3270 3270
3271 3271 # analyze revs for earlier grafts
3272 3272 ids = {}
3273 3273 for ctx in repo.set(b"%ld", revs):
3274 3274 ids[ctx.hex()] = ctx.rev()
3275 3275 n = ctx.extra().get(b'source')
3276 3276 if n:
3277 3277 ids[n] = ctx.rev()
3278 3278
3279 3279 # check ancestors for earlier grafts
3280 3280 ui.debug(b'scanning for duplicate grafts\n')
3281 3281
3282 3282 # The only changesets we can be sure doesn't contain grafts of any
3283 3283 # revs, are the ones that are common ancestors of *all* revs:
3284 3284 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3285 3285 ctx = repo[rev]
3286 3286 n = ctx.extra().get(b'source')
3287 3287 if n in ids:
3288 3288 try:
3289 3289 r = repo[n].rev()
3290 3290 except error.RepoLookupError:
3291 3291 r = None
3292 3292 if r in revs:
3293 3293 ui.warn(
3294 3294 _(
3295 3295 b'skipping revision %d:%s '
3296 3296 b'(already grafted to %d:%s)\n'
3297 3297 )
3298 3298 % (r, repo[r], rev, ctx)
3299 3299 )
3300 3300 revs.remove(r)
3301 3301 elif ids[n] in revs:
3302 3302 if r is None:
3303 3303 ui.warn(
3304 3304 _(
3305 3305 b'skipping already grafted revision %d:%s '
3306 3306 b'(%d:%s also has unknown origin %s)\n'
3307 3307 )
3308 3308 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3309 3309 )
3310 3310 else:
3311 3311 ui.warn(
3312 3312 _(
3313 3313 b'skipping already grafted revision %d:%s '
3314 3314 b'(%d:%s also has origin %d:%s)\n'
3315 3315 )
3316 3316 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3317 3317 )
3318 3318 revs.remove(ids[n])
3319 3319 elif ctx.hex() in ids:
3320 3320 r = ids[ctx.hex()]
3321 3321 if r in revs:
3322 3322 ui.warn(
3323 3323 _(
3324 3324 b'skipping already grafted revision %d:%s '
3325 3325 b'(was grafted from %d:%s)\n'
3326 3326 )
3327 3327 % (r, repo[r], rev, ctx)
3328 3328 )
3329 3329 revs.remove(r)
3330 3330 if not revs:
3331 3331 return -1
3332 3332
3333 3333 if opts.get('no_commit'):
3334 3334 statedata[b'no_commit'] = True
3335 3335 if opts.get('base'):
3336 3336 statedata[b'base'] = opts['base']
3337 3337 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3338 3338 desc = b'%d:%s "%s"' % (
3339 3339 ctx.rev(),
3340 3340 ctx,
3341 3341 ctx.description().split(b'\n', 1)[0],
3342 3342 )
3343 3343 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3344 3344 if names:
3345 3345 desc += b' (%s)' % b' '.join(names)
3346 3346 ui.status(_(b'grafting %s\n') % desc)
3347 3347 if opts.get('dry_run'):
3348 3348 continue
3349 3349
3350 3350 source = ctx.extra().get(b'source')
3351 3351 extra = {}
3352 3352 if source:
3353 3353 extra[b'source'] = source
3354 3354 extra[b'intermediate-source'] = ctx.hex()
3355 3355 else:
3356 3356 extra[b'source'] = ctx.hex()
3357 3357 user = ctx.user()
3358 3358 if opts.get('user'):
3359 3359 user = opts['user']
3360 3360 statedata[b'user'] = user
3361 3361 date = ctx.date()
3362 3362 if opts.get('date'):
3363 3363 date = opts['date']
3364 3364 statedata[b'date'] = date
3365 3365 message = ctx.description()
3366 3366 if opts.get('log'):
3367 3367 message += b'\n(grafted from %s)' % ctx.hex()
3368 3368 statedata[b'log'] = True
3369 3369
3370 3370 # we don't merge the first commit when continuing
3371 3371 if not cont:
3372 3372 # perform the graft merge with p1(rev) as 'ancestor'
3373 3373 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
3374 3374 base = ctx.p1() if basectx is None else basectx
3375 3375 with ui.configoverride(overrides, b'graft'):
3376 3376 stats = mergemod.graft(
3377 3377 repo, ctx, base, [b'local', b'graft', b'parent of graft']
3378 3378 )
3379 3379 # report any conflicts
3380 3380 if stats.unresolvedcount > 0:
3381 3381 # write out state for --continue
3382 3382 nodes = [repo[rev].hex() for rev in revs[pos:]]
3383 3383 statedata[b'nodes'] = nodes
3384 3384 stateversion = 1
3385 3385 graftstate.save(stateversion, statedata)
3386 3386 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3387 3387 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3388 3388 return 1
3389 3389 else:
3390 3390 cont = False
3391 3391
3392 3392 # commit if --no-commit is false
3393 3393 if not opts.get('no_commit'):
3394 3394 node = repo.commit(
3395 3395 text=message, user=user, date=date, extra=extra, editor=editor
3396 3396 )
3397 3397 if node is None:
3398 3398 ui.warn(
3399 3399 _(b'note: graft of %d:%s created no changes to commit\n')
3400 3400 % (ctx.rev(), ctx)
3401 3401 )
3402 3402 # checking that newnodes exist because old state files won't have it
3403 3403 elif statedata.get(b'newnodes') is not None:
3404 3404 nn = statedata[b'newnodes']
3405 3405 assert isinstance(nn, list) # list of bytes
3406 3406 nn.append(node)
3407 3407
3408 3408 # remove state when we complete successfully
3409 3409 if not opts.get('dry_run'):
3410 3410 graftstate.delete()
3411 3411
3412 3412 return 0
3413 3413
3414 3414
3415 3415 def _stopgraft(ui, repo, graftstate):
3416 3416 """stop the interrupted graft"""
3417 3417 if not graftstate.exists():
3418 3418 raise error.StateError(_(b"no interrupted graft found"))
3419 3419 pctx = repo[b'.']
3420 3420 mergemod.clean_update(pctx)
3421 3421 graftstate.delete()
3422 3422 ui.status(_(b"stopped the interrupted graft\n"))
3423 3423 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3424 3424 return 0
3425 3425
3426 3426
3427 3427 statemod.addunfinished(
3428 3428 b'graft',
3429 3429 fname=b'graftstate',
3430 3430 clearable=True,
3431 3431 stopflag=True,
3432 3432 continueflag=True,
3433 3433 abortfunc=cmdutil.hgabortgraft,
3434 3434 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3435 3435 )
3436 3436
3437 3437
3438 3438 @command(
3439 3439 b'grep',
3440 3440 [
3441 3441 (b'0', b'print0', None, _(b'end fields with NUL')),
3442 3442 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3443 3443 (
3444 3444 b'',
3445 3445 b'diff',
3446 3446 None,
3447 3447 _(
3448 3448 b'search revision differences for when the pattern was added '
3449 3449 b'or removed'
3450 3450 ),
3451 3451 ),
3452 3452 (b'a', b'text', None, _(b'treat all files as text')),
3453 3453 (
3454 3454 b'f',
3455 3455 b'follow',
3456 3456 None,
3457 3457 _(
3458 3458 b'follow changeset history,'
3459 3459 b' or file history across copies and renames'
3460 3460 ),
3461 3461 ),
3462 3462 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3463 3463 (
3464 3464 b'l',
3465 3465 b'files-with-matches',
3466 3466 None,
3467 3467 _(b'print only filenames and revisions that match'),
3468 3468 ),
3469 3469 (b'n', b'line-number', None, _(b'print matching line numbers')),
3470 3470 (
3471 3471 b'r',
3472 3472 b'rev',
3473 3473 [],
3474 3474 _(b'search files changed within revision range'),
3475 3475 _(b'REV'),
3476 3476 ),
3477 3477 (
3478 3478 b'',
3479 3479 b'all-files',
3480 3480 None,
3481 3481 _(
3482 3482 b'include all files in the changeset while grepping (DEPRECATED)'
3483 3483 ),
3484 3484 ),
3485 3485 (b'u', b'user', None, _(b'list the author (long with -v)')),
3486 3486 (b'd', b'date', None, _(b'list the date (short with -q)')),
3487 3487 ]
3488 3488 + formatteropts
3489 3489 + walkopts,
3490 3490 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3491 3491 helpcategory=command.CATEGORY_FILE_CONTENTS,
3492 3492 inferrepo=True,
3493 3493 intents={INTENT_READONLY},
3494 3494 )
3495 3495 def grep(ui, repo, pattern, *pats, **opts):
3496 3496 """search for a pattern in specified files
3497 3497
3498 3498 Search the working directory or revision history for a regular
3499 3499 expression in the specified files for the entire repository.
3500 3500
3501 3501 By default, grep searches the repository files in the working
3502 3502 directory and prints the files where it finds a match. To specify
3503 3503 historical revisions instead of the working directory, use the
3504 3504 --rev flag.
3505 3505
3506 3506 To search instead historical revision differences that contains a
3507 3507 change in match status ("-" for a match that becomes a non-match,
3508 3508 or "+" for a non-match that becomes a match), use the --diff flag.
3509 3509
3510 3510 PATTERN can be any Python (roughly Perl-compatible) regular
3511 3511 expression.
3512 3512
3513 3513 If no FILEs are specified and the --rev flag isn't supplied, all
3514 3514 files in the working directory are searched. When using the --rev
3515 3515 flag and specifying FILEs, use the --follow argument to also
3516 3516 follow the specified FILEs across renames and copies.
3517 3517
3518 3518 .. container:: verbose
3519 3519
3520 3520 Template:
3521 3521
3522 3522 The following keywords are supported in addition to the common template
3523 3523 keywords and functions. See also :hg:`help templates`.
3524 3524
3525 3525 :change: String. Character denoting insertion ``+`` or removal ``-``.
3526 3526 Available if ``--diff`` is specified.
3527 3527 :lineno: Integer. Line number of the match.
3528 3528 :path: String. Repository-absolute path of the file.
3529 3529 :texts: List of text chunks.
3530 3530
3531 3531 And each entry of ``{texts}`` provides the following sub-keywords.
3532 3532
3533 3533 :matched: Boolean. True if the chunk matches the specified pattern.
3534 3534 :text: String. Chunk content.
3535 3535
3536 3536 See :hg:`help templates.operators` for the list expansion syntax.
3537 3537
3538 3538 Returns 0 if a match is found, 1 otherwise.
3539 3539
3540 3540 """
3541 3541 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3542 3542
3543 3543 diff = opts.get('all') or opts.get('diff')
3544 3544 follow = opts.get('follow')
3545 3545 if opts.get('all_files') is None and not diff:
3546 3546 opts['all_files'] = True
3547 3547 plaingrep = (
3548 3548 opts.get('all_files') and not opts.get('rev') and not opts.get('follow')
3549 3549 )
3550 3550 all_files = opts.get('all_files')
3551 3551 if plaingrep:
3552 3552 opts['rev'] = [b'wdir()']
3553 3553
3554 3554 reflags = re.M
3555 3555 if opts.get('ignore_case'):
3556 3556 reflags |= re.I
3557 3557 try:
3558 3558 regexp = util.re.compile(pattern, reflags)
3559 3559 except re.error as inst:
3560 3560 ui.warn(
3561 3561 _(b"grep: invalid match pattern: %s\n")
3562 3562 % stringutil.forcebytestr(inst)
3563 3563 )
3564 3564 return 1
3565 3565 sep, eol = b':', b'\n'
3566 3566 if opts.get('print0'):
3567 3567 sep = eol = b'\0'
3568 3568
3569 3569 searcher = grepmod.grepsearcher(
3570 3570 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3571 3571 )
3572 3572
3573 3573 getfile = searcher._getfile
3574 3574
3575 3575 uipathfn = scmutil.getuipathfn(repo)
3576 3576
3577 3577 def display(fm, fn, ctx, pstates, states):
3578 3578 rev = scmutil.intrev(ctx)
3579 3579 if fm.isplain():
3580 3580 formatuser = ui.shortuser
3581 3581 else:
3582 3582 formatuser = pycompat.bytestr
3583 3583 if ui.quiet:
3584 3584 datefmt = b'%Y-%m-%d'
3585 3585 else:
3586 3586 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3587 3587 found = False
3588 3588
3589 3589 @util.cachefunc
3590 3590 def binary():
3591 3591 flog = getfile(fn)
3592 3592 try:
3593 3593 return stringutil.binary(flog.read(ctx.filenode(fn)))
3594 3594 except error.WdirUnsupported:
3595 3595 return ctx[fn].isbinary()
3596 3596
3597 3597 fieldnamemap = {b'linenumber': b'lineno'}
3598 3598 if diff:
3599 3599 iter = grepmod.difflinestates(pstates, states)
3600 3600 else:
3601 3601 iter = [(b'', l) for l in states]
3602 3602 for change, l in iter:
3603 3603 fm.startitem()
3604 3604 fm.context(ctx=ctx)
3605 3605 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3606 3606 fm.plain(uipathfn(fn), label=b'grep.filename')
3607 3607
3608 3608 cols = [
3609 3609 (b'rev', b'%d', rev, not plaingrep, b''),
3610 3610 (
3611 3611 b'linenumber',
3612 3612 b'%d',
3613 3613 l.linenum,
3614 3614 opts.get('line_number'),
3615 3615 b'',
3616 3616 ),
3617 3617 ]
3618 3618 if diff:
3619 3619 cols.append(
3620 3620 (
3621 3621 b'change',
3622 3622 b'%s',
3623 3623 change,
3624 3624 True,
3625 3625 b'grep.inserted '
3626 3626 if change == b'+'
3627 3627 else b'grep.deleted ',
3628 3628 )
3629 3629 )
3630 3630 cols.extend(
3631 3631 [
3632 3632 (
3633 3633 b'user',
3634 3634 b'%s',
3635 3635 formatuser(ctx.user()),
3636 3636 opts.get('user'),
3637 3637 b'',
3638 3638 ),
3639 3639 (
3640 3640 b'date',
3641 3641 b'%s',
3642 3642 fm.formatdate(ctx.date(), datefmt),
3643 3643 opts.get('date'),
3644 3644 b'',
3645 3645 ),
3646 3646 ]
3647 3647 )
3648 3648 for name, fmt, data, cond, extra_label in cols:
3649 3649 if cond:
3650 3650 fm.plain(sep, label=b'grep.sep')
3651 3651 field = fieldnamemap.get(name, name)
3652 3652 label = extra_label + (b'grep.%s' % name)
3653 3653 fm.condwrite(cond, field, fmt, data, label=label)
3654 3654 if not opts.get('files_with_matches'):
3655 3655 fm.plain(sep, label=b'grep.sep')
3656 3656 if not opts.get('text') and binary():
3657 3657 fm.plain(_(b" Binary file matches"))
3658 3658 else:
3659 3659 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3660 3660 fm.plain(eol)
3661 3661 found = True
3662 3662 if opts.get('files_with_matches'):
3663 3663 break
3664 3664 return found
3665 3665
3666 3666 def displaymatches(fm, l):
3667 3667 p = 0
3668 3668 for s, e in l.findpos(regexp):
3669 3669 if p < s:
3670 3670 fm.startitem()
3671 3671 fm.write(b'text', b'%s', l.line[p:s])
3672 3672 fm.data(matched=False)
3673 3673 fm.startitem()
3674 3674 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3675 3675 fm.data(matched=True)
3676 3676 p = e
3677 3677 if p < len(l.line):
3678 3678 fm.startitem()
3679 3679 fm.write(b'text', b'%s', l.line[p:])
3680 3680 fm.data(matched=False)
3681 3681 fm.end()
3682 3682
3683 3683 found = False
3684 3684
3685 3685 wopts = logcmdutil.walkopts(
3686 3686 pats=pats,
3687 3687 opts=opts,
3688 3688 revspec=opts['rev'],
3689 3689 include_pats=opts['include'],
3690 3690 exclude_pats=opts['exclude'],
3691 3691 follow=follow,
3692 3692 force_changelog_traversal=all_files,
3693 3693 filter_revisions_by_pats=not all_files,
3694 3694 )
3695 3695 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3696 3696
3697 3697 ui.pager(b'grep')
3698 3698 fm = ui.formatter(b'grep', pycompat.byteskwargs(opts))
3699 3699 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3700 3700 r = display(fm, fn, ctx, pstates, states)
3701 3701 found = found or r
3702 3702 if r and not diff and not all_files:
3703 3703 searcher.skipfile(fn, ctx.rev())
3704 3704 fm.end()
3705 3705
3706 3706 return not found
3707 3707
3708 3708
3709 3709 @command(
3710 3710 b'heads',
3711 3711 [
3712 3712 (
3713 3713 b'r',
3714 3714 b'rev',
3715 3715 b'',
3716 3716 _(b'show only heads which are descendants of STARTREV'),
3717 3717 _(b'STARTREV'),
3718 3718 ),
3719 3719 (b't', b'topo', False, _(b'show topological heads only')),
3720 3720 (
3721 3721 b'a',
3722 3722 b'active',
3723 3723 False,
3724 3724 _(b'show active branchheads only (DEPRECATED)'),
3725 3725 ),
3726 3726 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3727 3727 ]
3728 3728 + templateopts,
3729 3729 _(b'[-ct] [-r STARTREV] [REV]...'),
3730 3730 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3731 3731 intents={INTENT_READONLY},
3732 3732 )
3733 3733 def heads(ui, repo, *branchrevs, **opts):
3734 3734 """show branch heads
3735 3735
3736 3736 With no arguments, show all open branch heads in the repository.
3737 3737 Branch heads are changesets that have no descendants on the
3738 3738 same branch. They are where development generally takes place and
3739 3739 are the usual targets for update and merge operations.
3740 3740
3741 3741 If one or more REVs are given, only open branch heads on the
3742 3742 branches associated with the specified changesets are shown. This
3743 3743 means that you can use :hg:`heads .` to see the heads on the
3744 3744 currently checked-out branch.
3745 3745
3746 3746 If -c/--closed is specified, also show branch heads marked closed
3747 3747 (see :hg:`commit --close-branch`).
3748 3748
3749 3749 If STARTREV is specified, only those heads that are descendants of
3750 3750 STARTREV will be displayed.
3751 3751
3752 3752 If -t/--topo is specified, named branch mechanics will be ignored and only
3753 3753 topological heads (changesets with no children) will be shown.
3754 3754
3755 3755 Returns 0 if matching heads are found, 1 if not.
3756 3756 """
3757 3757
3758 3758 opts = pycompat.byteskwargs(opts)
3759 3759 start = None
3760 3760 rev = opts.get(b'rev')
3761 3761 if rev:
3762 3762 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3763 3763 start = logcmdutil.revsingle(repo, rev, None).node()
3764 3764
3765 3765 if opts.get(b'topo'):
3766 3766 heads = [repo[h] for h in repo.heads(start)]
3767 3767 else:
3768 3768 heads = []
3769 3769 for branch in repo.branchmap():
3770 3770 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3771 3771 heads = [repo[h] for h in heads]
3772 3772
3773 3773 if branchrevs:
3774 3774 branches = {
3775 3775 repo[r].branch() for r in logcmdutil.revrange(repo, branchrevs)
3776 3776 }
3777 3777 heads = [h for h in heads if h.branch() in branches]
3778 3778
3779 3779 if opts.get(b'active') and branchrevs:
3780 3780 dagheads = repo.heads(start)
3781 3781 heads = [h for h in heads if h.node() in dagheads]
3782 3782
3783 3783 if branchrevs:
3784 3784 haveheads = {h.branch() for h in heads}
3785 3785 if branches - haveheads:
3786 3786 headless = b', '.join(b for b in branches - haveheads)
3787 3787 msg = _(b'no open branch heads found on branches %s')
3788 3788 if opts.get(b'rev'):
3789 3789 msg += _(b' (started at %s)') % opts[b'rev']
3790 3790 ui.warn((msg + b'\n') % headless)
3791 3791
3792 3792 if not heads:
3793 3793 return 1
3794 3794
3795 3795 ui.pager(b'heads')
3796 3796 heads = sorted(heads, key=lambda x: -(x.rev()))
3797 3797 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3798 3798 for ctx in heads:
3799 3799 displayer.show(ctx)
3800 3800 displayer.close()
3801 3801
3802 3802
3803 3803 @command(
3804 3804 b'help',
3805 3805 [
3806 3806 (b'e', b'extension', None, _(b'show only help for extensions')),
3807 3807 (b'c', b'command', None, _(b'show only help for commands')),
3808 3808 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3809 3809 (
3810 3810 b's',
3811 3811 b'system',
3812 3812 [],
3813 3813 _(b'show help for specific platform(s)'),
3814 3814 _(b'PLATFORM'),
3815 3815 ),
3816 3816 ],
3817 3817 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3818 3818 helpcategory=command.CATEGORY_HELP,
3819 3819 norepo=True,
3820 3820 intents={INTENT_READONLY},
3821 3821 )
3822 3822 def help_(ui, name=None, **opts):
3823 3823 """show help for a given topic or a help overview
3824 3824
3825 3825 With no arguments, print a list of commands with short help messages.
3826 3826
3827 3827 Given a topic, extension, or command name, print help for that
3828 3828 topic.
3829 3829
3830 3830 Returns 0 if successful.
3831 3831 """
3832 3832
3833 3833 keep = opts.get('system') or []
3834 3834 if len(keep) == 0:
3835 3835 if pycompat.sysplatform.startswith(b'win'):
3836 3836 keep.append(b'windows')
3837 3837 elif pycompat.sysplatform == b'OpenVMS':
3838 3838 keep.append(b'vms')
3839 3839 elif pycompat.sysplatform == b'plan9':
3840 3840 keep.append(b'plan9')
3841 3841 else:
3842 3842 keep.append(b'unix')
3843 3843 keep.append(pycompat.sysplatform.lower())
3844 3844 if ui.verbose:
3845 3845 keep.append(b'verbose')
3846 3846
3847 3847 commands = sys.modules[__name__]
3848 3848 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3849 3849 ui.pager(b'help')
3850 3850 ui.write(formatted)
3851 3851
3852 3852
3853 3853 @command(
3854 3854 b'identify|id',
3855 3855 [
3856 3856 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3857 3857 (b'n', b'num', None, _(b'show local revision number')),
3858 3858 (b'i', b'id', None, _(b'show global revision id')),
3859 3859 (b'b', b'branch', None, _(b'show branch')),
3860 3860 (b't', b'tags', None, _(b'show tags')),
3861 3861 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3862 3862 ]
3863 3863 + remoteopts
3864 3864 + formatteropts,
3865 3865 _(b'[-nibtB] [-r REV] [SOURCE]'),
3866 3866 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3867 3867 optionalrepo=True,
3868 3868 intents={INTENT_READONLY},
3869 3869 )
3870 3870 def identify(
3871 3871 ui,
3872 3872 repo,
3873 3873 source=None,
3874 3874 rev=None,
3875 3875 num=None,
3876 3876 id=None,
3877 3877 branch=None,
3878 3878 tags=None,
3879 3879 bookmarks=None,
3880 3880 **opts
3881 3881 ):
3882 3882 """identify the working directory or specified revision
3883 3883
3884 3884 Print a summary identifying the repository state at REV using one or
3885 3885 two parent hash identifiers, followed by a "+" if the working
3886 3886 directory has uncommitted changes, the branch name (if not default),
3887 3887 a list of tags, and a list of bookmarks.
3888 3888
3889 3889 When REV is not given, print a summary of the current state of the
3890 3890 repository including the working directory. Specify -r. to get information
3891 3891 of the working directory parent without scanning uncommitted changes.
3892 3892
3893 3893 Specifying a path to a repository root or Mercurial bundle will
3894 3894 cause lookup to operate on that repository/bundle.
3895 3895
3896 3896 .. container:: verbose
3897 3897
3898 3898 Template:
3899 3899
3900 3900 The following keywords are supported in addition to the common template
3901 3901 keywords and functions. See also :hg:`help templates`.
3902 3902
3903 3903 :dirty: String. Character ``+`` denoting if the working directory has
3904 3904 uncommitted changes.
3905 3905 :id: String. One or two nodes, optionally followed by ``+``.
3906 3906 :parents: List of strings. Parent nodes of the changeset.
3907 3907
3908 3908 Examples:
3909 3909
3910 3910 - generate a build identifier for the working directory::
3911 3911
3912 3912 hg id --id > build-id.dat
3913 3913
3914 3914 - find the revision corresponding to a tag::
3915 3915
3916 3916 hg id -n -r 1.3
3917 3917
3918 3918 - check the most recent revision of a remote repository::
3919 3919
3920 3920 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3921 3921
3922 3922 See :hg:`log` for generating more information about specific revisions,
3923 3923 including full hash identifiers.
3924 3924
3925 3925 Returns 0 if successful.
3926 3926 """
3927 3927
3928 3928 opts = pycompat.byteskwargs(opts)
3929 3929 if not repo and not source:
3930 3930 raise error.InputError(
3931 3931 _(b"there is no Mercurial repository here (.hg not found)")
3932 3932 )
3933 3933
3934 3934 default = not (num or id or branch or tags or bookmarks)
3935 3935 output = []
3936 3936 revs = []
3937 3937
3938 3938 peer = None
3939 3939 try:
3940 3940 if source:
3941 3941 path = urlutil.get_unique_pull_path_obj(b'identify', ui, source)
3942 3942 # only pass ui when no repo
3943 3943 peer = hg.peer(repo or ui, opts, path)
3944 3944 repo = peer.local()
3945 3945 branches = (path.branch, [])
3946 3946 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3947 3947
3948 3948 fm = ui.formatter(b'identify', opts)
3949 3949 fm.startitem()
3950 3950
3951 3951 if not repo:
3952 3952 if num or branch or tags:
3953 3953 raise error.InputError(
3954 3954 _(b"can't query remote revision number, branch, or tags")
3955 3955 )
3956 3956 if not rev and revs:
3957 3957 rev = revs[0]
3958 3958 if not rev:
3959 3959 rev = b"tip"
3960 3960
3961 3961 remoterev = peer.lookup(rev)
3962 3962 hexrev = fm.hexfunc(remoterev)
3963 3963 if default or id:
3964 3964 output = [hexrev]
3965 3965 fm.data(id=hexrev)
3966 3966
3967 3967 @util.cachefunc
3968 3968 def getbms():
3969 3969 bms = []
3970 3970
3971 3971 if b'bookmarks' in peer.listkeys(b'namespaces'):
3972 3972 hexremoterev = hex(remoterev)
3973 3973 bms = [
3974 3974 bm
3975 3975 for bm, bmr in peer.listkeys(b'bookmarks').items()
3976 3976 if bmr == hexremoterev
3977 3977 ]
3978 3978
3979 3979 return sorted(bms)
3980 3980
3981 3981 if fm.isplain():
3982 3982 if bookmarks:
3983 3983 output.extend(getbms())
3984 3984 elif default and not ui.quiet:
3985 3985 # multiple bookmarks for a single parent separated by '/'
3986 3986 bm = b'/'.join(getbms())
3987 3987 if bm:
3988 3988 output.append(bm)
3989 3989 else:
3990 3990 fm.data(node=hex(remoterev))
3991 3991 if bookmarks or b'bookmarks' in fm.datahint():
3992 3992 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3993 3993 else:
3994 3994 if rev:
3995 3995 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3996 3996 ctx = logcmdutil.revsingle(repo, rev, None)
3997 3997
3998 3998 if ctx.rev() is None:
3999 3999 ctx = repo[None]
4000 4000 parents = ctx.parents()
4001 4001 taglist = []
4002 4002 for p in parents:
4003 4003 taglist.extend(p.tags())
4004 4004
4005 4005 dirty = b""
4006 4006 if ctx.dirty(missing=True, merge=False, branch=False):
4007 4007 dirty = b'+'
4008 4008 fm.data(dirty=dirty)
4009 4009
4010 4010 hexoutput = [fm.hexfunc(p.node()) for p in parents]
4011 4011 if default or id:
4012 4012 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
4013 4013 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
4014 4014
4015 4015 if num:
4016 4016 numoutput = [b"%d" % p.rev() for p in parents]
4017 4017 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
4018 4018
4019 4019 fm.data(
4020 4020 parents=fm.formatlist(
4021 4021 [fm.hexfunc(p.node()) for p in parents], name=b'node'
4022 4022 )
4023 4023 )
4024 4024 else:
4025 4025 hexoutput = fm.hexfunc(ctx.node())
4026 4026 if default or id:
4027 4027 output = [hexoutput]
4028 4028 fm.data(id=hexoutput)
4029 4029
4030 4030 if num:
4031 4031 output.append(pycompat.bytestr(ctx.rev()))
4032 4032 taglist = ctx.tags()
4033 4033
4034 4034 if default and not ui.quiet:
4035 4035 b = ctx.branch()
4036 4036 if b != b'default':
4037 4037 output.append(b"(%s)" % b)
4038 4038
4039 4039 # multiple tags for a single parent separated by '/'
4040 4040 t = b'/'.join(taglist)
4041 4041 if t:
4042 4042 output.append(t)
4043 4043
4044 4044 # multiple bookmarks for a single parent separated by '/'
4045 4045 bm = b'/'.join(ctx.bookmarks())
4046 4046 if bm:
4047 4047 output.append(bm)
4048 4048 else:
4049 4049 if branch:
4050 4050 output.append(ctx.branch())
4051 4051
4052 4052 if tags:
4053 4053 output.extend(taglist)
4054 4054
4055 4055 if bookmarks:
4056 4056 output.extend(ctx.bookmarks())
4057 4057
4058 4058 fm.data(node=ctx.hex())
4059 4059 fm.data(branch=ctx.branch())
4060 4060 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4061 4061 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4062 4062 fm.context(ctx=ctx)
4063 4063
4064 4064 fm.plain(b"%s\n" % b' '.join(output))
4065 4065 fm.end()
4066 4066 finally:
4067 4067 if peer:
4068 4068 peer.close()
4069 4069
4070 4070
4071 4071 @command(
4072 4072 b'import|patch',
4073 4073 [
4074 4074 (
4075 4075 b'p',
4076 4076 b'strip',
4077 4077 1,
4078 4078 _(
4079 4079 b'directory strip option for patch. This has the same '
4080 4080 b'meaning as the corresponding patch option'
4081 4081 ),
4082 4082 _(b'NUM'),
4083 4083 ),
4084 4084 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4085 4085 (b'', b'secret', None, _(b'use the secret phase for committing')),
4086 4086 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4087 4087 (
4088 4088 b'f',
4089 4089 b'force',
4090 4090 None,
4091 4091 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4092 4092 ),
4093 4093 (
4094 4094 b'',
4095 4095 b'no-commit',
4096 4096 None,
4097 4097 _(b"don't commit, just update the working directory"),
4098 4098 ),
4099 4099 (
4100 4100 b'',
4101 4101 b'bypass',
4102 4102 None,
4103 4103 _(b"apply patch without touching the working directory"),
4104 4104 ),
4105 4105 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4106 4106 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4107 4107 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4108 4108 (
4109 4109 b'',
4110 4110 b'import-branch',
4111 4111 None,
4112 4112 _(b'use any branch information in patch (implied by --exact)'),
4113 4113 ),
4114 4114 ]
4115 4115 + commitopts
4116 4116 + commitopts2
4117 4117 + similarityopts,
4118 4118 _(b'[OPTION]... PATCH...'),
4119 4119 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4120 4120 )
4121 4121 def import_(ui, repo, patch1=None, *patches, **opts):
4122 4122 """import an ordered set of patches
4123 4123
4124 4124 Import a list of patches and commit them individually (unless
4125 4125 --no-commit is specified).
4126 4126
4127 4127 To read a patch from standard input (stdin), use "-" as the patch
4128 4128 name. If a URL is specified, the patch will be downloaded from
4129 4129 there.
4130 4130
4131 4131 Import first applies changes to the working directory (unless
4132 4132 --bypass is specified), import will abort if there are outstanding
4133 4133 changes.
4134 4134
4135 4135 Use --bypass to apply and commit patches directly to the
4136 4136 repository, without affecting the working directory. Without
4137 4137 --exact, patches will be applied on top of the working directory
4138 4138 parent revision.
4139 4139
4140 4140 You can import a patch straight from a mail message. Even patches
4141 4141 as attachments work (to use the body part, it must have type
4142 4142 text/plain or text/x-patch). From and Subject headers of email
4143 4143 message are used as default committer and commit message. All
4144 4144 text/plain body parts before first diff are added to the commit
4145 4145 message.
4146 4146
4147 4147 If the imported patch was generated by :hg:`export`, user and
4148 4148 description from patch override values from message headers and
4149 4149 body. Values given on command line with -m/--message and -u/--user
4150 4150 override these.
4151 4151
4152 4152 If --exact is specified, import will set the working directory to
4153 4153 the parent of each patch before applying it, and will abort if the
4154 4154 resulting changeset has a different ID than the one recorded in
4155 4155 the patch. This will guard against various ways that portable
4156 4156 patch formats and mail systems might fail to transfer Mercurial
4157 4157 data or metadata. See :hg:`bundle` for lossless transmission.
4158 4158
4159 4159 Use --partial to ensure a changeset will be created from the patch
4160 4160 even if some hunks fail to apply. Hunks that fail to apply will be
4161 4161 written to a <target-file>.rej file. Conflicts can then be resolved
4162 4162 by hand before :hg:`commit --amend` is run to update the created
4163 4163 changeset. This flag exists to let people import patches that
4164 4164 partially apply without losing the associated metadata (author,
4165 4165 date, description, ...).
4166 4166
4167 4167 .. note::
4168 4168
4169 4169 When no hunks apply cleanly, :hg:`import --partial` will create
4170 4170 an empty changeset, importing only the patch metadata.
4171 4171
4172 4172 With -s/--similarity, hg will attempt to discover renames and
4173 4173 copies in the patch in the same way as :hg:`addremove`.
4174 4174
4175 4175 It is possible to use external patch programs to perform the patch
4176 4176 by setting the ``ui.patch`` configuration option. For the default
4177 4177 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4178 4178 See :hg:`help config` for more information about configuration
4179 4179 files and how to use these options.
4180 4180
4181 4181 See :hg:`help dates` for a list of formats valid for -d/--date.
4182 4182
4183 4183 .. container:: verbose
4184 4184
4185 4185 Examples:
4186 4186
4187 4187 - import a traditional patch from a website and detect renames::
4188 4188
4189 4189 hg import -s 80 http://example.com/bugfix.patch
4190 4190
4191 4191 - import a changeset from an hgweb server::
4192 4192
4193 4193 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4194 4194
4195 4195 - import all the patches in an Unix-style mbox::
4196 4196
4197 4197 hg import incoming-patches.mbox
4198 4198
4199 4199 - import patches from stdin::
4200 4200
4201 4201 hg import -
4202 4202
4203 4203 - attempt to exactly restore an exported changeset (not always
4204 4204 possible)::
4205 4205
4206 4206 hg import --exact proposed-fix.patch
4207 4207
4208 4208 - use an external tool to apply a patch which is too fuzzy for
4209 4209 the default internal tool.
4210 4210
4211 4211 hg import --config ui.patch="patch --merge" fuzzy.patch
4212 4212
4213 4213 - change the default fuzzing from 2 to a less strict 7
4214 4214
4215 4215 hg import --config ui.fuzz=7 fuzz.patch
4216 4216
4217 4217 Returns 0 on success, 1 on partial success (see --partial).
4218 4218 """
4219 4219
4220 4220 cmdutil.check_incompatible_arguments(
4221 4221 opts, 'no_commit', ['bypass', 'secret']
4222 4222 )
4223 4223 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4224 4224 opts = pycompat.byteskwargs(opts)
4225 4225 if not patch1:
4226 4226 raise error.InputError(_(b'need at least one patch to import'))
4227 4227
4228 4228 patches = (patch1,) + patches
4229 4229
4230 4230 date = opts.get(b'date')
4231 4231 if date:
4232 4232 opts[b'date'] = dateutil.parsedate(date)
4233 4233
4234 4234 exact = opts.get(b'exact')
4235 4235 update = not opts.get(b'bypass')
4236 4236 try:
4237 4237 sim = float(opts.get(b'similarity') or 0)
4238 4238 except ValueError:
4239 4239 raise error.InputError(_(b'similarity must be a number'))
4240 4240 if sim < 0 or sim > 100:
4241 4241 raise error.InputError(_(b'similarity must be between 0 and 100'))
4242 4242 if sim and not update:
4243 4243 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4244 4244
4245 4245 base = opts[b"base"]
4246 4246 msgs = []
4247 4247 ret = 0
4248 4248
4249 4249 with repo.wlock():
4250 4250 if update:
4251 4251 cmdutil.checkunfinished(repo)
4252 4252 if exact or not opts.get(b'force'):
4253 4253 cmdutil.bailifchanged(repo)
4254 4254
4255 4255 if not opts.get(b'no_commit'):
4256 4256 lock = repo.lock
4257 4257 tr = lambda: repo.transaction(b'import')
4258 4258 else:
4259 4259 lock = util.nullcontextmanager
4260 4260 tr = util.nullcontextmanager
4261 4261 with lock(), tr():
4262 4262 parents = repo[None].parents()
4263 4263 for patchurl in patches:
4264 4264 if patchurl == b'-':
4265 4265 ui.status(_(b'applying patch from stdin\n'))
4266 4266 patchfile = ui.fin
4267 4267 patchurl = b'stdin' # for error message
4268 4268 else:
4269 4269 patchurl = os.path.join(base, patchurl)
4270 4270 ui.status(_(b'applying %s\n') % patchurl)
4271 4271 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4272 4272
4273 4273 haspatch = False
4274 4274 for hunk in patch.split(patchfile):
4275 4275 with patch.extract(ui, hunk) as patchdata:
4276 4276 msg, node, rej = cmdutil.tryimportone(
4277 4277 ui, repo, patchdata, parents, opts, msgs, hg.clean
4278 4278 )
4279 4279 if msg:
4280 4280 haspatch = True
4281 4281 ui.note(msg + b'\n')
4282 4282 if update or exact:
4283 4283 parents = repo[None].parents()
4284 4284 else:
4285 4285 parents = [repo[node]]
4286 4286 if rej:
4287 4287 ui.write_err(_(b"patch applied partially\n"))
4288 4288 ui.write_err(
4289 4289 _(
4290 4290 b"(fix the .rej files and run "
4291 4291 b"`hg commit --amend`)\n"
4292 4292 )
4293 4293 )
4294 4294 ret = 1
4295 4295 break
4296 4296
4297 4297 if not haspatch:
4298 4298 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4299 4299
4300 4300 if msgs:
4301 4301 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4302 4302 return ret
4303 4303
4304 4304
4305 4305 @command(
4306 4306 b'incoming|in',
4307 4307 [
4308 4308 (
4309 4309 b'f',
4310 4310 b'force',
4311 4311 None,
4312 4312 _(b'run even if remote repository is unrelated'),
4313 4313 ),
4314 4314 (b'n', b'newest-first', None, _(b'show newest record first')),
4315 4315 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4316 4316 (
4317 4317 b'r',
4318 4318 b'rev',
4319 4319 [],
4320 4320 _(b'a remote changeset intended to be added'),
4321 4321 _(b'REV'),
4322 4322 ),
4323 4323 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4324 4324 (
4325 4325 b'b',
4326 4326 b'branch',
4327 4327 [],
4328 4328 _(b'a specific branch you would like to pull'),
4329 4329 _(b'BRANCH'),
4330 4330 ),
4331 4331 ]
4332 4332 + logopts
4333 4333 + remoteopts
4334 4334 + subrepoopts,
4335 4335 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4336 4336 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4337 4337 )
4338 4338 def incoming(ui, repo, source=b"default", **opts):
4339 4339 """show new changesets found in source
4340 4340
4341 4341 Show new changesets found in the specified path/URL or the default
4342 4342 pull location. These are the changesets that would have been pulled
4343 4343 by :hg:`pull` at the time you issued this command.
4344 4344
4345 4345 See pull for valid source format details.
4346 4346
4347 4347 .. container:: verbose
4348 4348
4349 4349 With -B/--bookmarks, the result of bookmark comparison between
4350 4350 local and remote repositories is displayed. With -v/--verbose,
4351 4351 status is also displayed for each bookmark like below::
4352 4352
4353 4353 BM1 01234567890a added
4354 4354 BM2 1234567890ab advanced
4355 4355 BM3 234567890abc diverged
4356 4356 BM4 34567890abcd changed
4357 4357
4358 4358 The action taken locally when pulling depends on the
4359 4359 status of each bookmark:
4360 4360
4361 4361 :``added``: pull will create it
4362 4362 :``advanced``: pull will update it
4363 4363 :``diverged``: pull will create a divergent bookmark
4364 4364 :``changed``: result depends on remote changesets
4365 4365
4366 4366 From the point of view of pulling behavior, bookmark
4367 4367 existing only in the remote repository are treated as ``added``,
4368 4368 even if it is in fact locally deleted.
4369 4369
4370 4370 .. container:: verbose
4371 4371
4372 4372 For remote repository, using --bundle avoids downloading the
4373 4373 changesets twice if the incoming is followed by a pull.
4374 4374
4375 4375 Examples:
4376 4376
4377 4377 - show incoming changes with patches and full description::
4378 4378
4379 4379 hg incoming -vp
4380 4380
4381 4381 - show incoming changes excluding merges, store a bundle::
4382 4382
4383 4383 hg in -vpM --bundle incoming.hg
4384 4384 hg pull incoming.hg
4385 4385
4386 4386 - briefly list changes inside a bundle::
4387 4387
4388 4388 hg in changes.hg -T "{desc|firstline}\\n"
4389 4389
4390 4390 Returns 0 if there are incoming changes, 1 otherwise.
4391 4391 """
4392 4392 opts = pycompat.byteskwargs(opts)
4393 4393 if opts.get(b'graph'):
4394 4394 logcmdutil.checkunsupportedgraphflags([], opts)
4395 4395
4396 4396 def display(other, chlist, displayer):
4397 4397 revdag = logcmdutil.graphrevs(other, chlist, opts)
4398 4398 logcmdutil.displaygraph(
4399 4399 ui, repo, revdag, displayer, graphmod.asciiedges
4400 4400 )
4401 4401
4402 4402 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4403 4403 return 0
4404 4404
4405 4405 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4406 4406
4407 4407 if opts.get(b'bookmarks'):
4408 4408 srcs = urlutil.get_pull_paths(repo, ui, [source])
4409 4409 for path in srcs:
4410 4410 # XXX the "branches" options are not used. Should it be used?
4411 4411 other = hg.peer(repo, opts, path)
4412 4412 try:
4413 4413 if b'bookmarks' not in other.listkeys(b'namespaces'):
4414 4414 ui.warn(_(b"remote doesn't support bookmarks\n"))
4415 4415 return 0
4416 4416 ui.pager(b'incoming')
4417 4417 ui.status(
4418 4418 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
4419 4419 )
4420 4420 return bookmarks.incoming(
4421 4421 ui, repo, other, mode=path.bookmarks_mode
4422 4422 )
4423 4423 finally:
4424 4424 other.close()
4425 4425
4426 4426 return hg.incoming(ui, repo, source, opts)
4427 4427
4428 4428
4429 4429 @command(
4430 4430 b'init',
4431 4431 remoteopts,
4432 4432 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4433 4433 helpcategory=command.CATEGORY_REPO_CREATION,
4434 4434 helpbasic=True,
4435 4435 norepo=True,
4436 4436 )
4437 4437 def init(ui, dest=b".", **opts):
4438 4438 """create a new repository in the given directory
4439 4439
4440 4440 Initialize a new repository in the given directory. If the given
4441 4441 directory does not exist, it will be created.
4442 4442
4443 4443 If no directory is given, the current directory is used.
4444 4444
4445 4445 It is possible to specify an ``ssh://`` URL as the destination.
4446 4446 See :hg:`help urls` for more information.
4447 4447
4448 4448 Returns 0 on success.
4449 4449 """
4450 4450 opts = pycompat.byteskwargs(opts)
4451 4451 path = urlutil.get_clone_path_obj(ui, dest)
4452 4452 peer = hg.peer(ui, opts, path, create=True)
4453 4453 peer.close()
4454 4454
4455 4455
4456 4456 @command(
4457 4457 b'locate',
4458 4458 [
4459 4459 (
4460 4460 b'r',
4461 4461 b'rev',
4462 4462 b'',
4463 4463 _(b'search the repository as it is in REV'),
4464 4464 _(b'REV'),
4465 4465 ),
4466 4466 (
4467 4467 b'0',
4468 4468 b'print0',
4469 4469 None,
4470 4470 _(b'end filenames with NUL, for use with xargs'),
4471 4471 ),
4472 4472 (
4473 4473 b'f',
4474 4474 b'fullpath',
4475 4475 None,
4476 4476 _(b'print complete paths from the filesystem root'),
4477 4477 ),
4478 4478 ]
4479 4479 + walkopts,
4480 4480 _(b'[OPTION]... [PATTERN]...'),
4481 4481 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4482 4482 )
4483 4483 def locate(ui, repo, *pats, **opts):
4484 4484 """locate files matching specific patterns (DEPRECATED)
4485 4485
4486 4486 Print files under Mercurial control in the working directory whose
4487 4487 names match the given patterns.
4488 4488
4489 4489 By default, this command searches all directories in the working
4490 4490 directory. To search just the current directory and its
4491 4491 subdirectories, use "--include .".
4492 4492
4493 4493 If no patterns are given to match, this command prints the names
4494 4494 of all files under Mercurial control in the working directory.
4495 4495
4496 4496 If you want to feed the output of this command into the "xargs"
4497 4497 command, use the -0 option to both this command and "xargs". This
4498 4498 will avoid the problem of "xargs" treating single filenames that
4499 4499 contain whitespace as multiple filenames.
4500 4500
4501 4501 See :hg:`help files` for a more versatile command.
4502 4502
4503 4503 Returns 0 if a match is found, 1 otherwise.
4504 4504 """
4505 4505 opts = pycompat.byteskwargs(opts)
4506 4506 if opts.get(b'print0'):
4507 4507 end = b'\0'
4508 4508 else:
4509 4509 end = b'\n'
4510 4510 ctx = logcmdutil.revsingle(repo, opts.get(b'rev'), None)
4511 4511
4512 4512 ret = 1
4513 4513 m = scmutil.match(
4514 4514 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4515 4515 )
4516 4516
4517 4517 ui.pager(b'locate')
4518 4518 if ctx.rev() is None:
4519 4519 # When run on the working copy, "locate" includes removed files, so
4520 4520 # we get the list of files from the dirstate.
4521 4521 filesgen = sorted(repo.dirstate.matches(m))
4522 4522 else:
4523 4523 filesgen = ctx.matches(m)
4524 4524 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4525 4525 for abs in filesgen:
4526 4526 if opts.get(b'fullpath'):
4527 4527 ui.write(repo.wjoin(abs), end)
4528 4528 else:
4529 4529 ui.write(uipathfn(abs), end)
4530 4530 ret = 0
4531 4531
4532 4532 return ret
4533 4533
4534 4534
4535 4535 @command(
4536 4536 b'log|history',
4537 4537 [
4538 4538 (
4539 4539 b'f',
4540 4540 b'follow',
4541 4541 None,
4542 4542 _(
4543 4543 b'follow changeset history, or file history across copies and renames'
4544 4544 ),
4545 4545 ),
4546 4546 (
4547 4547 b'',
4548 4548 b'follow-first',
4549 4549 None,
4550 4550 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4551 4551 ),
4552 4552 (
4553 4553 b'd',
4554 4554 b'date',
4555 4555 b'',
4556 4556 _(b'show revisions matching date spec'),
4557 4557 _(b'DATE'),
4558 4558 ),
4559 4559 (b'C', b'copies', None, _(b'show copied files')),
4560 4560 (
4561 4561 b'k',
4562 4562 b'keyword',
4563 4563 [],
4564 4564 _(b'do case-insensitive search for a given text'),
4565 4565 _(b'TEXT'),
4566 4566 ),
4567 4567 (
4568 4568 b'r',
4569 4569 b'rev',
4570 4570 [],
4571 4571 _(b'revisions to select or follow from'),
4572 4572 _(b'REV'),
4573 4573 ),
4574 4574 (
4575 4575 b'L',
4576 4576 b'line-range',
4577 4577 [],
4578 4578 _(b'follow line range of specified file (EXPERIMENTAL)'),
4579 4579 _(b'FILE,RANGE'),
4580 4580 ),
4581 4581 (
4582 4582 b'',
4583 4583 b'removed',
4584 4584 None,
4585 4585 _(b'include revisions where files were removed'),
4586 4586 ),
4587 4587 (
4588 4588 b'm',
4589 4589 b'only-merges',
4590 4590 None,
4591 4591 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4592 4592 ),
4593 4593 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4594 4594 (
4595 4595 b'',
4596 4596 b'only-branch',
4597 4597 [],
4598 4598 _(
4599 4599 b'show only changesets within the given named branch (DEPRECATED)'
4600 4600 ),
4601 4601 _(b'BRANCH'),
4602 4602 ),
4603 4603 (
4604 4604 b'b',
4605 4605 b'branch',
4606 4606 [],
4607 4607 _(b'show changesets within the given named branch'),
4608 4608 _(b'BRANCH'),
4609 4609 ),
4610 4610 (
4611 4611 b'B',
4612 4612 b'bookmark',
4613 4613 [],
4614 4614 _(b"show changesets within the given bookmark"),
4615 4615 _(b'BOOKMARK'),
4616 4616 ),
4617 4617 (
4618 4618 b'P',
4619 4619 b'prune',
4620 4620 [],
4621 4621 _(b'do not display revision or any of its ancestors'),
4622 4622 _(b'REV'),
4623 4623 ),
4624 4624 ]
4625 4625 + logopts
4626 4626 + walkopts,
4627 4627 _(b'[OPTION]... [FILE]'),
4628 4628 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4629 4629 helpbasic=True,
4630 4630 inferrepo=True,
4631 4631 intents={INTENT_READONLY},
4632 4632 )
4633 4633 def log(ui, repo, *pats, **opts):
4634 4634 """show revision history of entire repository or files
4635 4635
4636 4636 Print the revision history of the specified files or the entire
4637 4637 project.
4638 4638
4639 4639 If no revision range is specified, the default is ``tip:0`` unless
4640 4640 --follow is set.
4641 4641
4642 4642 File history is shown without following rename or copy history of
4643 4643 files. Use -f/--follow with a filename to follow history across
4644 4644 renames and copies. --follow without a filename will only show
4645 4645 ancestors of the starting revisions. The starting revisions can be
4646 4646 specified by -r/--rev, which default to the working directory parent.
4647 4647
4648 4648 By default this command prints revision number and changeset id,
4649 4649 tags, non-trivial parents, user, date and time, and a summary for
4650 4650 each commit. When the -v/--verbose switch is used, the list of
4651 4651 changed files and full commit message are shown.
4652 4652
4653 4653 With --graph the revisions are shown as an ASCII art DAG with the most
4654 4654 recent changeset at the top.
4655 4655 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4656 4656 involved in an unresolved merge conflict, '_' closes a branch,
4657 4657 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4658 4658 changeset from the lines below is a parent of the 'o' merge on the same
4659 4659 line.
4660 4660 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4661 4661 of a '|' indicates one or more revisions in a path are omitted.
4662 4662
4663 4663 .. container:: verbose
4664 4664
4665 4665 Use -L/--line-range FILE,M:N options to follow the history of lines
4666 4666 from M to N in FILE. With -p/--patch only diff hunks affecting
4667 4667 specified line range will be shown. This option requires --follow;
4668 4668 it can be specified multiple times. Currently, this option is not
4669 4669 compatible with --graph. This option is experimental.
4670 4670
4671 4671 .. note::
4672 4672
4673 4673 :hg:`log --patch` may generate unexpected diff output for merge
4674 4674 changesets, as it will only compare the merge changeset against
4675 4675 its first parent. Also, only files different from BOTH parents
4676 4676 will appear in files:.
4677 4677
4678 4678 .. note::
4679 4679
4680 4680 For performance reasons, :hg:`log FILE` may omit duplicate changes
4681 4681 made on branches and will not show removals or mode changes. To
4682 4682 see all such changes, use the --removed switch.
4683 4683
4684 4684 .. container:: verbose
4685 4685
4686 4686 .. note::
4687 4687
4688 4688 The history resulting from -L/--line-range options depends on diff
4689 4689 options; for instance if white-spaces are ignored, respective changes
4690 4690 with only white-spaces in specified line range will not be listed.
4691 4691
4692 4692 .. container:: verbose
4693 4693
4694 4694 Some examples:
4695 4695
4696 4696 - changesets with full descriptions and file lists::
4697 4697
4698 4698 hg log -v
4699 4699
4700 4700 - changesets ancestral to the working directory::
4701 4701
4702 4702 hg log -f
4703 4703
4704 4704 - last 10 commits on the current branch::
4705 4705
4706 4706 hg log -l 10 -b .
4707 4707
4708 4708 - changesets showing all modifications of a file, including removals::
4709 4709
4710 4710 hg log --removed file.c
4711 4711
4712 4712 - all changesets that touch a directory, with diffs, excluding merges::
4713 4713
4714 4714 hg log -Mp lib/
4715 4715
4716 4716 - all revision numbers that match a keyword::
4717 4717
4718 4718 hg log -k bug --template "{rev}\\n"
4719 4719
4720 4720 - the full hash identifier of the working directory parent::
4721 4721
4722 4722 hg log -r . --template "{node}\\n"
4723 4723
4724 4724 - list available log templates::
4725 4725
4726 4726 hg log -T list
4727 4727
4728 4728 - check if a given changeset is included in a tagged release::
4729 4729
4730 4730 hg log -r "a21ccf and ancestor(1.9)"
4731 4731
4732 4732 - find all changesets by some user in a date range::
4733 4733
4734 4734 hg log -k alice -d "may 2008 to jul 2008"
4735 4735
4736 4736 - summary of all changesets after the last tag::
4737 4737
4738 4738 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4739 4739
4740 4740 - changesets touching lines 13 to 23 for file.c::
4741 4741
4742 4742 hg log -L file.c,13:23
4743 4743
4744 4744 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4745 4745 main.c with patch::
4746 4746
4747 4747 hg log -L file.c,13:23 -L main.c,2:6 -p
4748 4748
4749 4749 See :hg:`help dates` for a list of formats valid for -d/--date.
4750 4750
4751 4751 See :hg:`help revisions` for more about specifying and ordering
4752 4752 revisions.
4753 4753
4754 4754 See :hg:`help templates` for more about pre-packaged styles and
4755 4755 specifying custom templates. The default template used by the log
4756 4756 command can be customized via the ``command-templates.log`` configuration
4757 4757 setting.
4758 4758
4759 4759 Returns 0 on success.
4760 4760
4761 4761 """
4762 4762 opts = pycompat.byteskwargs(opts)
4763 4763 linerange = opts.get(b'line_range')
4764 4764
4765 4765 if linerange and not opts.get(b'follow'):
4766 4766 raise error.InputError(_(b'--line-range requires --follow'))
4767 4767
4768 4768 if linerange and pats:
4769 4769 # TODO: take pats as patterns with no line-range filter
4770 4770 raise error.InputError(
4771 4771 _(b'FILE arguments are not compatible with --line-range option')
4772 4772 )
4773 4773
4774 4774 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4775 4775 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4776 4776 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4777 4777 if linerange:
4778 4778 # TODO: should follow file history from logcmdutil._initialrevs(),
4779 4779 # then filter the result by logcmdutil._makerevset() and --limit
4780 4780 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4781 4781
4782 4782 getcopies = None
4783 4783 if opts.get(b'copies'):
4784 4784 endrev = None
4785 4785 if revs:
4786 4786 endrev = revs.max() + 1
4787 4787 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4788 4788
4789 4789 ui.pager(b'log')
4790 4790 displayer = logcmdutil.changesetdisplayer(
4791 4791 ui, repo, opts, differ, buffered=True
4792 4792 )
4793 4793 if opts.get(b'graph'):
4794 4794 displayfn = logcmdutil.displaygraphrevs
4795 4795 else:
4796 4796 displayfn = logcmdutil.displayrevs
4797 4797 displayfn(ui, repo, revs, displayer, getcopies)
4798 4798
4799 4799
4800 4800 @command(
4801 4801 b'manifest',
4802 4802 [
4803 4803 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4804 4804 (b'', b'all', False, _(b"list files from all revisions")),
4805 4805 ]
4806 4806 + formatteropts,
4807 4807 _(b'[-r REV]'),
4808 4808 helpcategory=command.CATEGORY_MAINTENANCE,
4809 4809 intents={INTENT_READONLY},
4810 4810 )
4811 4811 def manifest(ui, repo, node=None, rev=None, **opts):
4812 4812 """output the current or given revision of the project manifest
4813 4813
4814 4814 Print a list of version controlled files for the given revision.
4815 4815 If no revision is given, the first parent of the working directory
4816 4816 is used, or the null revision if no revision is checked out.
4817 4817
4818 4818 With -v, print file permissions, symlink and executable bits.
4819 4819 With --debug, print file revision hashes.
4820 4820
4821 4821 If option --all is specified, the list of all files from all revisions
4822 4822 is printed. This includes deleted and renamed files.
4823 4823
4824 4824 Returns 0 on success.
4825 4825 """
4826 4826 opts = pycompat.byteskwargs(opts)
4827 4827 fm = ui.formatter(b'manifest', opts)
4828 4828
4829 4829 if opts.get(b'all'):
4830 4830 if rev or node:
4831 4831 raise error.InputError(_(b"can't specify a revision with --all"))
4832 4832
4833 4833 res = set()
4834 4834 for rev in repo:
4835 4835 ctx = repo[rev]
4836 4836 res |= set(ctx.files())
4837 4837
4838 4838 ui.pager(b'manifest')
4839 4839 for f in sorted(res):
4840 4840 fm.startitem()
4841 4841 fm.write(b"path", b'%s\n', f)
4842 4842 fm.end()
4843 4843 return
4844 4844
4845 4845 if rev and node:
4846 4846 raise error.InputError(_(b"please specify just one revision"))
4847 4847
4848 4848 if not node:
4849 4849 node = rev
4850 4850
4851 4851 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4852 4852 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4853 4853 if node:
4854 4854 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4855 4855 ctx = logcmdutil.revsingle(repo, node)
4856 4856 mf = ctx.manifest()
4857 4857 ui.pager(b'manifest')
4858 4858 for f in ctx:
4859 4859 fm.startitem()
4860 4860 fm.context(ctx=ctx)
4861 4861 fl = ctx[f].flags()
4862 4862 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4863 4863 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4864 4864 fm.write(b'path', b'%s\n', f)
4865 4865 fm.end()
4866 4866
4867 4867
4868 4868 @command(
4869 4869 b'merge',
4870 4870 [
4871 4871 (
4872 4872 b'f',
4873 4873 b'force',
4874 4874 None,
4875 4875 _(b'force a merge including outstanding changes (DEPRECATED)'),
4876 4876 ),
4877 4877 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4878 4878 (
4879 4879 b'P',
4880 4880 b'preview',
4881 4881 None,
4882 4882 _(b'review revisions to merge (no merge is performed)'),
4883 4883 ),
4884 4884 (b'', b'abort', None, _(b'abort the ongoing merge')),
4885 4885 ]
4886 4886 + mergetoolopts,
4887 4887 _(b'[-P] [[-r] REV]'),
4888 4888 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4889 4889 helpbasic=True,
4890 4890 )
4891 4891 def merge(ui, repo, node=None, **opts):
4892 4892 """merge another revision into working directory
4893 4893
4894 4894 The current working directory is updated with all changes made in
4895 4895 the requested revision since the last common predecessor revision.
4896 4896
4897 4897 Files that changed between either parent are marked as changed for
4898 4898 the next commit and a commit must be performed before any further
4899 4899 updates to the repository are allowed. The next commit will have
4900 4900 two parents.
4901 4901
4902 4902 ``--tool`` can be used to specify the merge tool used for file
4903 4903 merges. It overrides the HGMERGE environment variable and your
4904 4904 configuration files. See :hg:`help merge-tools` for options.
4905 4905
4906 4906 If no revision is specified, the working directory's parent is a
4907 4907 head revision, and the current branch contains exactly one other
4908 4908 head, the other head is merged with by default. Otherwise, an
4909 4909 explicit revision with which to merge must be provided.
4910 4910
4911 4911 See :hg:`help resolve` for information on handling file conflicts.
4912 4912
4913 4913 To undo an uncommitted merge, use :hg:`merge --abort` which
4914 4914 will check out a clean copy of the original merge parent, losing
4915 4915 all changes.
4916 4916
4917 4917 Returns 0 on success, 1 if there are unresolved files.
4918 4918 """
4919 4919
4920 4920 opts = pycompat.byteskwargs(opts)
4921 4921 abort = opts.get(b'abort')
4922 4922 if abort and repo.dirstate.p2() == repo.nullid:
4923 4923 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4924 4924 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4925 4925 if abort:
4926 4926 state = cmdutil.getunfinishedstate(repo)
4927 4927 if state and state._opname != b'merge':
4928 4928 raise error.StateError(
4929 4929 _(b'cannot abort merge with %s in progress') % (state._opname),
4930 4930 hint=state.hint(),
4931 4931 )
4932 4932 if node:
4933 4933 raise error.InputError(_(b"cannot specify a node with --abort"))
4934 4934 return hg.abortmerge(repo.ui, repo)
4935 4935
4936 4936 if opts.get(b'rev') and node:
4937 4937 raise error.InputError(_(b"please specify just one revision"))
4938 4938 if not node:
4939 4939 node = opts.get(b'rev')
4940 4940
4941 4941 if node:
4942 4942 ctx = logcmdutil.revsingle(repo, node)
4943 4943 else:
4944 4944 if ui.configbool(b'commands', b'merge.require-rev'):
4945 4945 raise error.InputError(
4946 4946 _(
4947 4947 b'configuration requires specifying revision to merge '
4948 4948 b'with'
4949 4949 )
4950 4950 )
4951 4951 ctx = repo[destutil.destmerge(repo)]
4952 4952
4953 4953 if ctx.node() is None:
4954 4954 raise error.InputError(
4955 4955 _(b'merging with the working copy has no effect')
4956 4956 )
4957 4957
4958 4958 if opts.get(b'preview'):
4959 4959 # find nodes that are ancestors of p2 but not of p1
4960 4960 p1 = repo[b'.'].node()
4961 4961 p2 = ctx.node()
4962 4962 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4963 4963
4964 4964 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4965 4965 for node in nodes:
4966 4966 displayer.show(repo[node])
4967 4967 displayer.close()
4968 4968 return 0
4969 4969
4970 4970 # ui.forcemerge is an internal variable, do not document
4971 4971 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4972 4972 with ui.configoverride(overrides, b'merge'):
4973 4973 force = opts.get(b'force')
4974 4974 labels = [b'working copy', b'merge rev', b'common ancestor']
4975 4975 return hg.merge(ctx, force=force, labels=labels)
4976 4976
4977 4977
4978 4978 statemod.addunfinished(
4979 4979 b'merge',
4980 4980 fname=None,
4981 4981 clearable=True,
4982 4982 allowcommit=True,
4983 4983 cmdmsg=_(b'outstanding uncommitted merge'),
4984 4984 abortfunc=hg.abortmerge,
4985 4985 statushint=_(
4986 4986 b'To continue: hg commit\nTo abort: hg merge --abort'
4987 4987 ),
4988 4988 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4989 4989 )
4990 4990
4991 4991
4992 4992 @command(
4993 4993 b'outgoing|out',
4994 4994 [
4995 4995 (
4996 4996 b'f',
4997 4997 b'force',
4998 4998 None,
4999 4999 _(b'run even when the destination is unrelated'),
5000 5000 ),
5001 5001 (
5002 5002 b'r',
5003 5003 b'rev',
5004 5004 [],
5005 5005 _(b'a changeset intended to be included in the destination'),
5006 5006 _(b'REV'),
5007 5007 ),
5008 5008 (b'n', b'newest-first', None, _(b'show newest record first')),
5009 5009 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
5010 5010 (
5011 5011 b'b',
5012 5012 b'branch',
5013 5013 [],
5014 5014 _(b'a specific branch you would like to push'),
5015 5015 _(b'BRANCH'),
5016 5016 ),
5017 5017 ]
5018 5018 + logopts
5019 5019 + remoteopts
5020 5020 + subrepoopts,
5021 5021 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
5022 5022 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5023 5023 )
5024 5024 def outgoing(ui, repo, *dests, **opts):
5025 5025 """show changesets not found in the destination
5026 5026
5027 5027 Show changesets not found in the specified destination repository
5028 5028 or the default push location. These are the changesets that would
5029 5029 be pushed if a push was requested.
5030 5030
5031 5031 See pull for details of valid destination formats.
5032 5032
5033 5033 .. container:: verbose
5034 5034
5035 5035 With -B/--bookmarks, the result of bookmark comparison between
5036 5036 local and remote repositories is displayed. With -v/--verbose,
5037 5037 status is also displayed for each bookmark like below::
5038 5038
5039 5039 BM1 01234567890a added
5040 5040 BM2 deleted
5041 5041 BM3 234567890abc advanced
5042 5042 BM4 34567890abcd diverged
5043 5043 BM5 4567890abcde changed
5044 5044
5045 5045 The action taken when pushing depends on the
5046 5046 status of each bookmark:
5047 5047
5048 5048 :``added``: push with ``-B`` will create it
5049 5049 :``deleted``: push with ``-B`` will delete it
5050 5050 :``advanced``: push will update it
5051 5051 :``diverged``: push with ``-B`` will update it
5052 5052 :``changed``: push with ``-B`` will update it
5053 5053
5054 5054 From the point of view of pushing behavior, bookmarks
5055 5055 existing only in the remote repository are treated as
5056 5056 ``deleted``, even if it is in fact added remotely.
5057 5057
5058 5058 Returns 0 if there are outgoing changes, 1 otherwise.
5059 5059 """
5060 5060 opts = pycompat.byteskwargs(opts)
5061 5061 if opts.get(b'bookmarks'):
5062 5062 for path in urlutil.get_push_paths(repo, ui, dests):
5063 5063 other = hg.peer(repo, opts, path)
5064 5064 try:
5065 5065 if b'bookmarks' not in other.listkeys(b'namespaces'):
5066 5066 ui.warn(_(b"remote doesn't support bookmarks\n"))
5067 5067 return 0
5068 5068 ui.status(
5069 5069 _(b'comparing with %s\n') % urlutil.hidepassword(path.loc)
5070 5070 )
5071 5071 ui.pager(b'outgoing')
5072 5072 return bookmarks.outgoing(ui, repo, other)
5073 5073 finally:
5074 5074 other.close()
5075 5075
5076 5076 return hg.outgoing(ui, repo, dests, opts)
5077 5077
5078 5078
5079 5079 @command(
5080 5080 b'parents',
5081 5081 [
5082 5082 (
5083 5083 b'r',
5084 5084 b'rev',
5085 5085 b'',
5086 5086 _(b'show parents of the specified revision'),
5087 5087 _(b'REV'),
5088 5088 ),
5089 5089 ]
5090 5090 + templateopts,
5091 5091 _(b'[-r REV] [FILE]'),
5092 5092 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5093 5093 inferrepo=True,
5094 5094 )
5095 5095 def parents(ui, repo, file_=None, **opts):
5096 5096 """show the parents of the working directory or revision (DEPRECATED)
5097 5097
5098 5098 Print the working directory's parent revisions. If a revision is
5099 5099 given via -r/--rev, the parent of that revision will be printed.
5100 5100 If a file argument is given, the revision in which the file was
5101 5101 last changed (before the working directory revision or the
5102 5102 argument to --rev if given) is printed.
5103 5103
5104 5104 This command is equivalent to::
5105 5105
5106 5106 hg log -r "p1()+p2()" or
5107 5107 hg log -r "p1(REV)+p2(REV)" or
5108 5108 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5109 5109 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5110 5110
5111 5111 See :hg:`summary` and :hg:`help revsets` for related information.
5112 5112
5113 5113 Returns 0 on success.
5114 5114 """
5115 5115
5116 5116 opts = pycompat.byteskwargs(opts)
5117 5117 rev = opts.get(b'rev')
5118 5118 if rev:
5119 5119 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5120 5120 ctx = logcmdutil.revsingle(repo, rev, None)
5121 5121
5122 5122 if file_:
5123 5123 m = scmutil.match(ctx, (file_,), opts)
5124 5124 if m.anypats() or len(m.files()) != 1:
5125 5125 raise error.InputError(_(b'can only specify an explicit filename'))
5126 5126 file_ = m.files()[0]
5127 5127 filenodes = []
5128 5128 for cp in ctx.parents():
5129 5129 if not cp:
5130 5130 continue
5131 5131 try:
5132 5132 filenodes.append(cp.filenode(file_))
5133 5133 except error.LookupError:
5134 5134 pass
5135 5135 if not filenodes:
5136 5136 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5137 5137 p = []
5138 5138 for fn in filenodes:
5139 5139 fctx = repo.filectx(file_, fileid=fn)
5140 5140 p.append(fctx.node())
5141 5141 else:
5142 5142 p = [cp.node() for cp in ctx.parents()]
5143 5143
5144 5144 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5145 5145 for n in p:
5146 5146 if n != repo.nullid:
5147 5147 displayer.show(repo[n])
5148 5148 displayer.close()
5149 5149
5150 5150
5151 5151 @command(
5152 5152 b'paths',
5153 5153 formatteropts,
5154 5154 _(b'[NAME]'),
5155 5155 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5156 5156 optionalrepo=True,
5157 5157 intents={INTENT_READONLY},
5158 5158 )
5159 5159 def paths(ui, repo, search=None, **opts):
5160 5160 """show aliases for remote repositories
5161 5161
5162 5162 Show definition of symbolic path name NAME. If no name is given,
5163 5163 show definition of all available names.
5164 5164
5165 5165 Option -q/--quiet suppresses all output when searching for NAME
5166 5166 and shows only the path names when listing all definitions.
5167 5167
5168 5168 Path names are defined in the [paths] section of your
5169 5169 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5170 5170 repository, ``.hg/hgrc`` is used, too.
5171 5171
5172 5172 The path names ``default`` and ``default-push`` have a special
5173 5173 meaning. When performing a push or pull operation, they are used
5174 5174 as fallbacks if no location is specified on the command-line.
5175 5175 When ``default-push`` is set, it will be used for push and
5176 5176 ``default`` will be used for pull; otherwise ``default`` is used
5177 5177 as the fallback for both. When cloning a repository, the clone
5178 5178 source is written as ``default`` in ``.hg/hgrc``.
5179 5179
5180 5180 .. note::
5181 5181
5182 5182 ``default`` and ``default-push`` apply to all inbound (e.g.
5183 5183 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5184 5184 and :hg:`bundle`) operations.
5185 5185
5186 5186 See :hg:`help urls` for more information.
5187 5187
5188 5188 .. container:: verbose
5189 5189
5190 5190 Template:
5191 5191
5192 5192 The following keywords are supported. See also :hg:`help templates`.
5193 5193
5194 5194 :name: String. Symbolic name of the path alias.
5195 5195 :pushurl: String. URL for push operations.
5196 5196 :url: String. URL or directory path for the other operations.
5197 5197
5198 5198 Returns 0 on success.
5199 5199 """
5200 5200
5201 5201 opts = pycompat.byteskwargs(opts)
5202 5202
5203 5203 pathitems = urlutil.list_paths(ui, search)
5204 5204 ui.pager(b'paths')
5205 5205
5206 5206 fm = ui.formatter(b'paths', opts)
5207 5207 if fm.isplain():
5208 5208 hidepassword = urlutil.hidepassword
5209 5209 else:
5210 5210 hidepassword = bytes
5211 5211 if ui.quiet:
5212 5212 namefmt = b'%s\n'
5213 5213 else:
5214 5214 namefmt = b'%s = '
5215 5215 showsubopts = not search and not ui.quiet
5216 5216
5217 5217 for name, path in pathitems:
5218 5218 fm.startitem()
5219 5219 fm.condwrite(not search, b'name', namefmt, name)
5220 5220 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5221 5221 for subopt, value in sorted(path.suboptions.items()):
5222 5222 assert subopt not in (b'name', b'url')
5223 5223 if showsubopts:
5224 5224 fm.plain(b'%s:%s = ' % (name, subopt))
5225 if isinstance(value, bool):
5226 if value:
5227 value = b'yes'
5228 else:
5229 value = b'no'
5225 display = urlutil.path_suboptions_display[subopt]
5226 value = display(value)
5230 5227 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5231 5228
5232 5229 fm.end()
5233 5230
5234 5231 if search and not pathitems:
5235 5232 if not ui.quiet:
5236 5233 ui.warn(_(b"not found!\n"))
5237 5234 return 1
5238 5235 else:
5239 5236 return 0
5240 5237
5241 5238
5242 5239 @command(
5243 5240 b'phase',
5244 5241 [
5245 5242 (b'p', b'public', False, _(b'set changeset phase to public')),
5246 5243 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5247 5244 (b's', b'secret', False, _(b'set changeset phase to secret')),
5248 5245 (b'f', b'force', False, _(b'allow to move boundary backward')),
5249 5246 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5250 5247 ],
5251 5248 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5252 5249 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5253 5250 )
5254 5251 def phase(ui, repo, *revs, **opts):
5255 5252 """set or show the current phase name
5256 5253
5257 5254 With no argument, show the phase name of the current revision(s).
5258 5255
5259 5256 With one of -p/--public, -d/--draft or -s/--secret, change the
5260 5257 phase value of the specified revisions.
5261 5258
5262 5259 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5263 5260 lower phase to a higher phase. Phases are ordered as follows::
5264 5261
5265 5262 public < draft < secret
5266 5263
5267 5264 Returns 0 on success, 1 if some phases could not be changed.
5268 5265
5269 5266 (For more information about the phases concept, see :hg:`help phases`.)
5270 5267 """
5271 5268 opts = pycompat.byteskwargs(opts)
5272 5269 # search for a unique phase argument
5273 5270 targetphase = None
5274 5271 for idx, name in enumerate(phases.cmdphasenames):
5275 5272 if opts[name]:
5276 5273 if targetphase is not None:
5277 5274 raise error.InputError(_(b'only one phase can be specified'))
5278 5275 targetphase = idx
5279 5276
5280 5277 # look for specified revision
5281 5278 revs = list(revs)
5282 5279 revs.extend(opts[b'rev'])
5283 5280 if revs:
5284 5281 revs = logcmdutil.revrange(repo, revs)
5285 5282 else:
5286 5283 # display both parents as the second parent phase can influence
5287 5284 # the phase of a merge commit
5288 5285 revs = [c.rev() for c in repo[None].parents()]
5289 5286
5290 5287 ret = 0
5291 5288 if targetphase is None:
5292 5289 # display
5293 5290 for r in revs:
5294 5291 ctx = repo[r]
5295 5292 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5296 5293 else:
5297 5294 with repo.lock(), repo.transaction(b"phase") as tr:
5298 5295 # set phase
5299 5296 if not revs:
5300 5297 raise error.InputError(_(b'empty revision set'))
5301 5298 nodes = [repo[r].node() for r in revs]
5302 5299 # moving revision from public to draft may hide them
5303 5300 # We have to check result on an unfiltered repository
5304 5301 unfi = repo.unfiltered()
5305 5302 getphase = unfi._phasecache.phase
5306 5303 olddata = [getphase(unfi, r) for r in unfi]
5307 5304 phases.advanceboundary(repo, tr, targetphase, nodes)
5308 5305 if opts[b'force']:
5309 5306 phases.retractboundary(repo, tr, targetphase, nodes)
5310 5307 getphase = unfi._phasecache.phase
5311 5308 newdata = [getphase(unfi, r) for r in unfi]
5312 5309 changes = sum(newdata[r] != olddata[r] for r in unfi)
5313 5310 cl = unfi.changelog
5314 5311 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5315 5312 if rejected:
5316 5313 ui.warn(
5317 5314 _(
5318 5315 b'cannot move %i changesets to a higher '
5319 5316 b'phase, use --force\n'
5320 5317 )
5321 5318 % len(rejected)
5322 5319 )
5323 5320 ret = 1
5324 5321 if changes:
5325 5322 msg = _(b'phase changed for %i changesets\n') % changes
5326 5323 if ret:
5327 5324 ui.status(msg)
5328 5325 else:
5329 5326 ui.note(msg)
5330 5327 else:
5331 5328 ui.warn(_(b'no phases changed\n'))
5332 5329 return ret
5333 5330
5334 5331
5335 5332 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5336 5333 """Run after a changegroup has been added via pull/unbundle
5337 5334
5338 5335 This takes arguments below:
5339 5336
5340 5337 :modheads: change of heads by pull/unbundle
5341 5338 :optupdate: updating working directory is needed or not
5342 5339 :checkout: update destination revision (or None to default destination)
5343 5340 :brev: a name, which might be a bookmark to be activated after updating
5344 5341
5345 5342 return True if update raise any conflict, False otherwise.
5346 5343 """
5347 5344 if modheads == 0:
5348 5345 return False
5349 5346 if optupdate:
5350 5347 try:
5351 5348 return hg.updatetotally(ui, repo, checkout, brev)
5352 5349 except error.UpdateAbort as inst:
5353 5350 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5354 5351 hint = inst.hint
5355 5352 raise error.UpdateAbort(msg, hint=hint)
5356 5353 if modheads is not None and modheads > 1:
5357 5354 currentbranchheads = len(repo.branchheads())
5358 5355 if currentbranchheads == modheads:
5359 5356 ui.status(
5360 5357 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5361 5358 )
5362 5359 elif currentbranchheads > 1:
5363 5360 ui.status(
5364 5361 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5365 5362 )
5366 5363 else:
5367 5364 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5368 5365 elif not ui.configbool(b'commands', b'update.requiredest'):
5369 5366 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5370 5367 return False
5371 5368
5372 5369
5373 5370 @command(
5374 5371 b'pull',
5375 5372 [
5376 5373 (
5377 5374 b'u',
5378 5375 b'update',
5379 5376 None,
5380 5377 _(b'update to new branch head if new descendants were pulled'),
5381 5378 ),
5382 5379 (
5383 5380 b'f',
5384 5381 b'force',
5385 5382 None,
5386 5383 _(b'run even when remote repository is unrelated'),
5387 5384 ),
5388 5385 (
5389 5386 b'',
5390 5387 b'confirm',
5391 5388 None,
5392 5389 _(b'confirm pull before applying changes'),
5393 5390 ),
5394 5391 (
5395 5392 b'r',
5396 5393 b'rev',
5397 5394 [],
5398 5395 _(b'a remote changeset intended to be added'),
5399 5396 _(b'REV'),
5400 5397 ),
5401 5398 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5402 5399 (
5403 5400 b'b',
5404 5401 b'branch',
5405 5402 [],
5406 5403 _(b'a specific branch you would like to pull'),
5407 5404 _(b'BRANCH'),
5408 5405 ),
5409 5406 (
5410 5407 b'',
5411 5408 b'remote-hidden',
5412 5409 False,
5413 5410 _(b"include changesets hidden on the remote (EXPERIMENTAL)"),
5414 5411 ),
5415 5412 ]
5416 5413 + remoteopts,
5417 5414 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5418 5415 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5419 5416 helpbasic=True,
5420 5417 )
5421 5418 def pull(ui, repo, *sources, **opts):
5422 5419 """pull changes from the specified source
5423 5420
5424 5421 Pull changes from a remote repository to a local one.
5425 5422
5426 5423 This finds all changes from the repository at the specified path
5427 5424 or URL and adds them to a local repository (the current one unless
5428 5425 -R is specified). By default, this does not update the copy of the
5429 5426 project in the working directory.
5430 5427
5431 5428 When cloning from servers that support it, Mercurial may fetch
5432 5429 pre-generated data. When this is done, hooks operating on incoming
5433 5430 changesets and changegroups may fire more than once, once for each
5434 5431 pre-generated bundle and as well as for any additional remaining
5435 5432 data. See :hg:`help -e clonebundles` for more.
5436 5433
5437 5434 Use :hg:`incoming` if you want to see what would have been added
5438 5435 by a pull at the time you issued this command. If you then decide
5439 5436 to add those changes to the repository, you should use :hg:`pull
5440 5437 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5441 5438
5442 5439 If SOURCE is omitted, the 'default' path will be used.
5443 5440 See :hg:`help urls` for more information.
5444 5441
5445 5442 If multiple sources are specified, they will be pulled sequentially as if
5446 5443 the command was run multiple time. If --update is specify and the command
5447 5444 will stop at the first failed --update.
5448 5445
5449 5446 Specifying bookmark as ``.`` is equivalent to specifying the active
5450 5447 bookmark's name.
5451 5448
5452 5449 .. container:: verbose
5453 5450
5454 5451 One can use the `--remote-hidden` flag to pull changesets
5455 5452 hidden on the remote. This flag is "best effort", and will only
5456 5453 work if the server supports the feature and is configured to
5457 5454 allow the user to access hidden changesets. This option is
5458 5455 experimental and backwards compatibility is not garanteed.
5459 5456
5460 5457 Returns 0 on success, 1 if an update had unresolved files.
5461 5458 """
5462 5459
5463 5460 opts = pycompat.byteskwargs(opts)
5464 5461 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5465 5462 b'update'
5466 5463 ):
5467 5464 msg = _(b'update destination required by configuration')
5468 5465 hint = _(b'use hg pull followed by hg update DEST')
5469 5466 raise error.InputError(msg, hint=hint)
5470 5467
5471 5468 for path in urlutil.get_pull_paths(repo, ui, sources):
5472 5469 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(path.loc))
5473 5470 ui.flush()
5474 5471 other = hg.peer(repo, opts, path, remotehidden=opts[b'remote_hidden'])
5475 5472 update_conflict = None
5476 5473 try:
5477 5474 branches = (path.branch, opts.get(b'branch', []))
5478 5475 revs, checkout = hg.addbranchrevs(
5479 5476 repo,
5480 5477 other,
5481 5478 branches,
5482 5479 opts.get(b'rev'),
5483 5480 remotehidden=opts[b'remote_hidden'],
5484 5481 )
5485 5482
5486 5483 pullopargs = {}
5487 5484
5488 5485 nodes = None
5489 5486 if opts.get(b'bookmark') or revs:
5490 5487 # The list of bookmark used here is the same used to actually update
5491 5488 # the bookmark names, to avoid the race from issue 4689 and we do
5492 5489 # all lookup and bookmark queries in one go so they see the same
5493 5490 # version of the server state (issue 4700).
5494 5491 nodes = []
5495 5492 fnodes = []
5496 5493 revs = revs or []
5497 5494 if revs and not other.capable(b'lookup'):
5498 5495 err = _(
5499 5496 b"other repository doesn't support revision lookup, "
5500 5497 b"so a rev cannot be specified."
5501 5498 )
5502 5499 raise error.Abort(err)
5503 5500 with other.commandexecutor() as e:
5504 5501 fremotebookmarks = e.callcommand(
5505 5502 b'listkeys', {b'namespace': b'bookmarks'}
5506 5503 )
5507 5504 for r in revs:
5508 5505 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5509 5506 remotebookmarks = fremotebookmarks.result()
5510 5507 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5511 5508 pullopargs[b'remotebookmarks'] = remotebookmarks
5512 5509 for b in opts.get(b'bookmark', []):
5513 5510 b = repo._bookmarks.expandname(b)
5514 5511 if b not in remotebookmarks:
5515 5512 raise error.InputError(
5516 5513 _(b'remote bookmark %s not found!') % b
5517 5514 )
5518 5515 nodes.append(remotebookmarks[b])
5519 5516 for i, rev in enumerate(revs):
5520 5517 node = fnodes[i].result()
5521 5518 nodes.append(node)
5522 5519 if rev == checkout:
5523 5520 checkout = node
5524 5521
5525 5522 wlock = util.nullcontextmanager()
5526 5523 if opts.get(b'update'):
5527 5524 wlock = repo.wlock()
5528 5525 with wlock:
5529 5526 pullopargs.update(opts.get(b'opargs', {}))
5530 5527 modheads = exchange.pull(
5531 5528 repo,
5532 5529 other,
5533 5530 path=path,
5534 5531 heads=nodes,
5535 5532 force=opts.get(b'force'),
5536 5533 bookmarks=opts.get(b'bookmark', ()),
5537 5534 opargs=pullopargs,
5538 5535 confirm=opts.get(b'confirm'),
5539 5536 ).cgresult
5540 5537
5541 5538 # brev is a name, which might be a bookmark to be activated at
5542 5539 # the end of the update. In other words, it is an explicit
5543 5540 # destination of the update
5544 5541 brev = None
5545 5542
5546 5543 if checkout:
5547 5544 checkout = repo.unfiltered().changelog.rev(checkout)
5548 5545
5549 5546 # order below depends on implementation of
5550 5547 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5551 5548 # because 'checkout' is determined without it.
5552 5549 if opts.get(b'rev'):
5553 5550 brev = opts[b'rev'][0]
5554 5551 elif opts.get(b'branch'):
5555 5552 brev = opts[b'branch'][0]
5556 5553 else:
5557 5554 brev = path.branch
5558 5555
5559 5556 # XXX path: we are losing the `path` object here. Keeping it
5560 5557 # would be valuable. For example as a "variant" as we do
5561 5558 # for pushes.
5562 5559 repo._subtoppath = path.loc
5563 5560 try:
5564 5561 update_conflict = postincoming(
5565 5562 ui, repo, modheads, opts.get(b'update'), checkout, brev
5566 5563 )
5567 5564 except error.FilteredRepoLookupError as exc:
5568 5565 msg = _(b'cannot update to target: %s') % exc.args[0]
5569 5566 exc.args = (msg,) + exc.args[1:]
5570 5567 raise
5571 5568 finally:
5572 5569 del repo._subtoppath
5573 5570
5574 5571 finally:
5575 5572 other.close()
5576 5573 # skip the remaining pull source if they are some conflict.
5577 5574 if update_conflict:
5578 5575 break
5579 5576 if update_conflict:
5580 5577 return 1
5581 5578 else:
5582 5579 return 0
5583 5580
5584 5581
5585 5582 @command(
5586 5583 b'purge|clean',
5587 5584 [
5588 5585 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5589 5586 (b'', b'all', None, _(b'purge ignored files too')),
5590 5587 (b'i', b'ignored', None, _(b'purge only ignored files')),
5591 5588 (b'', b'dirs', None, _(b'purge empty directories')),
5592 5589 (b'', b'files', None, _(b'purge files')),
5593 5590 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5594 5591 (
5595 5592 b'0',
5596 5593 b'print0',
5597 5594 None,
5598 5595 _(
5599 5596 b'end filenames with NUL, for use with xargs'
5600 5597 b' (implies -p/--print)'
5601 5598 ),
5602 5599 ),
5603 5600 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5604 5601 ]
5605 5602 + cmdutil.walkopts,
5606 5603 _(b'hg purge [OPTION]... [DIR]...'),
5607 5604 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5608 5605 )
5609 5606 def purge(ui, repo, *dirs, **opts):
5610 5607 """removes files not tracked by Mercurial
5611 5608
5612 5609 Delete files not known to Mercurial. This is useful to test local
5613 5610 and uncommitted changes in an otherwise-clean source tree.
5614 5611
5615 5612 This means that purge will delete the following by default:
5616 5613
5617 5614 - Unknown files: files marked with "?" by :hg:`status`
5618 5615 - Empty directories: in fact Mercurial ignores directories unless
5619 5616 they contain files under source control management
5620 5617
5621 5618 But it will leave untouched:
5622 5619
5623 5620 - Modified and unmodified tracked files
5624 5621 - Ignored files (unless -i or --all is specified)
5625 5622 - New files added to the repository (with :hg:`add`)
5626 5623
5627 5624 The --files and --dirs options can be used to direct purge to delete
5628 5625 only files, only directories, or both. If neither option is given,
5629 5626 both will be deleted.
5630 5627
5631 5628 If directories are given on the command line, only files in these
5632 5629 directories are considered.
5633 5630
5634 5631 Be careful with purge, as you could irreversibly delete some files
5635 5632 you forgot to add to the repository. If you only want to print the
5636 5633 list of files that this program would delete, use the --print
5637 5634 option.
5638 5635 """
5639 5636 opts = pycompat.byteskwargs(opts)
5640 5637 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5641 5638
5642 5639 act = not opts.get(b'print')
5643 5640 eol = b'\n'
5644 5641 if opts.get(b'print0'):
5645 5642 eol = b'\0'
5646 5643 act = False # --print0 implies --print
5647 5644 if opts.get(b'all', False):
5648 5645 ignored = True
5649 5646 unknown = True
5650 5647 else:
5651 5648 ignored = opts.get(b'ignored', False)
5652 5649 unknown = not ignored
5653 5650
5654 5651 removefiles = opts.get(b'files')
5655 5652 removedirs = opts.get(b'dirs')
5656 5653 confirm = opts.get(b'confirm')
5657 5654 if confirm is None:
5658 5655 try:
5659 5656 extensions.find(b'purge')
5660 5657 confirm = False
5661 5658 except KeyError:
5662 5659 confirm = True
5663 5660
5664 5661 if not removefiles and not removedirs:
5665 5662 removefiles = True
5666 5663 removedirs = True
5667 5664
5668 5665 match = scmutil.match(repo[None], dirs, opts)
5669 5666
5670 5667 paths = mergemod.purge(
5671 5668 repo,
5672 5669 match,
5673 5670 unknown=unknown,
5674 5671 ignored=ignored,
5675 5672 removeemptydirs=removedirs,
5676 5673 removefiles=removefiles,
5677 5674 abortonerror=opts.get(b'abort_on_err'),
5678 5675 noop=not act,
5679 5676 confirm=confirm,
5680 5677 )
5681 5678
5682 5679 for path in paths:
5683 5680 if not act:
5684 5681 ui.write(b'%s%s' % (path, eol))
5685 5682
5686 5683
5687 5684 @command(
5688 5685 b'push',
5689 5686 [
5690 5687 (b'f', b'force', None, _(b'force push')),
5691 5688 (
5692 5689 b'r',
5693 5690 b'rev',
5694 5691 [],
5695 5692 _(b'a changeset intended to be included in the destination'),
5696 5693 _(b'REV'),
5697 5694 ),
5698 5695 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5699 5696 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5700 5697 (
5701 5698 b'b',
5702 5699 b'branch',
5703 5700 [],
5704 5701 _(b'a specific branch you would like to push'),
5705 5702 _(b'BRANCH'),
5706 5703 ),
5707 5704 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5708 5705 (
5709 5706 b'',
5710 5707 b'pushvars',
5711 5708 [],
5712 5709 _(b'variables that can be sent to server (ADVANCED)'),
5713 5710 ),
5714 5711 (
5715 5712 b'',
5716 5713 b'publish',
5717 5714 False,
5718 5715 _(b'push the changeset as public (EXPERIMENTAL)'),
5719 5716 ),
5720 5717 ]
5721 5718 + remoteopts,
5722 5719 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5723 5720 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5724 5721 helpbasic=True,
5725 5722 )
5726 5723 def push(ui, repo, *dests, **opts):
5727 5724 """push changes to the specified destination
5728 5725
5729 5726 Push changesets from the local repository to the specified
5730 5727 destination.
5731 5728
5732 5729 This operation is symmetrical to pull: it is identical to a pull
5733 5730 in the destination repository from the current one.
5734 5731
5735 5732 By default, push will not allow creation of new heads at the
5736 5733 destination, since multiple heads would make it unclear which head
5737 5734 to use. In this situation, it is recommended to pull and merge
5738 5735 before pushing.
5739 5736
5740 5737 Use --new-branch if you want to allow push to create a new named
5741 5738 branch that is not present at the destination. This allows you to
5742 5739 only create a new branch without forcing other changes.
5743 5740
5744 5741 .. note::
5745 5742
5746 5743 Extra care should be taken with the -f/--force option,
5747 5744 which will push all new heads on all branches, an action which will
5748 5745 almost always cause confusion for collaborators.
5749 5746
5750 5747 If -r/--rev is used, the specified revision and all its ancestors
5751 5748 will be pushed to the remote repository.
5752 5749
5753 5750 If -B/--bookmark is used, the specified bookmarked revision, its
5754 5751 ancestors, and the bookmark will be pushed to the remote
5755 5752 repository. Specifying ``.`` is equivalent to specifying the active
5756 5753 bookmark's name. Use the --all-bookmarks option for pushing all
5757 5754 current bookmarks.
5758 5755
5759 5756 Please see :hg:`help urls` for important details about ``ssh://``
5760 5757 URLs. If DESTINATION is omitted, a default path will be used.
5761 5758
5762 5759 When passed multiple destinations, push will process them one after the
5763 5760 other, but stop should an error occur.
5764 5761
5765 5762 .. container:: verbose
5766 5763
5767 5764 The --pushvars option sends strings to the server that become
5768 5765 environment variables prepended with ``HG_USERVAR_``. For example,
5769 5766 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5770 5767 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5771 5768
5772 5769 pushvars can provide for user-overridable hooks as well as set debug
5773 5770 levels. One example is having a hook that blocks commits containing
5774 5771 conflict markers, but enables the user to override the hook if the file
5775 5772 is using conflict markers for testing purposes or the file format has
5776 5773 strings that look like conflict markers.
5777 5774
5778 5775 By default, servers will ignore `--pushvars`. To enable it add the
5779 5776 following to your configuration file::
5780 5777
5781 5778 [push]
5782 5779 pushvars.server = true
5783 5780
5784 5781 Returns 0 if push was successful, 1 if nothing to push.
5785 5782 """
5786 5783
5787 5784 opts = pycompat.byteskwargs(opts)
5788 5785
5789 5786 if opts.get(b'all_bookmarks'):
5790 5787 cmdutil.check_incompatible_arguments(
5791 5788 opts,
5792 5789 b'all_bookmarks',
5793 5790 [b'bookmark', b'rev'],
5794 5791 )
5795 5792 opts[b'bookmark'] = list(repo._bookmarks)
5796 5793
5797 5794 if opts.get(b'bookmark'):
5798 5795 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5799 5796 for b in opts[b'bookmark']:
5800 5797 # translate -B options to -r so changesets get pushed
5801 5798 b = repo._bookmarks.expandname(b)
5802 5799 if b in repo._bookmarks:
5803 5800 opts.setdefault(b'rev', []).append(b)
5804 5801 else:
5805 5802 # if we try to push a deleted bookmark, translate it to null
5806 5803 # this lets simultaneous -r, -b options continue working
5807 5804 opts.setdefault(b'rev', []).append(b"null")
5808 5805
5809 5806 some_pushed = False
5810 5807 result = 0
5811 5808 for path in urlutil.get_push_paths(repo, ui, dests):
5812 5809 dest = path.loc
5813 5810 branches = (path.branch, opts.get(b'branch') or [])
5814 5811 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5815 5812 revs, checkout = hg.addbranchrevs(
5816 5813 repo, repo, branches, opts.get(b'rev')
5817 5814 )
5818 5815 other = hg.peer(repo, opts, dest)
5819 5816
5820 5817 try:
5821 5818 if revs:
5822 5819 revs = [repo[r].node() for r in logcmdutil.revrange(repo, revs)]
5823 5820 if not revs:
5824 5821 raise error.InputError(
5825 5822 _(b"specified revisions evaluate to an empty set"),
5826 5823 hint=_(b"use different revision arguments"),
5827 5824 )
5828 5825 elif path.pushrev:
5829 5826 # It doesn't make any sense to specify ancestor revisions. So limit
5830 5827 # to DAG heads to make discovery simpler.
5831 5828 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5832 5829 revs = scmutil.revrange(repo, [expr])
5833 5830 revs = [repo[rev].node() for rev in revs]
5834 5831 if not revs:
5835 5832 raise error.InputError(
5836 5833 _(
5837 5834 b'default push revset for path evaluates to an empty set'
5838 5835 )
5839 5836 )
5840 5837 elif ui.configbool(b'commands', b'push.require-revs'):
5841 5838 raise error.InputError(
5842 5839 _(b'no revisions specified to push'),
5843 5840 hint=_(b'did you mean "hg push -r ."?'),
5844 5841 )
5845 5842
5846 5843 repo._subtoppath = dest
5847 5844 try:
5848 5845 # push subrepos depth-first for coherent ordering
5849 5846 c = repo[b'.']
5850 5847 subs = c.substate # only repos that are committed
5851 5848 for s in sorted(subs):
5852 5849 sub_result = c.sub(s).push(opts)
5853 5850 if sub_result == 0:
5854 5851 return 1
5855 5852 finally:
5856 5853 del repo._subtoppath
5857 5854
5858 5855 opargs = dict(
5859 5856 opts.get(b'opargs', {})
5860 5857 ) # copy opargs since we may mutate it
5861 5858 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5862 5859
5863 5860 pushop = exchange.push(
5864 5861 repo,
5865 5862 other,
5866 5863 opts.get(b'force'),
5867 5864 revs=revs,
5868 5865 newbranch=opts.get(b'new_branch'),
5869 5866 bookmarks=opts.get(b'bookmark', ()),
5870 5867 publish=opts.get(b'publish'),
5871 5868 opargs=opargs,
5872 5869 )
5873 5870
5874 5871 if pushop.cgresult == 0:
5875 5872 result = 1
5876 5873 elif pushop.cgresult is not None:
5877 5874 some_pushed = True
5878 5875
5879 5876 if pushop.bkresult is not None:
5880 5877 if pushop.bkresult == 2:
5881 5878 result = 2
5882 5879 elif not result and pushop.bkresult:
5883 5880 result = 2
5884 5881
5885 5882 if result:
5886 5883 break
5887 5884
5888 5885 finally:
5889 5886 other.close()
5890 5887 if result == 0 and not some_pushed:
5891 5888 result = 1
5892 5889 return result
5893 5890
5894 5891
5895 5892 @command(
5896 5893 b'recover',
5897 5894 [
5898 5895 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5899 5896 ],
5900 5897 helpcategory=command.CATEGORY_MAINTENANCE,
5901 5898 )
5902 5899 def recover(ui, repo, **opts):
5903 5900 """roll back an interrupted transaction
5904 5901
5905 5902 Recover from an interrupted commit or pull.
5906 5903
5907 5904 This command tries to fix the repository status after an
5908 5905 interrupted operation. It should only be necessary when Mercurial
5909 5906 suggests it.
5910 5907
5911 5908 Returns 0 if successful, 1 if nothing to recover or verify fails.
5912 5909 """
5913 5910 ret = repo.recover()
5914 5911 if ret:
5915 5912 if opts['verify']:
5916 5913 return hg.verify(repo)
5917 5914 else:
5918 5915 msg = _(
5919 5916 b"(verify step skipped, run `hg verify` to check your "
5920 5917 b"repository content)\n"
5921 5918 )
5922 5919 ui.warn(msg)
5923 5920 return 0
5924 5921 return 1
5925 5922
5926 5923
5927 5924 @command(
5928 5925 b'remove|rm',
5929 5926 [
5930 5927 (b'A', b'after', None, _(b'record delete for missing files')),
5931 5928 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5932 5929 ]
5933 5930 + subrepoopts
5934 5931 + walkopts
5935 5932 + dryrunopts,
5936 5933 _(b'[OPTION]... FILE...'),
5937 5934 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5938 5935 helpbasic=True,
5939 5936 inferrepo=True,
5940 5937 )
5941 5938 def remove(ui, repo, *pats, **opts):
5942 5939 """remove the specified files on the next commit
5943 5940
5944 5941 Schedule the indicated files for removal from the current branch.
5945 5942
5946 5943 This command schedules the files to be removed at the next commit.
5947 5944 To undo a remove before that, see :hg:`revert`. To undo added
5948 5945 files, see :hg:`forget`.
5949 5946
5950 5947 .. container:: verbose
5951 5948
5952 5949 -A/--after can be used to remove only files that have already
5953 5950 been deleted, -f/--force can be used to force deletion, and -Af
5954 5951 can be used to remove files from the next revision without
5955 5952 deleting them from the working directory.
5956 5953
5957 5954 The following table details the behavior of remove for different
5958 5955 file states (columns) and option combinations (rows). The file
5959 5956 states are Added [A], Clean [C], Modified [M] and Missing [!]
5960 5957 (as reported by :hg:`status`). The actions are Warn, Remove
5961 5958 (from branch) and Delete (from disk):
5962 5959
5963 5960 ========= == == == ==
5964 5961 opt/state A C M !
5965 5962 ========= == == == ==
5966 5963 none W RD W R
5967 5964 -f R RD RD R
5968 5965 -A W W W R
5969 5966 -Af R R R R
5970 5967 ========= == == == ==
5971 5968
5972 5969 .. note::
5973 5970
5974 5971 :hg:`remove` never deletes files in Added [A] state from the
5975 5972 working directory, not even if ``--force`` is specified.
5976 5973
5977 5974 Returns 0 on success, 1 if any warnings encountered.
5978 5975 """
5979 5976
5980 5977 opts = pycompat.byteskwargs(opts)
5981 5978 after, force = opts.get(b'after'), opts.get(b'force')
5982 5979 dryrun = opts.get(b'dry_run')
5983 5980 if not pats and not after:
5984 5981 raise error.InputError(_(b'no files specified'))
5985 5982
5986 5983 with repo.wlock(), repo.dirstate.changing_files(repo):
5987 5984 m = scmutil.match(repo[None], pats, opts)
5988 5985 subrepos = opts.get(b'subrepos')
5989 5986 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5990 5987 return cmdutil.remove(
5991 5988 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5992 5989 )
5993 5990
5994 5991
5995 5992 @command(
5996 5993 b'rename|move|mv',
5997 5994 [
5998 5995 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5999 5996 (b'A', b'after', None, _(b'record a rename that has already occurred')),
6000 5997 (
6001 5998 b'',
6002 5999 b'at-rev',
6003 6000 b'',
6004 6001 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
6005 6002 _(b'REV'),
6006 6003 ),
6007 6004 (
6008 6005 b'f',
6009 6006 b'force',
6010 6007 None,
6011 6008 _(b'forcibly move over an existing managed file'),
6012 6009 ),
6013 6010 ]
6014 6011 + walkopts
6015 6012 + dryrunopts,
6016 6013 _(b'[OPTION]... SOURCE... DEST'),
6017 6014 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6018 6015 )
6019 6016 def rename(ui, repo, *pats, **opts):
6020 6017 """rename files; equivalent of copy + remove
6021 6018
6022 6019 Mark dest as copies of sources; mark sources for deletion. If dest
6023 6020 is a directory, copies are put in that directory. If dest is a
6024 6021 file, there can only be one source.
6025 6022
6026 6023 By default, this command copies the contents of files as they
6027 6024 exist in the working directory. If invoked with -A/--after, the
6028 6025 operation is recorded, but no copying is performed.
6029 6026
6030 6027 To undo marking a destination file as renamed, use --forget. With that
6031 6028 option, all given (positional) arguments are unmarked as renames. The
6032 6029 destination file(s) will be left in place (still tracked). The source
6033 6030 file(s) will not be restored. Note that :hg:`rename --forget` behaves
6034 6031 the same way as :hg:`copy --forget`.
6035 6032
6036 6033 This command takes effect with the next commit by default.
6037 6034
6038 6035 Returns 0 on success, 1 if errors are encountered.
6039 6036 """
6040 6037 opts = pycompat.byteskwargs(opts)
6041 6038 context = lambda repo: repo.dirstate.changing_files(repo)
6042 6039 rev = opts.get(b'at_rev')
6043 6040 ctx = None
6044 6041 if rev:
6045 6042 ctx = logcmdutil.revsingle(repo, rev)
6046 6043 if ctx.rev() is not None:
6047 6044
6048 6045 def context(repo):
6049 6046 return util.nullcontextmanager()
6050 6047
6051 6048 opts[b'at_rev'] = ctx.rev()
6052 6049 with repo.wlock(), context(repo):
6053 6050 return cmdutil.copy(ui, repo, pats, opts, rename=True)
6054 6051
6055 6052
6056 6053 @command(
6057 6054 b'resolve',
6058 6055 [
6059 6056 (b'a', b'all', None, _(b'select all unresolved files')),
6060 6057 (b'l', b'list', None, _(b'list state of files needing merge')),
6061 6058 (b'm', b'mark', None, _(b'mark files as resolved')),
6062 6059 (b'u', b'unmark', None, _(b'mark files as unresolved')),
6063 6060 (b'n', b'no-status', None, _(b'hide status prefix')),
6064 6061 (b'', b're-merge', None, _(b're-merge files')),
6065 6062 ]
6066 6063 + mergetoolopts
6067 6064 + walkopts
6068 6065 + formatteropts,
6069 6066 _(b'[OPTION]... [FILE]...'),
6070 6067 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6071 6068 inferrepo=True,
6072 6069 )
6073 6070 def resolve(ui, repo, *pats, **opts):
6074 6071 """redo merges or set/view the merge status of files
6075 6072
6076 6073 Merges with unresolved conflicts are often the result of
6077 6074 non-interactive merging using the ``internal:merge`` configuration
6078 6075 setting, or a command-line merge tool like ``diff3``. The resolve
6079 6076 command is used to manage the files involved in a merge, after
6080 6077 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
6081 6078 working directory must have two parents). See :hg:`help
6082 6079 merge-tools` for information on configuring merge tools.
6083 6080
6084 6081 The resolve command can be used in the following ways:
6085 6082
6086 6083 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
6087 6084 the specified files, discarding any previous merge attempts. Re-merging
6088 6085 is not performed for files already marked as resolved. Use ``--all/-a``
6089 6086 to select all unresolved files. ``--tool`` can be used to specify
6090 6087 the merge tool used for the given files. It overrides the HGMERGE
6091 6088 environment variable and your configuration files. Previous file
6092 6089 contents are saved with a ``.orig`` suffix.
6093 6090
6094 6091 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6095 6092 (e.g. after having manually fixed-up the files). The default is
6096 6093 to mark all unresolved files.
6097 6094
6098 6095 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6099 6096 default is to mark all resolved files.
6100 6097
6101 6098 - :hg:`resolve -l`: list files which had or still have conflicts.
6102 6099 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6103 6100 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6104 6101 the list. See :hg:`help filesets` for details.
6105 6102
6106 6103 .. note::
6107 6104
6108 6105 Mercurial will not let you commit files with unresolved merge
6109 6106 conflicts. You must use :hg:`resolve -m ...` before you can
6110 6107 commit after a conflicting merge.
6111 6108
6112 6109 .. container:: verbose
6113 6110
6114 6111 Template:
6115 6112
6116 6113 The following keywords are supported in addition to the common template
6117 6114 keywords and functions. See also :hg:`help templates`.
6118 6115
6119 6116 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6120 6117 :path: String. Repository-absolute path of the file.
6121 6118
6122 6119 Returns 0 on success, 1 if any files fail a resolve attempt.
6123 6120 """
6124 6121
6125 6122 opts = pycompat.byteskwargs(opts)
6126 6123 confirm = ui.configbool(b'commands', b'resolve.confirm')
6127 6124 flaglist = b'all mark unmark list no_status re_merge'.split()
6128 6125 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6129 6126
6130 6127 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6131 6128 if actioncount > 1:
6132 6129 raise error.InputError(_(b"too many actions specified"))
6133 6130 elif actioncount == 0 and ui.configbool(
6134 6131 b'commands', b'resolve.explicit-re-merge'
6135 6132 ):
6136 6133 hint = _(b'use --mark, --unmark, --list or --re-merge')
6137 6134 raise error.InputError(_(b'no action specified'), hint=hint)
6138 6135 if pats and all:
6139 6136 raise error.InputError(_(b"can't specify --all and patterns"))
6140 6137 if not (all or pats or show or mark or unmark):
6141 6138 raise error.InputError(
6142 6139 _(b'no files or directories specified'),
6143 6140 hint=b'use --all to re-merge all unresolved files',
6144 6141 )
6145 6142
6146 6143 if confirm:
6147 6144 if all:
6148 6145 if ui.promptchoice(
6149 6146 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6150 6147 ):
6151 6148 raise error.CanceledError(_(b'user quit'))
6152 6149 if mark and not pats:
6153 6150 if ui.promptchoice(
6154 6151 _(
6155 6152 b'mark all unresolved files as resolved (yn)?'
6156 6153 b'$$ &Yes $$ &No'
6157 6154 )
6158 6155 ):
6159 6156 raise error.CanceledError(_(b'user quit'))
6160 6157 if unmark and not pats:
6161 6158 if ui.promptchoice(
6162 6159 _(
6163 6160 b'mark all resolved files as unresolved (yn)?'
6164 6161 b'$$ &Yes $$ &No'
6165 6162 )
6166 6163 ):
6167 6164 raise error.CanceledError(_(b'user quit'))
6168 6165
6169 6166 uipathfn = scmutil.getuipathfn(repo)
6170 6167
6171 6168 if show:
6172 6169 ui.pager(b'resolve')
6173 6170 fm = ui.formatter(b'resolve', opts)
6174 6171 ms = mergestatemod.mergestate.read(repo)
6175 6172 wctx = repo[None]
6176 6173 m = scmutil.match(wctx, pats, opts)
6177 6174
6178 6175 # Labels and keys based on merge state. Unresolved path conflicts show
6179 6176 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6180 6177 # resolved conflicts.
6181 6178 mergestateinfo = {
6182 6179 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6183 6180 b'resolve.unresolved',
6184 6181 b'U',
6185 6182 ),
6186 6183 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6187 6184 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6188 6185 b'resolve.unresolved',
6189 6186 b'P',
6190 6187 ),
6191 6188 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6192 6189 b'resolve.resolved',
6193 6190 b'R',
6194 6191 ),
6195 6192 }
6196 6193
6197 6194 for f in ms:
6198 6195 if not m(f):
6199 6196 continue
6200 6197
6201 6198 label, key = mergestateinfo[ms[f]]
6202 6199 fm.startitem()
6203 6200 fm.context(ctx=wctx)
6204 6201 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6205 6202 fm.data(path=f)
6206 6203 fm.plain(b'%s\n' % uipathfn(f), label=label)
6207 6204 fm.end()
6208 6205 return 0
6209 6206
6210 6207 with repo.wlock():
6211 6208 ms = mergestatemod.mergestate.read(repo)
6212 6209
6213 6210 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6214 6211 raise error.StateError(
6215 6212 _(b'resolve command not applicable when not merging')
6216 6213 )
6217 6214
6218 6215 wctx = repo[None]
6219 6216 m = scmutil.match(wctx, pats, opts)
6220 6217 ret = 0
6221 6218 didwork = False
6222 6219
6223 6220 hasconflictmarkers = []
6224 6221 if mark:
6225 6222 markcheck = ui.config(b'commands', b'resolve.mark-check')
6226 6223 if markcheck not in [b'warn', b'abort']:
6227 6224 # Treat all invalid / unrecognized values as 'none'.
6228 6225 markcheck = False
6229 6226 for f in ms:
6230 6227 if not m(f):
6231 6228 continue
6232 6229
6233 6230 didwork = True
6234 6231
6235 6232 # path conflicts must be resolved manually
6236 6233 if ms[f] in (
6237 6234 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6238 6235 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6239 6236 ):
6240 6237 if mark:
6241 6238 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6242 6239 elif unmark:
6243 6240 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6244 6241 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6245 6242 ui.warn(
6246 6243 _(b'%s: path conflict must be resolved manually\n')
6247 6244 % uipathfn(f)
6248 6245 )
6249 6246 continue
6250 6247
6251 6248 if mark:
6252 6249 if markcheck:
6253 6250 fdata = repo.wvfs.tryread(f)
6254 6251 if (
6255 6252 filemerge.hasconflictmarkers(fdata)
6256 6253 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6257 6254 ):
6258 6255 hasconflictmarkers.append(f)
6259 6256 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6260 6257 elif unmark:
6261 6258 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6262 6259 else:
6263 6260 # backup pre-resolve (merge uses .orig for its own purposes)
6264 6261 a = repo.wjoin(f)
6265 6262 try:
6266 6263 util.copyfile(a, a + b".resolve")
6267 6264 except FileNotFoundError:
6268 6265 pass
6269 6266
6270 6267 try:
6271 6268 # preresolve file
6272 6269 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6273 6270 with ui.configoverride(overrides, b'resolve'):
6274 6271 r = ms.resolve(f, wctx)
6275 6272 if r:
6276 6273 ret = 1
6277 6274 finally:
6278 6275 ms.commit()
6279 6276
6280 6277 # replace filemerge's .orig file with our resolve file
6281 6278 try:
6282 6279 util.rename(
6283 6280 a + b".resolve", scmutil.backuppath(ui, repo, f)
6284 6281 )
6285 6282 except FileNotFoundError:
6286 6283 pass
6287 6284
6288 6285 if hasconflictmarkers:
6289 6286 ui.warn(
6290 6287 _(
6291 6288 b'warning: the following files still have conflict '
6292 6289 b'markers:\n'
6293 6290 )
6294 6291 + b''.join(
6295 6292 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6296 6293 )
6297 6294 )
6298 6295 if markcheck == b'abort' and not all and not pats:
6299 6296 raise error.StateError(
6300 6297 _(b'conflict markers detected'),
6301 6298 hint=_(b'use --all to mark anyway'),
6302 6299 )
6303 6300
6304 6301 ms.commit()
6305 6302 branchmerge = repo.dirstate.p2() != repo.nullid
6306 6303 # resolve is not doing a parent change here, however, `record updates`
6307 6304 # will call some dirstate API that at intended for parent changes call.
6308 6305 # Ideally we would not need this and could implement a lighter version
6309 6306 # of the recordupdateslogic that will not have to deal with the part
6310 6307 # related to parent changes. However this would requires that:
6311 6308 # - we are sure we passed around enough information at update/merge
6312 6309 # time to no longer needs it at `hg resolve time`
6313 6310 # - we are sure we store that information well enough to be able to reuse it
6314 6311 # - we are the necessary logic to reuse it right.
6315 6312 #
6316 6313 # All this should eventually happens, but in the mean time, we use this
6317 6314 # context manager slightly out of the context it should be.
6318 6315 with repo.dirstate.changing_parents(repo):
6319 6316 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6320 6317
6321 6318 if not didwork and pats:
6322 6319 hint = None
6323 6320 if not any([p for p in pats if p.find(b':') >= 0]):
6324 6321 pats = [b'path:%s' % p for p in pats]
6325 6322 m = scmutil.match(wctx, pats, opts)
6326 6323 for f in ms:
6327 6324 if not m(f):
6328 6325 continue
6329 6326
6330 6327 def flag(o):
6331 6328 if o == b're_merge':
6332 6329 return b'--re-merge '
6333 6330 return b'-%s ' % o[0:1]
6334 6331
6335 6332 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6336 6333 hint = _(b"(try: hg resolve %s%s)\n") % (
6337 6334 flags,
6338 6335 b' '.join(pats),
6339 6336 )
6340 6337 break
6341 6338 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6342 6339 if hint:
6343 6340 ui.warn(hint)
6344 6341
6345 6342 unresolvedf = ms.unresolvedcount()
6346 6343 if not unresolvedf:
6347 6344 ui.status(_(b'(no more unresolved files)\n'))
6348 6345 cmdutil.checkafterresolved(repo)
6349 6346
6350 6347 return ret
6351 6348
6352 6349
6353 6350 @command(
6354 6351 b'revert',
6355 6352 [
6356 6353 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6357 6354 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6358 6355 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6359 6356 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6360 6357 (b'i', b'interactive', None, _(b'interactively select the changes')),
6361 6358 ]
6362 6359 + walkopts
6363 6360 + dryrunopts,
6364 6361 _(b'[OPTION]... [-r REV] [NAME]...'),
6365 6362 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6366 6363 )
6367 6364 def revert(ui, repo, *pats, **opts):
6368 6365 """restore files to their checkout state
6369 6366
6370 6367 .. note::
6371 6368
6372 6369 To check out earlier revisions, you should use :hg:`update REV`.
6373 6370 To cancel an uncommitted merge (and lose your changes),
6374 6371 use :hg:`merge --abort`.
6375 6372
6376 6373 With no revision specified, revert the specified files or directories
6377 6374 to the contents they had in the parent of the working directory.
6378 6375 This restores the contents of files to an unmodified
6379 6376 state and unschedules adds, removes, copies, and renames. If the
6380 6377 working directory has two parents, you must explicitly specify a
6381 6378 revision.
6382 6379
6383 6380 Using the -r/--rev or -d/--date options, revert the given files or
6384 6381 directories to their states as of a specific revision. Because
6385 6382 revert does not change the working directory parents, this will
6386 6383 cause these files to appear modified. This can be helpful to "back
6387 6384 out" some or all of an earlier change. See :hg:`backout` for a
6388 6385 related method.
6389 6386
6390 6387 Modified files are saved with a .orig suffix before reverting.
6391 6388 To disable these backups, use --no-backup. It is possible to store
6392 6389 the backup files in a custom directory relative to the root of the
6393 6390 repository by setting the ``ui.origbackuppath`` configuration
6394 6391 option.
6395 6392
6396 6393 See :hg:`help dates` for a list of formats valid for -d/--date.
6397 6394
6398 6395 See :hg:`help backout` for a way to reverse the effect of an
6399 6396 earlier changeset.
6400 6397
6401 6398 Returns 0 on success.
6402 6399 """
6403 6400
6404 6401 opts = pycompat.byteskwargs(opts)
6405 6402 if opts.get(b"date"):
6406 6403 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6407 6404 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6408 6405
6409 6406 parent, p2 = repo.dirstate.parents()
6410 6407 if not opts.get(b'rev') and p2 != repo.nullid:
6411 6408 # revert after merge is a trap for new users (issue2915)
6412 6409 raise error.InputError(
6413 6410 _(b'uncommitted merge with no revision specified'),
6414 6411 hint=_(b"use 'hg update' or see 'hg help revert'"),
6415 6412 )
6416 6413
6417 6414 rev = opts.get(b'rev')
6418 6415 if rev:
6419 6416 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6420 6417 ctx = logcmdutil.revsingle(repo, rev)
6421 6418
6422 6419 if not (
6423 6420 pats
6424 6421 or opts.get(b'include')
6425 6422 or opts.get(b'exclude')
6426 6423 or opts.get(b'all')
6427 6424 or opts.get(b'interactive')
6428 6425 ):
6429 6426 msg = _(b"no files or directories specified")
6430 6427 if p2 != repo.nullid:
6431 6428 hint = _(
6432 6429 b"uncommitted merge, use --all to discard all changes,"
6433 6430 b" or 'hg update -C .' to abort the merge"
6434 6431 )
6435 6432 raise error.InputError(msg, hint=hint)
6436 6433 dirty = any(repo.status())
6437 6434 node = ctx.node()
6438 6435 if node != parent:
6439 6436 if dirty:
6440 6437 hint = (
6441 6438 _(
6442 6439 b"uncommitted changes, use --all to discard all"
6443 6440 b" changes, or 'hg update %d' to update"
6444 6441 )
6445 6442 % ctx.rev()
6446 6443 )
6447 6444 else:
6448 6445 hint = (
6449 6446 _(
6450 6447 b"use --all to revert all files,"
6451 6448 b" or 'hg update %d' to update"
6452 6449 )
6453 6450 % ctx.rev()
6454 6451 )
6455 6452 elif dirty:
6456 6453 hint = _(b"uncommitted changes, use --all to discard all changes")
6457 6454 else:
6458 6455 hint = _(b"use --all to revert all files")
6459 6456 raise error.InputError(msg, hint=hint)
6460 6457
6461 6458 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6462 6459
6463 6460
6464 6461 @command(
6465 6462 b'rollback',
6466 6463 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6467 6464 helpcategory=command.CATEGORY_MAINTENANCE,
6468 6465 )
6469 6466 def rollback(ui, repo, **opts):
6470 6467 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6471 6468
6472 6469 Please use :hg:`commit --amend` instead of rollback to correct
6473 6470 mistakes in the last commit.
6474 6471
6475 6472 This command should be used with care. There is only one level of
6476 6473 rollback, and there is no way to undo a rollback. It will also
6477 6474 restore the dirstate at the time of the last transaction, losing
6478 6475 any dirstate changes since that time. This command does not alter
6479 6476 the working directory.
6480 6477
6481 6478 Transactions are used to encapsulate the effects of all commands
6482 6479 that create new changesets or propagate existing changesets into a
6483 6480 repository.
6484 6481
6485 6482 .. container:: verbose
6486 6483
6487 6484 For example, the following commands are transactional, and their
6488 6485 effects can be rolled back:
6489 6486
6490 6487 - commit
6491 6488 - import
6492 6489 - pull
6493 6490 - push (with this repository as the destination)
6494 6491 - unbundle
6495 6492
6496 6493 To avoid permanent data loss, rollback will refuse to rollback a
6497 6494 commit transaction if it isn't checked out. Use --force to
6498 6495 override this protection.
6499 6496
6500 6497 The rollback command can be entirely disabled by setting the
6501 6498 ``ui.rollback`` configuration setting to false. If you're here
6502 6499 because you want to use rollback and it's disabled, you can
6503 6500 re-enable the command by setting ``ui.rollback`` to true.
6504 6501
6505 6502 This command is not intended for use on public repositories. Once
6506 6503 changes are visible for pull by other users, rolling a transaction
6507 6504 back locally is ineffective (someone else may already have pulled
6508 6505 the changes). Furthermore, a race is possible with readers of the
6509 6506 repository; for example an in-progress pull from the repository
6510 6507 may fail if a rollback is performed.
6511 6508
6512 6509 Returns 0 on success, 1 if no rollback data is available.
6513 6510 """
6514 6511 if not ui.configbool(b'ui', b'rollback'):
6515 6512 raise error.Abort(
6516 6513 _(b'rollback is disabled because it is unsafe'),
6517 6514 hint=b'see `hg help -v rollback` for information',
6518 6515 )
6519 6516 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6520 6517
6521 6518
6522 6519 @command(
6523 6520 b'root',
6524 6521 [] + formatteropts,
6525 6522 intents={INTENT_READONLY},
6526 6523 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6527 6524 )
6528 6525 def root(ui, repo, **opts):
6529 6526 """print the root (top) of the current working directory
6530 6527
6531 6528 Print the root directory of the current repository.
6532 6529
6533 6530 .. container:: verbose
6534 6531
6535 6532 Template:
6536 6533
6537 6534 The following keywords are supported in addition to the common template
6538 6535 keywords and functions. See also :hg:`help templates`.
6539 6536
6540 6537 :hgpath: String. Path to the .hg directory.
6541 6538 :storepath: String. Path to the directory holding versioned data.
6542 6539
6543 6540 Returns 0 on success.
6544 6541 """
6545 6542 opts = pycompat.byteskwargs(opts)
6546 6543 with ui.formatter(b'root', opts) as fm:
6547 6544 fm.startitem()
6548 6545 fm.write(b'reporoot', b'%s\n', repo.root)
6549 6546 fm.data(hgpath=repo.path, storepath=repo.spath)
6550 6547
6551 6548
6552 6549 @command(
6553 6550 b'serve',
6554 6551 [
6555 6552 (
6556 6553 b'A',
6557 6554 b'accesslog',
6558 6555 b'',
6559 6556 _(b'name of access log file to write to'),
6560 6557 _(b'FILE'),
6561 6558 ),
6562 6559 (b'd', b'daemon', None, _(b'run server in background')),
6563 6560 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6564 6561 (
6565 6562 b'E',
6566 6563 b'errorlog',
6567 6564 b'',
6568 6565 _(b'name of error log file to write to'),
6569 6566 _(b'FILE'),
6570 6567 ),
6571 6568 # use string type, then we can check if something was passed
6572 6569 (
6573 6570 b'p',
6574 6571 b'port',
6575 6572 b'',
6576 6573 _(b'port to listen on (default: 8000)'),
6577 6574 _(b'PORT'),
6578 6575 ),
6579 6576 (
6580 6577 b'a',
6581 6578 b'address',
6582 6579 b'',
6583 6580 _(b'address to listen on (default: all interfaces)'),
6584 6581 _(b'ADDR'),
6585 6582 ),
6586 6583 (
6587 6584 b'',
6588 6585 b'prefix',
6589 6586 b'',
6590 6587 _(b'prefix path to serve from (default: server root)'),
6591 6588 _(b'PREFIX'),
6592 6589 ),
6593 6590 (
6594 6591 b'n',
6595 6592 b'name',
6596 6593 b'',
6597 6594 _(b'name to show in web pages (default: working directory)'),
6598 6595 _(b'NAME'),
6599 6596 ),
6600 6597 (
6601 6598 b'',
6602 6599 b'web-conf',
6603 6600 b'',
6604 6601 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6605 6602 _(b'FILE'),
6606 6603 ),
6607 6604 (
6608 6605 b'',
6609 6606 b'webdir-conf',
6610 6607 b'',
6611 6608 _(b'name of the hgweb config file (DEPRECATED)'),
6612 6609 _(b'FILE'),
6613 6610 ),
6614 6611 (
6615 6612 b'',
6616 6613 b'pid-file',
6617 6614 b'',
6618 6615 _(b'name of file to write process ID to'),
6619 6616 _(b'FILE'),
6620 6617 ),
6621 6618 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6622 6619 (
6623 6620 b'',
6624 6621 b'cmdserver',
6625 6622 b'',
6626 6623 _(b'for remote clients (ADVANCED)'),
6627 6624 _(b'MODE'),
6628 6625 ),
6629 6626 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6630 6627 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6631 6628 (b'6', b'ipv6', None, _(b'use IPv6 instead of IPv4')),
6632 6629 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6633 6630 (b'', b'print-url', None, _(b'start and print only the URL')),
6634 6631 ]
6635 6632 + subrepoopts,
6636 6633 _(b'[OPTION]...'),
6637 6634 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6638 6635 helpbasic=True,
6639 6636 optionalrepo=True,
6640 6637 )
6641 6638 def serve(ui, repo, **opts):
6642 6639 """start stand-alone webserver
6643 6640
6644 6641 Start a local HTTP repository browser and pull server. You can use
6645 6642 this for ad-hoc sharing and browsing of repositories. It is
6646 6643 recommended to use a real web server to serve a repository for
6647 6644 longer periods of time.
6648 6645
6649 6646 Please note that the server does not implement access control.
6650 6647 This means that, by default, anybody can read from the server and
6651 6648 nobody can write to it by default. Set the ``web.allow-push``
6652 6649 option to ``*`` to allow everybody to push to the server. You
6653 6650 should use a real web server if you need to authenticate users.
6654 6651
6655 6652 By default, the server logs accesses to stdout and errors to
6656 6653 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6657 6654 files.
6658 6655
6659 6656 To have the server choose a free port number to listen on, specify
6660 6657 a port number of 0; in this case, the server will print the port
6661 6658 number it uses.
6662 6659
6663 6660 Returns 0 on success.
6664 6661 """
6665 6662
6666 6663 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6667 6664 opts = pycompat.byteskwargs(opts)
6668 6665 if opts[b"print_url"] and ui.verbose:
6669 6666 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6670 6667
6671 6668 if opts[b"stdio"]:
6672 6669 if repo is None:
6673 6670 raise error.RepoError(
6674 6671 _(b"there is no Mercurial repository here (.hg not found)")
6675 6672 )
6676 6673 accesshidden = False
6677 6674 if repo.filtername is None:
6678 6675 allow = ui.configlist(
6679 6676 b'experimental', b'server.allow-hidden-access'
6680 6677 )
6681 6678 user = procutil.getuser()
6682 6679 if allow and scmutil.ismember(ui, user, allow):
6683 6680 accesshidden = True
6684 6681 else:
6685 6682 msg = (
6686 6683 _(
6687 6684 b'ignoring request to access hidden changeset by '
6688 6685 b'unauthorized user: %s\n'
6689 6686 )
6690 6687 % user
6691 6688 )
6692 6689 ui.warn(msg)
6693 6690
6694 6691 s = wireprotoserver.sshserver(ui, repo, accesshidden=accesshidden)
6695 6692 s.serve_forever()
6696 6693 return
6697 6694
6698 6695 service = server.createservice(ui, repo, opts)
6699 6696 return server.runservice(opts, initfn=service.init, runfn=service.run)
6700 6697
6701 6698
6702 6699 @command(
6703 6700 b'shelve',
6704 6701 [
6705 6702 (
6706 6703 b'A',
6707 6704 b'addremove',
6708 6705 None,
6709 6706 _(b'mark new/missing files as added/removed before shelving'),
6710 6707 ),
6711 6708 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6712 6709 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6713 6710 (
6714 6711 b'',
6715 6712 b'date',
6716 6713 b'',
6717 6714 _(b'shelve with the specified commit date'),
6718 6715 _(b'DATE'),
6719 6716 ),
6720 6717 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6721 6718 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6722 6719 (
6723 6720 b'k',
6724 6721 b'keep',
6725 6722 False,
6726 6723 _(b'shelve, but keep changes in the working directory'),
6727 6724 ),
6728 6725 (b'l', b'list', None, _(b'list current shelves')),
6729 6726 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6730 6727 (
6731 6728 b'n',
6732 6729 b'name',
6733 6730 b'',
6734 6731 _(b'use the given name for the shelved commit'),
6735 6732 _(b'NAME'),
6736 6733 ),
6737 6734 (
6738 6735 b'p',
6739 6736 b'patch',
6740 6737 None,
6741 6738 _(
6742 6739 b'output patches for changes (provide the names of the shelved '
6743 6740 b'changes as positional arguments)'
6744 6741 ),
6745 6742 ),
6746 6743 (b'i', b'interactive', None, _(b'interactive mode')),
6747 6744 (
6748 6745 b'',
6749 6746 b'stat',
6750 6747 None,
6751 6748 _(
6752 6749 b'output diffstat-style summary of changes (provide the names of '
6753 6750 b'the shelved changes as positional arguments)'
6754 6751 ),
6755 6752 ),
6756 6753 ]
6757 6754 + cmdutil.walkopts,
6758 6755 _(b'hg shelve [OPTION]... [FILE]...'),
6759 6756 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6760 6757 )
6761 6758 def shelve(ui, repo, *pats, **opts):
6762 6759 """save and set aside changes from the working directory
6763 6760
6764 6761 Shelving takes files that "hg status" reports as not clean, saves
6765 6762 the modifications to a bundle (a shelved change), and reverts the
6766 6763 files so that their state in the working directory becomes clean.
6767 6764
6768 6765 To restore these changes to the working directory, using "hg
6769 6766 unshelve"; this will work even if you switch to a different
6770 6767 commit.
6771 6768
6772 6769 When no files are specified, "hg shelve" saves all not-clean
6773 6770 files. If specific files or directories are named, only changes to
6774 6771 those files are shelved.
6775 6772
6776 6773 In bare shelve (when no files are specified, without interactive,
6777 6774 include and exclude option), shelving remembers information if the
6778 6775 working directory was on newly created branch, in other words working
6779 6776 directory was on different branch than its first parent. In this
6780 6777 situation unshelving restores branch information to the working directory.
6781 6778
6782 6779 Each shelved change has a name that makes it easier to find later.
6783 6780 The name of a shelved change defaults to being based on the active
6784 6781 bookmark, or if there is no active bookmark, the current named
6785 6782 branch. To specify a different name, use ``--name``.
6786 6783
6787 6784 To see a list of existing shelved changes, use the ``--list``
6788 6785 option. For each shelved change, this will print its name, age,
6789 6786 and description; use ``--patch`` or ``--stat`` for more details.
6790 6787
6791 6788 To delete specific shelved changes, use ``--delete``. To delete
6792 6789 all shelved changes, use ``--cleanup``.
6793 6790 """
6794 6791 opts = pycompat.byteskwargs(opts)
6795 6792 allowables = [
6796 6793 (b'addremove', {b'create'}), # 'create' is pseudo action
6797 6794 (b'unknown', {b'create'}),
6798 6795 (b'cleanup', {b'cleanup'}),
6799 6796 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6800 6797 (b'delete', {b'delete'}),
6801 6798 (b'edit', {b'create'}),
6802 6799 (b'keep', {b'create'}),
6803 6800 (b'list', {b'list'}),
6804 6801 (b'message', {b'create'}),
6805 6802 (b'name', {b'create'}),
6806 6803 (b'patch', {b'patch', b'list'}),
6807 6804 (b'stat', {b'stat', b'list'}),
6808 6805 ]
6809 6806
6810 6807 def checkopt(opt):
6811 6808 if opts.get(opt):
6812 6809 for i, allowable in allowables:
6813 6810 if opts[i] and opt not in allowable:
6814 6811 raise error.InputError(
6815 6812 _(
6816 6813 b"options '--%s' and '--%s' may not be "
6817 6814 b"used together"
6818 6815 )
6819 6816 % (opt, i)
6820 6817 )
6821 6818 return True
6822 6819
6823 6820 if checkopt(b'cleanup'):
6824 6821 if pats:
6825 6822 raise error.InputError(
6826 6823 _(b"cannot specify names when using '--cleanup'")
6827 6824 )
6828 6825 return shelvemod.cleanupcmd(ui, repo)
6829 6826 elif checkopt(b'delete'):
6830 6827 return shelvemod.deletecmd(ui, repo, pats)
6831 6828 elif checkopt(b'list'):
6832 6829 return shelvemod.listcmd(ui, repo, pats, opts)
6833 6830 elif checkopt(b'patch') or checkopt(b'stat'):
6834 6831 return shelvemod.patchcmds(ui, repo, pats, opts)
6835 6832 else:
6836 6833 return shelvemod.createcmd(ui, repo, pats, opts)
6837 6834
6838 6835
6839 6836 _NOTTERSE = b'nothing'
6840 6837
6841 6838
6842 6839 @command(
6843 6840 b'status|st',
6844 6841 [
6845 6842 (b'A', b'all', None, _(b'show status of all files')),
6846 6843 (b'm', b'modified', None, _(b'show only modified files')),
6847 6844 (b'a', b'added', None, _(b'show only added files')),
6848 6845 (b'r', b'removed', None, _(b'show only removed files')),
6849 6846 (b'd', b'deleted', None, _(b'show only missing files')),
6850 6847 (b'c', b'clean', None, _(b'show only files without changes')),
6851 6848 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6852 6849 (b'i', b'ignored', None, _(b'show only ignored files')),
6853 6850 (b'n', b'no-status', None, _(b'hide status prefix')),
6854 6851 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6855 6852 (
6856 6853 b'C',
6857 6854 b'copies',
6858 6855 None,
6859 6856 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6860 6857 ),
6861 6858 (
6862 6859 b'0',
6863 6860 b'print0',
6864 6861 None,
6865 6862 _(b'end filenames with NUL, for use with xargs'),
6866 6863 ),
6867 6864 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6868 6865 (
6869 6866 b'',
6870 6867 b'change',
6871 6868 b'',
6872 6869 _(b'list the changed files of a revision'),
6873 6870 _(b'REV'),
6874 6871 ),
6875 6872 ]
6876 6873 + walkopts
6877 6874 + subrepoopts
6878 6875 + formatteropts,
6879 6876 _(b'[OPTION]... [FILE]...'),
6880 6877 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6881 6878 helpbasic=True,
6882 6879 inferrepo=True,
6883 6880 intents={INTENT_READONLY},
6884 6881 )
6885 6882 def status(ui, repo, *pats, **opts):
6886 6883 """show changed files in the working directory
6887 6884
6888 6885 Show status of files in the repository. If names are given, only
6889 6886 files that match are shown. Files that are clean or ignored or
6890 6887 the source of a copy/move operation, are not listed unless
6891 6888 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6892 6889 Unless options described with "show only ..." are given, the
6893 6890 options -mardu are used.
6894 6891
6895 6892 Option -q/--quiet hides untracked (unknown and ignored) files
6896 6893 unless explicitly requested with -u/--unknown or -i/--ignored.
6897 6894
6898 6895 .. note::
6899 6896
6900 6897 :hg:`status` may appear to disagree with diff if permissions have
6901 6898 changed or a merge has occurred. The standard diff format does
6902 6899 not report permission changes and diff only reports changes
6903 6900 relative to one merge parent.
6904 6901
6905 6902 If one revision is given, it is used as the base revision.
6906 6903 If two revisions are given, the differences between them are
6907 6904 shown. The --change option can also be used as a shortcut to list
6908 6905 the changed files of a revision from its first parent.
6909 6906
6910 6907 The codes used to show the status of files are::
6911 6908
6912 6909 M = modified
6913 6910 A = added
6914 6911 R = removed
6915 6912 C = clean
6916 6913 ! = missing (deleted by non-hg command, but still tracked)
6917 6914 ? = not tracked
6918 6915 I = ignored
6919 6916 = origin of the previous file (with --copies)
6920 6917
6921 6918 .. container:: verbose
6922 6919
6923 6920 The -t/--terse option abbreviates the output by showing only the directory
6924 6921 name if all the files in it share the same status. The option takes an
6925 6922 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6926 6923 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6927 6924 for 'ignored' and 'c' for clean.
6928 6925
6929 6926 It abbreviates only those statuses which are passed. Note that clean and
6930 6927 ignored files are not displayed with '--terse ic' unless the -c/--clean
6931 6928 and -i/--ignored options are also used.
6932 6929
6933 6930 The -v/--verbose option shows information when the repository is in an
6934 6931 unfinished merge, shelve, rebase state etc. You can have this behavior
6935 6932 turned on by default by enabling the ``commands.status.verbose`` option.
6936 6933
6937 6934 You can skip displaying some of these states by setting
6938 6935 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6939 6936 'histedit', 'merge', 'rebase', or 'unshelve'.
6940 6937
6941 6938 Template:
6942 6939
6943 6940 The following keywords are supported in addition to the common template
6944 6941 keywords and functions. See also :hg:`help templates`.
6945 6942
6946 6943 :path: String. Repository-absolute path of the file.
6947 6944 :source: String. Repository-absolute path of the file originated from.
6948 6945 Available if ``--copies`` is specified.
6949 6946 :status: String. Character denoting file's status.
6950 6947
6951 6948 Examples:
6952 6949
6953 6950 - show changes in the working directory relative to a
6954 6951 changeset::
6955 6952
6956 6953 hg status --rev 9353
6957 6954
6958 6955 - show changes in the working directory relative to the
6959 6956 current directory (see :hg:`help patterns` for more information)::
6960 6957
6961 6958 hg status re:
6962 6959
6963 6960 - show all changes including copies in an existing changeset::
6964 6961
6965 6962 hg status --copies --change 9353
6966 6963
6967 6964 - get a NUL separated list of added files, suitable for xargs::
6968 6965
6969 6966 hg status -an0
6970 6967
6971 6968 - show more information about the repository status, abbreviating
6972 6969 added, removed, modified, deleted, and untracked paths::
6973 6970
6974 6971 hg status -v -t mardu
6975 6972
6976 6973 Returns 0 on success.
6977 6974
6978 6975 """
6979 6976
6980 6977 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6981 6978 opts = pycompat.byteskwargs(opts)
6982 6979 revs = opts.get(b'rev', [])
6983 6980 change = opts.get(b'change', b'')
6984 6981 terse = opts.get(b'terse', _NOTTERSE)
6985 6982 if terse is _NOTTERSE:
6986 6983 if revs:
6987 6984 terse = b''
6988 6985 else:
6989 6986 terse = ui.config(b'commands', b'status.terse')
6990 6987
6991 6988 if revs and terse:
6992 6989 msg = _(b'cannot use --terse with --rev')
6993 6990 raise error.InputError(msg)
6994 6991 elif change:
6995 6992 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6996 6993 ctx2 = logcmdutil.revsingle(repo, change, None)
6997 6994 ctx1 = ctx2.p1()
6998 6995 else:
6999 6996 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
7000 6997 ctx1, ctx2 = logcmdutil.revpair(repo, revs)
7001 6998
7002 6999 forcerelativevalue = None
7003 7000 if ui.hasconfig(b'commands', b'status.relative'):
7004 7001 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
7005 7002 uipathfn = scmutil.getuipathfn(
7006 7003 repo,
7007 7004 legacyrelativevalue=bool(pats),
7008 7005 forcerelativevalue=forcerelativevalue,
7009 7006 )
7010 7007
7011 7008 if opts.get(b'print0'):
7012 7009 end = b'\0'
7013 7010 else:
7014 7011 end = b'\n'
7015 7012 states = b'modified added removed deleted unknown ignored clean'.split()
7016 7013 show = [k for k in states if opts.get(k)]
7017 7014 if opts.get(b'all'):
7018 7015 show += ui.quiet and (states[:4] + [b'clean']) or states
7019 7016
7020 7017 if not show:
7021 7018 if ui.quiet:
7022 7019 show = states[:4]
7023 7020 else:
7024 7021 show = states[:5]
7025 7022
7026 7023 m = scmutil.match(ctx2, pats, opts)
7027 7024 if terse:
7028 7025 # we need to compute clean and unknown to terse
7029 7026 stat = repo.status(
7030 7027 ctx1.node(),
7031 7028 ctx2.node(),
7032 7029 m,
7033 7030 b'ignored' in show or b'i' in terse,
7034 7031 clean=True,
7035 7032 unknown=True,
7036 7033 listsubrepos=opts.get(b'subrepos'),
7037 7034 )
7038 7035
7039 7036 stat = cmdutil.tersedir(stat, terse)
7040 7037 else:
7041 7038 stat = repo.status(
7042 7039 ctx1.node(),
7043 7040 ctx2.node(),
7044 7041 m,
7045 7042 b'ignored' in show,
7046 7043 b'clean' in show,
7047 7044 b'unknown' in show,
7048 7045 opts.get(b'subrepos'),
7049 7046 )
7050 7047
7051 7048 changestates = zip(
7052 7049 states,
7053 7050 pycompat.iterbytestr(b'MAR!?IC'),
7054 7051 [getattr(stat, s.decode('utf8')) for s in states],
7055 7052 )
7056 7053
7057 7054 copy = {}
7058 7055 show_copies = ui.configbool(b'ui', b'statuscopies')
7059 7056 if opts.get(b'copies') is not None:
7060 7057 show_copies = opts.get(b'copies')
7061 7058 show_copies = (show_copies or opts.get(b'all')) and not opts.get(
7062 7059 b'no_status'
7063 7060 )
7064 7061 if show_copies:
7065 7062 copy = copies.pathcopies(ctx1, ctx2, m)
7066 7063
7067 7064 morestatus = None
7068 7065 if (
7069 7066 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
7070 7067 and not ui.plain()
7071 7068 and not opts.get(b'print0')
7072 7069 ):
7073 7070 morestatus = cmdutil.readmorestatus(repo)
7074 7071
7075 7072 ui.pager(b'status')
7076 7073 fm = ui.formatter(b'status', opts)
7077 7074 fmt = b'%s' + end
7078 7075 showchar = not opts.get(b'no_status')
7079 7076
7080 7077 for state, char, files in changestates:
7081 7078 if state in show:
7082 7079 label = b'status.' + state
7083 7080 for f in files:
7084 7081 fm.startitem()
7085 7082 fm.context(ctx=ctx2)
7086 7083 fm.data(itemtype=b'file', path=f)
7087 7084 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
7088 7085 fm.plain(fmt % uipathfn(f), label=label)
7089 7086 if f in copy:
7090 7087 fm.data(source=copy[f])
7091 7088 fm.plain(
7092 7089 (b' %s' + end) % uipathfn(copy[f]),
7093 7090 label=b'status.copied',
7094 7091 )
7095 7092 if morestatus:
7096 7093 morestatus.formatfile(f, fm)
7097 7094
7098 7095 if morestatus:
7099 7096 morestatus.formatfooter(fm)
7100 7097 fm.end()
7101 7098
7102 7099
7103 7100 @command(
7104 7101 b'summary|sum',
7105 7102 [(b'', b'remote', None, _(b'check for push and pull'))],
7106 7103 b'[--remote]',
7107 7104 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7108 7105 helpbasic=True,
7109 7106 intents={INTENT_READONLY},
7110 7107 )
7111 7108 def summary(ui, repo, **opts):
7112 7109 """summarize working directory state
7113 7110
7114 7111 This generates a brief summary of the working directory state,
7115 7112 including parents, branch, commit status, phase and available updates.
7116 7113
7117 7114 With the --remote option, this will check the default paths for
7118 7115 incoming and outgoing changes. This can be time-consuming.
7119 7116
7120 7117 Returns 0 on success.
7121 7118 """
7122 7119
7123 7120 opts = pycompat.byteskwargs(opts)
7124 7121 ui.pager(b'summary')
7125 7122 ctx = repo[None]
7126 7123 parents = ctx.parents()
7127 7124 pnode = parents[0].node()
7128 7125 marks = []
7129 7126
7130 7127 try:
7131 7128 ms = mergestatemod.mergestate.read(repo)
7132 7129 except error.UnsupportedMergeRecords as e:
7133 7130 s = b' '.join(e.recordtypes)
7134 7131 ui.warn(
7135 7132 _(b'warning: merge state has unsupported record types: %s\n') % s
7136 7133 )
7137 7134 unresolved = []
7138 7135 else:
7139 7136 unresolved = list(ms.unresolved())
7140 7137
7141 7138 for p in parents:
7142 7139 # label with log.changeset (instead of log.parent) since this
7143 7140 # shows a working directory parent *changeset*:
7144 7141 # i18n: column positioning for "hg summary"
7145 7142 ui.write(
7146 7143 _(b'parent: %d:%s ') % (p.rev(), p),
7147 7144 label=logcmdutil.changesetlabels(p),
7148 7145 )
7149 7146 ui.write(b' '.join(p.tags()), label=b'log.tag')
7150 7147 if p.bookmarks():
7151 7148 marks.extend(p.bookmarks())
7152 7149 if p.rev() == -1:
7153 7150 if not len(repo):
7154 7151 ui.write(_(b' (empty repository)'))
7155 7152 else:
7156 7153 ui.write(_(b' (no revision checked out)'))
7157 7154 if p.obsolete():
7158 7155 ui.write(_(b' (obsolete)'))
7159 7156 if p.isunstable():
7160 7157 instabilities = (
7161 7158 ui.label(instability, b'trouble.%s' % instability)
7162 7159 for instability in p.instabilities()
7163 7160 )
7164 7161 ui.write(b' (' + b', '.join(instabilities) + b')')
7165 7162 ui.write(b'\n')
7166 7163 if p.description():
7167 7164 ui.status(
7168 7165 b' ' + p.description().splitlines()[0].strip() + b'\n',
7169 7166 label=b'log.summary',
7170 7167 )
7171 7168
7172 7169 branch = ctx.branch()
7173 7170 bheads = repo.branchheads(branch)
7174 7171 # i18n: column positioning for "hg summary"
7175 7172 m = _(b'branch: %s\n') % branch
7176 7173 if branch != b'default':
7177 7174 ui.write(m, label=b'log.branch')
7178 7175 else:
7179 7176 ui.status(m, label=b'log.branch')
7180 7177
7181 7178 if marks:
7182 7179 active = repo._activebookmark
7183 7180 # i18n: column positioning for "hg summary"
7184 7181 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7185 7182 if active is not None:
7186 7183 if active in marks:
7187 7184 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7188 7185 marks.remove(active)
7189 7186 else:
7190 7187 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7191 7188 for m in marks:
7192 7189 ui.write(b' ' + m, label=b'log.bookmark')
7193 7190 ui.write(b'\n', label=b'log.bookmark')
7194 7191
7195 7192 status = repo.status(unknown=True)
7196 7193
7197 7194 c = repo.dirstate.copies()
7198 7195 copied, renamed = [], []
7199 7196 for d, s in c.items():
7200 7197 if s in status.removed:
7201 7198 status.removed.remove(s)
7202 7199 renamed.append(d)
7203 7200 else:
7204 7201 copied.append(d)
7205 7202 if d in status.added:
7206 7203 status.added.remove(d)
7207 7204
7208 7205 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7209 7206
7210 7207 labels = [
7211 7208 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7212 7209 (ui.label(_(b'%d added'), b'status.added'), status.added),
7213 7210 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7214 7211 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7215 7212 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7216 7213 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7217 7214 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7218 7215 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7219 7216 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7220 7217 ]
7221 7218 t = []
7222 7219 for l, s in labels:
7223 7220 if s:
7224 7221 t.append(l % len(s))
7225 7222
7226 7223 t = b', '.join(t)
7227 7224 cleanworkdir = False
7228 7225
7229 7226 if repo.vfs.exists(b'graftstate'):
7230 7227 t += _(b' (graft in progress)')
7231 7228 if repo.vfs.exists(b'updatestate'):
7232 7229 t += _(b' (interrupted update)')
7233 7230 elif len(parents) > 1:
7234 7231 t += _(b' (merge)')
7235 7232 elif branch != parents[0].branch():
7236 7233 t += _(b' (new branch)')
7237 7234 elif parents[0].closesbranch() and pnode in repo.branchheads(
7238 7235 branch, closed=True
7239 7236 ):
7240 7237 t += _(b' (head closed)')
7241 7238 elif not (
7242 7239 status.modified
7243 7240 or status.added
7244 7241 or status.removed
7245 7242 or renamed
7246 7243 or copied
7247 7244 or subs
7248 7245 ):
7249 7246 t += _(b' (clean)')
7250 7247 cleanworkdir = True
7251 7248 elif pnode not in bheads:
7252 7249 t += _(b' (new branch head)')
7253 7250
7254 7251 if parents:
7255 7252 pendingphase = max(p.phase() for p in parents)
7256 7253 else:
7257 7254 pendingphase = phases.public
7258 7255
7259 7256 if pendingphase > phases.newcommitphase(ui):
7260 7257 t += b' (%s)' % phases.phasenames[pendingphase]
7261 7258
7262 7259 if cleanworkdir:
7263 7260 # i18n: column positioning for "hg summary"
7264 7261 ui.status(_(b'commit: %s\n') % t.strip())
7265 7262 else:
7266 7263 # i18n: column positioning for "hg summary"
7267 7264 ui.write(_(b'commit: %s\n') % t.strip())
7268 7265
7269 7266 # all ancestors of branch heads - all ancestors of parent = new csets
7270 7267 new = len(
7271 7268 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7272 7269 )
7273 7270
7274 7271 if new == 0:
7275 7272 # i18n: column positioning for "hg summary"
7276 7273 ui.status(_(b'update: (current)\n'))
7277 7274 elif pnode not in bheads:
7278 7275 # i18n: column positioning for "hg summary"
7279 7276 ui.write(_(b'update: %d new changesets (update)\n') % new)
7280 7277 else:
7281 7278 # i18n: column positioning for "hg summary"
7282 7279 ui.write(
7283 7280 _(b'update: %d new changesets, %d branch heads (merge)\n')
7284 7281 % (new, len(bheads))
7285 7282 )
7286 7283
7287 7284 t = []
7288 7285 draft = len(repo.revs(b'draft()'))
7289 7286 if draft:
7290 7287 t.append(_(b'%d draft') % draft)
7291 7288 secret = len(repo.revs(b'secret()'))
7292 7289 if secret:
7293 7290 t.append(_(b'%d secret') % secret)
7294 7291
7295 7292 if draft or secret:
7296 7293 ui.status(_(b'phases: %s\n') % b', '.join(t))
7297 7294
7298 7295 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7299 7296 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7300 7297 numtrouble = len(repo.revs(trouble + b"()"))
7301 7298 # We write all the possibilities to ease translation
7302 7299 troublemsg = {
7303 7300 b"orphan": _(b"orphan: %d changesets"),
7304 7301 b"contentdivergent": _(b"content-divergent: %d changesets"),
7305 7302 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7306 7303 }
7307 7304 if numtrouble > 0:
7308 7305 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7309 7306
7310 7307 cmdutil.summaryhooks(ui, repo)
7311 7308
7312 7309 if opts.get(b'remote'):
7313 7310 needsincoming, needsoutgoing = True, True
7314 7311 else:
7315 7312 needsincoming, needsoutgoing = False, False
7316 7313 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7317 7314 if i:
7318 7315 needsincoming = True
7319 7316 if o:
7320 7317 needsoutgoing = True
7321 7318 if not needsincoming and not needsoutgoing:
7322 7319 return
7323 7320
7324 7321 def getincoming():
7325 7322 # XXX We should actually skip this if no default is specified, instead
7326 7323 # of passing "default" which will resolve as "./default/" if no default
7327 7324 # path is defined.
7328 7325 path = urlutil.get_unique_pull_path_obj(b'summary', ui, b'default')
7329 7326 sbranch = path.branch
7330 7327 try:
7331 7328 other = hg.peer(repo, {}, path)
7332 7329 except error.RepoError:
7333 7330 if opts.get(b'remote'):
7334 7331 raise
7335 7332 return path.loc, sbranch, None, None, None
7336 7333 branches = (path.branch, [])
7337 7334 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7338 7335 if revs:
7339 7336 revs = [other.lookup(rev) for rev in revs]
7340 7337 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(path.loc))
7341 7338 with repo.ui.silent():
7342 7339 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7343 7340 return path.loc, sbranch, other, commoninc, commoninc[1]
7344 7341
7345 7342 if needsincoming:
7346 7343 source, sbranch, sother, commoninc, incoming = getincoming()
7347 7344 else:
7348 7345 source = sbranch = sother = commoninc = incoming = None
7349 7346
7350 7347 def getoutgoing():
7351 7348 # XXX We should actually skip this if no default is specified, instead
7352 7349 # of passing "default" which will resolve as "./default/" if no default
7353 7350 # path is defined.
7354 7351 d = None
7355 7352 if b'default-push' in ui.paths:
7356 7353 d = b'default-push'
7357 7354 elif b'default' in ui.paths:
7358 7355 d = b'default'
7359 7356 path = None
7360 7357 if d is not None:
7361 7358 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7362 7359 dest = path.loc
7363 7360 dbranch = path.branch
7364 7361 else:
7365 7362 dest = b'default'
7366 7363 dbranch = None
7367 7364 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7368 7365 if source != dest:
7369 7366 try:
7370 7367 dother = hg.peer(repo, {}, path if path is not None else dest)
7371 7368 except error.RepoError:
7372 7369 if opts.get(b'remote'):
7373 7370 raise
7374 7371 return dest, dbranch, None, None
7375 7372 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7376 7373 elif sother is None:
7377 7374 # there is no explicit destination peer, but source one is invalid
7378 7375 return dest, dbranch, None, None
7379 7376 else:
7380 7377 dother = sother
7381 7378 if source != dest or (sbranch is not None and sbranch != dbranch):
7382 7379 common = None
7383 7380 else:
7384 7381 common = commoninc
7385 7382 if revs:
7386 7383 revs = [repo.lookup(rev) for rev in revs]
7387 7384 with repo.ui.silent():
7388 7385 outgoing = discovery.findcommonoutgoing(
7389 7386 repo, dother, onlyheads=revs, commoninc=common
7390 7387 )
7391 7388 return dest, dbranch, dother, outgoing
7392 7389
7393 7390 if needsoutgoing:
7394 7391 dest, dbranch, dother, outgoing = getoutgoing()
7395 7392 else:
7396 7393 dest = dbranch = dother = outgoing = None
7397 7394
7398 7395 if opts.get(b'remote'):
7399 7396 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7400 7397 # The former always sets `sother` (or raises an exception if it can't);
7401 7398 # the latter always sets `outgoing`.
7402 7399 assert sother is not None
7403 7400 assert outgoing is not None
7404 7401
7405 7402 t = []
7406 7403 if incoming:
7407 7404 t.append(_(b'1 or more incoming'))
7408 7405 o = outgoing.missing
7409 7406 if o:
7410 7407 t.append(_(b'%d outgoing') % len(o))
7411 7408 other = dother or sother
7412 7409 if b'bookmarks' in other.listkeys(b'namespaces'):
7413 7410 counts = bookmarks.summary(repo, other)
7414 7411 if counts[0] > 0:
7415 7412 t.append(_(b'%d incoming bookmarks') % counts[0])
7416 7413 if counts[1] > 0:
7417 7414 t.append(_(b'%d outgoing bookmarks') % counts[1])
7418 7415
7419 7416 if t:
7420 7417 # i18n: column positioning for "hg summary"
7421 7418 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7422 7419 else:
7423 7420 # i18n: column positioning for "hg summary"
7424 7421 ui.status(_(b'remote: (synced)\n'))
7425 7422
7426 7423 cmdutil.summaryremotehooks(
7427 7424 ui,
7428 7425 repo,
7429 7426 opts,
7430 7427 (
7431 7428 (source, sbranch, sother, commoninc),
7432 7429 (dest, dbranch, dother, outgoing),
7433 7430 ),
7434 7431 )
7435 7432
7436 7433
7437 7434 @command(
7438 7435 b'tag',
7439 7436 [
7440 7437 (b'f', b'force', None, _(b'force tag')),
7441 7438 (b'l', b'local', None, _(b'make the tag local')),
7442 7439 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7443 7440 (b'', b'remove', None, _(b'remove a tag')),
7444 7441 # -l/--local is already there, commitopts cannot be used
7445 7442 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7446 7443 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7447 7444 ]
7448 7445 + commitopts2,
7449 7446 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7450 7447 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7451 7448 )
7452 7449 def tag(ui, repo, name1, *names, **opts):
7453 7450 """add one or more tags for the current or given revision
7454 7451
7455 7452 Name a particular revision using <name>.
7456 7453
7457 7454 Tags are used to name particular revisions of the repository and are
7458 7455 very useful to compare different revisions, to go back to significant
7459 7456 earlier versions or to mark branch points as releases, etc. Changing
7460 7457 an existing tag is normally disallowed; use -f/--force to override.
7461 7458
7462 7459 If no revision is given, the parent of the working directory is
7463 7460 used.
7464 7461
7465 7462 To facilitate version control, distribution, and merging of tags,
7466 7463 they are stored as a file named ".hgtags" which is managed similarly
7467 7464 to other project files and can be hand-edited if necessary. This
7468 7465 also means that tagging creates a new commit. The file
7469 7466 ".hg/localtags" is used for local tags (not shared among
7470 7467 repositories).
7471 7468
7472 7469 Tag commits are usually made at the head of a branch. If the parent
7473 7470 of the working directory is not a branch head, :hg:`tag` aborts; use
7474 7471 -f/--force to force the tag commit to be based on a non-head
7475 7472 changeset.
7476 7473
7477 7474 See :hg:`help dates` for a list of formats valid for -d/--date.
7478 7475
7479 7476 Since tag names have priority over branch names during revision
7480 7477 lookup, using an existing branch name as a tag name is discouraged.
7481 7478
7482 7479 Returns 0 on success.
7483 7480 """
7484 7481 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7485 7482 opts = pycompat.byteskwargs(opts)
7486 7483 with repo.wlock(), repo.lock():
7487 7484 rev_ = b"."
7488 7485 names = [t.strip() for t in (name1,) + names]
7489 7486 if len(names) != len(set(names)):
7490 7487 raise error.InputError(_(b'tag names must be unique'))
7491 7488 for n in names:
7492 7489 scmutil.checknewlabel(repo, n, b'tag')
7493 7490 if not n:
7494 7491 raise error.InputError(
7495 7492 _(b'tag names cannot consist entirely of whitespace')
7496 7493 )
7497 7494 if opts.get(b'rev'):
7498 7495 rev_ = opts[b'rev']
7499 7496 message = opts.get(b'message')
7500 7497 if opts.get(b'remove'):
7501 7498 if opts.get(b'local'):
7502 7499 expectedtype = b'local'
7503 7500 else:
7504 7501 expectedtype = b'global'
7505 7502
7506 7503 for n in names:
7507 7504 if repo.tagtype(n) == b'global':
7508 7505 alltags = tagsmod.findglobaltags(ui, repo)
7509 7506 if alltags[n][0] == repo.nullid:
7510 7507 raise error.InputError(
7511 7508 _(b"tag '%s' is already removed") % n
7512 7509 )
7513 7510 if not repo.tagtype(n):
7514 7511 raise error.InputError(_(b"tag '%s' does not exist") % n)
7515 7512 if repo.tagtype(n) != expectedtype:
7516 7513 if expectedtype == b'global':
7517 7514 raise error.InputError(
7518 7515 _(b"tag '%s' is not a global tag") % n
7519 7516 )
7520 7517 else:
7521 7518 raise error.InputError(
7522 7519 _(b"tag '%s' is not a local tag") % n
7523 7520 )
7524 7521 rev_ = b'null'
7525 7522 if not message:
7526 7523 # we don't translate commit messages
7527 7524 message = b'Removed tag %s' % b', '.join(names)
7528 7525 elif not opts.get(b'force'):
7529 7526 for n in names:
7530 7527 if n in repo.tags():
7531 7528 raise error.InputError(
7532 7529 _(b"tag '%s' already exists (use -f to force)") % n
7533 7530 )
7534 7531 if not opts.get(b'local'):
7535 7532 p1, p2 = repo.dirstate.parents()
7536 7533 if p2 != repo.nullid:
7537 7534 raise error.StateError(_(b'uncommitted merge'))
7538 7535 bheads = repo.branchheads()
7539 7536 if not opts.get(b'force') and bheads and p1 not in bheads:
7540 7537 raise error.InputError(
7541 7538 _(
7542 7539 b'working directory is not at a branch head '
7543 7540 b'(use -f to force)'
7544 7541 )
7545 7542 )
7546 7543 node = logcmdutil.revsingle(repo, rev_).node()
7547 7544
7548 7545 # don't allow tagging the null rev or the working directory
7549 7546 if node is None:
7550 7547 raise error.InputError(_(b"cannot tag working directory"))
7551 7548 elif not opts.get(b'remove') and node == nullid:
7552 7549 raise error.InputError(_(b"cannot tag null revision"))
7553 7550
7554 7551 if not message:
7555 7552 # we don't translate commit messages
7556 7553 message = b'Added tag %s for changeset %s' % (
7557 7554 b', '.join(names),
7558 7555 short(node),
7559 7556 )
7560 7557
7561 7558 date = opts.get(b'date')
7562 7559 if date:
7563 7560 date = dateutil.parsedate(date)
7564 7561
7565 7562 if opts.get(b'remove'):
7566 7563 editform = b'tag.remove'
7567 7564 else:
7568 7565 editform = b'tag.add'
7569 7566 editor = cmdutil.getcommiteditor(
7570 7567 editform=editform, **pycompat.strkwargs(opts)
7571 7568 )
7572 7569
7573 7570 tagsmod.tag(
7574 7571 repo,
7575 7572 names,
7576 7573 node,
7577 7574 message,
7578 7575 opts.get(b'local'),
7579 7576 opts.get(b'user'),
7580 7577 date,
7581 7578 editor=editor,
7582 7579 )
7583 7580
7584 7581
7585 7582 @command(
7586 7583 b'tags',
7587 7584 formatteropts,
7588 7585 b'',
7589 7586 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7590 7587 intents={INTENT_READONLY},
7591 7588 )
7592 7589 def tags(ui, repo, **opts):
7593 7590 """list repository tags
7594 7591
7595 7592 This lists both regular and local tags. When the -v/--verbose
7596 7593 switch is used, a third column "local" is printed for local tags.
7597 7594 When the -q/--quiet switch is used, only the tag name is printed.
7598 7595
7599 7596 .. container:: verbose
7600 7597
7601 7598 Template:
7602 7599
7603 7600 The following keywords are supported in addition to the common template
7604 7601 keywords and functions such as ``{tag}``. See also
7605 7602 :hg:`help templates`.
7606 7603
7607 7604 :type: String. ``local`` for local tags.
7608 7605
7609 7606 Returns 0 on success.
7610 7607 """
7611 7608
7612 7609 opts = pycompat.byteskwargs(opts)
7613 7610 ui.pager(b'tags')
7614 7611 fm = ui.formatter(b'tags', opts)
7615 7612 hexfunc = fm.hexfunc
7616 7613
7617 7614 for t, n in reversed(repo.tagslist()):
7618 7615 hn = hexfunc(n)
7619 7616 label = b'tags.normal'
7620 7617 tagtype = repo.tagtype(t)
7621 7618 if not tagtype or tagtype == b'global':
7622 7619 tagtype = b''
7623 7620 else:
7624 7621 label = b'tags.' + tagtype
7625 7622
7626 7623 fm.startitem()
7627 7624 fm.context(repo=repo)
7628 7625 fm.write(b'tag', b'%s', t, label=label)
7629 7626 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7630 7627 fm.condwrite(
7631 7628 not ui.quiet,
7632 7629 b'rev node',
7633 7630 fmt,
7634 7631 repo.changelog.rev(n),
7635 7632 hn,
7636 7633 label=label,
7637 7634 )
7638 7635 fm.condwrite(
7639 7636 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7640 7637 )
7641 7638 fm.plain(b'\n')
7642 7639 fm.end()
7643 7640
7644 7641
7645 7642 @command(
7646 7643 b'tip',
7647 7644 [
7648 7645 (b'p', b'patch', None, _(b'show patch')),
7649 7646 (b'g', b'git', None, _(b'use git extended diff format')),
7650 7647 ]
7651 7648 + templateopts,
7652 7649 _(b'[-p] [-g]'),
7653 7650 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7654 7651 )
7655 7652 def tip(ui, repo, **opts):
7656 7653 """show the tip revision (DEPRECATED)
7657 7654
7658 7655 The tip revision (usually just called the tip) is the changeset
7659 7656 most recently added to the repository (and therefore the most
7660 7657 recently changed head).
7661 7658
7662 7659 If you have just made a commit, that commit will be the tip. If
7663 7660 you have just pulled changes from another repository, the tip of
7664 7661 that repository becomes the current tip. The "tip" tag is special
7665 7662 and cannot be renamed or assigned to a different changeset.
7666 7663
7667 7664 This command is deprecated, please use :hg:`heads` instead.
7668 7665
7669 7666 Returns 0 on success.
7670 7667 """
7671 7668 opts = pycompat.byteskwargs(opts)
7672 7669 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7673 7670 displayer.show(repo[b'tip'])
7674 7671 displayer.close()
7675 7672
7676 7673
7677 7674 @command(
7678 7675 b'unbundle',
7679 7676 [
7680 7677 (
7681 7678 b'u',
7682 7679 b'update',
7683 7680 None,
7684 7681 _(b'update to new branch head if changesets were unbundled'),
7685 7682 )
7686 7683 ],
7687 7684 _(b'[-u] FILE...'),
7688 7685 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7689 7686 )
7690 7687 def unbundle(ui, repo, fname1, *fnames, **opts):
7691 7688 """apply one or more bundle files
7692 7689
7693 7690 Apply one or more bundle files generated by :hg:`bundle`.
7694 7691
7695 7692 Returns 0 on success, 1 if an update has unresolved files.
7696 7693 """
7697 7694 fnames = (fname1,) + fnames
7698 7695
7699 7696 with repo.lock():
7700 7697 for fname in fnames:
7701 7698 f = hg.openpath(ui, fname)
7702 7699 gen = exchange.readbundle(ui, f, fname)
7703 7700 if isinstance(gen, streamclone.streamcloneapplier):
7704 7701 raise error.InputError(
7705 7702 _(
7706 7703 b'packed bundles cannot be applied with '
7707 7704 b'"hg unbundle"'
7708 7705 ),
7709 7706 hint=_(b'use "hg debugapplystreamclonebundle"'),
7710 7707 )
7711 7708 url = b'bundle:' + fname
7712 7709 try:
7713 7710 txnname = b'unbundle'
7714 7711 if not isinstance(gen, bundle2.unbundle20):
7715 7712 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7716 7713 with repo.transaction(txnname) as tr:
7717 7714 op = bundle2.applybundle(
7718 7715 repo, gen, tr, source=b'unbundle', url=url
7719 7716 )
7720 7717 except error.BundleUnknownFeatureError as exc:
7721 7718 raise error.Abort(
7722 7719 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7723 7720 hint=_(
7724 7721 b"see https://mercurial-scm.org/"
7725 7722 b"wiki/BundleFeature for more "
7726 7723 b"information"
7727 7724 ),
7728 7725 )
7729 7726 modheads = bundle2.combinechangegroupresults(op)
7730 7727
7731 7728 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7732 7729 return 1
7733 7730 else:
7734 7731 return 0
7735 7732
7736 7733
7737 7734 @command(
7738 7735 b'unshelve',
7739 7736 [
7740 7737 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7741 7738 (
7742 7739 b'c',
7743 7740 b'continue',
7744 7741 None,
7745 7742 _(b'continue an incomplete unshelve operation'),
7746 7743 ),
7747 7744 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7748 7745 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7749 7746 (
7750 7747 b'n',
7751 7748 b'name',
7752 7749 b'',
7753 7750 _(b'restore shelved change with given name'),
7754 7751 _(b'NAME'),
7755 7752 ),
7756 7753 (b't', b'tool', b'', _(b'specify merge tool')),
7757 7754 (
7758 7755 b'',
7759 7756 b'date',
7760 7757 b'',
7761 7758 _(b'set date for temporary commits (DEPRECATED)'),
7762 7759 _(b'DATE'),
7763 7760 ),
7764 7761 ],
7765 7762 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7766 7763 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7767 7764 )
7768 7765 def unshelve(ui, repo, *shelved, **opts):
7769 7766 """restore a shelved change to the working directory
7770 7767
7771 7768 This command accepts an optional name of a shelved change to
7772 7769 restore. If none is given, the most recent shelved change is used.
7773 7770
7774 7771 If a shelved change is applied successfully, the bundle that
7775 7772 contains the shelved changes is moved to a backup location
7776 7773 (.hg/shelve-backup).
7777 7774
7778 7775 Since you can restore a shelved change on top of an arbitrary
7779 7776 commit, it is possible that unshelving will result in a conflict
7780 7777 between your changes and the commits you are unshelving onto. If
7781 7778 this occurs, you must resolve the conflict, then use
7782 7779 ``--continue`` to complete the unshelve operation. (The bundle
7783 7780 will not be moved until you successfully complete the unshelve.)
7784 7781
7785 7782 (Alternatively, you can use ``--abort`` to abandon an unshelve
7786 7783 that causes a conflict. This reverts the unshelved changes, and
7787 7784 leaves the bundle in place.)
7788 7785
7789 7786 If bare shelved change (without interactive, include and exclude
7790 7787 option) was done on newly created branch it would restore branch
7791 7788 information to the working directory.
7792 7789
7793 7790 After a successful unshelve, the shelved changes are stored in a
7794 7791 backup directory. Only the N most recent backups are kept. N
7795 7792 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7796 7793 configuration option.
7797 7794
7798 7795 .. container:: verbose
7799 7796
7800 7797 Timestamp in seconds is used to decide order of backups. More
7801 7798 than ``maxbackups`` backups are kept, if same timestamp
7802 7799 prevents from deciding exact order of them, for safety.
7803 7800
7804 7801 Selected changes can be unshelved with ``--interactive`` flag.
7805 7802 The working directory is updated with the selected changes, and
7806 7803 only the unselected changes remain shelved.
7807 7804 Note: The whole shelve is applied to working directory first before
7808 7805 running interactively. So, this will bring up all the conflicts between
7809 7806 working directory and the shelve, irrespective of which changes will be
7810 7807 unshelved.
7811 7808 """
7812 7809 with repo.wlock():
7813 7810 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7814 7811
7815 7812
7816 7813 statemod.addunfinished(
7817 7814 b'unshelve',
7818 7815 fname=b'shelvedstate',
7819 7816 continueflag=True,
7820 7817 abortfunc=shelvemod.hgabortunshelve,
7821 7818 continuefunc=shelvemod.hgcontinueunshelve,
7822 7819 cmdmsg=_(b'unshelve already in progress'),
7823 7820 )
7824 7821
7825 7822
7826 7823 @command(
7827 7824 b'update|up|checkout|co',
7828 7825 [
7829 7826 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7830 7827 (b'c', b'check', None, _(b'require clean working directory')),
7831 7828 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7832 7829 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7833 7830 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7834 7831 ]
7835 7832 + mergetoolopts,
7836 7833 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7837 7834 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7838 7835 helpbasic=True,
7839 7836 )
7840 7837 def update(ui, repo, node=None, **opts):
7841 7838 """update working directory (or switch revisions)
7842 7839
7843 7840 Update the repository's working directory to the specified
7844 7841 changeset. If no changeset is specified, update to the tip of the
7845 7842 current named branch and move the active bookmark (see :hg:`help
7846 7843 bookmarks`).
7847 7844
7848 7845 Update sets the working directory's parent revision to the specified
7849 7846 changeset (see :hg:`help parents`).
7850 7847
7851 7848 If the changeset is not a descendant or ancestor of the working
7852 7849 directory's parent and there are uncommitted changes, the update is
7853 7850 aborted. With the -c/--check option, the working directory is checked
7854 7851 for uncommitted changes; if none are found, the working directory is
7855 7852 updated to the specified changeset.
7856 7853
7857 7854 .. container:: verbose
7858 7855
7859 7856 The -C/--clean, -c/--check, and -m/--merge options control what
7860 7857 happens if the working directory contains uncommitted changes.
7861 7858 At most of one of them can be specified.
7862 7859
7863 7860 1. If no option is specified, and if
7864 7861 the requested changeset is an ancestor or descendant of
7865 7862 the working directory's parent, the uncommitted changes
7866 7863 are merged into the requested changeset and the merged
7867 7864 result is left uncommitted. If the requested changeset is
7868 7865 not an ancestor or descendant (that is, it is on another
7869 7866 branch), the update is aborted and the uncommitted changes
7870 7867 are preserved.
7871 7868
7872 7869 2. With the -m/--merge option, the update is allowed even if the
7873 7870 requested changeset is not an ancestor or descendant of
7874 7871 the working directory's parent.
7875 7872
7876 7873 3. With the -c/--check option, the update is aborted and the
7877 7874 uncommitted changes are preserved.
7878 7875
7879 7876 4. With the -C/--clean option, uncommitted changes are discarded and
7880 7877 the working directory is updated to the requested changeset.
7881 7878
7882 7879 To cancel an uncommitted merge (and lose your changes), use
7883 7880 :hg:`merge --abort`.
7884 7881
7885 7882 Use null as the changeset to remove the working directory (like
7886 7883 :hg:`clone -U`).
7887 7884
7888 7885 If you want to revert just one file to an older revision, use
7889 7886 :hg:`revert [-r REV] NAME`.
7890 7887
7891 7888 See :hg:`help dates` for a list of formats valid for -d/--date.
7892 7889
7893 7890 Returns 0 on success, 1 if there are unresolved files.
7894 7891 """
7895 7892 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7896 7893 rev = opts.get('rev')
7897 7894 date = opts.get('date')
7898 7895 clean = opts.get('clean')
7899 7896 check = opts.get('check')
7900 7897 merge = opts.get('merge')
7901 7898 if rev and node:
7902 7899 raise error.InputError(_(b"please specify just one revision"))
7903 7900
7904 7901 if ui.configbool(b'commands', b'update.requiredest'):
7905 7902 if not node and not rev and not date:
7906 7903 raise error.InputError(
7907 7904 _(b'you must specify a destination'),
7908 7905 hint=_(b'for example: hg update ".::"'),
7909 7906 )
7910 7907
7911 7908 if rev is None or rev == b'':
7912 7909 rev = node
7913 7910
7914 7911 if date and rev is not None:
7915 7912 raise error.InputError(_(b"you can't specify a revision and a date"))
7916 7913
7917 7914 updatecheck = None
7918 7915 if check or merge is not None and not merge:
7919 7916 updatecheck = b'abort'
7920 7917 elif merge or check is not None and not check:
7921 7918 updatecheck = b'none'
7922 7919
7923 7920 with repo.wlock():
7924 7921 cmdutil.clearunfinished(repo)
7925 7922 if date:
7926 7923 rev = cmdutil.finddate(ui, repo, date)
7927 7924
7928 7925 # if we defined a bookmark, we have to remember the original name
7929 7926 brev = rev
7930 7927 if rev:
7931 7928 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7932 7929 ctx = logcmdutil.revsingle(repo, rev, default=None)
7933 7930 rev = ctx.rev()
7934 7931 hidden = ctx.hidden()
7935 7932 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7936 7933 with ui.configoverride(overrides, b'update'):
7937 7934 ret = hg.updatetotally(
7938 7935 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7939 7936 )
7940 7937 if hidden:
7941 7938 ctxstr = ctx.hex()[:12]
7942 7939 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7943 7940
7944 7941 if ctx.obsolete():
7945 7942 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7946 7943 ui.warn(b"(%s)\n" % obsfatemsg)
7947 7944 return ret
7948 7945
7949 7946
7950 7947 @command(
7951 7948 b'verify',
7952 7949 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7953 7950 helpcategory=command.CATEGORY_MAINTENANCE,
7954 7951 )
7955 7952 def verify(ui, repo, **opts):
7956 7953 """verify the integrity of the repository
7957 7954
7958 7955 Verify the integrity of the current repository.
7959 7956
7960 7957 This will perform an extensive check of the repository's
7961 7958 integrity, validating the hashes and checksums of each entry in
7962 7959 the changelog, manifest, and tracked files, as well as the
7963 7960 integrity of their crosslinks and indices.
7964 7961
7965 7962 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7966 7963 for more information about recovery from corruption of the
7967 7964 repository.
7968 7965
7969 7966 Returns 0 on success, 1 if errors are encountered.
7970 7967 """
7971 7968 opts = pycompat.byteskwargs(opts)
7972 7969
7973 7970 level = None
7974 7971 if opts[b'full']:
7975 7972 level = verifymod.VERIFY_FULL
7976 7973 return hg.verify(repo, level)
7977 7974
7978 7975
7979 7976 @command(
7980 7977 b'version',
7981 7978 [] + formatteropts,
7982 7979 helpcategory=command.CATEGORY_HELP,
7983 7980 norepo=True,
7984 7981 intents={INTENT_READONLY},
7985 7982 )
7986 7983 def version_(ui, **opts):
7987 7984 """output version and copyright information
7988 7985
7989 7986 .. container:: verbose
7990 7987
7991 7988 Template:
7992 7989
7993 7990 The following keywords are supported. See also :hg:`help templates`.
7994 7991
7995 7992 :extensions: List of extensions.
7996 7993 :ver: String. Version number.
7997 7994
7998 7995 And each entry of ``{extensions}`` provides the following sub-keywords
7999 7996 in addition to ``{ver}``.
8000 7997
8001 7998 :bundled: Boolean. True if included in the release.
8002 7999 :name: String. Extension name.
8003 8000 """
8004 8001 opts = pycompat.byteskwargs(opts)
8005 8002 if ui.verbose:
8006 8003 ui.pager(b'version')
8007 8004 fm = ui.formatter(b"version", opts)
8008 8005 fm.startitem()
8009 8006 fm.write(
8010 8007 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
8011 8008 )
8012 8009 license = _(
8013 8010 b"(see https://mercurial-scm.org for more information)\n"
8014 8011 b"\nCopyright (C) 2005-2023 Olivia Mackall and others\n"
8015 8012 b"This is free software; see the source for copying conditions. "
8016 8013 b"There is NO\nwarranty; "
8017 8014 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
8018 8015 )
8019 8016 if not ui.quiet:
8020 8017 fm.plain(license)
8021 8018
8022 8019 if ui.verbose:
8023 8020 fm.plain(_(b"\nEnabled extensions:\n\n"))
8024 8021 # format names and versions into columns
8025 8022 names = []
8026 8023 vers = []
8027 8024 isinternals = []
8028 8025 for name, module in sorted(extensions.extensions()):
8029 8026 names.append(name)
8030 8027 vers.append(extensions.moduleversion(module) or None)
8031 8028 isinternals.append(extensions.ismoduleinternal(module))
8032 8029 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
8033 8030 if names:
8034 8031 namefmt = b" %%-%ds " % max(len(n) for n in names)
8035 8032 places = [_(b"external"), _(b"internal")]
8036 8033 for n, v, p in zip(names, vers, isinternals):
8037 8034 fn.startitem()
8038 8035 fn.condwrite(ui.verbose, b"name", namefmt, n)
8039 8036 if ui.verbose:
8040 8037 fn.plain(b"%s " % places[p])
8041 8038 fn.data(bundled=p)
8042 8039 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
8043 8040 if ui.verbose:
8044 8041 fn.plain(b"\n")
8045 8042 fn.end()
8046 8043 fm.end()
8047 8044
8048 8045
8049 8046 def loadcmdtable(ui, name, cmdtable):
8050 8047 """Load command functions from specified cmdtable"""
8051 8048 overrides = [cmd for cmd in cmdtable if cmd in table]
8052 8049 if overrides:
8053 8050 ui.warn(
8054 8051 _(b"extension '%s' overrides commands: %s\n")
8055 8052 % (name, b" ".join(overrides))
8056 8053 )
8057 8054 table.update(cmdtable)
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now