upstream/mercurial-mirror Commit - r44232:29adf0a0

merge with stable

Augie Fackler -

r44232:29adf0a0 default

parent child

.hgsigs

0 +1 0

 fb62a3a673d5322f6274a44ba6456e5e4b3b37 0 iD8DBQBEYmO2ywK+sNU5EO8RAnaYAKCO7x15xUn5mnhqWNXqk/ehlhRt2QCfRDfY0LrUq2q4oK/KypuJYPHgq1A=
 be3001847cb18a23c403439d9e7d0ace30804e9 0 iD8DBQBExUbjywK+sNU5EO8RAhzxAKCtyHAQUzcTSZTqlfJ0by6vhREwWQCghaQFHfkfN0l9/40EowNhuMOKnJk=
 a957364b1b89c150f2d0e60a99befe0ee08bd3 0 iD8DBQBFfL2QywK+sNU5EO8RAjYFAKCoGlaWRTeMsjdmxAjUYx6diZxOBwCfY6IpBYsKvPTwB3oktnPt5Rmrlys=
 c29bfec36d5540fbe1c976810aefecfd1d2 0 iD8DBQBFheweywK+sNU5EO8RAt7VAKCrqJQWT2/uo2RWf0ZI4bLp6v82jACgjrMdsaTbxRsypcmEsdPhlG6/8F4=
              fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0 iD8DBQBGgHicywK+sNU5EO8RAgNxAJ0VG8ixAaeudx4sZbhngI1syu49HQCeNUJQfWBgA8bkJ2pvsFpNxwYaX3I=
              23889160905a1b09fffe1c07378e9fc1827606eb 0 iD8DBQBHGTzoywK+sNU5EO8RAr/UAJ0Y8s4jQtzgS+G9vM8z6CWBThZ8fwCcCT5XDj2XwxKkz/0s6UELwjsO3LU=
              bae2e9c838e90a393bae3973a7850280413e091a 0 iD8DBQBH6DO5ywK+sNU5EO8RAsfrAJ0e4r9c9GF/MJsM7Xjd3NesLRC3+ACffj6+6HXdZf8cswAoFPO+DY00oD0=
              d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 0 iD8DBQBINdwsywK+sNU5EO8RAjIUAKCPmlFJSpsPAAUKF+iNHAwVnwmzeQCdEXrL27CWclXuUKdbQC8De7LICtE=
              d2375bbee6d47e62ba8e415c86e83a465dc4dce9 0 iD8DBQBIo1wpywK+sNU5EO8RAmRNAJ94x3OFt6blbqu/yBoypm/AJ44fuACfUaldXcV5z9tht97hSp22DVTEPGc=
 a67430f92f15ea5159c26b09ec4839a0c549a26 0 iEYEABECAAYFAkk1hykACgkQywK+sNU5EO85QACeNJNUanjc2tl4wUoPHNuv+lSj0ZMAoIm93wSTc/feyYnO2YCaQ1iyd9Nu
 e510d433969e277b1863c317b674cbee2065 0 iEYEABECAAYFAklNbbAACgkQywK+sNU5EO8o+gCfeb2/lfIJZMvyDA1m+G1CsBAxfFsAoIa6iAMG8SBY7hW1Q85Yf/LXEvaE
 a4eb81fb4f4742451591489e2797dc47903277 0 iEYEABECAAYFAklcAnsACgkQywK+sNU5EO+uXwCbBVHNNsLy1g7BlAyQJwadYVyHOXoAoKvtAVO71+bv7EbVoukwTzT+P4Sx
 efa41037e280d08cfb07c09ad485df30fb0ea8 0 iEYEABECAAYFAkmvJRQACgkQywK+sNU5EO9XZwCeLMgDgPSMWMm6vgjL4lDs2pEc5+0AnRxfiFbpbBfuEFTqKz9nbzeyoBlx
              02981000012e3adf40c4849bd7b3d5618f9ce82d 0 iEYEABECAAYFAknEH3wACgkQywK+sNU5EO+uXwCeI+LbLMmhjU1lKSfU3UWJHjjUC7oAoIZLvYDGOL/tNZFUuatc3RnZ2eje
 d40e7c885fa6e95f89134809b3ec7bdbca34b 0 iEYEABECAAYFAkpL2X4ACgkQywK+sNU5EO9FOwCfXJycjyKJXsvQqKkHrglwOQhEKS4An36GfKzptfN8b1qNc3+ya/5c2WOM
 ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 0 iEYEABECAAYFAkpopLIACgkQywK+sNU5EO8QSgCfZ0ztsd071rOa2lhmp9Fyue/WoI0AoLTei80/xrhRlB8L/rZEf2KBl8dA
 ec469f9b556f11819937cf68ee53f2be927ebf 0 iEYEABECAAYFAksBuxAACgkQywK+sNU5EO+mBwCfagB+A0txzWZ6dRpug3LEoK7Z1QsAoKpbk8vsLjv6/oRDicSk/qBu33+m
 d7ea6fe3aa4ab9ec274a68846779153789de9 0 iEYEABECAAYFAksVw0kACgkQywK+sNU5EO/oZwCfdfBEkgp38xq6wN2F4nj+SzofrJIAnjmxt04vaJSeOOeHylHvk6lzuQsw
 a0b14a68621f6990c54fdba0083f6f20935bf 0 iEYEABECAAYFAks+jCoACgkQywK+sNU5EO9J8wCeMUGF9E/gS2UBsqIz56WS4HMPRPUAoI5J95mwEIK8Clrl7qFRidNI6APq
 aa619c4c2c09907034d9824ebb1dd0e878206eb 0 iEYEABECAAYFAktm9IsACgkQywK+sNU5EO9XGgCgk4HclRQhexEtooPE5GcUCdB6M8EAn2ptOhMVbIoO+JncA+tNACPFXh0O
              ff2704a8ded37fbebd8b6eb5ec733731d725da8a 0 iEYEABECAAYFAkuRoSQACgkQywK+sNU5EO//3QCeJDc5r2uFyFCtAlpSA27DEE5rrxAAn2FSwTy9fhrB3QAdDQlwkEZcQzDh
 b01dab594167bc0dd33331dbaa6dca3dca1b3aa 0 iEYEABECAAYFAku1IwIACgkQywK+sNU5EO9MjgCdHLVwkTZlNHxhcznZKBL1rjN+J7cAoLLWi9LTL6f/TgBaPSKOy1ublbaW
 f725929f0c48c5fb3b90c071fc3066012456ca 0 iEYEABECAAYFAkvclvsACgkQywK+sNU5EO9FSwCeL9i5x8ALW/LE5+lCX6MFEAe4MhwAn1ev5o6SX6GrNdDfKweiemfO2VBk
              fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 0 iEYEABECAAYFAkvsKTkACgkQywK+sNU5EO9qEACgiSiRGvTG2vXGJ65tUSOIYihTuFAAnRzRIqEVSw8M8/RGeUXRps0IzaCO
 fe2629c6fd0c74c90bd066e77387c2b02e8437 0 iEYEABECAAYFAkwFLRsACgkQywK+sNU5EO+pJACgp13tPI+pbwKZV+LeMjcQ4H6tCZYAoJebzhd6a8yYx6qiwpJxA9BXZNXy
              f786fc4b8764cd2a5526d259cf2f94d8a66924d9 0 iEYEABECAAYFAkwsyxcACgkQywK+sNU5EO+crACfUpNAF57PmClkSri9nJcBjb2goN4AniPCNaKvnki7TnUsi1u2oxltpKKL
              bf1774d95bde614af3956d92b20e2a0c68c5fec7 0 iEYEABECAAYFAkxVwccACgkQywK+sNU5EO+oFQCeJzwZ+we1fIIyBGCddHceOUAN++cAnjvT6A8ZWW0zV21NXIFF1qQmjxJd
              c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
              ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
 d8bff78c96fe7e33237b257558ee97290048a4 0 iD8DBQBMpfvdywK+sNU5EO8RAsxVAJ0UaL1XB51C76JUBhafc9GBefuMxwCdEWkTOzwvE0SarJBe9i008jhbqW4=
 b9e0f96c7bc788e5667c146a58a9440a55 0 iD8DBQBMz0HOywK+sNU5EO8RAlsEAJ0USh6yOG7OrWkADGunVt9QimBQnwCbBqeMnKgSbwEw8jZwE3Iz1mdrYlo=
              4438875ec01bd0fc32be92b0872eb6daeed4d44f 0 iD8DBQBM4WYUywK+sNU5EO8RAhCVAJ0dJswachwFAHALmk1x0RJehxzqPQCbBNskP9n/X689jB+btNTZTyKU/fw=
 aff4f144ad356311318b0011df0bb21f2c97429 0 iD8DBQBM9uxXywK+sNU5EO8RAv+4AKCDj4qKP16GdPaq1tP6BUwpM/M1OACfRyzLPp/qiiN8xJTWoWYSe/XjJug=
              e3bf16703e2601de99e563cdb3a5d50b64e6d320 0 iD8DBQBNH8WqywK+sNU5EO8RAiQTAJ9sBO+TeiGro4si77VVaQaA6jcRUgCfSA28dBbjj0oFoQwvPoZjANiZBH8=
              a6c855c32ea081da3c3b8ff628f1847ff271482f 0 iD8DBQBNSJJ+ywK+sNU5EO8RAoJaAKCweDEF70fu+r1Zn7pYDXdlk5RuSgCeO9gK/eit8Lin/1n3pO7aYguFLok=
 b2155623ee2559caf288fd333f30475966c4525 0 iD8DBQBNSJeBywK+sNU5EO8RAm1KAJ4hW9Cm9nHaaGJguchBaPLlAr+O3wCgqgmMok8bdAS06N6PL60PSTM//Gg=
              2616325766e3504c8ae7c84bd15ee610901fe91d 0 iD8DBQBNbWy9ywK+sNU5EO8RAlWCAJ4mW8HbzjJj9GpK98muX7k+7EvEHwCfaTLbC/DH3QEsZBhEP+M8tzL6RU4=
              aa1f3be38ab127280761889d2dca906ca465b5f4 0 iD8DBQBNeQq7ywK+sNU5EO8RAlEOAJ4tlEDdetE9lKfjGgjbkcR8PrC3egCfXCfF3qNVvU/2YYjpgvRwevjvDy0=
              b032bec2c0a651ca0ddecb65714bfe6770f67d70 0 iD8DBQBNlg5kywK+sNU5EO8RAnGEAJ9gmEx6MfaR4XcG2m/93vwtfyzs3gCgltzx8/YdHPwqDwRX/WbpYgi33is=
 cb1e95676ad089596bd81d0937cad37d6e3b7fb 0 iD8DBQBNvTy4ywK+sNU5EO8RAmp8AJ9QnxK4jTJ7G722MyeBxf0UXEdGwACgtlM7BKtNQfbEH/fOW5y+45W88VI=
 af5d9f6b22387913e1d11350fb8cb7c1487dd 0 iD8DBQBN5q/8ywK+sNU5EO8RArRGAKCNGT94GKIYtSuwZ57z1sQbcw6uLACfffpbMV4NAPMl8womAwg+7ZPKnIU=
              de9eb6b1da4fc522b1cab16d86ca166204c24f25 0 iD8DBQBODhfhywK+sNU5EO8RAr2+AJ4ugbAj8ae8/K0bYZzx3sascIAg1QCeK3b+zbbVVqd3b7CDpwFnaX8kTd4=
 a43e23b8c55b4566b8200bf69fe2158485a2634 0 iD8DBQBONzIMywK+sNU5EO8RAj5SAJ0aPS3+JHnyI6bHB2Fl0LImbDmagwCdGbDLp1S7TFobxXudOH49bX45Iik=
              d629f1e89021103f1753addcef6b310e4435b184 0 iD8DBQBOWAsBywK+sNU5EO8RAht4AJwJl9oNFopuGkj5m8aKuf7bqPkoAQCeNrEm7UhFsZKYT5iUOjnMV7s2LaM=
 a9292e430e35766c552066ed3e87c557b803b 0 iD8DBQBOh3zUywK+sNU5EO8RApFMAKCD3Y/u3avDFndznwqfG5UeTHMlvACfUivPIVQZyDZnhZMq0UhC6zhCEQg=
              384082750f2c51dc917d85a7145748330fa6ef4d 0 iD8DBQBOmd+OywK+sNU5EO8RAgDgAJ9V/X+G7VLwhTpHrZNiOHabzSyzYQCdE2kKfIevJUYB9QLAWCWP6DPwrwI=
 d55b481ddfcc1dacb445179649e24ca861d 0 iD8DBQBOsFhpywK+sNU5EO8RAqM6AKCyfxUae3/zLuiLdQz+JR78690eMACfQ6JTBQib4AbE+rUDdkeFYg9K/+4=
 dbd1cef0c2f9f8bcf4ea303238105f716bda3 0 iD8DBQBO1/fWywK+sNU5EO8RAmoPAKCR5lpv1D6JLURHD8KVLSV4GRVEBgCgnd0Sy78ligNfqAMafmACRDvj7vo=
              6344043924497cd06d781d9014c66802285072e4 0 iD8DBQBPALgmywK+sNU5EO8RAlfhAJ9nYOdWnhfVDHYtDTJAyJtXBAQS9wCgnefoSQt7QABkbGxM+Q85UYEBuD0=
              db33555eafeaf9df1e18950e29439eaa706d399b 0 iD8DBQBPGdzxywK+sNU5EO8RAppkAJ9jOXhUVE/97CPgiMA0pMGiIYnesQCfengAszcBiSiKGugiI8Okc9ghU+Y=
 aa5b51f310fb3befd26bed99c02267f5c12c734 0 iD8DBQBPKZ9bywK+sNU5EO8RAt1TAJ45r1eJ0YqSkInzrrayg4TVCh0SnQCgm0GA/Ua74jnnDwVQ60lAwROuz1Q=
 e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 0 iD8DBQBPT/fvywK+sNU5EO8RAnfYAKCn7d0vwqIb100YfWm1F7nFD5B+FACeM02YHpQLSNsztrBCObtqcnfod7Q=
              b9bd95e61b49c221c4cca24e6da7c946fc02f992 0 iD8DBQBPeLsIywK+sNU5EO8RAvpNAKCtKe2gitz8dYn52IRF0hFOPCR7AQCfRJL/RWCFweu2T1vH/mUOCf8SXXc=
              d9e2f09d5488c395ae9ddbb320ceacd24757e055 0 iD8DBQBPju/dywK+sNU5EO8RArBYAJ9xtifdbk+hCOJO8OZa4JfHX8OYZQCeKPMBaBWiT8N/WHoOm1XU0q+iono=
 b3d087909e3c3ae44761efecdde8f319ef3 0 iD8DBQBPoFhIywK+sNU5EO8RAhzhAKCBj1n2jxPTkZNJJ5pSp3soa+XHIgCgsZZpAQxOpXwCp0eCdNGe0+pmxmg=
 de86462c5a9f42a3ad0f5e90ce5b1d221d25 0 iD8DBQBPovNWywK+sNU5EO8RAhgiAJ980T91FdPTRMmVONDhpkMsZwVIMACgg3bKvoWSeuCW28llUhAJtUjrMv0=
 a358df5bbbe404ca25730c9c459b34263441dc 0 iD8DBQBPyZsWywK+sNU5EO8RAnpLAJ48qrGDJRT+pteS0mSQ11haqHstPwCdG4ccGbk+0JHb7aNy8/NRGAOqn9w=
              b013baa3898e117959984fc64c29d8c784d2f28b 0 iD8DBQBP8QOPywK+sNU5EO8RAqimAKCFRSx0lvG6y8vne2IhNG062Hn0dACeMLI5/zhpWpHBIVeAAquYfx2XFeA=
 f5094bb3f423fc799e471aac2aee81a7ce57a0b 0 iD8DBQBQGiL8ywK+sNU5EO8RAq5oAJ4rMMCPx6O+OuzNXVOexogedWz/QgCeIiIxLd76I4pXO48tdXhr0hQcBuM=
 ae4ddb654eb2d5fd35bff358c738414432 0 iD8DBQBQQkq0ywK+sNU5EO8RArDTAJ9nk5CySnNAjAXYvqvx4uWCw9ThZwCgqmFRehH/l+oTwj3f8nw8u8qTCdc=
              b3f0f9a39c4e1d0250048cd803ab03542d6f140a 0 iD8DBQBQamltywK+sNU5EO8RAlsqAJ4qF/m6aFu4mJCOKTiAP5RvZFK02ACfawYShUZO6OXEFfveU0aAxDR0M1k=
              d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 0 iD8DBQBQgPV5ywK+sNU5EO8RArylAJ0abcx5NlDjyv3ZDWpAfRIHyRsJtQCgn4TMuEayqgxzrvadQZHdTEU2g38=
 ad823b5d58c68903a6153a25e3fb4ed25239d 0 iD8DBQBQkuT9ywK+sNU5EO8RAhB4AKCeerItoK2Jipm2cVf4euGofAa/WACeJj3TVd4pFILpb+ogj7ebweFLJi0=
 c10cf8191469e7c3c8844922e17e71a176cb7cb 0 iD8DBQBQvQWoywK+sNU5EO8RAnq3AJoCn98u4geFx5YaQaeh99gFhCd7bQCgjoBwBSUyOvGd0yBy60E3Vv3VZhM=
              a4765077b65e6ae29ba42bab7834717b5072d5ba 0 iD8DBQBQ486sywK+sNU5EO8RAhmJAJ90aLfLKZhmcZN7kqphigQJxiFOQACeJ5IUZxjGKH4xzi3MrgIcx9n+dB0=
              f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 0 iD8DBQBQ+yuYywK+sNU5EO8RAm9JAJoD/UciWvpGeKBcpGtZJBFJVcL/HACghDXSgQ+xQDjB+6uGrdgAQsRR1Lg=
              a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 0 iD8DBQBRDDROywK+sNU5EO8RAh75AJ9uJCGoCWnP0Lv/+XuYs4hvUl+sAgCcD36QgAnuw8IQXrvv684BAXAnHcA=
 d4df752e61fe7ae4f3682e0a0008573b0402 0 iD8DBQBRFYaoywK+sNU5EO8RAuErAJoDyhXn+lptU3+AevVdwAIeNFyR2gCdHzPHyWd+JDeWCUR+pSOBi8O2ppM=
 b7175377babacce80a6c1e12366d8032a6d4340 0 iD8DBQBRMCYgywK+sNU5EO8RAq1/AKCWKlt9ysibyQgYwoxxIOZv5J8rpwCcDSHQaaf1fFZUTnQsOePwcM2Y/Sg=
 c922c1b5145dab8baefefb0437d363b6a6c21c 0 iD8DBQBRWnUnywK+sNU5EO8RAuQRAJwM42cJqJPeqJ0jVNdMqKMDqr4dSACeP0cRVGz1gitMuV0x8f3mrZrqc7I=
 a7bd2dccd44ed571afe7424cd7f95594f27c092 0 iD8DBQBRXfBvywK+sNU5EO8RAn+LAKCsMmflbuXjYRxlzFwId5ptm8TZcwCdGkyLbZcASBOkzQUm/WW1qfknJHU=
 cd385856d98bacb2c3086f8897bc660c2beea 0 iD8DBQBRcM0BywK+sNU5EO8RAjp4AKCJBykQbvXhKuvLSMxKx3a2TBiXcACfbr/kLg5GlZTF/XDPmY+PyHgI/GM=
 f785b38af38d2fca6b8f3db56b8007a84cd73a 0 iD8DBQBRgZwNywK+sNU5EO8RAmO4AJ4u2ILGuimRP6MJgE2t65LZ5dAdkACgiENEstIdrlFC80p+sWKD81kKIYI=
              ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 0 iD8DBQBRkswvywK+sNU5EO8RAiYYAJsHTHyHbJeAgmGvBTmDrfcKu4doUgCeLm7eGBjx7yAPUvEtxef8rAkQmXI=
              cceaf7af4c9e9e6fa2dbfdcfe9856c5da69c4ffd 0 iD8DBQBRqnFLywK+sNU5EO8RAsWNAJ9RR6t+y1DLFc2HeH0eN9VfZAKF9gCeJ8ezvhtKq/LMs0/nvcgKQc/d5jk=
 acc6e37a650f0fae37872e733382ac1c0c 0 iD8DBQBR0guxywK+sNU5EO8RArNkAKCq9pMihVzP8Os5kCmgbWpe5C37wgCgqzuPZTHvAsXF5wTyaSTMVa9Ccq4=
              f0d7721d7322dcfb5af33599c2543f27335334bb 0 iD8DBQBR8taaywK+sNU5EO8RAqeEAJ4idDhhDuEsgsUjeQgWNj498matHACfT67gSF5w0ylsrBx1Hb52HkGXDm0=
              f37b5a17e6a0ee17afde2cdde5393dd74715fb58 0 iD8DBQBR+ymFywK+sNU5EO8RAuSdAJkBMcd9DAZ3rWE9WGKPm2YZ8LBoXACfXn/wbEsVy7ZgJoUwiWmHSnQaWCI=
 a558f81dc73afeab4d7be63617392b130117f 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=
              e7fa36d2ad3a7944a52dca126458d6f482db3524 0 iQIVAwUAUktg4yBXgaxoKi1yAQLO0g//du/2ypYYUfmM/yZ4zztNKIvgMSGTDVbCCGB2y2/wk2EcolpjpGTkcgnJT413ksYtw78ZU+mvv0RjgrFCm8DQ8kroJaQZ2qHmtSUb42hPBPvtg6kL9YaA4yvp87uUBpFRavGS5uX4hhEIyvZKzhXUBvqtL3TfwR7ld21bj8j00wudqELyyU9IrojIY9jkJ3XL/4shBGgP7u6OK5g8yJ6zTnWgysUetxHBPrYjG25lziiiZQFvZqK1B3PUqAOaFPltQs0PB8ipOCAHQgJsjaREj8VmC3+rskmSSy66NHm6gAB9+E8oAgOcU7FzWbdYgnz4kR3M7TQvHX9U61NinPXC6Q9d1VPhO3E6sIGvqJ4YeQOn65V9ezYuIpFSlgQzCHMmLVnOV96Uv1R/Z39I4w7D3S5qoZcQT/siQwGbsZoPMGFYmqOK1da5TZWrrJWkYzc9xvzT9m3q3Wds5pmCmo4b/dIqDifWwYEcNAZ0/YLHwCN5SEZWuunkEwtU5o7TZAv3bvDDA6WxUrrHI/y9/qvvhXxsJnY8IueNhshdmWZfXKz+lJi2Dvk7DUlEQ1zZWSsozi1E+3biMPJO47jsxjoT/jmE5+GHLCgcnXXDVBeaVal99IOaTRFukiz2EMsry1s8fnwEE5XKDKRlU/dOPfsje0gc7bgE0QD/u3E4NJ99g9A=
 f2d8f2421314b1ddead8f7d0c91009358994 0 iQIVAwUAUmRq+yBXgaxoKi1yAQLolhAAi+l4ZFdQTu9yJDv22YmkmHH4fI3d5VBYgvfJPufpyaj7pX626QNW18UNcGSw2BBpYHIJzWPkk/4XznLVKr4Ciw2N3/yqloEFV0V2SSrTbMWiR9qXI4KJH+Df3KZnKs3FgiYpXkErL4GWkc1jLVR50xQ5RnkMljjtCd0NTeV2PHZ6gP2qbu6CS+5sm3AFhTDGnx8GicbMw76ZNw5M2G+T48yH9jn5KQi2SBThfi4H9Bpr8FDuR7PzQLgw9SbtYxtdQxNkK55k0nG4oLDxduNakU6SH9t8n8tdCfMt58kTzlQVrPFiTFjKu2n2JioDTz2HEivbZ5H757cu7SvpX8gW3paeBc57e+GOLMisMZABXLICq59c3QnrMwFY4FG+5cpiHVXoaZz/0bYCJx+IhU4QLWqZuzb18KSyHUCqQRzXlzS6QV5O7dY5YNQXFC44j/dS5zdgWMYo2mc6mVP2OaPUn7F6aQh5MCDYorPIOkcNjOg7ytajo7DXbzWt5Al8qt6386BJksyR3GAonc09+l8IFeNxk8HZNP4ETQ8aWj0dC9jgBDPK43T2Bju/i84s+U/bRe4tGSQalZUEv06mkIH/VRJp5w2izYTsdIjA4FT9d36OhaxlfoO1X6tHR9AyA3bF/g/ozvBwuo3kTRUUqo+Ggvx/DmcPQdDiZZQIqDBXch0=
              d825e4025e39d1c39db943cdc89818abd0a87c27 0 iQIVAwUAUnQlXiBXgaxoKi1yAQJd3BAAi7LjMSpXmdR7B8K98C3/By4YHsCOAocMl3JXiLd7SXwKmlta1zxtkgWwWJnNYE3lVJvGCl+l4YsGKmFu755MGXlyORh1x4ohckoC1a8cqnbNAgD6CSvjSaZfnINLGZQP1wIP4yWj0FftKVANQBjj/xkkxO530mjBYnUvyA4PeDd5A1AOUUu6qHzX6S5LcprEt7iktLI+Ae1dYTkiCpckDtyYUKIk3RK/4AGWwGCPddVWeV5bDxLs8GHyMbqdBwx+2EAMtyZfXT+z6MDRsL/gEBVOXHb/UR0qpYED+qFnbtTlxqQkRE/wBhwDoRzUgcSuukQ9iPn79WNDSdT5b6Jd393uEO5BNF/DB6rrOiWmlpoooWgTY9kcwGB02v0hhLrH5r1wkv8baaPl+qjCjBxf4CNKm/83KN5/umGbZlORqPSN5JVxK6vDNwFFmHLaZbMT1g27GsGOWm84VH+dgolgk4nmRNSO37eTNM5Y1C3Zf2amiqDSRcAxCgseg0Jh10G7i52SSTcZPI2MqrwT9eIyg8PTIxT1D5bPcCzkg5nTTL6S7bet7OSwynRnHslhvVUBly8aIj4eY/5cQqAucUUa5sq6xLD8N27Tl+sQi+kE6KtWu2c0ZhpouflYp55XNMHgU4KeFcVcDtHfJRF6THT6tFcHFNauCHbhfN2F33ANMP4=
 e04a06467e2969c0cc6501335be0406d46ef0 0 iQIVAwUAUpv1oCBXgaxoKi1yAQKOFBAAma2wlsr3w/5NvDwq2rmOrgtNDq1DnNqcXloaOdwegX1z3/N++5uVjLjI0VyguexnwK+7E8rypMZ+4glaiZvIiGPnGMYbG9iOoz5XBhtUHzI5ECYfm5QU81by9VmCIvArDFe5Hlnz4XaXpEGnAwPywD+yzV3/+tyoV7MgsVinCMtbX9OF84/ubWKNzq2810FpQRfYoCOrF8sUed/1TcQrSm1eMB/PnuxjFCFySiR6J7Urd9bJoJIDtdZOQeeHaL5Z8Pcsyzjoe/9oTwJ3L3tl/NMZtRxiQUWtfRA0zvEnQ4QEkZSDMd/JnGiWHPVeP4P92+YN15za9yhneEAtustrTNAmVF2Uh92RIlmkG475HFhvwPJ4DfCx0vU1OOKX/U4c1rifW7H7HaipoaMlsDU2VFsAHcc3YF8ulVt27bH2yUaLGJz7eqpt+3DzZTKp4d/brZA2EkbVgsoYP+XYLbzxfwWlaMwiN3iCnlTFbNogH8MxhfHFWBj6ouikqOz8HlNl6BmSQiUCBnz5fquVpXmW2Md+TDekk+uOW9mvk1QMU62br+Z6PEZupkdTrqKaz+8ZMWvTRct8SiOcu7R11LpfERyrwYGGPei0P2YrEGIWGgXvEobXoPTSl7J+mpOA/rp2Q1zA3ihjgzwtGZZF+ThQXZGIMGaA2YPgzuYRqY8l5oc=
              ca387377df7a3a67dbb90b6336b781cdadc3ef41 0 iQIVAwUAUsThISBXgaxoKi1yAQJpvRAAkRkCWLjHBZnWxX9Oe6t2HQgkSsmn9wMHvXXGFkcAmrqJ86yfyrxLq2Ns0X7Qwky37kOwKsywM53FQlsx9j//Y+ncnGZoObFTz9YTuSbOHGVsTbAruXWxBrGOf1nFTlg8afcbH0jPfQXwxf3ptfBhgsFCzORcqc8HNopAW+2sgXGhHnbVtq6LF90PWkbKjCCQLiX3da1uETGAElrl4jA5Y2i64S1Q/2X+UFrNslkIIRCGmAJ6BnE6KLJaUftpfbN7Br7a3z9xxWqxRYDOinxDgfAPAucOJPLgMVQ0bJIallaRu7KTmIWKIuSBgg1/hgfoX8I1w49WrTGp0gGY140kl8RWwczAz/SB03Xtbl2+h6PV7rUV2K/5g61DkwdVbWqXM9wmJZmvjEKK0qQbBT0By4QSEDNcKKqtaFFwhFzx4dkXph0igHOtXhSNzMd8PsFx/NRn9NLFIpirxfqVDwakpDNBZw4Q9hUAlTPxSFL3vD9/Zs7lV4/dAvvl+tixJEi2k/iv248b/AI1PrPIQEqDvjrozzzYvrS4HtbkUn+IiHiepQaYnpqKoXvBu6btK/nv0GTxB5OwVJzMA1RPDcxIFfZA2AazHjrXiPAl5uWYEddEvRjaCiF8xkQkfiXzLOoqhKQHdwPGcfMFEs9lNR8BrB2ZOajBJc8RPsFDswhT5h4=
              8862469e16f9236208581b20de5f96bd13cc039d 0 iQIVAwUAUt7cLSBXgaxoKi1yAQLOkRAAidp501zafqe+JnDwlf7ORcJc+FgCE6mK1gxDfReCbkMsY7AzspogU7orqfSmr6XXdrDwmk3Y5x3mf44OGzNQjvuNWhqnTgJ7sOcU/lICGQUc8WiGNzHEMFGX9S+K4dpUaBf8Tcl8pU3iArhlthDghW6SZeDFB/FDBaUx9dkdFp6eXrmu4OuGRZEvwUvPtCGxIL7nKNnufI1du/MsWQxvC2ORHbMNtRq6tjA0fLZi4SvbySuYifQRS32BfHkFS5Qu4/40+1k7kd0YFyyQUvIsVa17lrix3zDqMavG8x7oOlqM/axDMBT6DhpdBMAdc5qqf8myz8lwjlFjyDUL6u3Z4/yE0nUrmEudXiXwG0xbVoEN8SCNrDmmvFMt6qdCpdDMkHr2TuSh0Hh4FT5CDkzPI8ZRssv/01j/QvIO3c/xlbpGRPWpsPXEVOz3pmjYN4qyQesnBKWCENsQLy/8s2rey8iQgx2GtsrNw8+wGX6XE4v3QtwUrRe12hWoNrEHWl0xnLv2mvAFqdMAMpFY6EpOKLlE4hoCs2CmTJ2dv6e2tiGTXGU6/frI5iuNRK61OXnH5OjEc8DCGH/GC7NXyDOXOB+7BdBvvf50l2C/vxR2TKgTncLtHeLCrR0GHNHsxqRo1UDwOWur0r7fdfCRvb2tIr5LORCqKYVKd60/BAXjHWc=
 cec5134e9c4bceab6a00c60f52a4f80677a78f2 0 iQIVAwUAUu1lIyBXgaxoKi1yAQIzCBAAizSWvTkWt8+tReM9jUetoSToF+XahLhn381AYdErFCBErX4bNL+vyEj+Jt2DHsAfabkvNBe3k7rtFlXHwpq6POa/ciFGPDhFlplNv6yN1jOKBlMsgdjpn7plZKcLHODOigU7IMlgg70Um8qVrRgQ8FhvbVgR2I5+CD6bucFzqo78wNl9mCIHIQCpGKIUoz56GbwT+rUpEB182Z3u6rf4NWj35RZLGAicVV2A2eAAFh4ZvuC+Z0tXMkp6Gq9cINawZgqfLbzVYJeXBtJC39lHPyp5P3LaEVRhntc9YTwbfkVGjyJZR60iYrieeKpOYRnzgHauPVdgVhkTkBxshmEPY7svKYSQqlj8hLuFa+a3ajbIPrpQAAi1MgtamA991atNqGiSTjdZa9kLQvfdn0k80+gkCxpuO56PhvtdjKsYVRgQMTYmQVQdh3x4WbQOSqTADXXIZUaWxx4RmNSlxY7KD+3lPP09teOD+A3B2cP60bC5NsCfULtQFXQzdC7NvfIyYfYBTZa+Pv6HFkVe10cbnqTt83hBy0D77vdaegPRe56qDNU+GrIG2/rosnlKGFjFoK/pTYkR9uzfkrhEjLwyfkoXlBqY+376W0PC5fP10pJeQBS9DuXpCPlgtyW0Jy1ayCT1YR4QJC4n75vZwTFBFRBhSi0HqFquOgy83+O0Q/k=
              b96cb15ec9e04d8ac5ee08b34fcbbe4200588965 0 iQIVAwUAUxJPlyBXgaxoKi1yAQLIRA//Qh9qzoYthPAWAUNbzybWXC/oMBI2X89NQC7l1ivKhv7cn9L79D8SWXM18q7LTwLdlwOkV/a0NTE3tkQTLvxJpfnRLCBbMOcGiIn/PxsAae8IhMAUbR7qz+XOynHOs60ZhK9X8seQHJRf1YtOI9gYTL/WYk8Cnpmc6xZQ90TNhoPPkpdfe8Y236V11SbYtN14fmrPaWQ3GXwyrvQaqM1F7BxSnC/sbm9+/wprsTa8gRQo7YQL/T5jJQgFiatG3yayrDdJtoRq3TZKtsxw8gtQdfVCrrBibbysjM8++dnwA92apHNUY8LzyptPy7rSDXRrIpPUWGGTQTD+6HQwkcLFtIuUpw4I75SV3z2r6LyOLKzDJUIunKOOYFS/rEIQGxZHxZOBAvbI+73mHAn3pJqm+UAA7R1n7tk3JyQncg50qJlm9zIUPGpNFcdEqak5iXzGYx292VlcE+fbJYeIPWggpilaVUgdmXtMCG0O0uX6C8MDmzVDCjd6FzDJ4GTZwgmWJaamvls85CkZgyN/UqlisfFXub0A1h7qAzBSVpP1+Ti+UbBjlrGX8BMRYHRGYIeIq16elcWwSpLgshjDwNn2r2EdwX8xKU5mucgTzSLprbOYGdQaqnvf6e8IX5WMBgwVW9YdY9yJKSLF7kE1AlM9nfVcXwOK4mHoMvnNgiX3zsw=
 f83fc5cfe715d292069ee8417c83804f6c6c1e4 0 iQIVAwUAUztENyBXgaxoKi1yAQIpkhAAmJj5JRTSn0Dn/OTAHggalw8KYFbAck1X35Wg9O7ku7sd+cOnNnkYfqAdz2m5ikqWHP7aWMiNkNy7Ree2110NqkQVYG/2AJStXBdIOmewqnjDlNt+rbJQN/JsjeKSCy+ToNvhqX5cTM9DF2pwRjMsTXVff307S6/3pga244i+RFAeG3WCUrzfDu641MGFLjG4atCj8ZFLg9DcW5bsRiOs5ZK5Il+UAb2yyoS2KNQ70VLhYULhGtqq9tuO4nLRGN3DX/eDcYfncPCav1GckW4OZKakcbLtAdW0goSgGWloxcM+j2E6Z1JZ9tOTTkFN77EvX0ZWZLmYM7sUN1meFnKbVxrtGKlMelwKwlT252c65PAKa9zsTaRUKvN7XclyxZAYVCsiCQ/V08NXhNgXJXcoKUAeGNf6wruOyvRU9teia8fAiuHJoY58WC8jC4nYG3iZTnl+zNj2A5xuEUpYHhjUfe3rNJeK7CwUpJKlbxopu5mnW9AE9ITfI490eaapRLTojOBDJNqCORAtbggMD46fLeCOzzB8Gl70U2p5P34F92Sn6mgERFKh/10XwJcj4ZIeexbQK8lqQ2cIanDN9dAmbvavPTY8grbANuq+vXDGxjIjfxapqzsSPqUJ5KnfTQyLq5NWwquR9t38XvHZfktkd140BFKwIUAIlKKaFfYXXtM=
 f55b251224f16508dd1311452db7780dafe2b 0 iQIVAwUAU1BmFSBXgaxoKi1yAQJ2Aw//bjK++xJuZCIdktg/i5FxBwoxdbipfTkKsN/YjUwrEmroYM8IkqIsO+U54OGCYWr3NPJ3VS8wUQeJ+NF3ffcjmjC297R9J+X0c5G90DdQUYX44jG/tP8Tqpev4Q7DLCXT26aRwEMdJQpq0eGaqv55E5Cxnyt3RrLCqe7RjPresZFg7iYrro5nq8TGYwBhessHXnCix9QI0HtXiLpms+0UGz8Sbi9nEYW+M0OZCyO1TvykCpFzEsLNwqqtFvhOMD/AMiWcTKNUpjmOn3V83xjWl+jnDUt7BxJ7n1efUnlwl4IeWlSUb73q/durtaymb97cSdKFmXHv4pdAShQEuEpVVGO1WELsKoXmbj30ItTW2V3KvNbjFsvIdDo7zLCpXyTq1HC56W7QCIMINX2qT+hrAMWC12tPQ05f89Cv1+jpk6eOPFqIHFdi663AjyrnGll8nwN7HJWwtA5wTXisu3bec51FAq4yJTzPMtOE9spz36E+Go2hZ1cAv9oCSceZcM0wB8KiMfaZJKNZNZk1jvsdiio4CcdASOFQPOspz07GqQxVP7W+F1Oz32LgwcNAEAS/f3juwDj45GYfAWJrTh3dnJy5DTD2LVC7KtkxxUVkWkqxivnDB9anj++FN9eyekxzut5eFED+WrCfZMcSPW0ai7wbslhKUhCwSf/v3DgGwsM=
 ac506c6ababe86985b932f4948837c0891b5 0 iQIVAwUAU2LO/CBXgaxoKi1yAQI/3w/7BT/VRPyxey6tYp7i5cONIlEB3gznebGYwm0SGYNE6lsvS2VLh6ztb+j4eqOadr8Ssna6bslBx+dVsm+VuJ+vrNLMucD5Uc+fhn6dAfVqg+YBzUEaedI5yNsJizcJUDI7hUVsxiPiiYd9hchCWJ+z2tVt2jCyG2lMV2rbW36AM89sgz/wn5/AaAFsgoS6up/uzA3Tmw+qZSO6dZChb4Q8midIUWEbNzVhokgYcw7/HmjmvkvV9RJYiG8aBnMdQmxTE69q2dTjnnDL6wu61WU2FpTN09HRFbemUqzAfoJp8MmXq6jWgfLcm0cI3kRo7ZNpnEkmVKsfKQCXXiaR4alt9IQpQ6Jl7LSYsYI+D4ejpYysIsZyAE8qzltYhBKJWqO27A5V4WdJsoTgA/RwKfPRlci4PY8I4N466S7PBXVz/Cc5EpFkecvrgceTmBafb8JEi+gPiD2Po4vtW3bCeV4xldiEXHeJ77byUz7fZU7jL78SjJVOCCQTJfKZVr36kTz3KlaOz3E700RxzEFDYbK7I41mdANeQBmNNbcvRTy5ma6W6I3McEcAH4wqM5fFQ8YS+QWJxk85Si8KtaDPqoEdC/0dQPavuU/jAVjhV8IbmmkOtO7WvOHQDBtrR15yMxGMnUwMrPHaRNKdHNYRG0LL7lpCtdMi1mzLQgHYY9SRYvI=
 c80ee5b3cb3684fa8edc61501b3506d02eb10 0 iQIVAwUAU4uX5CBXgaxoKi1yAQLpdg/+OxulOKwZN+Nr7xsRhUijYjyAElRf2mGDvMrbAOA2xNf85DOXjOrX5TKETumf1qANA5cHa1twA8wYgxUzhx30H+w5EsLjyeSsOncRnD5WZNqSoIq2XevT0T4c8xdyNftyBqK4h/SC/t2h3vEiSCUaGcfNK8yk4XO45MIk4kk9nlA9jNWdA5ZMLgEFBye2ggz0JjEAPUkVDqlr9sNORDEbnwZxGPV8CK9HaL/I8VWClaFgjKQmjqV3SQsNFe2XPffzXmIipFJ+ODuXVxYpAsvLiGmcfuUfSDHQ4L9QvjBsWe1PgYMr/6CY/lPYmR+xW5mJUE9eIdN4MYcXgicLrmMpdF5pToNccNCMtfa6CDvEasPRqe2bDzL/Q9dQbdOVE/boaYBlgmYLL+/u+dpqip9KkyGgbSo9uJzst1mLTCzJmr5bw+surul28i9HM+4+Lewg4UUdHLz46no1lfTlB5o5EAhiOZBTEVdoBaKfewVpDa/aBRvtWX7UMVRG5qrtA0sXwydN00Jaqkr9m20W0jWjtc1ZC72QCrynVHOyfIb2rN98rnuy2QN4bTvjNpNjHOhhhPTOoVo0YYPdiUupm46vymUTQCmWsglU4Rlaa3vXneP7JenL5TV8WLPs9J28lF0IkOnyBXY7OFcpvYO1euu7iR1VdjfrQukMyaX18usymiA=
 d8cd3d0e83c7336c0cb45a9f88638363f993848 0 iQIVAwUAU7OLTCBXgaxoKi1yAQJ+pw/+M3yOesgf55eo3PUTZw02QZxDyEg9ElrRc6664/QFXaJuYdz8H3LGG/NYs8uEdYihiGpS1Qc70jwd1IoUlrCELsaSSZpzWQ+VpQFX29aooBoetfL+8WgqV8zJHCtY0E1EBg/Z3ZL3n2OS++fVeWlKtp5mwEq8uLTUmhIS7GseP3bIG/CwF2Zz4bzhmPGK8V2s74aUvELZLCfkBE1ULNs7Nou1iPDGnhYOD53eq1KGIPlIg1rnLbyYw5bhS20wy5IxkWf2eCaXfmQBTG61kO5m3nkzfVgtxmZHLqYggISTJXUovfGsWZcp5a71clCSMVal+Mfviw8L/UPHG0Ie1c36djJiFLxM0f2HlwVMjegQOZSAeMGg1YL1xnIys2zMMsKgEeR+JISTal1pJyLcT9x5mr1HCnUczSGXE5zsixN+PORRnZOqcEZTa2mHJ1h5jJeEm36B/eR57BMJG+i0QgZqTpLzYTFrp2eWokGMjFB1MvgAkL2YoRsw9h6TeIwqzK8mFwLi28bf1c90gX9uMbwY/NOqGzfQKBR9bvCjs2k/gmJ+qd5AbC3DvOxHnN6hRZUqNq76Bo4F+CUVcjQ/NXnfnOIVNbILpl5Un5kl+8wLFM+mNxDxduajaUwLhSHZofKmmCSLbuuaGmQTC7a/4wzhQM9e5dX0X/8sOo8CptW7uw4=
 c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 0 iQIVAwUAU8n97yBXgaxoKi1yAQKqcA/+MT0VFoP6N8fHnlxj85maoM2HfZbAzX7oEW1B8F1WH6rHESHDexDWIYWJ2XnEeTD4GCXN0/1p+O/I0IMPNzqoSz8BU0SR4+ejhRkGrKG7mcFiF5G8enxaiISn9nmax6DyRfqtOQBzuXYGObXg9PGvMS6zbR0SorJK61xX7fSsUNN6BAvHJfpwcVkOrrFAIpEhs/Gh9wg0oUKCffO/Abs6oS+P6nGLylpIyXqC7rKZ4uPVc6Ljh9DOcpV4NCU6kQbNE7Ty79E0/JWWLsHOEY4F4WBzI7rVh7dOkRMmfNGaqvKkuNkJOEqTR1o1o73Hhbxn4NU7IPbVP/zFKC+/4QVtcPk2IPlpK1MqA1H2hBNYZhJlNhvAa7LwkIxM0916/zQ8dbFAzp6Ay/t/L0tSEcIrudTz2KTrY0WKw+pkzB/nTwaS3XZre6H2B+gszskmf1Y41clkIy/nH9K7zBuzANWyK3+bm40vmMoBbbnsweUAKkyCwqm4KTyQoYQWzu/ZiZcI+Uuk/ajJ9s7EhJbIlSnYG9ttWL/IZ1h+qPU9mqVO9fcaqkeL/NIRh+IsnzaWo0zmHU1bK+/E29PPGGf3v6+IEJmXg7lvNl5pHiMd2tb7RNO/UaNSv1Y2E9naD4FQwSWo38GRBcnRGuKCLdZNHGUR+6dYo6BJCGG8wtZvNXb3TOo=
 e49892020336491cdc6945885c4de26ffa8b 0 iQIVAwUAU9whUCBXgaxoKi1yAQJDKxAAoGzdHXV/BvZ598VExEQ8IqkmBVIP1QZDVBr/orMc1eFM4tbGKxumMGbqgJsg+NetI0irkh/YWeJQ13lT4Og72iJ+4UC9eF9pcpUKr/0eBYdU2N/p2MIbVNWh3aF5QkbuQpSri0VbHOWkxqwoqrrwXEjgHaKYP4PKh+Dzukax4yzBUIyzAG38pt4a8hbjnozCl2uAikxk4Ojg+ZufhPoZWgFEuYzSfK5SrwVKOwuxKYFGbbVGTQMIXLvBhOipAmHp4JMEYHfG85kwuyx/DCDbGmXKPQYQfClwjJ4ob/IwG8asyMsPWs+09vrvpVO08HBuph3GjuiWJ1fhEef/ImWmZdQySI9Y4SjwP4dMVfzLCnY+PYPDM9Sq/5Iee13gI2lVM2NtAfQZPXh9l8u6SbCir1UhMNMx0qVMkqMAATmiZ+ETHCO75q4Wdcmnv5fk2PbvaGBVtrHGeiyuz5mK/j4cMbd0R9R0hR1PyC4dOhNqOnbqELNIe0rKNByG1RkpiQYsqZTU6insmnZrv4fVsxfA4JOObPfKNT4oa24MHS73ldLFCfQAuIxVE7RDJJ3bHeh/yO6Smo28FuVRldBl5e+wj2MykS8iVcuSa1smw6gJ14iLBH369nlR3fAAQxI0omVYPDHLr7SsH3vJasTaCD7V3SL4lW6vo/yaAh4ImlTAE+Y=
 dc91146f35369949ea56b40172308158b59063a 0 iQIVAwUAVAUgJyBXgaxoKi1yAQJkEg/9EXFZvPpuvU7AjII1dlIT8F534AXrO30+H6hweg+h2mUCSb/mZnbo3Jr1tATgBWbIKkYmmsiIKNlJMFNPZTWhImGcVA93t6v85tSFiNJRI2QP9ypl5wTt2KhiS/s7GbUYCtPDm6xyNYoSvDo6vXJ5mfGlgFZY5gYLwEHq/lIRWLWD4EWYWbk5yN+B7rHu6A1n3yro73UR8DudEhYYqC23KbWEqFOiNd1IGj3UJlxIHUE4AcDukxbfiMWrKvv1kuT/vXak3X7cLXlO56aUbMopvaUflA3PSr3XAqynDd69cxACo/T36fuwzCQN4ICpdzGTos0rQALSr7CKF5YP9LMhVhCsOn0pCsAkSiw4HxxbcHQLl+t+0rchNysc4dWGwDt6GAfYcdm3fPtGFtA3qsN8lOpCquFH3TAZ3TrIjLFoTOk6s1xX1x5rjP/DAHc/y3KZU0Ffx3TwdQEEEIFaAXaxQG848rdfzV42+dnFnXh1G/MIrKAmv3ZSUkQ3XJfGc7iu82FsYE1NLHriUQDmMRBzCoQ1Rn1Kji119Cxf5rsMcQ6ZISR1f0jDCUS/qxlHvSqETLp8H63NSUfvuKSC7uC6pGvq9XQm1JRNO5UuJfK6tHzy0jv9bt2IRo2xbmvpDu9L5oHHd3JePsAmFmbrFf/7Qem3JyzEvRcpdcdHtefxcxc=
              f768c888aaa68d12dd7f509dcc7f01c9584357d0 0 iQIVAwUAVCxczSBXgaxoKi1yAQJYiA/9HnqKuU7IsGACgsUGt+YaqZQumg077Anj158kihSytmSts6xDxqVY1UQB38dqAKLJrQc7RbN0YK0NVCKZZrx/4OqgWvjiL5qWUJKqQzsDx4LGTUlbPlZNZawW2urmmYW6c9ZZDs1EVnVeZMDrOdntddtnBgtILDwrZ8o3U7FwSlfnm03vTkqUMj9okA3AsI8+lQIlo4qbqjQJYwvUC1ZezRdQwaT1LyoWUgjmhoZ1XWcWKOs9baikaJr6fMv8vZpwmaOY1+pztxYlROeSPVWt9P6yOf0Hi/2eg8AwSZLaX96xfk9IvXUSItg/wjTWP9BhnNs/ulwTnN8QOgSXpYxH4RXwsYOyU7BvwAekA9xi17wuzPrGEliScplxICIZ7jiiwv/VngMvM9AYw2mNBvZt2ZIGrrLaK6pq/zBm5tbviwqt5/8U5aqO8k1O0e4XYm5WmQ1c2AkXRO+xwvFpondlSF2y0flzf2FRXP82QMfsy7vxIP0KmaQ4ex+J8krZgMjNTwXh2M4tdYNtu5AehJQEP3l6giy2srkMDuFLqoe1yECjVlGdgA86ve3J/84I8KGgsufYMhfQnwHHGXCbONcNsDvO0QOee6CIQVcdKCG7dac3M89SC6Ns2CjuC8BIYDRnxbGQb7Fvn4ZcadyJKKbXQJzMgRV25K6BAwTIdvYAtgU=
 f8d16af8cae246fa5a48e723d48d58b015aed94 0 iQIVAwUAVEL0XyBXgaxoKi1yAQJLkRAAjZhpUju5nnSYtN9S0/vXS/tjuAtBTUdGwc0mz97VrM6Yhc6BjSCZL59tjeqQaoH7Lqf94pRAtZyIB2Vj/VVMDbM+/eaoSr1JixxppU+a4eqScaj82944u4C5YMSMC22PMvEwqKmy87RinZKJlFwSQ699zZ5g6mnNq8xeAiDlYhoF2QKzUXwnKxzpvjGsYhYGDMmVS1QPmky4WGvuTl6KeGkv8LidKf7r6/2RZeMcq+yjJ7R0RTtyjo1cM5dMcn/jRdwZxuV4cmFweCAeoy5guV+X6du022TpVndjOSDoKiRgdk7pTuaToXIy+9bleHpEo9bwKx58wvOMg7sirAYjrA4Xcx762RHiUuidTTPktm8sNsBQmgwJZ8Pzm+8TyHjFGLnBfeiDbQQEdLCXloz0jVOVRflDfMays1WpAYUV8XNOsgxnD2jDU8L0NLkJiX5Y0OerGq9AZ+XbgJFVBFhaOfsm2PEc3jq00GOLzrGzA+4b3CGpFzM3EyK9OnnwbP7SqCGb7PJgjmQ7IO8IWEmVYGaKtWONSm8zRLcKdH8xuk8iN1qCkBXMty/wfTEVTkIlMVEDbslYkVfj0rAPJ8B37bfe0Yz4CEMkCmARIB1rIOpMhnavXGuD50OP2PBBY/8DyC5aY97z9f04na/ffk+l7rWaHihjHufKIApt5OnfJ1w=
              ced632394371a36953ce4d394f86278ae51a2aae 0 iQIVAwUAVFWpfSBXgaxoKi1yAQLCQw//cvCi/Di3z/2ZEDQt4Ayyxv18gzewqrYyoElgnEzr5uTynD9Mf25hprstKla/Y5C6q+y0K6qCHPimGOkz3H+wZ2GVUgLKAwMABkfSb5IZiLTGaB2DjAJKZRwB6h43wG/DSFggE3dYszWuyHW88c72ZzVF5CSNc4J1ARLjDSgnNYJQ6XdPw3C9KgiLFDXzynPpZbPg0AK5bdPUKJruMeIKPn36Hx/Tv5GXUrbc2/lcnyRDFWisaDl0X/5eLdA+r3ID0cSmyPLYOeCgszRiW++KGw+PPDsWVeM3ZaZ9SgaBWU7MIn9A7yQMnnSzgDbN+9v/VMT3zbk1WJXlQQK8oA+CCdHH9EY33RfZ6ST/lr3pSQbUG1hdK6Sw+H6WMkOnnEk6HtLwa4xZ3HjDpoPkhVV+S0C7D5WWOovbubxuBiW5v8tK4sIOS6bAaKevTBKRbo4Rs6qmS/Ish5Q+z5bKst80cyEdi4QSoPZ/W+6kh1KfOprMxynwPQhtEcDYW2gfLpgPIM7RdXPKukLlkV2qX3eF/tqApGU4KNdP4I3N80Ri0h+6tVU/K4TMYzlRV3ziLBumJ4TnBrTHU3X6AfZUfTgslQzokX8/7a3tbctX6kZuJPggLGisdFSdirHbrUc+y5VKuJtPr+LxxgZKRFbs2VpJRem6FvwGNyndWLv32v0GMtQ=
 c58303fb0ec020907af28b9e486be299ba043 0 iQIVAwUAVGKawCBXgaxoKi1yAQL7zxAAjpXKNvzm/PKVlTfDjuVOYZ9H8w9QKUZ0vfrNJrN6Eo6hULIostbdRc25FcMWocegTqvKbz3IG+L2TKOIdZJS9M9QS4URybUd37URq4Jai8kMiJY31KixNNnjO2G1B39aIXUhY+EPx12aY31/OVy4laXIVtN6qpSncjo9baXSOMZmx6RyA1dbyfwXRjT/aODCGHZXgLJHS/kHlkCsThVlqYQ4rUCDkXIeMqIGF1CR0KjfmKpp1fS14OMgpLgdnt9+pnBZ+qcf1YdpOeQob1zwunjMYOyYC74FyOTdwaynU2iDsuBrmkE8kgEedIn7+WWe9fp/6TQJMVOeTQPZBNSRRSUYCw5Tg/0L/+jLtzjc2mY4444sDPbR7scrtU+/GtvlR5z0Y5pofwEdFME7PZNOp9a4kMiSa7ZERyGdN7U1pDu9JU6BZRz+nPzW217PVnTF7YFV/GGUzMTk9i7EZb5M4T9r9gfxFSMPeT5ct712CdBfyRlsSbSWk8XclTXwW385kLVYNDtOukWrvEiwxpA14Xb/ZUXbIDZVf5rP2HrZHMkghzeUYPjRn/IlgYUt7sDNmqFZNIc9mRFrZC9uFQ/Nul5InZodNODQDM+nHpxaztt4xl4qKep8SDEPAQjNr8biC6T9MtLKbWbSKDlqYYNv0pb2PuGub3y9rvkF1Y05mgM=
              902554884335e5ca3661d63be9978eb4aec3f68a 0 iQIVAwUAVH0KMyBXgaxoKi1yAQLUKxAAjgyYpmqD0Ji5OQ3995yX0dmwHOaaSuYpq71VUsOMYBskjH4xE2UgcTrX8RWUf0E+Ya91Nw3veTf+IZlYLaWuOYuJPRzw+zD1sVY8xprwqBOXNaA7n8SsTqZPSh6qgw4S0pUm0xJUOZzUP1l9S7BtIdJP7KwZ7hs9YZev4r9M3G15xOIPn5qJqBAtIeE6f5+ezoyOpSPZFtLFc4qKQ/YWzOT5uuSaYogXgVByXRFaO84+1TD93LR0PyVWxhwU9JrDU5d7P/bUTW1BXdjsxTbBnigWswKHC71EHpgz/HCYxivVL30qNdOm4Fow1Ec2GdUzGunSqTPrq18ScZDYW1x87f3JuqPM+ce/lxRWBBqP1yE30/8l/Us67m6enWXdGER8aL1lYTGOIWAhvJpfzv9KebaUq1gMFLo6j+OfwR3rYPiCHgi20nTNBa+LOceWFjCGzFa3T9UQWHW/MBElfAxK65uecbGRRYY9V1/+wxtTUiS6ixpmzL8S7uUd5n6oMaeeMiD82NLgPIbMyUHQv6eFEcCj0U9NT2uKbFRmclMs5V+8D+RTCsLJ55R9PD5OoRw/6K/coqqPShYmJvgYsFQPzXVpQdCRae31xdfGFmd5KUetqyrT+4GUdJWzSm0giSgovpEJNxXglrvNdvSO7fX3R1oahhwOwtGqMwNilcK+iDw=
 dad422ecc5adb63d9fa649eeb8e05a5f9bc4900 0 iQIVAwUAVJNALCBXgaxoKi1yAQKgmw/+OFbHHOMmN2zs2lI2Y0SoMALPNQBInMBq2E6RMCMbfcS9Cn75iD29DnvBwAYNWaWsYEGyheJ7JjGBiuNKPOrLaHkdjG+5ypbhAfNDyHDiteMsXfH7D1L+cTOAB8yvhimZHOTTVF0zb/uRyVIPNowAyervUVRjDptzdfcvjUS+X+/Ufgwms6Y4CcuzFLFCxpmryJhLtOpwUPLlzIqeNkFOYWkHanCgtZX03PNIWhorH3AWOc9yztwWPQ+kcKl3FMlyuNMPhS/ElxSF6GHGtreRbtP+ZLoSIOMb2QBKpGDpZLgJ3JQEHDcZ0h5CLZWL9dDUJR3M8pg1qglqMFSWMgRPTzxPS4QntPgT/Ewd3+U5oCZUh052fG41OeCZ0CnVCpqi5PjUIDhzQkONxRCN2zbjQ2GZY7glbXoqytissihEIVP9m7RmBVq1rbjOKr+yUetJ9gOZcsMtZiCEq4Uj2cbA1x32MQv7rxwAgQP1kgQ62b0sN08HTjQpI7/IkNALLIDHoQWWr45H97i34qK1dd5uCOnYk7juvhGNX5XispxNnC01/CUVNnqChfDHpgnDjgT+1H618LiTgUAD3zo4IVAhCqF5XWsS4pQEENOB3Msffi62fYowvJx7f/htWeRLZ2OA+B85hhDiD4QBdHCRoz3spVp0asNqDxX4f4ndj8RlzfM=
 a3a71d75396f5d4cf6935ae7d9ba5407a547 0 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
 b4ed033390bf6e2879c8f5c28c84e1ee3b87231 0 iQIVAwUAVPQL9CBXgaxoKi1yAQJIXxAAtD2hWhaKa+lABmCOYG92FE/WdqY/91Xv5atTL8Xeko/MkirIKZiOuxNWX+J34TVevINZSWmMfDSc5TkGxktL9jW/pDB/CXn+CVZpxRabPYFH9HM2K3g8VaTV1MFtV2+feOMDIPCmq5ogMF9/kXjmifiEBrJcFsE82fdexJ3OHoOY4iHFxEhh3GzvNqEQygk4VeU6VYziNvSQj9G//PsK3Bmk7zm5ScsZcMVML3SIYFuej1b1PI1v0N8mmCRooVNBGhD/eA0iLtdh/hSb9s/8UgJ4f9HOcx9zqs8V4i14lpd/fo0+yvFuVrVbWGzrDrk5EKLENhVPwvc1KA32PTQ4Z9u7VQIBIxq3K5lL2VlCMIYc1BSaSQBjuiLm8VdN6iDuf5poNZhk1rvtpQgpxJzh362dlGtR/iTJuLCeW7gCqWUAorLTeHy0bLQ/jSOeTAGys8bUHtlRL4QbnhLbUmJmRYVvCJ+Yt1aTgTSNcoFjoLJarR1169BXgdCA38BgReUL6kB224UJSTzB1hJUyB2LvCWrXZMipZmR99Iwdq7MePD3+AoSIXQNUMY9blxuuF5x7W2ikNXmVWuab4Z8rQRtmGqEuIMBSunxAnZSn+i8057dFKlq+/yGy+WW3RQg+RnLnwZs1zCDTfu98/GT5k5hFpjXZeUWWiOVwQJ5HrqncCw=
 a92bbd02e5e3a625e0820389b47786b02b2cea 0 iQIVAwUAVPSP9SBXgaxoKi1yAQLkBQ//dRQExJHFepJfZ0gvGnUoYI4APsLmne5XtfeXJ8OtUyC4a6RylxA5BavDWgXwUh9BGhOX2cBSz1fyvzohrPrvNnlBrYKAvOIJGEAiBTXHYTxHINEKPtDF92Uz23T0Rn/wnSvvlbWF7Pvd+0DMJpFDEyr9n6jvVLR7mgxMaCqZbVaB1W/wTwDjni780WgVx8OPUXkLx3/DyarMcIiPeI5UN+FeHDovTsBWFC95msFLm80PMRPuHOejWp65yyEemGujZEPO2D5VVah7fshM2HTz63+bkEBYoqrftuv3vXKBRG78MIrUrKpqxmnCKNKDUUWJ4yk3+NwuOiHlKdly5kZ7MNFaL73XKo8HH287lDWz0lIazs91dQA9a9JOyTsp8YqGtIJGGCbhrUDtiQJ199oBU84mw3VH/EEzm4mPv4sW5fm7BnnoH/a+9vXySc+498rkdLlzFwxrQkWyJ/pFOx4UA3mCtGQK+OSwLPc+X4SRqA4fiyqKxVAL1kpLTSDL3QA82I7GzBaXsxUXzS4nmteMhUyzTdwAhKVydL0gC3d7NmkAFSyRjdGzutUUXshYxg0ywRgYebe8uzJcTj4nNRgaalYLdg3guuDulD+dJmILsrcLmA6KD/pvfDn8PYt+4ZjNIvN2E9GF6uXDu4Ux+AlOTLk9BChxUF8uBX9ev5cvWtQ=
 e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 0 iQIVAwUAVRw4nyBXgaxoKi1yAQIFExAAkbCPtLjQlJvPaYCL1KhNR+ZVAmn7JrFH3XhvR26RayYbs4NxR3W1BhwhDy9+W+28szEx1kQvmr6t1bXAFywY0tNJOeuLU7uFfmbgAfYgkQ9kpsQNqFYkjbCyftw0S9vX9VOJ9DqUoDWuKfX7VzjkwE9dCfKI5F+dvzxnd6ZFjB85nyHBQuTZlzXl0+csY212RJ2G2j/mzEBVyeZj9l7Rm+1X8AC1xQMWRJGiyd0b7nhYqoOcceeJFAV1t9QO4+gjmkM5kL0orjxTnuVsxPTxcC5ca1BfidPWrZEto3duHWNiATGnCDylxxr52BxCAS+BWePW9J0PROtw1pYaZ9pF4N5X5LSXJzqX7ZiNGckxqIjry09+Tbsa8FS0VkkYBEiGotpuo4Jd05V6qpXfW2JqAfEVo6X6aGvPM2B7ZUtKi30I4J+WprrOP3WgZ/ZWHe1ERYKgjDqisn3t/D40q30WQUeQGltGsOX0Udqma2RjBugO5BHGzJ2yer4GdJXg7q1OMzrjAEuz1IoKvIB/o1pg86quVA4H2gQnL1B8t1M38/DIafyw7mrEY4Z3GL44Reev63XVvDE099Vbhqp7ufwq81Fpq7Xxa5vsr9SJ+8IqqQr8AcYSuK3G3L6BmIuSUAYMRqgl35FWoWkGyZIG5c6K6zI8w5Pb0aGi6Lb2Wfb9zbc=
              e89f909edffad558b56f4affa8239e4832f88de0 0 iQIVAwUAVTBozCBXgaxoKi1yAQLHeg/+IvfpPmG7OSqCoHvMVETYdrqT7lKCwfCQWMFOC/2faWs1n4R/qQNm6ckE5OY888RK8tVQ7ue03Pg/iyWgQlYfS7Njd3WPjS4JsnEBxIvuGkIu6TPIXAUAH0PFTBh0cZEICDpPEVT2X3bPRwDHA+hUE9RrxM5zJ39Fpk/pTYCjQ9UKfEhXlEfka75YB39g2Y/ssaSbn5w/tAAx8sL72Y4G96D4IV2seLHZhB3VQ7UZKThEWn6UdVOoKj+urIwGaBYMeekGVtHSh6fnHOw3EtDO9mQ5HtAz2Bl4CwRYN8eSN+Dwgr+mdk8MWpQQJ+i1A8jUhUp8gn1Pe5GkIH4CWZ9+AvLLnshe2MkVaTT1g7EQk37tFkkdZDRBsOHIvpF71B9pEA1gMUlX4gKgh5YwukgpQlDmFCfY7XmX6eXw9Ub+EckEwYuGMz7Fbwe9J/Ce4DxvgJgq3/cu/jb3bmbewH6tZmcrlqziqqA8GySIwcURnF1c37e7+e7x1jhFJfCWpHzvCusjKhUp9tZsl9Rt1Bo/y41QY+avY7//ymhbwTMKgqjzCYoA+ipF4JfZlFiZF+JhvOSIFb0ltkfdqKD+qOjlkFaglvQU1bpGKLJ6cz4Xk2Jqt5zhcrpyDMGVv9aiWywCK2ZP34RNaJ6ZFwzwdpXihqgkm5dBGoZ4ztFUfmjXzIg=
 cc6036bca532e06681c5a8fa37efaa812de67b5 0 iQIVAwUAVUP0xCBXgaxoKi1yAQLIChAAme3kg1Z0V8t5PnWKDoIvscIeAsD2s6EhMy1SofmdZ4wvYD1VmGC6TgXMCY7ssvRBhxqwG3GxwYpwELASuw2GYfVot2scN7+b8Hs5jHtkQevKbxarYni+ZI9mw/KldnJixD1yW3j+LoJFh/Fu6GD2yrfGIhimFLozcwUu3EbLk7JzyHSn7/8NFjLJz0foAYfcbowU9/BFwNVLrQPnsUbWcEifsq5bYso9MBO9k+25yLgqHoqMbGpJcgjubNy1cWoKnlKS+lOJl0/waAk+aIjHXMzFpRRuJDjxEZn7V4VdV5d23nrBTcit1BfMzga5df7VrLPVRbom1Bi0kQ0BDeDex3hHNqHS5X+HSrd/njzP1xp8twG8hTE+njv85PWoGBTo1eUGW/esChIJKA5f3/F4B9ErgBNNOKnYmRgxixd562OWAwAQZK0r0roe2H/Mfg2VvgxT0kHd22NQLoAv0YI4jcXcCFrnV/80vHUQ8AsAYAbkLcz1jkfk3YwYDP8jbJCqcwJRt9ialYKJwvXlEe0TMeGdq7EjCO0z/pIpu82k2R/C0FtCFih3bUvJEmWoVVx8UGkDDQEORLbzxQCt0IOiQGFcoCCxgQmL0x9ZoljCWg5vZuuhU4uSOuRTuM+aa4xoLkeOcvgGRSOXrqfkV8JpWKoJB4dmY2qSuxw8LsAAzK0=
              ed18f4acf435a2824c6f49fba40f42b9df5da7ad 0 iQIVAwUAVWy9mCBXgaxoKi1yAQIm+Q/+I/tV8DC51d4f/6T5OR+motlIx9U5za5p9XUUzfp3tzSY2PutVko/FclajVdFekZsK5pUzlh/GZhfe1jjyEEIr3UC3yWk8hMcvvS+2UDmfy81QxN7Uf0kz4mZOlME6d/fYDzf4cDKkkCXoec3kyZBw7L84mteUcrJoyb5K3fkQBrK5CG/CV7+uZN6b9+quKjtDhDEkAyc6phNanzWNgiHGucEbNgXsKM01HmV1TnN4GXTKx8y2UDalIJOPyes2OWHggibMHbaNnGnwSBAK+k29yaQ5FD0rsA+q0j3TijA1NfqvtluNEPbFOx/wJV4CxonYad93gWyEdgU34LRqqw1bx7PFUvew2/T3TJsxQLoCt67OElE7ScG8evuNEe8/4r3LDnzYFx7QMP5r5+B7PxVpj/DT+buS16BhYS8pXMMqLynFOQkX5uhEM7mNC0JTXQsBMHSDAcizVDrdFCF2OSfQjLpUfFP1VEWX7EInqj7hZrd+GE7TfBD8/rwSBSkkCX2aa9uKyt6Ius1GgQUuEETskAUvvpsNBzZxtvGpMMhqQLGlJYnBbhOmsbOyTSnXU66KJ5e/H3O0KRrF09i74v30DaY4uIH8xG6KpSkfw5s/oiLCtagfc0goUvvojk9pACDR3CKM/jVC63EVp2oUcjT72jUgSLxBgi7siLD8IW86wc=
 cd0ddac49c1125b2e013aa2ff18ecbd4dd954 0 iQIVAwUAVZRtzSBXgaxoKi1yAQJVLhAAtfn+8OzHIp6wRC4NUbkImAJRLsNTRPKeRSWPCF5O5XXQ84hp+86qjhndIE6mcJSAt4cVP8uky6sEa8ULd6b3ACRBvtgZtsecA9S/KtRjyE9CKr8nP+ogBNqJPaYlTz9RuwGedOd+8I9lYgsnRjfaHSByNMX08WEHtWqAWhSkAz/HO32ardS38cN97fckCgQtA8v7c77nBT7vcw4epgxyUQvMUxUhqmCVVhVfz8JXa5hyJxFrOtqgaVuQ1B5Y/EKxcyZT+JNHPtu3V1uc1awS/w16CEPstNBSFHax5MuT9UbY0mV2ZITP99EkM+vdomh82VHdnMo0i7Pz7XF45ychD4cteroO9gGqDDt9j7hd1rubBX1bfkPsd/APJlyeshusyTj+FqsUD/HDlvM9LRjY1HpU7i7yAlLQQ3851XKMLUPNFYu2r3bo8Wt/CCHtJvB4wYuH+7Wo3muudpU01ziJBxQrUWwPbUrG+7LvO1iEEVxB8l+8Vq0mU3Te7lJi1kGetm6xHNbtvQip5P2YUqvv+lLo/K8KoJDxsh63Y01JGwdmUDb8mnFlRx4J7hQJaoNEvz3cgnc4X8gDJD8sUOjGOPnbtz2QwTY+zj/5+FdLxWDCxNrHX5vvkVdJHcCqEfVvQTKfDMOUeKuhjI7GD7t3xRPfUxq19jjoLPe7aqn1Z1s=
 a38d44ba093bd1d1ecfd34119e94056030278b 0 iQIVAwUAVarUUyBXgaxoKi1yAQIfJw/+MG/0736F/9IvzgCTF6omIC+9kS8JH0n/JBGPhpbPAHK4xxjhOOz6m3Ia3c3HNoy+I6calwU6YV7k5dUzlyLhM0Z5oYpdrH+OBNxDEsD5SfhclfR63MK1kmgtD33izijsZ++6a+ZaVfyxpMTksKOktWSIDD63a5b/avb6nKY64KwJcbbeXPdelxvXV7TXYm0GvWc46BgvrHOJpYHCDaXorAn6BMq7EQF8sxdNK4GVMNMVk1njve0HOg3Kz8llPB/7QmddZXYLFGmWqICyUn1IsJDfePxzh8sOYVCbxAgitTJHJJmmH5gzVzw7t7ljtmxSJpcUGQJB2MphejmNFGfgvJPB9c6xOCfUqDjxN5m24V+UYesZntpfgs3lpfvE7785IpVnf6WfKG4PKty01ome/joHlDlrRTekKMlpiBapGMfv8EHvPBrOA+5yAHNfKsmcyCcjD1nvXYZ2/X9qY35AhdcBuNkyp55oPDOdtYIHfnOIxlYMKG1dusDx3Z4eveF0lQTzfRVoE5w+k9A2Ov3Zx0aiSkFFevJjrq5QBfs9dAiT8JYgBmWhaJzCtJm12lQirRMKR/br88Vwt/ry/UVY9cereMNvRYUGOGfC8CGGDCw4WDD+qWvyB3mmrXVuMlXxQRIZRJy5KazaQXsBWuIsx4kgGqC5Uo+yzpiQ1VMuCyI=
 aa1c313b05b1a85f8ffa1120d51579ddf6bf24 0 iQIVAwUAVbuouCBXgaxoKi1yAQL2ng//eI1w51F4YkDiUAhrZuc8RE/chEd2o4F6Jyu9laA03vbim598ntqGjX3+UkOyTQ/zGVeZfW2cNG8zkJjSLk138DHCYl2YPPD/yxqMOJp/a7U34+HrA0aE5Y2pcfx+FofZHRvRtt40UCngicjKivko8au7Ezayidpa/vQbc6dNvGrwwk4KMgOP2HYIfHgCirR5UmaWtNpzlLhf9E7JSNL5ZXij3nt6AgEPyn0OvmmOLyUARO/JTJ6vVyLEtwiXg7B3sF5RpmyFDhrkZ+MbFHgL4k/3y9Lb97WaZl8nXJIaNPOTPJqkApFY/56S12PKYK4js2OgU+QsX1XWvouAhEx6CC6Jk9EHhr6+9qxYFhBJw7RjbswUG6LvJy/kBe+Ei5UbYg9dATf3VxQ6Gqs19lebtzltERH2yNwaHyVeqqakPSonOaUyxGMRRosvNHyrTTor38j8d27KksgpocXzBPZcc1MlS3vJg2nIwZlc9EKM9z5R0J1KAi1Z/+xzBjiGRYg5EZY6ElAw30eCjGta7tXlBssJiKeHut7QTLxCZHQuX1tKxDDs1qlXlGCMbrFqo0EiF9hTssptRG3ZyLwMdzEjnh4ki6gzONZKDI8uayAS3N+CEtWcGUtiA9OwuiFXTwodmles/Mh14LEhiVZoDK3L9TPcY22o2qRuku/6wq6QKsg=
 a45e49a6bed023deb229102a8903234d18054d3 0 iQIVAwUAVeYa2SBXgaxoKi1yAQLWVA//Q7vU0YzngbxIbrTPvfFiNTJcT4bx9u1xMHRZf6QBIE3KtRHKTooJwH9lGR0HHM+8DWWZup3Vzo6JuWHMGoW0v5fzDyk2czwM9BgQQPfEmoJ/ZuBMevTkTZngjgHVwhP3tHFym8Rk9vVxyiZd35EcxP+4F817GCzD+K7XliIBqVggmv9YeQDXfEtvo7UZrMPPec79t8tzt2UadI3KC1jWUriTS1Fg1KxgXW6srD80D10bYyCkkdo/KfF6BGZ9SkF+U3b95cuqSmOfoyyQwUA3JbMXXOnIefnC7lqRC2QTC6mYDx5hIkBiwymXJBe8rpq/S94VVvPGfW6A5upyeCZISLEEnAz0GlykdpIy/NogzhmWpbAMOus05Xnen6xPdNig6c/M5ZleRxVobNrZSd7c5qI3aUUyfMKXlY1j9oiUTjSKH1IizwaI3aL/MM70eErBxXiLs2tpQvZeaVLn3kwCB5YhywO3LK0x+FNx4Gl90deAXMYibGNiLTq9grpB8fuLg9M90JBjFkeYkrSJ2yGYumYyP/WBA3mYEYGDLNstOby4riTU3WCqVl+eah6ss3l+gNDjLxiMtJZ/g0gQACaAvxQ9tYp5eeRMuLRTp79QQPxv97s8IyVwE/TlPlcSFlEXAzsBvqvsolQXRVi9AxA6M2davYabBYAgRf6rRfgujoU=
 a466b9f9792e3ad7ae3fc6c43c3ff2e136b718d 0 iQIVAwUAVg1oMSBXgaxoKi1yAQLPag/+Pv0+pR9b9Y5RflEcERUzVu92q+l/JEiP7PHP9pAZuXoQ0ikYBFo1Ygw8tkIG00dgEaLk/2b7E3OxaU9pjU3thoX//XpTcbkJtVhe7Bkjh9/S3dRpm2FWNL9n0qnywebziB45Xs8XzUwBZTYOkVRInYr/NzSo8KNbQH1B4u2g56veb8u/7GtEvBSGnMGVYKhVUZ3jxyDf371QkdafMOJPpogkZcVhXusvMZPDBYtTIzswyxBJ2jxHzjt8+EKs+FI3FxzvQ9Ze3M5Daa7xfiHI3sOgECO8GMVaJi0F49lttKx08KONw8xLlEof+cJ+qxLxQ42X5XOQglJ2/bv5ES5JiZYAti2XSXbZK96p4wexqL4hnaLVU/2iEUfqB9Sj6itEuhGOknPD9fQo1rZXYIS8CT5nGTNG4rEpLFN6VwWn1btIMNkEHw998zU7N3HAOk6adD6zGcntUfMBvQC3V4VK3o7hp8PGeySrWrOLcC/xLKM+XRonz46woJK5D8w8lCVYAxBWEGKAFtj9hv9R8Ye9gCW0Q8BvJ7MwGpn+7fLQ1BVZdV1LZQTSBUr5u8mNeDsRo4H2hITQRhUeElIwlMsUbbN078a4JPOUgPz1+Fi8oHRccBchN6I40QohL934zhcKXQ+NXYN8BgpCicPztSg8O8Y/qvhFP12Zu4tOH8P/dFY=
              b66e3ca0b90c3095ea28dfd39aa24247bebf5c20 0 iQIVAwUAViarTyBXgaxoKi1yAQLZgRAAh7c7ebn7kUWI5M/b/T6qHGjFrU5azkjamzy9IG+KIa2hZgSMxyEM7JJUFqKP4TiWa3sW03bjKGSM/SjjDSSyheX+JIVSPNyKrBwneYhPq45Ius8eiHziClkt0CSsl2d9xDRpI0JmHbN0Pf8nh7rnbL+231GDAOT6dP+2S8K1HGa/0BgEcL9gpYs4/2GyjL+hBSUjyrabzvwe48DCN5W0tEJbGFw5YEADxdfbVbNEuXL81tR4PFGiJxPW0QKRLDB74MWmiWC0gi2ZC/IhbNBZ2sLb6694d4Bx4PVwtiARh63HNXVMEaBrFu1S9NcMQyHvAOc6Zw4izF/PCeTcdEnPk8J1t5PTz09Lp0EAKxe7CWIViy350ke5eiaxO3ySrNMX6d83BOHLDqEFMSWm+ad+KEMT4CJrK4X/n/XMgEFAaU5nWlIRqrLRIeU2Ifc625T0Xh4BgTqXPpytQxhgV5b+Fi6duNk4cy+QnHT4ymxI6BPD9HvSQwc+O7h37qjvJVZmpQX6AP8O75Yza8ZbcYKRIIxZzOkwNpzE5A/vpvP5bCRn7AGcT3ORWmAYr/etr3vxUvt2fQz6U/R4S915V+AeWBdcp+uExu6VZ42M0vhhh0lyzx1VRJGVdV+LoxFKkaC42d0yT+O1QEhSB7WL1D3/a/iWubv6ieB/cvNMhFaK9DA=
 dd34f2e7272be9e3b2a5a83cd0d20be44293f4 0 iQIVAwUAVjZiKiBXgaxoKi1yAQKBWQ/+JcE37vprSOA5e0ezs/avC7leR6hTlXy9O5bpFnvMpbVMTUp+KfBE4HxTT0KKXKh9lGtNaQ+lAmHuy1OQE1hBKPIaCUd8/1gunGsXgRM3TJ9LwjFd4qFpOMxvOouc6kW5kmea7V9W2fg6aFNjjc/4/0J3HMOIjmf2fFz87xqR1xX8iezJ57A4pUPNViJlOWXRzfa56cI6VUe5qOMD0NRXcY+JyI5qW25Y/aL5D9loeKflpzd53Ue+Pu3qlhddJd3PVkaAiVDH+DYyRb8sKgwuiEsyaBO18IBgC8eDmTohEJt6707A+WNhwBJwp9aOUhHC7caaKRYhEKuDRQ3op++VqwuxbFRXx22XYR9bEzQIlpsv9GY2k8SShU5MZqUKIhk8vppFI6RaID5bmALnLLmjmXfSPYSJDzDuCP5UTQgI3PKPOATorVrqMdKzfb7FiwtcTvtHAXpOgLaY9P9XIePbnei6Rx9TfoHYDvzFWRqzSjl21xR+ZUrJtG2fx7XLbMjEAZJcnjP++GRvNbHBOi57aX0l2LO1peQqZVMULoIivaoLFP3i16RuXXQ/bvKyHmKjJzGrLc0QCa0yfrvV2m30RRMaYlOv7ToJfdfZLXvSAP0zbAuDaXdjGnq7gpfIlNE3xM+kQ75Akcf4V4fK1p061EGBQvQz6Ov3PkPiWL/bxrQ=
 aa5083cbebbe7575c88f3402ab377539b484897 0 iQIVAwUAVkEdCCBXgaxoKi1yAQKdWg//crTr5gsnHQppuD1p+PPn3/7SMsWJ7bgbuaXgERDLC0zWMfhM2oMmu/4jqXnpangdBVvb0SojejgzxoBo9FfRQiIoKt0vxmmn+S8CrEwb99rpP4M7lgyMAInKPMXQdYxkoDNwL70Afmog6eBtlxjYnu8nmUE/swu6JoVns+tF8UOvIKFYbuCcGujo2pUOQC0xBGiHeHSGRDJOlWmY2d7D/PkQtQE/u/d4QZt7enTHMiV44XVJ8+0U0f1ZQE7V+hNWf+IjwcZtL95dnQzUKs6tXMIln/OwO+eJ3d61BfLvmABvCwUC9IepPssNSFBUfGqBAP5wXOzFIPSYn00IWpmZtCnpUNL99X1IV3RP+p99gnEDTScQFPYt5B0q5I1nFdRh1p48BSF/kjPA7V++UfBwMXrrYLKhUR9BjmrRzYnyXJKwbH6iCNj5hsXUkVrBdBi/FnMczgsVILfFcIXUfnJD3E/dG+1lmuObg6dEynxiGChTuaR4KkLa5ZRkUcUl6fWlSRsqSNbGEEbdwcI+nTCZqJUlLSghumhs0Z89Hs1nltBd1ALX2VLJEHrKMrFQ8NfEBeCB6ENqMJi5qPlq354MCdGOZ9RvisX/HlxE4Q61BW0+EwnyXSch6LFSOS3axOocUazMoK1XiOTJSv/5bAsnwb0ztDWeUj9fZEJL+SWtgB8=
 d437a0f3355834a9485bbbeb30a52a052c98f19 0 iQIVAwUAVl5U9CBXgaxoKi1yAQLocg//a4YFz9UVSIEzVEJMUPJnN2dBvEXRpwpb5CdKPd428+18K6VWZd5Mc6xNNRV5AV/hCYylgqDplIvyOvwCj7uN8nEOrLUQQ0Pp37M5ZIX8ZVCK/wgchJ2ltabUG1NrZ7/JA84U79VGLAECMnD0Z9WvZDESpVXmdXfxrk1eCc3omRB0ofNghEx+xpYworfZsu8aap1GHQuBsjPv4VyUWGpMq/KA01PdxRTELmrJnfSyr0nPKwxlI5KsbA1GOe+Mk3tp5HJ42DZqLtKSGPirf6E+6lRJeB0H7EpotN4wD3yZDsw6AgRb2C/ay/3T3Oz7CN+45mwuujV9Cxx5zs1EeOgZcqgA/hXMcwlQyvQDMrWpO8ytSBm6MhOuFOTB3HnUxfsnfSocLJsbNwGWKceAzACcXSqapveVAz/7h+InFgl/8Qce28UJdnX5wro5gP6UWt+xrvc7vfmVGgI3oxbiOUrfglhkjmrxBjEiDQy4BWH7HWMZUVxnqPQRcxIE10+dv0KtM/PBkbUtnbGJ88opFBGkFweje5vQcZy/duuPEIufRkPr8EV47QjOxlvldEjlLq3+QUdJZEgCIFw1X0y7Pix4dsPFjwOmAyo4El1ePrdFzG3dXSVA3eHvMDRnYnNlue9wHvKhYbBle5xTOZBgGuMzhDVe+54JLql5JYr4WrI1pvA=
              ea389970c08449440587712117f178d33bab3f1e 0 iQIVAwUAVociGyBXgaxoKi1yAQJx9Q//TzMypcls5CQW3DM9xY1Q+RFeIw1LcDIev6NDBjUYxULb2WIK2qPw4Th5czF622SMd+XO/kiQeWYp9IW90MZOUVT1YGgUPKlKWMjkf0lZEPzprHjHq0+z/no1kBCBQg2uUOLsb6Y7zom4hFCyPsxXOk5nnxcFEK0VDbODa9zoKb/flyQ7rtzs+Z6BljIQ0TJAJsXs+6XgrW1XJ/f6nbeqsQyPklIBJuGKiaU1Pg8wQe6QqFaO1NYgM3hBETku6r3OTpUhu/2FTUZ7yDWGGzBqmifxzdHoj7/B+2qzRpII77PlZqoe6XF+UOObSFnhKvXKLjlGY5cy3SXBMbHkPcYtHua8wYR8LqO2bYYnsDd9qD0DJ+LlqH0ZMUkB2Cdk9q/cp1PGJWGlYYecHP87DLuWKwS+a6LhVI9TGkIUosVtLaIMsUUEz83RJFb4sSGOXtjk5DDznn9QW8ltXXMTdGQwFq1vmuiXATYenhszbvagrnbAnDyNFths4IhS1jG8237SB36nGmO3zQm5V7AMHfSrISB/8VPyY4Si7uvAV2kMWxuMhYuQbBwVx/KxbKrYjowuvJvCKaV101rWxvSeU2wDih20v+dnQKPveRNnO8AAK/ICflVVsISkd7hXcfk+SnhfxcPQTr+HQIJEW9wt5Q8WbgHk9wuR8kgXQEX6tCGpT/w=
 bdc8965720ca4061f8f8d806563cfc7cdb62e 0 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
 eedf2c450aee58b1a90b0e826f47c5da64 0 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
 a5d605b8683a292bb89aea11f37a81b06ac016 0 iQIVAwUAV3bOsSBXgaxoKi1yAQLiDg//fxmcNpTUedsXqEwNdGFJsJ2E25OANgyv1saZHNfbYFWXIR8g4nyjNaj2SjtXF0wzOq5aHlMWXjMZPOT6pQBdTnOYDdgv+O8DGpgHs5x/f+uuxtpVkdxR6uRP0/ImlTEtDix8VQiN3nTu5A0N3C7E2y+D1JIIyTp6vyjzxvGQTY0MD/qgB55Dn6khx8c3phDtMkzmVEwL4ItJxVRVNw1m+2FOXHu++hJEruJdeMV0CKOV6LVbXHho+yt3jQDKhlIgJ65EPLKrf+yRalQtSWpu7y/vUMcEUde9XeQ5x05ebCiI4MkJ0ULQro/Bdx9vBHkAstUC7D+L5y45ZnhHjOwxz9c3GQMZQt1HuyORqbBhf9hvOkUQ2GhlDHc5U04nBe0VhEoCw9ra54n+AgUyqWr4CWimSW6pMTdquCzAAbcJWgdNMwDHrMalCYHhJksKFARKq3uSTR1Noz7sOCSIEQvOozawKSQfOwGxn/5bNepKh4uIRelC1uEDoqculqCLgAruzcMNIMndNVYaJ09IohJzA9jVApa+SZVPAeREg71lnS3d8jaWh1Lu5JFlAAKQeKGVJmNm40Y3HBjtHQDrI67TT59oDAhjo420Wf9VFCaj2k0weYBLWSeJhfUZ5x3PVpAHUvP/rnHPwNYyY0wVoQEvM/bnQdcpICmKhqcK+vKjDrM=
 bb4f9d3a47a6e83c2b414d58811ed38f503c2 0 iQIVAwUAV42tNyBXgaxoKi1yAQI/Iw//V0NtxpVD4sClotAwffBVW42Uv+SG+07CJoOuFYnmHZv/plOzXuuJlmm95L00/qyRCCTUyAGxK/eP5cAKP2V99ln6rNhh8gpgvmZlnYjU3gqFv8tCQ+fkwgRiWmgKjRL6/bK9FY5cO7ATLVu3kCkFd8CEgzlAaUqBfkNFxZxLDLvKqRlhXxVXhKjvkKg5DZ6eJqRQY7w3UqqR+sF1rMLtVyt490Wqv7YQKwcvY7MEKTyH4twGLx/RhBpBi+GccVKvWC011ffjSjxqAfQqrrSVt0Ld1Khj2/p1bDDYpTgtdDgCzclSXWEQpmSdFRBF5wYs/pDMUreI/E6mlWkB4hfZZk1NBRPRWYikXwnhU3ziubCGesZDyBYLrK1vT+tf6giseo22YQmDnOftbS999Pcn04cyCafeFuOjkubYaINB25T20GS5Wb4a0nHPRAOOVxzk/m/arwYgF0ZZZDDvJ48TRMDf3XOc1jc5qZ7AN/OQKbvh2B08vObnnPm3lmBY1qOnhwzJxpNiq+Z/ypokGXQkGBfKUo7rWHJy5iXLb3Biv9AhxY9d5pSTjBmTAYJEic3q03ztzlnfMyi+C13+YxFAbSSNGBP8Hejkkz0NvmB1TBuCKpnZA8spxY5rhZ/zMx+cCw8hQvWHHDUURps7SQvZEfrJSCGJFPDHL3vbfK+LNwI=
 f84e68dbb9bd026f0f3a974ce4bdb93686 0 iQIcBAABCAAGBQJXn3rFAAoJELnJ3IJKpb3VmZoQAK0cdOfi/OURglnN0vYYGwdvSXTPpZauPEYEpwML3dW1j6HRnl5L+H8D8vlYzahK95X4+NNBhqtyyB6wmIVI0NkYfXfd6ACntJE/EnTdLIHIP2NAAoVsggIjiNr26ubRegaD5ya63Ofxz+Yq5iRsUUfHet7o+CyFhExyzdu+Vcz1/E9GztxNfTDVpC/mf+RMLwQTfHOhoTVbaamLCmGAIjw39w72X+vRMJoYNF44te6PvsfI67+6uuC0+9DjMnp5eL/hquSQ1qfks71rnWwxuiPcUDZloIueowVmt0z0sO4loSP1nZ5IP/6ZOoAzSjspqsxeay9sKP0kzSYLGsmCi29otyVSnXiKtyMCW5z5iM6k8XQcMi5mWy9RcpqlNYD7RUTn3g0+a8u7F6UEtske3/qoweJLPhtTmBNOfDNw4JXwOBSZea0QnIIjCeCc4ZGqfojPpbvcA4rkRpxI23YoMrT2v/kp4wgwrqK9fi8ctt8WbXpmGoAQDXWj2bWcuzj94HsAhLduFKv6sxoDz871hqjmjjnjQSU7TSNNnVzdzwqYkMB+BvhcNYxk6lcx3Aif3AayGdrWDubtU/ZRNoLzBwe6gm0udRMXBj4D/60GD6TIkYeL7HjJwfBb6Bf7qvQ6y7g0zbYG9uwBmMeduU7XchErGqQGSEyyJH3DG9OLaFOj
              ccd436f7db6d5d7b9af89715179b911d031d44f1 0 iQIVAwUAV8h7F0emf/qjRqrOAQjmdhAAgYhom8fzL/YHeVLddm71ZB+pKDviKASKGSrBHY4D5Szrh/pYTedmG9IptYue5vzXpspHAaGvZN5xkwrz1/5nmnCsLA8DFaYT9qCkize6EYzxSBtA/W1S9Mv5tObinr1EX9rCSyI4HEJYE8i1IQM5h07SqUsMKDoasd4e29t6gRWg5pfOYq1kc2MTck35W9ff1Fii8S28dqbO3cLU6g5K0pT0JLCZIq7hyTNQdxHAYfebxkVl7PZrZR383IrnyotXVKFFc44qinv94T50uR4yUNYPQ8Gu0TgoGQQjBjk1Lrxot2xpgPQAy8vx+EOJgpg/yNZnYkmJZMxjDkTGVrwvXtOXZzmy2jti7PniET9hUBCU7aNHnoJJLzIf+Vb1CIRP0ypJl8GYCZx6HIYwOQH6EtcaeUqq3r+WXWv74ijIE7OApotmutM9buTvdOLdZddBzFPIjykc6cXO+W4E0kl6u9/OHtaZ3Nynh0ejBRafRWAVw2yU3T9SgQyICsmYWJCThkj14WqCJr2b7jfGlg9MkQOUG6/3f4xz2R3SgyUD8KiGsq/vdBE53zh0YA9gppLoum6AY+z61G1NhVGlrtps90txZBehuARUUz2dJC0pBMRy8XFwXMewDSIe6ATg25pHZsxHfhcalBpJncBl8pORs7oQl+GKBVxlnV4jm1pCzLU=
 e68974eb5c63ccb03f794d8b57339a80c4 0 iQIcBAABAgAGBQJX8AfCAAoJELnJ3IJKpb3VnNAP/3umS8tohcZTr4m6DJm9u4XGr2m3FWQmjTEfimGpsOuBC8oCgsq0eAlORYcV68zDax+vQHQu3pqfPXaX+y4ZFDuz0ForNRiPJn+Q+tj1+NrOT1e8h4gH0nSK4rDxEGaa6x01fyC/xQMqN6iNfzbLLB7+WadZlyBRbHaUeZFDlPxPDf1rjDpu1vqwtOrVzSxMasRGEceiUegwsFdFMAefCq0ya/pKe9oV+GgGfR4qNrP7BfpOBcN/Po/ctkFCbLOhHbu6M7HpBSiD57BUy5lfhQQtSjzCKEVTyrWEH0ApjjXKuJzLSyq7xsHKQSOPMgGQprGehyzdCETlZOdauGrC0t9vBCr7kXEhXtycqxBC03vknA2eNeV610VX+HgO9VpCVZWHtENiArhALCcpoEsJvT29xCBYpSii/wnTpYJFT9yW8tjQCxH0zrmEZJvO1/nMINEBQFScB/nzUELn9asnghNf6vMpSGy0fSM27j87VAXCzJ5lqa6WCL/RrKgvYflow/m5AzUfMQhpqpH1vmh4ba1zZ4123lgnW4pNZDV9kmwXrEagGbWe1rnmsMzHugsECiYQyIngjWzHfpHgyEr49Uc5bMM1MlTypeHYYL4kV1jJ8Ou0SC4aV+49p8Onmb2NlVY7JKV7hqDCuZPI164YXMxhPNst4XK0/ENhoOE+8iB6
 c415874f6ac653efc1099dec9c9150e90f 0 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
 b624d27e3917d978af56d6ad59331e0464a 0 iQIcBAABCAAGBQJYuMSwAAoJELnJ3IJKpb3VL3YP/iKWY3+K3cLUBD3Ne5MhfS7N3t6rlk9YD4kmU8JnVeV1oAfg36VCylpbJLBnmQdvC8AfBJOkXi6DHp9RKXXmlsOeoppdWYGX5RMOzuwuGPBii6cA6KFd+WBpBJlRtklz61qGCAtv4q8V1mga0yucihghzt4lD/PPz7mk6yUBL8s3rK+bIHGdEhnK2dfnn/U2G0K/vGgsYZESORISuBclCrrc7M3/v1D+FBMCEYX9FXYU4PhYkKXK1mSqzCB7oENu/WP4ijl1nRnEIyzBV9pKO4ylnXTpbZAr/e4PofzjzPXb0zume1191C3wvgJ4eDautGide/Pxls5s6fJRaIowf5XVYQ5srX/NC9N3K77Hy01t5u8nwcyAhjmajZYuB9j37nmiwFawqS/y2eHovrUjkGdelV8OM7/iAexPRC8i2NcGk0m6XuzWy1Dxr8453VD8Hh3tTeafd6v5uHXSLjwogpu/th5rk/i9/5GBzc1MyJgRTwBhVHi/yFxfyakrSU7HT2cwX/Lb5KgWccogqfvrFYQABIBanxLIeZxTv8OIjC75EYknbxYtvvgb35ZdJytwrTHSZN0S7Ua2dHx2KUnHB6thbLu/v9fYrCgFF76DK4Ogd22Cbvv6NqRoglG26d0bqdwz/l1n3o416YjupteW8LMxHzuwiJy69WP1yi10eNDq
              ed5b25874d998ababb181a939dd37a16ea644435 0 iQIcBAABCAAGBQJY4r/gAAoJELnJ3IJKpb3VtwYP/RuTmo252ExXQk/n5zGJZvZQnI86vO1+yGuyOlGFFBwf1v3sOLW1HD7fxF6/GdT8CSQrRqtC17Ya3qtayfY/0AEiSuH2bklBXSB1H5wPyguS5iLqyilCJY0SkHYBIDhJ0xftuIjsa805wdMm3OdclnTOkYT+K1WL8Ylbx/Ni2Lsx1rPpYdcQ/HlTkr5ca1ZbNOOSxSNI4+ilGlKbdSYeEsmqB2sDEiSaDEoxGGoSgzAE9+5Q2FfCGXV0bq4vfmEPoT9lhB4kANE+gcFUvsJTu8Z7EdF8y3CJLiy8+KHO/VLKTGJ1pMperbig9nAXl1AOt+izBFGJGTolbR/ShkkDWB/QVcqIF5CysAWMgnHAx7HjnMDBOANcKzhMMfOi3GUvOCNNIqIIoJHKRHaRk0YbMdt7z2mKpTrRQ9Zadz764jXOqqrPgQFM3jkBHzAvZz9yShrHGh42Y+iReAF9pAN0xPjyZ5Y2qp+DSl0bIQqrAet6Zd3QuoJtXczAeRrAvgn7O9MyLnMyE5s7xxI7o8M7zfWtChLF8ytJUzmRo3iVJNOJH+Zls9N30PGw6vubQAnB5ieaVTv8lnNpcAnEQD/i0tmRSxzyyqoOQbnItIPKFOsaYW+eX9sgJmObU3yDc5k3cs+yAFD2CM/uiUsLcTKyxPNcP1JHBYpwhOjIGczSHVS1
 eaf9539499a1b8be259ffe7ada787d07857f80 0 iQIcBAABCAAGBQJY9iz9AAoJELnJ3IJKpb3VYqEQAJNkB09sXgYRLA4kGQv3p4v02q9WZ1lHkAhOlNwIh7Zp+pGvT33nHZffByA0v+xtJNV9TNMIFFjkCg3jl5Z42CCe33ZlezGBAzXU+70QPvOR0ojlYk+FdMfeSyCBzWYokIpImwNmwNGKVrUAfywdikCsUC2aRjKg4Mn7GnqWl9WrBG6JEOOUamdx8qV2f6g/utRiqj4YQ86P0y4K3yakwc1LMM+vRfrwvsf1+DZ9t7QRENNKQ6gRnUdfryqSFIWn1VkBVMwIN5W3yIrTMfgH1wAZxbnYHrN5qDK7mcbP7bOA3XWJuEC+3QRnheRFd/21O1dMFuYjaKApXPHRlTGRMOaz2eydbfBopUS1BtfYEh4/B/1yJb9/HDw6LiAjea7ACHiaNec83z643005AvtUuWhjX3QTPkYlQzWaosanGy1IOGtXCPp1L0A+9gUpqyqycfPjQCbST5KRzYSZn3Ngmed5Bb6jsgvg5e5y0En/SQgK/pTKnxemAmFFVvIIrrWGRKj0AD0IFEHEepmwprPRs97EZPoBPFAGmVRuASBeIhFQxSDIXV0ebHJoUmz5w1rTy7U3Eq0ff6nW14kjWOUplatXz5LpWJ3VkZKrI+4gelto5xpTI6gJl2nmezhXQIlInk17cPuxmiHjeMdlOHZRh/zICLhQNL5fGne0ZL+qlrXY
 e788321cc4ae9975b7f0c54c849f36d82182b 0 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
 c49ed51a698ec016d2b4c6b44ca3c3f73cc788 0 iQIcBAABCAAGBQJZXQSmAAoJELnJ3IJKpb3VmTwP/jsxFTlKzWU8EnEhEViiP2YREOD3AXU7685DIMnoyVAsZgxrt0CG6Y92b5sINCeh5B0ORPQ7+xi2Xmz6tX8EeAR+/Dpdx6K623yExf8kq91zgfMvYkatNMu6ZVfywibYZAASq02oKoX7WqSPcQG/OwgtdFiGacCrG5iMH7wRv0N9hPc6D5vAV8/H/Inq8twpSG5SGDpCdKj7KPZiY8DFu/3OXatJtl+byg8zWT4FCYKkBPvmZp8/sRhDKBgwr3RvF1p84uuw/QxXjt+DmGxgtjvObjHr+shCMcKBAuZ4RtZmyEo/0L81uaTElHu1ejsEzsEKxs+8YifnH070PTFoV4VXQyXfTc8AyaqHE6rzX96a/HjQiJnL4dFeTZIrUhGK3AkObFLWJxVTo4J8+oliBQQldIh1H2yb1ZMfwapLnUGIqSieHDGZ6K2ccNJK8Q7IRhTCvYc0cjsnbwTpV4cebGqf3WXZhX0cZN+TNfhh/HGRzR1EeAAavjJqpDam1OBA5TmtJd/lHLIRVR5jyG+r4SK0XDlJ8uSfah7MpVH6aQ6UrycPyFusGXQlIqJ1DYQaBrI/SRJfIvRUmvVz9WgKLe83oC3Ui3aWR9rNjMb2InuQuXjeZaeaYfBAUYACcGfCZpZZvoEkMHCqtTng1rbbFnKMFk5kVy9YWuVgK9Iuh0O5
 ebaed4e315f63157bd157d6ce553c7ab73 0 iQIVAwUAWW9XW0emf/qjRqrOAQhI7A//cKXIM4l8vrWWsc1Os4knXm/2UaexmAwV70TpviKL9RxCy5zBP/EapCaGRCH8uNPOQTkWGR9Aucm3CtxhggCMzULQxxeH86mEpWf1xILWLySPXW/t2f+2zxrwLSAxxqFJtuYv83Pe8CnS3y4BlgHnBKYXH8XXuW8uvfc0lHKblhrspGBIAinx7vPLoGQcpYrn9USWUKq5d9FaCLQCDT9501FHKf5dlYQajevCUDnewtn5ohelOXjTJQClW3aygv/z+98Kq7ZhayeIiZu+SeP+Ay7lZPklXcy6eyRiQtGCa1yesb9v53jKtgxWewV4o6zyuUesdknZ/IBeNUgw8LepqTIJo6/ckyvBOsSQcda81DuYNUChZLYTSXYPHEUmYiz6CvNoLEgHF/oO5p6CZXOPWbmLWrAFd+0+1Tuq8BSh+PSdEREM3ZLOikkXoVzTKBgu4zpMvmBnjliBg7WhixkcG0v5WunlV9/oHAIpsKdL7AatU+oCPulp+xDpTKzRazEemYiWG9zYKzwSMk9Nc17e2tk+EtFSPsPo4iVCXMgdIZSTNBvynKEFXZQVPWVa+bYRdAmbSY8awiX7exxYL10UcpnN2q/AH/F7rQzAmo8eZ3OtD0+3Nk3JRx0/CMyzKLPYDpdUgwmaPb+s2Bsy7f7TfmA7jTa69YqB1/zVwlWULr0=
 af8622863796a0027566f6b646e10d522c4c 0 iQIcBAABCAAGBQJZjJflAAoJELnJ3IJKpb3V19kQALCvTdPrpce5+rBNbFtLGNFxTMDol1dUy87EUAWiArnfOzW3rKBdYxvxDL23BpgUfjRm1fAXdayVvlj6VC6Dyb195OLmc/I9z7SjFxsfmxWilF6U0GIa3W0x37i05EjfcccrBIuSLrvR6AWyJhjLOBCcyAqD/HcEom00/L+o2ry9CDQNLEeVuNewJiupcUqsTIG2yS26lWbtLZuoqS2T4Nlg8wjJhiSXlsZSuAF55iUJKlTQP6KyWReiaYuEVfm/Bybp0A2bFcZCYpWPwnwKBdSCHhIalH8PO57gh9J7xJVnyyBg5PU6n4l6PrGOmKhNiU/xyNe36tEAdMW6svcVvt8hiY0dnwWqR6wgnFFDu0lnTMUcjsy5M5FBY6wSw9Fph8zcNRzYyaeUbasNonPvrIrk21nT3ET3RzVR3ri2nJDVF+0GlpogGfk9k7wY3808091BMsyV3448ZPKQeWiK4Yy4UOUwbKV7YAsS5MdDnC1uKjl4GwLn9UCY/+Q2/2R0CBZ13Tox+Nbo6hBRuRGtFIbLK9j7IIUhhZrIZFSh8cDNkC+UMaS52L5z7ECvoYIUpw+MJ7NkMLHIVGZ2Nxn0C7IbGO6uHyR7D6bdNpxilU+WZStHk0ppZItRTm/htar4jifnaCI8F8OQNYmZ3cQhxx6qV2Tyow8arvWb1NYXrocG
 c91326b23954e6e1c6960d0239511f9530258 0 iQIcBAABCAAGBQJZjKKZAAoJELnJ3IJKpb3VGQkP/0iF6Khef0lBaRhbSAPwa7RUBb3iaBeuwmeic/hUjMoU1E5NR36bDDaF3u2di5mIYPBONFIeCPf9/DKyFkidueX1UnlAQa3mjh/QfKTb4/yO2Nrk7eH+QtrYxVUUYYjwgp4rS0Nd/++I1IUOor54vqJzJ7ZnM5O1RsE7VI1esAC/BTlUuO354bbm08B0owsZBwVvcVvpV4zeTvq5qyPxBJ3M0kw83Pgwh3JZB9IYhOabhSUBcA2fIPHgYGYnJVC+bLOeMWI1HJkJeoYfClNUiQUjAmi0cdTC733eQnHkDw7xyyFi+zkKu6JmU1opxkHSuj4Hrjul7Gtw3vVWWUPufz3AK7oymNp2Xr5y1HQLDtNJP3jicTTG1ae2TdX5Az3ze0I8VGbpR81/6ShAvY2cSKttV3I+2k4epxTTTf0xaZS1eUdnFOox6acElG2reNzx7EYYxpHj17K8N2qNzyY78iPgbJ+L39PBFoiGXMZJqWCxxIHoK1MxlXa8WwSnsXAU768dJvEn2N1x3fl+aeaWzeM4/5Qd83YjFuCeycuRnIo3rejSX3rWFAwZE0qQHKI5YWdKDLxIfdHTjdfMP7np+zLcHt0DV/dHmj2hKQgU0OK04fx7BrmdS1tw67Y9bL3H3TDohn7khU1FrqrKVuqSLbLsxnNyWRbZQF+DCoYrHlIW
 fee7f7d2da04226914c2258cc2884dc27384fd7 0 iQIcBAABCAAGBQJZjOJfAAoJELnJ3IJKpb3VvikP/iGjfahwkl2BDZYGq6Ia64a0bhEh0iltoWTCCDKMbHuuO+7h07fHpBl/XX5XPnS7imBUVWLOARhVL7aDPb0tu5NZzMKN57XUC/0FWFyf7lXXAVaOapR4kP8RtQvnoxfNSLRgiZQL88KIRBgFc8pbl8hLA6UbcHPsOk4dXKvmfPfHBHnzdUEDcSXDdyOBhuyOSzRs8egXVi3WeX6OaXG3twkw/uCF3pgOMOSyWVDwD+KvK+IBmSxCTKXzsb+pqpc7pPOFWhSXjpbuYUcI5Qy7mpd0bFL3qNqgvUNq2gX5mT6zH/TsVD10oSUjYYqKMO+gi34OgTVWRRoQfWBwrQwxsC/MxH6ZeOetl2YkS13OxdmYpNAFNQ8ye0vZigJRA+wHoC9dn0h8c5X4VJt/dufHeXc887EGJpLg6GDXi5Emr2ydAUhBJKlpi2yss22AmiQ4G9NE1hAjxqhPvkgBK/hpbr3FurV4hjTG6XKsF8I0WdbYz2CW/FEbp1+4T49ChhrwW0orZdEQX7IEjXr45Hs5sTInT90Hy2XG3Kovi0uVMt15cKsSEYDoFHkR4NgCZX2Y+qS5ryH8yqor3xtel3KsBIy6Ywn8pAo2f8flW3nro/O6x+0NKGV+ZZ0uo/FctuQLBrQVs025T1ai/6MbscQXvFVZVPKrUzlQaNPf/IwNOaRa
 f72c7b70acfdaf56ab35360584d7845827 0 iQIcBAABCAAGBQJZv+wSAAoJELnJ3IJKpb3VH3kQAJp3OkV6qOPXBnlOSSodbVZveEQ5dGJfG9hk+VokcK6MFnieAFouROoGNlQXQtzj6cMqK+LGCP/NeJEG323gAxpxMzc32g7TqbVEhKNqNK8HvQSt04aCVZXtBmP0cPzc348UPP1X1iPTkyZxaJ0kHulaHVptwGbFZZyhwGefauU4eMafJsYqwgiGmvDpjUFu6P8YJXliYeTo1HX2lNChS1xmvJbop1YHfBYACsi8Eron0vMuhaQ+TKYq8Zd762u2roRYnaQ23ubEaVsjGDUYxXXVmit2gdaEKk+6Rq2I+EgcI5XvFzK8gvoP7siz6FL1jVf715k9/UYoWj9KDNUm8cweiyiUpjHQt0S+Ro9ryKvQy6tQVunRZqBN/kZWVth/FlMbUENbxVyXZcXv+m7OLvk+vyK7UZ7yT+OBzgRr0PyUuafzSVW3e+RZJtGxYGM5ew2bWQ8L6wuBucRYZOSnXXtCw7cKEMlK3BTjfAfpHUdIZIG492R9d6aOECUK/MpNvCiXXaZoh5Kj4a0dARiuWFCZxWwt3bmOg13oQ841zLdzOi/YZe15vCm8OB4Ffg6CkmPKhZhnMwVbFmlaBcoaeMzzpMuog91J1M2zgEUBTYwe/HKiNr/0iilJMPFRpZ+zEb2GvVoc8FMttXi8aomlXf/6LHCC9ndexGC29jIzl41+
 f427b57bf9019c6dc3750baa539dc22c1be50f6 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlnQtVIQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91TTkD/409sWTM9vUH2qkqNTb1IXyGpqzb9UGOSVDioz6rvgZEBgh9D1oBTWnfBXW8sOWR0A7iCL6qZh2Yi7g7p0mKGXh9LZViLtSwwMSXpNiGBO7RVPW+NQ6DOY5Rhr0i08UBiVEkZXHeIVCd2Bd6mhAiUsm5iUh9Jne10wO8cIxeAUnsx4DBdHBMWLg6AZKWllSgN+r9H+7wnOhDbkvj1Cu6+ugKpEs+xvbTh47OTyM+w9tC1aoZD4HhfR5w5O16FC+TIoE6wmWut6e2pxIMHDB3H08Dky6gNjucY/ntJXvOZW5kYrQA3LHKks8ebpjsIXesOAvReOAsDz0drwzbWZan9Cbj8yWoYz/HCgHCnX3WqKKORSP5pvdrsqYua9DXtJwBeSWY4vbIM2kECAiyw1SrOGudxlyWBlW1f1jhGR2DsBlwoieeAvUVoaNwO7pYirwxR4nFPdLDRCQ4hLK/GFiuyr+lGoc1WUzVRNBYD3udcOZAbqq4JhWLf0Gvd5xP0rn1cJNhHMvrPH4Ki4a5KeeK6gQI7GT9/+PPQzTdpxXj6KwofktJtVNqm5sJmJ+wMIddnobFlNNLZ/F7OMONWajuVhh+vSOV34YLdhqzAR5XItkeJL6qyAJjNH5PjsnhT7nMqjgwriPz6xxYOLJWgtK5ZqcSCx4gWy9KJVVja8wJ7rRUg==
 e2454b60e5936f5e77498cab2648db469504487 0 iQJVBAABCAA/FiEEOoFVFj0OIKUw/LeGR6Z/+qNGqs4FAlnqRBUhHGtidWxsb2NrK21lcmN1cmlhbEByaW5nd29ybGQub3JnAAoJEEemf/qjRqrOAQQP/28EzmTKFL/RxmNYePdzqrmcdJ2tn+s7OYmGdtneN2sESZ4MK0xb5Q8Mkm+41aXS52zzJdz9ynwdun8DG4wZ3sE5MOG+GgK6K0ecOv1XTKS3a2DkUM0fl5hlcXN7Zz7m7m5M6sy6vSxHP7kTyzQWt//z175ZLSQEu1a0nm/BLH+HP9e8DfnJ2Nfcnwp32kV0Nj1xTqjRV1Yo/oCnXfVvsxEJU+CDUGBiLc29ZcoWVbTw9c1VcxihJ6k0pK711KZ+bedSk7yc1OudiJF7idjB0bLQY6ESHNNNjK8uLppok0RsyuhvvDTAoTsl1rMKGmXMM0Ela3/5oxZ/5lUZB73vEJhzEi48ULvstpq82EO39KylkEfQxwMBPhnBIHQaGRkl7QPLXGOYUDMY6gT08Sm3e8/NqEJc/AgckXehpH3gSS2Ji2xg7/E8H5plGsswFidw//oYTTwm0j0halWpB521TD2wmjkjRHXzk1mj0EoFQUMfwHTIZU3E8flUBasD3mZ9XqZJPr66RV7QCrXayH75B/i0CyNqd/Hv5Tkf2TlC3EkEBZwZyAjqw7EyL1LuS936sc7fWuMFsH5k/fwjVwzIc1LmP+nmk2Dd9hIC66vec4w1QZeeAXuDKgOJjvQzj2n+uYRuObl4kKcxvoXqgQN0glGuB1IW7lPllGHR1kplhoub
 ccb43d4cf01d013ae05917ec4f305509f851b2d 0 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
 b6df1b5adbdf647cf5c6675b40575e1b197c60 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlpmbwIQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91W4BD/4h+y7QH7FkNcueOBrmdci7w1apkPX7KuknKxf8+FmA1QDGWYATnqD6IcAk3+f4reO4n9qc0y2BGrIz/pyTSIHvJW+ORrbPCKVrXlfUgkUK3TumtRObt8B75BVBBNaJ93r1yOALpo/K8wSwRrBF+Yl6aCoFiibUEbfcfaOAHVqZXKC1ZPtLRwq5NHIw0wWB0qNoAXj+FJV1EHO7SEjj2lXqw/r0HriQMdObWLgAb6QVUq7oVMpAumUeuQtZ169qHdqYfF1OLdCnsVBcwYEz/cBLC43bvYiwFxSkbAFyl656caWiwA3PISFSzP9Co0zWU/Qf8f7dTdAdT/orzCfUq8YoXqryfRSxi+8L8/EMxankzdW73Rx5X+0539pSq+gDDtTOyNuW6+CZwa5D84b31rsd+jTx8zVm3SRHRKsoGF2EEMQkWmDbhIFjX5W1fE84Ul3umypv+lPSvCPlQpIqv2hZmcTR12sgjdBjU8z+Zcq22SHFybqiYNmWpkVUtiMvTlHMoJfi5PI6xF8D2dxV4ErG+NflqdjaXydgnbO6D3/A1FCASig0wL4jMxSeRqnRRqLihN3VaGG2QH6MLJ+Ty6YuoonKtopw9JNOZydr/XN7K5LcjX1T3+31qmnHZyBXRSejWl9XN93IDbQcnMBWHkz/cJLN0kKu4pvnV8UGUcyXfA==
              d334afc585e29577f271c5eda03378736a16ca6b 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlpzZuUQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91TiDEADDD6Tn04UjgrZ36nAqOcHaG1ZT2Cm1/sbTw+6duAhf3+uKWFqi2bgcdCBkdfRH7KfEU0GNsPpiC6mzWw3PDWmGhnLJAkR+9FTBU0edK01hkNW8RelDTL5J9IzIGwrP4KFfcUue6yrxU8GnSxnf5Vy/N5ZZzLV/P3hdBte5We9PD5KHPAwTzzcZ9Wiog700rFDDChyFq7hNQ3H0GpknF6+Ck5XmJ3DOqt1MFHk9V4Z/ASU59cQXKOeaMChlBpTb1gIIWjOE99v5aY06dc1WlwttuHtCZvZgtAduRAB6XYWyniS/7nXBv0MXD3EWbpH1pkOaWUxw217HpNP4g9Yo3u/i8UW+NkSJOeXtC1CFjWmUNj138IhS1pogaiPPnIs+H6eOJsmnGhN2KbOMjA5Dn9vSTi6s/98TarfUSiwxA4L7fJy5qowFETftuBO0fJpbB8+ZtpnjNp0MMKed27OUSv69i6BmLrP+eqk+MVO6PovvIySlWAP9/REM/I5/mFkqoI+ruT4a9osNGDZ4Jqb382b7EmpEMDdgb7+ezsybgDfizuaTs/LBae7h79o1m30DxZ/EZ5C+2LY8twbGSORvZN4ViMVhIhWBTlOE/iVBOj807Y2OaUURcuLfHRmaCcfF1uIzg0uNB/aM/WSE0+AXh2IX+mipoTS3eh/V2EKldBHcOQ==
 aadf7a3264b03c8b09efce715bc41e6ab4a9b 0 iQJVBAABCAA/FiEEOoFVFj0OIKUw/LeGR6Z/+qNGqs4FAlqe5w8hHGtidWxsb2NrK21lcmN1cmlhbEByaW5nd29ybGQub3JnAAoJEEemf/qjRqrO1lUQAK6+S26rE3AMt6667ClT+ubPl+nNMRkWJXa8EyPplBUGTPdMheViOe+28dCsveJxqUF7A4TMLMA/eIj4cRIwmVbBaivfQKnG5GMZ+9N6j6oqE/OAJujdHzzZ3+o9KJGtRgJP2tzdY/6qkXwL3WN6KULz7pSkrKZLOiNfj4k2bf3bXeB7d3N5erxJYlhddlPBlHXImRkWiPR/bdaAaYJq+EEWCbia6MWXlSAqEjIgQi+ytuh/9Z+QSsJCsECDRqEExZClqHGkCLYhST99NqqdYCGJzAFMgh+xWxZxI0LO08pJxYctHGoHm+vvRVMfmdbxEydEy01H6jX+1e7Yq44bovIiIOkaXCTSuEBol+R5aPKJhgvqgZ5IlcTLoIYQBE3MZMKZ89NWy3TvgcNkQiOPCCkKs1+DukXKqTt62zOTxfa6mIZDCXdGai6vZBJ5b0yeEd3HV96yHb9dFlS5w1cG7prIBRv5BkqEaFbRMGZGV31Ri7BuVu0O68Pfdq+R+4A1YLdJ0H5DySe2dGlwE2DMKhdtVu1bie4UWHK10TphmqhBk6B9Ew2+tASCU7iczAqRzyzMLBTHIfCYO2R+5Yuh0CApt47KV23OcLje9nORyE2yaDTbVUPiXzdOnbRaCQf7eW5/1y/LLjG6OwtuETTcHKh7ruko+u7rFL96a4DNlNdk
 bba684efde7f45add05f737952093bb2aa07155 0 iQJVBAABCAA/FiEEOoFVFj0OIKUw/LeGR6Z/+qNGqs4FAlqe6dkhHGtidWxsb2NrK21lcmN1cmlhbEByaW5nd29ybGQub3JnAAoJEEemf/qjRqrOJmIQALUVCoWUFYYaRxGH4OpmIQ2o1JrMefvarFhaPY1r3+G87sjXgw15uobEQDtoybTUYbcdSxJQT1KE1FOm3wU0VyN6PY9c1PMEAVgJlve0eDiXNNlBsoYMXnpq1HidZknkjpXgUPdE/LElxpJJRlJQZlS29bkGmEDZQBoOvlcZoBRDSYcbM07wn7d+1gmJkcHViDBMAbSrudfO0OYzDC1BjtGyKm7Mes2WB1yFYw+ySa8hF/xPKEDvoZINOE5n3PBJiCvPuTw3PqsHvWgKOA1Obx9fATlxj7EHBLfKBTNfpUwPMRSH1cmA+qUS9mRDrdLvrThwalr6D3r2RJ2ntOipcZpKMmxARRV+VUAI1K6H0/Ws3XAxENqhF7RgRruJFVq8G8EcHJLZEoVHsR+VOnd/pzgkFKS+tIsYYRcMpL0DdMF8pV3xrEFahgRhaEZOh4jsG3Z+sGLVFFl7DdMqeGs6m/TwDrvfuYtGczfGRB0wqu8KOwhR1BjNJKcr4lk35GKwSXmI1vk6Z1gAm0e13995lqbCJwkuOKynQlHWVOR6hu3ypvAgV/zXLF5t8HHtL48sOJ8a33THuJT4whbXSIb9BQXu/NQnNhK8G3Kly5UN88vL4a3sZi/Y86h4R2fKOSib/txJ3ydLbMeS8LlJMqeF/hrBanVF0r15NZ2CdmL1Qxim
 de7bd407251af2bc98e5b809c8598ee95830daf 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlrE4p0QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91c4UD/4tC+mBWxBw/JYm4vlFTKWLHopLEa1/uhFRK/uGsdgcCyexbCDbisjJpl3JTQb+wQDlZnUorm8zB206y418YqhJ7lCauRgcoqKka0e3kvKnwmklwmuGkwOIoruWxxhCcgRCT4C+jZ/ZE3Kre0CKnUvlASsHtbkqrCqFClEcIlPVohlccmjbpQXN+akB40tkMF5Xf0AMBPYG7UievmeHhz3pO/yex/Uc6RhgWAqD4zjA1bh+3REGs3CaoYgKUTXZw/XYI9cqAI0FobRuXSVbq2dqkXCFLfD+WizxUz55rZA+CP4pqLndwxGm4fLy4gk2iLHxKfrHsAul7n5e4tHmxDcOOa1K0fIJDBijuXoNfXN7nF4NQUlfpmtOxUxfniVohvXJeYV8ecepsDMSFqDtEtbdhsep5QDx85lGLNLQAA1f36swJzLBSqGw688Hjql2c9txK2eVrVxNp+M8tqn9qU/h2/firgu9a2DxQB45M7ISfkutmpizN5TNlEyElH0htHnKG7+AIbRAm4novCXfSzP8eepk0kVwj9QMIx/rw4aeicRdPWBTcDIG0gWELb0skunTQqeZwPPESwimntdmwCxfFksgT0t79ZEDAWWfxNLhJP/HWO2mYG5GUJOzNQ4rj/YXLcye6A4KkhvuZlVCaKAbnm60ivoG082HYuozV4qPOQ==
              ed5448edcbfa747b9154099e18630e49024fd47b 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlrXnuoQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91fSHEACBVg4FsCE2nN5aEKAQb7l7rG4XTQ9FbvoTYB3tkvmsLQSRfh2GB2ZDBOI7Vswo2UxXupr4qSkUQbeHrwrk9A1s5b/T5e4wSKZuFJOrkwLVZDFfUHumKomqdoVj/D8+LDt7Rz+Wm7OClO/4dTAsl2E4rkl7XPtqjC3jESGad8IBANlPVBhNUMER4eFcPZzq1qi2MrlJKEKpdeZEWJ/ow7gka/aTLqHMfRwhA3kS5X34Yai17kLQZGQdWISWYiM9Zd2b/FSTHZGy8rf9cvjXs3EXfEB5nePveDrFOfmuubVRDplO+/naJjNBqwxeB99jb7Fk3sekPZNW/NqR/w1jvQFA3OP9fS2g1OwfXMWyx6DvBJNfQwppNH3JUvA5PEiorul4GJ2nuubXk+Or1yzoRJtwOGz/GQi2BcsPKaL6niewrInFw18jMVhx/4Jbpu+glaim4EvT/PfJ5KdSwF7pJxsoiqvw7A2C2/DsZRbCeal9GrTulkNf/hgpCJOBK1DqVVq1O5MI/oYQ69HxgMq9Ip1OGJJhse3qjevBJbpNCosCpjb3htlo4go29H8yyGJb09i05WtNW2EQchrTHrlruFr7mKJ5h1mAYket74QQyaGzqwgD5kwSVnIcwHpfb8oiJTwA5R+LtbAQXWC/fFu1g1KEp/4hGOQoRU04+mYuPsrzaA==
 ec874717d8a93b19e0d50628443e0ee5efab3a9 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlraM3wQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91RAJEACSnf/HWwS0/OZaqz4Hfh0UBgkXDmH1IC90Pc/kczf//WuXu5AVnnRHDziOlCYYZAnZ2iKu0EQI6GT2K2garaWkaEhukOnjz4WADVys6DAzJyw5iOXeEpIOlZH6hbYbsW3zVcPjiMPo8cY5tIYEy4E/8RcVly1SDtWxvt/nWYQd2MxObLrpU7bPP6a2Db4Vy8WpGRbZRJmOvDNworld5rB5M/OGgHyMa9hg2Hjn+cLtQSEJY4O92A6h2hix9xpDC7zzfoluD2piDslocTm/gyeln2BJJBAtr+aRoHO9hI0baq5yFRQLO8aqQRJJP8dXgYZIWgSU/9oVGPZoGotJyw24iiB37R/YCisKE+cEUjfVclHTDFCkzmYP2ZMbGaktohJeF7EMau0ZJ8II5F0ja3bj6GrwfpGGY5OOcQrzIYW7nB0msFWTljb34qN3nd7m+hQ5hji3Hp9CFXEbCboVmm46LqwukSDWTmnfcP8knxWbBlJ4xDxySwTtcHAJhnUmKxu7oe3D/0Ttdv7HscI40eeMdr01pLQ0Ee3a4OumQ1hn+oL+o+tlqg8PKT20q528CMHgSJp6aIlU7pEK81b+Zj6B57us4P97qSL6XLNUIfubADCaf/KUDwh1HvKhHXV2aRli1GX1REFsy0ItGZn0yhQxIDJKc/FKsEMBKvlVIHGQFw==
 cac550aea66d19c601e45efd1b7bd08d7c40 0 iQJVBAABCAA/FiEEOoFVFj0OIKUw/LeGR6Z/+qNGqs4FAlruOCQhHGtidWxsb2NrK21lcmN1cmlhbEByaW5nd29ybGQub3JnAAoJEEemf/qjRqrOENQQAI1ttaffqYucUEyBARP1GDlZMIGDJgNG7smPMU4Sw7YEzB9mcmxnBFlPx/9n973ucEnLJVONBSZq0VWIKJwPp1RMBpAHuGrMlhkMvYIAukg5EBN3YpA1UogHYycwLj2Ye7fNgiN5FIkaodt9++c4d1Lfu658A2pAeg8qUn5uJ77vVcZRp988u9eVDQfubS8P6bB4KZc87VDAUUeXy+AcS9KHGBmdRAabwU4m09VPZ4h8NEj3+YUPnKXBaNK9pXK5pnkmB8uFePayimnw6St6093oylQTVw/tfxGLBImnHw+6KCu2ut9r5PxXEVxVYpranGbS4jYqpzRtpQBxyo/Igu7fqrioR2rGLQL5NcHsoUEdOC7VW+0HgHjXKtRy7agmcFcgjFco47D3hor7Y16lwgm+RV2EWQ/u2M4Bbo1EWj1oxQ/0j5DOM5UeAJ3Jh64gb4sCDqJfADR8NQaxh7QiqYhn69IcjsEfzU/11VuqWXlQgghJhEEP/bojRyM0qee87CKLiTescafIfnRsNQhyhsKqdHU1QAp29cCqh3mzNxJH3PDYg4fjRaGW4PM7K5gmSXFn/Ifeza0cuZ4XLdYZ76Z1BG80pqBpKZy1unGob+RpItlSmO5jQw7OoRuf0q3Id92gawUDDLuQ7Xg3zOVqV8/wJBlHM7ZUz162bnNsO5Hn
 c5ced5276d6e7d54f7c3dadf5247b7ee98ec79c 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlsYGdAQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91S3fEACmrG3S5eAUhnKqkXFe+HZUwmUvLKRhyWDLlWQzEHaJZQCFWxqSM1ag7JtAx3WkWwmWrOZ0+T/w/xMv81h9JAv9RsoszUT/RH4RsnWoc2ddcK93Q/PrNJ29kFjvC8j3LF42WfHEIeNqAki5c3GbprUL86KG7XVYuMvpPI/SeNSz8siPaKjXo6sg6bAupPCyapisTmeRHcCUc5UfeTTq4YQdS9UI0p9Fo8/vcqmnWY6XnQCRYs2U8Y2I2QCJBHBE5p4KrxrFsAdPWMCg0dJT0goSbzpfDjukPHQaAnUKjCtXCwrzA/KY8fDH9hm5tt1FnC6nl6BRpEHRoHqTfE1ag2QktJZTn5+JWpzz85qFDl5ktmxj1gS80jkOUJ2699RykBy7NACu+TtLJdBk+E1TN0pAU+zsrTSGiteuikEBjQP/8i4whUZCFIHLPgVlxrHWwn0/oszj1Q/u86sCxnYTflR2GLZs3fbSGBEKDDrjqwetxMlwi/3Qhf0PN9aAI7S13YnA89tGLGRLTsVsOoKiQoTExQaCUpE5jFYBLVjsTPh2AjPhG3Zaf7R5ZIvW4CbVYORNTMaYhFNnFyczILJLRid+INHLVifNiJuaLiAFD5Izq9Me4H+GpwB5AI7aG1r+01Si2KbqqpdfoK430UeDV+U/MvEU7v0RoeF30M7uVYv+kg==
 b63a6743010dfdbf8a8154186e119949bdaa1cc 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAls7n+0QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91XVGEAC1aPuUmW9R0QjWUmyY4vMO7AOT4F1sHKrkgNaoG/RCvczuZOCz/fGliEKQ52pkvThrOgOvNfJlIGOu91noLKsYUybO8eeTksCzc7agUjk6/Xsed35D8gNEPuiVTNu379sTQRnOA2T/plQnVCY2PjMzBe6nQ2DJYnggJelCUxuqUsLM76OvMEeNlXvyxZmyAcFT5dfSBYbjAt0kklRRQWgaug3GwLJY/+0tmXhq0tCpAF6myXoVQm/ynSxjR+5+2/+F5nudOQmDnL0zGayOAQU97RLAAxf1L+3DTRfbtxams9ZrGfRzQGcI1d4I4ernfnFYI19kSzMPcW4qI7gQQlTfOzs8X5d2fKiqUFjlgOO42hgM6cQv2Hx3u+bxF00sAvrW8sWRjfMQACuNH3FJoeIubpohN5o1Madv4ayGAZkcyskYRCs9X40gn+Q9gv34uknjaF/mep7BBl08JC9zFqwGaLyCssSsHV7ncekkUZfcWfq4TNNEUZFIu7UtsnZYz0aYrueAKMp+4udTjfKKnSZL2o0n1g11iH9KTQO/dWP7rVbu/OIbLeE+D87oXOWGfDNBRyHLItrM70Vum0HxtFuWc1clj8qzF61Mx0umFfUmdGQcl9DGivmc7TLNzBKG11ElDuDIey6Yxc6nwWiAJ6v1H5bO3WBi/klbT2fWguOo5w==
              e90130af47ce8dd53a3109aed9d15876b3e7dee8 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAltQ1bUQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91RQVD/9NA5t2mlt7pFc0Sswktc5dI8GaSYxgeknacLkEdkYx9L+mzg77G7TGueeu5duovjdI/vDIzdadGtJJ+zJE5icCqeUFDfNZNZLQ+7StuC8/f+4i/DaCzjHJ4tDYd0x6R5efisLWRKkWoodI1Iit7gCL493gj1HZaIzRLaqYkbOk3PhOEkTcov2cnhb4h54OKm07qlg6PYH507WGmmTDDnhL9SwdfBXHA2ps9dCe52NzPMyebXoZYA9T5Yz67eQ8D+YCh9bLauA59dW0Iyx59yGJ0tmLwVKBgbUkynAknwk/hdNlF7r6wLqbR00NLKmAZl8crdVSqFUU/vAsPQLn3BkbtpzqjmisIq2BWEt/YWYZOHUvJoK81cRcsVpPuAOIQM/rTm9pprTq7RFtuVnCj+QnmWwEPZJcS/7pnnIXte3gQt76ovLuFxr7dq99anEA7gnTbSdADIzgZhJMM8hJcrcgvbI4xz0H1qKn3webTNl/jPgTsNjAPYcmRZcoU2wUIR+OPhZvfwhvreRX0dGUV6gqxWnx3u3dsWE9jcBIGlNfYnIkLXyqBdOL6f4yQoxaVjRg/ScEt3hU17TknuPIDOXE/iMgWnYpnTqKBolt/Vbx7qB1OiK7AmQvXY1bnhtkIfOoIwZ9X1Zi2vmV1Wz4G0a5Vxq5eNKpQgACA2HE0MS2HQ==
 ac6a72308a215e6086fbced347ec10aa963b0a 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlthwaIQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91atOD/0de4nA55WJpiQzAqTg4xWIRZB6y0pkQ8D4cKNQkNiwPQAdDEPf85RuYmoPusNxhM40qfJlmHOw8sbRaqqabhVBPEzL1DpKe4GBucagLZqoL3pycyMzhkhzMka2RJT6nekCchTKJTIs2gx4FOA/QwaFYNkXFfguAEvi01isVdMo0GFLQ7pf7wU8UO1PPdkYphH0xPUvsreQ3pR3+6WwMLovk4JYW4cSaM4YkLlqJQPSO2YAlyXAwiQRvu2A227ydVqHOgLeV5zMQPy2v2zTgl2AoMdWp8+g2lJrYwclkNR+LAk5OlGYamyZwlmsTO7OX3n7xJYtfjbqdoqEKhO1igMi3ZSjqwkaBxxkXxArrteD19bpUyInTjbwTRO3mSe5aNkEDGoOYWn8UOn5ZkeEo7NyhP4OTXqyxQs9rwjD79xZk+6fGB777vuZDUdLZYRQFOPEximpmCGJDrZWj5PeIALWkrRGWBl2eFJ5sl6/pFlUJDjDEstnrsfosp6NJ3VFiD9EunFWsTlV2qXaueh9+TfaSRmGHVuwFCDt7nATVEzTt8l74xsL3xUPS4u9EcNPuEhCRu1zLojCGjemEA29R9tJS8oWd6SwXKryzjo8SyN7yQVSM/yl212IOiOHTQF8vVZuJnailtcWc3D4NoOxntnnv8fnd1nr8M5QSjYQVzSkHw==
              ede3bf31fe63677fdf5bd8db687977d4e3d792ed 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAluOq84QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91ao3D/oC9zKNbk+MMUP0cSfl+ESRbP/sAI466IYDkr9f1klooIFMsdqCd16eS36DVwIwrBYapRaNszC6Pg0KCFKCdeAWJLcgeIawwOkZPrLKQmS3I9GTl9gxtExeFvRryaAdP1DAPEU6JkyHo3xmURkJB58VjuBquZz4cYnL2aE1ag04CWAoRFiLu6bt1hEZ8pONU6cbDpHaJVyUZmJRB+llpybgdLnlBTrhfWjNofTh8MM6+vz67lIienYoSbepY+029J98phBTV+UEfWSBWw1hcNT/+QmOBGWWTLfBARsNDZFeYgQQOo3gRghKO7qUA/hqzDTmMG4/a2obs0LGsBlcMZ1Ky//zhdAJ/EN7uH9svM1t1fkw1RgvftmybptK5KiusZ9AWhnggHSwZtj1I6i/sojqsj9MrtdrD+1LfiKuAv/FtcMHSeff8IfItrd2B67JIj4wCzU8vDrAbAAqODHx7AnssvNbYrH2iOigSINFMNJoLU/xLxBhTxitU2Zf8puHA4CQ3+BybgOH9HPqCtGcVAB7bcp4hiezGrachM+2oec2YwcGCpIobMPl43cmWkLhtGF5qfl7APVfbo18UXk8ZGmBY8YAYwEyksk2SBMJV6+XHw9J7uaaugc3uN8PuMVLqvSMpWN1ZdRsSkxrOJK+UNW7kbUi0wHnsV1rN0U0BIfVOQ==
 cb1a79010ac50c58cd84e6f50c4556bf2a4c 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAluyfokQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91eWpD/0eu/JfD6SfaT4Ozd2767ojNIW4M9BgcRH/FehFBd/3iQ/YQmaMVd6GmdaagM5YUpD9U+rDK95l8rUstuTglXeKD2SVcDM4Oq9ToyZyp5aizWjkxRxHT60W95G5FQO/tBbs63jfNrVDWDElbkpcn/gUG6JbX+q/S/mKd6WsuwNQC1N4VOWp0OWCmFGBWN7t/DqxGLGEajJM0NB97/r/IV6TzrGtaPf1CXaepDVvZwIIeas/eQgGInyqry7WBSn5sCUq4opIh1UigMABUAgzIZbgTg8NLGSmEgRgk0Vb4K+pLejLLDb5YD7ZwuUCkbd8oJImKQfU6++Ajd70TbNQRvVhMtd15iCtOOjLR+VNkUiDXm0g1U53sREMLdj/+SMJZB6Z18DotdgpaeCmwA/wWijXOdt76xwUKjByioxyQilPrzrWGaoSG4ynjiD2Y+eSRS1DxbpDgt4YEuiVA6U3ay99oW7KkhFjQsUtKl4SJ5SQWiEofvgtb2maNrXkPtKOtNRHhc61v73zYnsxtl2qduC99YOTin90FykD80XvgJZfyow/LICb77MNGwYBsJJMDQ3jG1YyUC2CQsb8wyrWM4TO3tspKAQPyMegUaVtBqw7ZhgiC3OXEes+z+AL5YRSZXALfurXPYbja8M8uGL2TYB3/5bKYvBXxvfmSGIeY6VieQ==
 ec6f1320df26f3133ec40f3de866ea0695fd7 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlvOG20QHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91eZ+EACb/XfPWaMkwIX54JaFWtL/nVkDcaL8xLVzlI+PxL0ZtHdQTGVQNp5f1BnZU9RKPZ9QOuz+QKNvb4hOOXBwmCi2AAjmTYUqtKThHmOT50ZRICkllY+YlZ3tI6JXRDhh7pSXaus8jBFG/VwuUlVmK5sA2TP+lIJijOgV9rThszfS4Q2I8sBTIaeZS1hyujFxGRO++tjYR+jPuo/98FhqJ5EylVYvKmnflWkOYLFNFqgDI6DQs7Dl+u2nrNAzZJQlgk+1ekd66T3WyK8U3tcFLZGRQ+gpzINH0Syn6USaaE+0nGi4we1hJS8JK0txWyHXJGNZYaWQAC2l1hIBfA38azwVLSe2w9JatXhS3HWByILy8JkEQ2kSo1xTD4mBkszZo/kWZpZRsAWydxCnzhNgKmTJYxASFTTX1mpdX4EzJBOs/++52y1OjVc0Ko0+6vSwxsC6zgIGJx1Os7vVgWHql0XbDmJ1NDdNmz7q5HjFcbNOWScKf6UGcBKV4dpW1w+7CvdoMFHUsVTa2zn6YOki3NEt0GWLXq+0aXbHSw8XETcyunQKjDi9ddKOw0rYGip6EKUKhOILZimQ0lgYRE23RDdT5Tl2D8s66SUuipgP9vGjbMaE/FhO3OAb7406jyCrOVfDis7sK0Hvw074GhIfZUjA4W4Ey2TeExCZHHhBdoPTrg==
              a91a2837150bdcb27ae76b3646e6c93cd6a15904 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlvclPMQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91fc0EADF/62jqCARFaQRRcKpobPNBZupwSbnQ7E296ZRwHdZvT8CVGfkWBUIStyh+r8bfmBzzea6d9/SUoRqCoV9rwCXuRbeCZZRMMkqx9IblV3foaIOxyQi0KE2lpzGJAHxPiNxD3czZV4B+P6X2wNmG9OLjmHyQ7o64GvPAJ+Ko/EsND1tkx4qB16mEuEHVxtfaG6hbjgpLekIA3+3xur3E8cWBsNO28HtQBK83r2qURwv6eG3TfkbmiE+Ie5TNC15LPVhAOHVSD7miZdI82uk2063puCKZxIJXsy7EMjHfChTM9c7B4+TdEBjms3y+Byz2EV7kRfjplGOnBbYvfY7qiteTn/22+rLrTTQNkndDN/Sqr1DjwsvxKDeIfsqgXzGQPupLOrGdGf4ILAtA0Reme7VKNN5Px6dNxnjKKwsnSrKTQ7ZcmD+W1LKlL63lBEQvEy+TLmmFLfM2xvvBxL5177AKZrj/8gMUzEi1K2MelDGrasA7OSjTlABoleDvZzVOf1nC0Bv83tFc8FeMHLwNOxkFSsjORvZuIH/G9BYUTAd96iLwQRBxXLOVNitxAOQT+s3hs7JEaUzTHlAY+lNeFAxUujb4H0V40Xgr20O1u7PJ53tzApIrg9JQPgvUXntmRs8fpNo6f3P6Sg8XtaCCHIUAB6qTHiose56llf6bzl66A==
 c8c54cf97256f4468da2eb4dbee24f7f3888e71 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlwG+eIQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91YqSD/9IAwdaPrOeiT+DVBW2x33oFeY1X1f5CBG/vCJptalOd2QDIsD0ANEzQHmzV25RKD851v155Txt/BPlkuBfO/kg0BbOoqTpGZk+5CcoFWeyhJct2CxtCLdEpyZ/98/htMR4VfWprCX2GHXPjS813l9pebsN3WgBUOc2VaUdHNRoAGsMVgWC5BWwNP4XSA9oixFL/O4aGLQ6pPfP3vmMFySWXWnIN8gUZ4sm53eKaT0QCICAgzFh+GzRd81uACDfoJn1d8RS9GK+h6j8x0crLY5CpQQy8lRVkokvc0h6XK44ofc57p9GHAOfprHY3DbBhD9H6fLAf5raUsqPkLRYVGqhg8bOsBr3vJ56hiXJYOYPZSYXGjnHRcUrgfPVrY+6mPTeCIQMPmWBHwYH5Tc5TLrPuxxCL4wVywqGbfmIVP+WFUikkykAAwuPOZAswxJJOB0gsnnxcApmTeXRznBXyvzscMlWVZiMjzflKRRJ9V5RI4Fdc6n1wQ4vuLSO4AUnIypIsV6ZFAOBuFKH7x6nPG0tP3FYzcICaMOPbxEx3LStnuU+UuEs6TIxM6IiR3LPiiDGZ2BA2gjJhDxQFV8hAl8KDO3LsYuyUQCv3RTAP+YejH21bIXdnwDlNqy8Hrd53rq7jZsdb2pMVvOZZ3VmIu64f+jVkD/r5msDUkQL3M9jwg==
 f092b2cd9691e2a55d198f717b231af9be6f9 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlwz6DUQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91SbtD/47TJkSFuDJrvrpLuZROeR48opM8kPtMdbFKZxmeUtap/1q1ahBcA8cnkf5t5iEna57OkPfx0FVw7zupFZSD970q8KeQa1C1oRf+DV83rkOqMEzTLmDYZ5YWWILyDb2NrSkBzArhLNhEtWrFFo9uoigwJWiyNGXUkjVd7XUaYvxVYvnHJcmr98l9sW+RxgV2Cm/6ImeW6BkSUjfrJpZlHUecxcHIaDVniSCVzVF7T+tgG0+CxpehmRrPE/qlPTY2DVHuG6ogwjmu7pWr4kW3M6pTmOYICKjkojIhPTAfNDZGNYruJMukEeB2JyxSz+J9jhjPe//9x4JznpCzm/JzCHFO9CfONjHIcUqLa9qxqhmBFpr1U5J7vRir4ch7v8TGtGbcR3833HTUA7EEMu/Ca48XVfGNDmySQs8zgGpj1yzf/lBGbiAzTSp7Zp+ANLu+R3NjeiDUYQbgf3vcpoHL44duk4dzhD+ofFD75PF1SMTluWbeLCSENH9io2pxVDj3I5VhlNxHdbqY1WXb+sDBVr4niIGzQiKqVOV33ghyRpzVJFZ7SaQG7VR/mLL3UnvJuapLYtUV9+/7Si/CHl7m8NntPMvx1nM/Z4t/BN8Z5cdhPn2PLxp9f5VCmCqLlCQDSv94cCTLlatiCTfF7axgE0u7+CWiOUNyyqg/vu0pjTwIA==
 ff5844cad7a27ee3eb5adad89ac8550949 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlxCG6EQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91YptD/9DG76IvubjzVsfX1UiQcV1mqWuSgz/idpeFCrc6Z1dyFB5UmbHKfAaZnrPBR7ly6bGD9+NZupB9A8QRxX92koiq0Hw2ywbwR5oWVrBaDiinIDLiTQTUCPnNMH0FSNrt4Kf9Gj4RqMufZvL+dR0pDYV0n6HP3aGOeTnowNhv0lUbw/Gx20YrcCU9uf3GbgRvMQiFNv9cTJAdQlH++98C8MVLfRU4ZxP11hI7sR8mp1q6ruJoozd0Cta67E6MyC/L2Rp3W89psvvY7DSTg9RwQwoS8I6U9iyQJ16Bb6UgZVV6jqQqOSxWUaPfKUhJLl2ENHH5f3rzoi3NH6jHuy5rq2v9XuvOpQ7LqSi1Ev0oq1xllZiyD4Zm69Z/Is0mxwqPskZGWR5Lh6Uq3Dh0zJW7O5M2m1IHdAYqffHpUr2NgEQVST4VDvO4fR2d7n6+ZNXYbZrpmQ1j4bpOZCEMqWXPfl4HY7a60hWa884mWxtVLGvhYycxnN8r1o5ouS0pAMAI6qEFFW1XFFN4eNDDWl83BkuDa32DTEthoyi15JM5jS7VPDYACdHE3IVqsTsZq7nn60uoFCGpdMcSqrD2mlUd9Z12x8NnCIrxKhlHLkq89OrQAcz8/0bbluGuzm3FHKb+8VQWr0MgkvOLTqqvOqn97oBdKqo0eyT0IPz8QeVYPbZfQ==
 b4b4ae0e9a6b8e579f7b0a693b8cf5c3b10 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlxUk3gQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91aT7EACaycWeal53ShxaNyTNOa5IPZ71+iyWA9xEh7hK6cDDirpItarWLRVWoWqBlWRBBs6uU4BxnpPSCLFkJLu6ts/5p4R6/0Z04Pasd6sFi14bCGslmPJFlwrpfFDpQvFR6xZAtv1xGb8n+rjpK+wfstjRgyf84zn4//0dOdylY5EUXOk4/3zcXKAzPgZHBRper+PlQ0ICgYHiKQUlyDWrFrdSEis6OqBa+PbxdmgzLYbhXi0bvS5XRWM9EVJZa+5ITEVOEGPClRcoA7SJE5DiapMYlwNnB3U6TEazJoj5yuvGhrJzj9lx7/jx9tzZ/mhdOVsSRiSCBu46B/E63fnUDqaMw8KKlFKBRuzKnqnByZD8fuD34YJ6A82hta56W4SJ4pusa/X2nAJn1QbRjESY4wN4FEaNdYiMbpgbG2uBDhmEowAyhXtiuQAPCUra5o42a+E+tAgV5uNUAal8vk0DcPRmzc4UntQiQGwxL0fsTEpMQtG5ryxWRmOIBq6aKGuLVELllPCwOh8UIGLlpAoEynlNi9qJNT6kHpSmwquiU6TG6R1dA/ckBK2H90hewtb/jwLlenGugpylLQ2U/NsDdoWRyHNrdB4eUJiWD/BBPXktZQJVja97Js+Vn44ctCkNjui/53xcBQfIYdHGLttIEq56v/yZiSviCcTUhBPRSEdoUg==
 ea21df312ec7159c5b3633096b6ecf68750b0dd 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlyQ7VYQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91aziD/4uI/Nr+UJgOri1zfa6ObXuMVO2FeadAolKemMDE/c4ddPUN2AwysZyJaOHmqj5VR0nf4a9CpTBc8Ciq9tfaFSWN6XFIJ2s3GPHhsnyhsPbF56c2bpl2W/csxor9eDGpv9TrQOK0qgI4wGxSQVFW0uUgHtZ5Yd6JWupHuyDfWopJf3oonissKI9ykRLeZEQ3sPIP6vTWMM3pdavAmDii3qKVEaCEGWmXgnM/vfBJ/tA1U5LSXpxwkJB7Pi/6Xc6OnGHWmCpsA4L6TSRkoyho4a6tLUA1Qlqm6sMxJjXAer8dmDLpmXL7gF3JhZgkiX74i2zDZnM4i42E6EhO52l3uorF5gtsw85dY20MSoBOmn5bM7k40TCA+vriNZJgmDrTYgY3B00mNysioEuSpDkILPJIV4U9LTazsxR49h3/mH2D1Sdxu6YtCIPE8ggThmveW/dZQy6W1xLfS66pFmDvq8ND0WjDa/Fi9dmjMcQtzA9CZL8AMlSc2aLJs++KjCuN+t6tn/tLhLz1nHaSitqgsIoJmBWb00QjOilnAQq7H8gUpUqMdLyEeL2B9HfJobQx6A8Op2xohjI7qD5gLGAxh+QMmuUmf7wx1h2UuQvrNW5di7S3k3nxfhm87Gkth3j0M/aMy0P6irPOKcKns55r6eOzItC+ezQayXc4A10F+x6Ew==
 a8d9ed864754837a185a642170cde24392f9abf 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAly3aLkQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91bpXD/0Qdx3lNv6230rl369PnGM7o56BFywJtGtQ0FjBj81/Q6IKNJkAus/FXA02MevAxnKhyCMPHbiWQn4cn+Fpt9Y7FOFl3MTdoY5v4rGDAbAaJsjyK3BNqSwWD1uFaOnFDzA/112MJ6nDciVaOzeD7qakMj8zdVhvyEfFszN7f7xT1JyGc+cOWfbvcIv/IXWZNrSZC0EzcZspfwxYQwFscgDL3AHeKeYqihJ6vgWxgEg4V8ZnJ6roJeERTp2wwvIj/pKSEpgzfLQfHiEwvH9MKMaJHGx4huzWJxYX2DB83LaK7cgkKqzyQ+z8rsb27oFPMVgb1Kg78+6sRujFdkahFWYYGPT6sFBDWkRQ/J7DRnBzHH2wbBoyNkApmLEfaRGJpxX8wojPFGJkNr6GF12uF7E+djsuE8ZL7l4p2YD33NBSzcEjNTlgruRauj/7SoSC3BgDlrqCypCkNgn5nDDjvf6oJx16qGqZsglHJOl0S2LRiGaMQTpBhpDWAyVIAQBRW/vF1IRnNJaQ+dX7M9VqlVsXnfh8WD+FPKDgpiSLO8hIuvlYlcrtU9rXyWu1njKvCs744G836k4SNBoi+y6bi6XbmU0Uv0GSCLyj1BIsqglfXuac0QHlz5RNmS6LVf7z13ZIn/ePXehYoKHu+PNDmbVGGwAVoZP4HLEqonD3SVpVcQ==
 e479ef7c9639be0029f00e6a722b96dcc05fee 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlzJ5QYQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91U0QD/4xQ00Suo+XNM/2v01NEALJA8pFxSaUcz1fBVQDwIQbApAHbjVDgIShuFlAXu7Jf582+C5wJu0J8L5Rb+Q9WJuM9sM+6cxUWclT3D3gB326LuQg86y5MYbzmwsSCOnBdRn/MY18on2XTa8t4Mxf0jAaHPUXEadmuwkOw4ds62eUD81lkakGoxgXrD1GUhAlGItNPOb0rp2XFj7i+LvazMX2mWOEXMXA5KPQrOvLsKnoESiPfONXumBfZNVSxVA7fJ3Vl1+PldBax+w9LQMgVGo+BkqPt7i+lPTcnlh2Nbf8y3zERTcItFBzrBxmuG6pINfNpZY/fi+9VL7mpMYlzlxs7VcLF8bVnpYpxpHfDR4hPjP0sq6+/nSSGUfzQXmfGHq0ZdoVGSzrDEv8UzYE9ehWUhHNE+sIU3MpwjC+WiW2YhYzPYN2KOlfSog3LuWLAcn3ZghWg1S4crsPt9CeE0vKxkNWNz9dzvhbniW7VGorXJKFCJzMu6pGaP/UjwpHxR+C6J1MGUW2TQwdIUyhPA8HfHJSVbifFJV+1CYEDcqRcFETpxm4YNrLJNL/Ns7zoWmdmEUXT1NEnK1r3Pe2Xi1o56FHGPffOWASmqFnF/coZCq6b4vmBWK/n8mI/JF1yxltfwacaY+1pEor92ztK34Lme1A+R7zyObGYNDcWiGZgA==
              c3484ddbdb9621256d597ed86b90d229c59c2af9 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAlz3zjsQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91XWVEACnlQCHCF7dMrvTHwE4nA+i/I1l8UfRwR3ufXhBxjVUqxS75mHMcCsOwClAa2HaqNP97IGbk2fi9y53SOKH67imNVm8NY8yIook1C8T7nKsFmyM3l63FdVQDgUF6AJ0krDt6iJo4vjk8CyRHowAcmL942jcfBU9U5/Jli11Sx33MKF/eMXnuXYRBNESh97f1bDgwydp7QT8dj/T23YvuIVtfq9h8D46qXWkpwbgtnXMnaz21kqcN6A5aKbadG4ELf9175cBlfe+ZpOqpy+OSuQBByOP5eBNl5d0vq/i4WQyJZs8GoVd5Bh559+HjKIKv11Y+gXoaQMf4VSp2JZwwPlTR5Me5N6AJNViXW1Bm108ZWeXR81Hu2+t2eQv6EelcQxnW0e/mTCUot8TaewYFJ+4VWwAAca81FP0X8J0YcdIkvvNmrU9V62B3WYK3iYgbwm7IlR3+7ilQUz3NZCZOqJpo+c7k/yhuoj4ZMDq8JzaqBnBnARbvUF61B4iVhto4xpruUQw8FwFLUuZLohsESCNCCgqdoiyJHnVQVitoNJlCeEPl+W+UUeFfwf9fzrS6nj9xWkNm9lBOahaH+fV69msi5Ex/gy8y4H+4T8z0f3gFO7kp9eKr5C7hoGyKQWv5D61H1qEZOFUZjXHBhMxbe+og40G0apMm3qmsj2KsCNDdQ==
 ada9b8d51bef24c5cb4cdca4243f0db694ab6e 0 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
 e52f2b62f4768aa0d988936c929dc7c4a41a0 0 iQJEBAABCAAuFiEEK8zhT1xnJaouqK63ucncgkqlvdUFAl2UzlMQHHJhZkBkdXJpbjQyLmNvbQAKCRC5ydyCSqW91SDzD/0YZqtN+LK5AusJjWaTa61DRIPhJQoZD+HKg4kAzjL8zw8SxBGLxMZkGmve9QFMNzqIr5kkPk6yEKrEWYqyPtpwrv5Xh5D4d8AKfphdzwSr+BvMk4fBEvwnBhrUJtKDEiuYQdbh4+OQfQs1c3xhtinjXn30160uzFvLQY6/h4hxai2XWj4trgoNXqPHDHlQKc6kRfPpmNO2UZhG+2Xfsava2JpcP4xA2R0XkI10be5MDoGU4AFCMUcXZzIto0DYT+HOezowoNpdC1EWVHfa+bdrlzHHO7WPaTLzEPy44/IhXmNhbwFKOk5RZ/qBADQvs9BDfmIDczOoZKTC5+ESZM0PR2np5t7+JFMUeeRcINqBdSc4Aszw3iHjgNbJJ3viU72JZvGGGd9MglP590tA0proVGxQgvXDq3mtq3Se5yOLAjmRnktW5Tnt8/Z3ycuZz+QsTEMXR5uIZvgz63ibfsCGTXFYUz9h7McGgmhfKWvQw9+MH6kRbE9U8qaUumgf4zi4HNzmf8AyaMJo07DIMwWVgjlVUdWUlN/Eg61fU3wC79mV8mLVsi5/TZ986obz4csoYSYXyyez5ScRji+znSw8vUx0YhoiOQbDms/y2QZR/toyon554tHkDZsya2lhpwXs8T0IFZhERXsmz/XmT3fWnhSzyrUe6VjBMep1zn6lvQ==
 f9561099de77c684c00f76507f11e46ebe8 0 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
+             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

.hgtags

0 +1 0

              d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f
 c590d34bf61e2ea12c71738e5a746cd74586157 0.4e
 eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d
              b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c
              f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5
 a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b
 e0fdbc57a0be78f0e817fd1d170a3615cd35da 0.6
 ccf3de52989b14c3d84e1097f59e39a992e00bd 0.6b
              eac9c8efcd9bd8244e72fb6821f769f450457a32 0.6c
 c049974485125e1f9357f6bbe9c1b548a64c3 0.7
 a56574f329a368d645853e0f9e09472aee62349 0.8
 a03cff2b0f5d30281e6addefe96b993582f2eac 0.8.1
 fb62a3a673d5322f6274a44ba6456e5e4b3b37 0.9
 be3001847cb18a23c403439d9e7d0ace30804e9 0.9.1
 a957364b1b89c150f2d0e60a99befe0ee08bd3 0.9.2
 c29bfec36d5540fbe1c976810aefecfd1d2 0.9.3
              fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0.9.4
              23889160905a1b09fffe1c07378e9fc1827606eb 0.9.5
              bae2e9c838e90a393bae3973a7850280413e091a 1.0
              d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1
              d2375bbee6d47e62ba8e415c86e83a465dc4dce9 1.0.2
 a67430f92f15ea5159c26b09ec4839a0c549a26 1.1
 e510d433969e277b1863c317b674cbee2065 1.1.1
 a4eb81fb4f4742451591489e2797dc47903277 1.1.2
 efa41037e280d08cfb07c09ad485df30fb0ea8 1.2
              02981000012e3adf40c4849bd7b3d5618f9ce82d 1.2.1
 d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3
 ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1
 ec469f9b556f11819937cf68ee53f2be927ebf 1.4
 d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1
 a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2
 aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3
              ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5
 b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1
 f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2
              fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3
 fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4
              f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6
              bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1
              c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
              ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3
 d8bff78c96fe7e33237b257558ee97290048a4 1.6.4
 b9e0f96c7bc788e5667c146a58a9440a55 1.7
              4438875ec01bd0fc32be92b0872eb6daeed4d44f 1.7.1
 aff4f144ad356311318b0011df0bb21f2c97429 1.7.2
              e3bf16703e2601de99e563cdb3a5d50b64e6d320 1.7.3
              a6c855c32ea081da3c3b8ff628f1847ff271482f 1.7.4
 b2155623ee2559caf288fd333f30475966c4525 1.7.5
              2616325766e3504c8ae7c84bd15ee610901fe91d 1.8
              aa1f3be38ab127280761889d2dca906ca465b5f4 1.8.1
              b032bec2c0a651ca0ddecb65714bfe6770f67d70 1.8.2
 cb1e95676ad089596bd81d0937cad37d6e3b7fb 1.8.3
 af5d9f6b22387913e1d11350fb8cb7c1487dd 1.8.4
              de9eb6b1da4fc522b1cab16d86ca166204c24f25 1.9
 a43e23b8c55b4566b8200bf69fe2158485a2634 1.9.1
              d629f1e89021103f1753addcef6b310e4435b184 1.9.2
 a9292e430e35766c552066ed3e87c557b803b 1.9.3
              384082750f2c51dc917d85a7145748330fa6ef4d 2.0-rc
 d55b481ddfcc1dacb445179649e24ca861d 2.0
 dbd1cef0c2f9f8bcf4ea303238105f716bda3 2.0.1
              6344043924497cd06d781d9014c66802285072e4 2.0.2
              db33555eafeaf9df1e18950e29439eaa706d399b 2.1-rc
 aa5b51f310fb3befd26bed99c02267f5c12c734 2.1
 e2cd303ecf8ca7c7eeebd785c34e5ed6b0f4a4 2.1.1
              b9bd95e61b49c221c4cca24e6da7c946fc02f992 2.1.2
              d9e2f09d5488c395ae9ddbb320ceacd24757e055 2.2-rc
 b3d087909e3c3ae44761efecdde8f319ef3 2.2
 de86462c5a9f42a3ad0f5e90ce5b1d221d25 2.2.1
 a358df5bbbe404ca25730c9c459b34263441dc 2.2.2
              b013baa3898e117959984fc64c29d8c784d2f28b 2.2.3
              a06e2681dd1786e2354d84a5fa9c1c88dd4fa3e0 2.3-rc
 f5094bb3f423fc799e471aac2aee81a7ce57a0b 2.3
 ae4ddb654eb2d5fd35bff358c738414432 2.3.1
              b3f0f9a39c4e1d0250048cd803ab03542d6f140a 2.3.2
              d118a4f4fd16d9b558ec3f3e87bfee772861d2b7 2.4-rc
 ad823b5d58c68903a6153a25e3fb4ed25239d 2.4
 c10cf8191469e7c3c8844922e17e71a176cb7cb 2.4.1
              a4765077b65e6ae29ba42bab7834717b5072d5ba 2.4.2
              f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 2.5-rc
              a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5
 d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1
 b7175377babacce80a6c1e12366d8032a6d4340 2.5.2
 c922c1b5145dab8baefefb0437d363b6a6c21c 2.5.3
 a7bd2dccd44ed571afe7424cd7f95594f27c092 2.5.4
 cd385856d98bacb2c3086f8897bc660c2beea 2.6-rc
 f785b38af38d2fca6b8f3db56b8007a84cd73a 2.6
              ddc7a6be20212d18f3e27d9d7e6f079a66d96f21 2.6.1
              cceaf7af4c9e9e6fa2dbfdcfe9856c5da69c4ffd 2.6.2
 acc6e37a650f0fae37872e733382ac1c0c 2.6.3
              f0d7721d7322dcfb5af33599c2543f27335334bb 2.7-rc
              f37b5a17e6a0ee17afde2cdde5393dd74715fb58 2.7
 a558f81dc73afeab4d7be63617392b130117f 2.7.1
              e7fa36d2ad3a7944a52dca126458d6f482db3524 2.7.2
 f2d8f2421314b1ddead8f7d0c91009358994 2.8-rc
              d825e4025e39d1c39db943cdc89818abd0a87c27 2.8
 e04a06467e2969c0cc6501335be0406d46ef0 2.8.1
              ca387377df7a3a67dbb90b6336b781cdadc3ef41 2.8.2
              8862469e16f9236208581b20de5f96bd13cc039d 2.9-rc
 cec5134e9c4bceab6a00c60f52a4f80677a78f2 2.9
              b96cb15ec9e04d8ac5ee08b34fcbbe4200588965 2.9.1
 f83fc5cfe715d292069ee8417c83804f6c6c1e4 2.9.2
 f55b251224f16508dd1311452db7780dafe2b 3.0-rc
 ac506c6ababe86985b932f4948837c0891b5 3.0
 c80ee5b3cb3684fa8edc61501b3506d02eb10 3.0.1
 d8cd3d0e83c7336c0cb45a9f88638363f993848 3.0.2
 c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 3.1-rc
 e49892020336491cdc6945885c4de26ffa8b 3.1
 dc91146f35369949ea56b40172308158b59063a 3.1.1
              f768c888aaa68d12dd7f509dcc7f01c9584357d0 3.1.2
 f8d16af8cae246fa5a48e723d48d58b015aed94 3.2-rc
              ced632394371a36953ce4d394f86278ae51a2aae 3.2
 c58303fb0ec020907af28b9e486be299ba043 3.2.1
              902554884335e5ca3661d63be9978eb4aec3f68a 3.2.2
 dad422ecc5adb63d9fa649eeb8e05a5f9bc4900 3.2.3
 a3a71d75396f5d4cf6935ae7d9ba5407a547 3.2.4
              db8e3f7948b1fdeb9ad12d448fc3525759908b9f 3.3-rc
              fbdd5195528fae4f41feebc1838215c110b25d6a 3.3
 b4ed033390bf6e2879c8f5c28c84e1ee3b87231 3.3.1
 a92bbd02e5e3a625e0820389b47786b02b2cea 3.3.2
 e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 3.3.3
              e89f909edffad558b56f4affa8239e4832f88de0 3.4-rc
 cc6036bca532e06681c5a8fa37efaa812de67b5 3.4
              ed18f4acf435a2824c6f49fba40f42b9df5da7ad 3.4.1
 cd0ddac49c1125b2e013aa2ff18ecbd4dd954 3.4.2
 a38d44ba093bd1d1ecfd34119e94056030278b 3.5-rc
 aa1c313b05b1a85f8ffa1120d51579ddf6bf24 3.5
 a45e49a6bed023deb229102a8903234d18054d3 3.5.1
 a466b9f9792e3ad7ae3fc6c43c3ff2e136b718d 3.5.2
              b66e3ca0b90c3095ea28dfd39aa24247bebf5c20 3.6-rc
 dd34f2e7272be9e3b2a5a83cd0d20be44293f4 3.6
 aa5083cbebbe7575c88f3402ab377539b484897 3.6.1
 d437a0f3355834a9485bbbeb30a52a052c98f19 3.6.2
              ea389970c08449440587712117f178d33bab3f1e 3.6.3
 bdc8965720ca4061f8f8d806563cfc7cdb62e 3.7-rc
              2408645de650d8a29a6ce9e7dce601d8dd0d1474 3.7
              b698abf971e7377d9b7ec7fc8c52df45255b0329 3.7.1
              d493d64757eb45ada99fcb3693e479a51b7782da 3.7.2
              ae279d4a19e9683214cbd1fe8298cf0b50571432 3.7.3
 eedf2c450aee58b1a90b0e826f47c5da64 3.8-rc
              f85de28eae32e7d3064b1a1321309071bbaaa069 3.8
              a56296f55a5e1038ea5016dace2076b693c28a56 3.8.1
              aaabed77791a75968a12b8c43ad263631a23ee81 3.8.2
              a9764ab80e11bcf6a37255db7dd079011f767c6c 3.8.3
 a5d605b8683a292bb89aea11f37a81b06ac016 3.8.4
 bb4f9d3a47a6e83c2b414d58811ed38f503c2 3.9-rc
 f84e68dbb9bd026f0f3a974ce4bdb93686 3.9
              ccd436f7db6d5d7b9af89715179b911d031d44f1 3.9.1
 e68974eb5c63ccb03f794d8b57339a80c4 3.9.2
 c415874f6ac653efc1099dec9c9150e90f 4.0-rc
              eab27446995210c334c3d06f1a659e3b9b5da769 4.0
              b3b1ae98f6a0e14c1e1ba806a6c18e193b6dae5c 4.0.1
              e69874dc1f4e142746ff3df91e678a09c6fc208c 4.0.2
              a1dd2c0c479e0550040542e392e87bc91262517e 4.1-rc
              e1526da1e6d84e03146151c9b6e6950fe9a83d7d 4.1
 b624d27e3917d978af56d6ad59331e0464a 4.1.1
              ed5b25874d998ababb181a939dd37a16ea644435 4.1.2
 eaf9539499a1b8be259ffe7ada787d07857f80 4.1.3
 e788321cc4ae9975b7f0c54c849f36d82182b 4.2-rc
              bb96d4a497432722623ae60d9bc734a1e360179e 4.2
              c850f0ed54c1d42f9aa079ad528f8127e5775217 4.2.1
 c49ed51a698ec016d2b4c6b44ca3c3f73cc788 4.2.2
 ebaed4e315f63157bd157d6ce553c7ab73 4.3-rc
 af8622863796a0027566f6b646e10d522c4c 4.3
 c91326b23954e6e1c6960d0239511f9530258 4.2.3
 fee7f7d2da04226914c2258cc2884dc27384fd7 4.3.1
 f72c7b70acfdaf56ab35360584d7845827 4.3.2
 f427b57bf9019c6dc3750baa539dc22c1be50f6 4.3.3
 e2454b60e5936f5e77498cab2648db469504487 4.4-rc
 ccb43d4cf01d013ae05917ec4f305509f851b2d 4.4
              cabc840ffdee8a72f3689fb77dd74d04fdc2bc04 4.4.1
              a92b9f8e11ba330614cdfd6af0e03b15c1ff3797 4.4.2
 b6df1b5adbdf647cf5c6675b40575e1b197c60 4.5-rc
              d334afc585e29577f271c5eda03378736a16ca6b 4.5
 aadf7a3264b03c8b09efce715bc41e6ab4a9b 4.5.1
 bba684efde7f45add05f737952093bb2aa07155 4.5.2
 de7bd407251af2bc98e5b809c8598ee95830daf 4.5.3
              ed5448edcbfa747b9154099e18630e49024fd47b 4.6rc0
 ec874717d8a93b19e0d50628443e0ee5efab3a9 4.6rc1
 cac550aea66d19c601e45efd1b7bd08d7c40 4.6
 c5ced5276d6e7d54f7c3dadf5247b7ee98ec79c 4.6.1
 b63a6743010dfdbf8a8154186e119949bdaa1cc 4.6.2
              e90130af47ce8dd53a3109aed9d15876b3e7dee8 4.7rc0
 ac6a72308a215e6086fbced347ec10aa963b0a 4.7
              ede3bf31fe63677fdf5bd8db687977d4e3d792ed 4.7.1
 cb1a79010ac50c58cd84e6f50c4556bf2a4c 4.7.2
 ec6f1320df26f3133ec40f3de866ea0695fd7 4.8rc0
              a91a2837150bdcb27ae76b3646e6c93cd6a15904 4.8
 c8c54cf97256f4468da2eb4dbee24f7f3888e71 4.8.1
 f092b2cd9691e2a55d198f717b231af9be6f9 4.8.2
 ff5844cad7a27ee3eb5adad89ac8550949 4.9rc0
 b4b4ae0e9a6b8e579f7b0a693b8cf5c3b10 4.9
 ea21df312ec7159c5b3633096b6ecf68750b0dd 4.9.1
 a8d9ed864754837a185a642170cde24392f9abf 5.0rc0
 e479ef7c9639be0029f00e6a722b96dcc05fee 5.0
              c3484ddbdb9621256d597ed86b90d229c59c2af9 5.0.1
 ada9b8d51bef24c5cb4cdca4243f0db694ab6e 5.0.2
              e386b5f4f8360dbb43a576dd9b1368e386fefa5b 5.1rc0
              e91930d712e8507d1bc1b2dffd96c83edc4cbed3 5.1
              a4e32fd539ab41489a51b2aa88bda9a73b839562 5.1.1
 e52f2b62f4768aa0d988936c929dc7c4a41a0 5.1.2
 f9561099de77c684c00f76507f11e46ebe8 5.2rc0
              ca3dca416f8d5863ca6f5a4a6a6bb835dcd5feeb 5.2
+             a50fecefa691c9b72a99e49aa6fe9dd13943c2bf 5.2.1

hgext/githelp.py

0 +1 -1

              # githelp.py - Try to map Git commands to Mercurial equivalents.
              #
              # Copyright 2013 Facebook, Inc.
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              """try mapping git commands to Mercurial commands
              Tries to map a given git command to a Mercurial command:
                $ hg githelp -- git checkout master
                hg update master
              If an unknown command or parameter combination is detected, an error is
              produced.
              """
              from __future__ import absolute_import
              import getopt
              import re
              from mercurial.i18n import _
              from mercurial import (
                  encoding,
                  error,
                  fancyopts,
                  pycompat,
                  registrar,
                  scmutil,
              )
              from mercurial.utils import procutil
              # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
              # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
              # be specifying the version(s) of Mercurial they are tested with, or
              # leave the attribute unspecified.
              testedwith = b'ships-with-hg-core'
              cmdtable = {}
              command = registrar.command(cmdtable)
              def convert(s):
                  if s.startswith(b"origin/"):
                      return s[7:]
                  if b'HEAD' in s:
                      s = s.replace(b'HEAD', b'.')
                  # HEAD~ in git is .~1 in mercurial
                  s = re.sub(b'~$', b'~1', s)
                  return s
              @command(
                  b'githelp|git',
                  [],
                  _(b'hg githelp'),
                  helpcategory=command.CATEGORY_HELP,
                  helpbasic=True,
              )
              def githelp(ui, repo, *args, **kwargs):
                  '''suggests the Mercurial equivalent of the given git command
                  Usage: hg githelp -- <git command>
                  '''
                  if len(args) == 0 or (len(args) == 1 and args[0] == b'git'):
                      raise error.Abort(
                          _(b'missing git command - usage: hg githelp -- <git command>')
                      )
                  if args[0] == b'git':
                      args = args[1:]
                  cmd = args[0]
                  if not cmd in gitcommands:
                      raise error.Abort(_(b"error: unknown git command %s") % cmd)
                  ui.pager(b'githelp')
                  args = args[1:]
                  return gitcommands[cmd](ui, repo, *args, **kwargs)
              def parseoptions(ui, cmdoptions, args):
                  cmdoptions = list(cmdoptions)
                  opts = {}
                  args = list(args)
                  while True:
                      try:
                          args = fancyopts.fancyopts(list(args), cmdoptions, opts, True)
                          break
                      except getopt.GetoptError as ex:
                          if "requires argument" in ex.msg:
                              raise
                          if ('--' + ex.opt) in ex.msg:
                              flag = b'--' + pycompat.bytestr(ex.opt)
                          elif ('-' + ex.opt) in ex.msg:
                              flag = b'-' + pycompat.bytestr(ex.opt)
                          else:
                              raise error.Abort(
                                  _(b"unknown option %s") % pycompat.bytestr(ex.opt)
                              )
                          try:
                              args.remove(flag)
                          except Exception:
                              msg = _(b"unknown option '%s' packed with other options")
                              hint = _(b"please try passing the option as its own flag: -%s")
                              raise error.Abort(
                                  msg % pycompat.bytestr(ex.opt),
                                  hint=hint % pycompat.bytestr(ex.opt),
                              )
                          ui.warn(_(b"ignoring unknown option %s\n") % flag)
                  args = list([convert(x) for x in args])
                  opts = dict(
                      [
-                         (k, convert(v)) if isinstance(v, str) else (k, v)
+                         (k, convert(v)) if isinstance(v, bytes) else (k, v)
                          for k, v in pycompat.iteritems(opts)
                      ]
                  )
                  return args, opts
              class Command(object):
                  def __init__(self, name):
                      self.name = name
                      self.args = []
                      self.opts = {}
                  def __bytes__(self):
                      cmd = b"hg " + self.name
                      if self.opts:
                          for k, values in sorted(pycompat.iteritems(self.opts)):
                              for v in values:
                                  if v:
                                      if isinstance(v, int):
                                          fmt = b' %s %d'
                                      else:
                                          fmt = b' %s %s'
                                      cmd += fmt % (k, v)
                                  else:
                                      cmd += b" %s" % (k,)
                      if self.args:
                          cmd += b" "
                          cmd += b" ".join(self.args)
                      return cmd
                  __str__ = encoding.strmethod(__bytes__)
                  def append(self, value):
                      self.args.append(value)
                  def extend(self, values):
                      self.args.extend(values)
                  def __setitem__(self, key, value):
                      values = self.opts.setdefault(key, [])
                      values.append(value)
                  def __and__(self, other):
                      return AndCommand(self, other)
              class AndCommand(object):
                  def __init__(self, left, right):
                      self.left = left
                      self.right = right
                  def __str__(self):
                      return b"%s && %s" % (self.left, self.right)
                  def __and__(self, other):
                      return AndCommand(self, other)
              def add(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'A', b'all', None, b''),
                      (b'p', b'patch', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if opts.get(b'patch'):
                      ui.status(
                          _(
                              b"note: Mercurial will commit when complete, "
                              b"as there is no staging area in Mercurial\n\n"
                          )
                      )
                      cmd = Command(b'commit --interactive')
                  else:
                      cmd = Command(b"add")
                      if not opts.get(b'all'):
                          cmd.extend(args)
                      else:
                          ui.status(
                              _(
                                  b"note: use hg addremove to remove files that have "
                                  b"been deleted\n\n"
                              )
                          )
                  ui.status((bytes(cmd)), b"\n")
              def am(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'import')
                  ui.status(bytes(cmd), b"\n")
              def apply(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'p', b'p', int, b''),
                      (b'', b'directory', b'', b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'import --no-commit')
                  if opts.get(b'p'):
                      cmd[b'-p'] = opts.get(b'p')
                  if opts.get(b'directory'):
                      cmd[b'--prefix'] = opts.get(b'directory')
                  cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def bisect(ui, repo, *args, **kwargs):
                  ui.status(_(b"see 'hg help bisect' for how to use bisect\n\n"))
              def blame(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'annotate -udl')
                  cmd.extend([convert(v) for v in args])
                  ui.status((bytes(cmd)), b"\n")
              def branch(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'set-upstream', None, b''),
                      (b'', b'set-upstream-to', b'', b''),
                      (b'd', b'delete', None, b''),
                      (b'D', b'delete', None, b''),
                      (b'm', b'move', None, b''),
                      (b'M', b'move', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b"bookmark")
                  if opts.get(b'set_upstream') or opts.get(b'set_upstream_to'):
                      ui.status(_(b"Mercurial has no concept of upstream branches\n"))
                      return
                  elif opts.get(b'delete'):
                      cmd = Command(b"strip")
                      for branch in args:
                          cmd[b'-B'] = branch
                      else:
                          cmd[b'-B'] = None
                  elif opts.get(b'move'):
                      if len(args) > 0:
                          if len(args) > 1:
                              old = args.pop(0)
                          else:
                              # shell command to output the active bookmark for the active
                              # revision
                              old = b'`hg log -T"{activebookmark}" -r .`'
                      else:
                          raise error.Abort(_(b'missing newbranch argument'))
                      new = args[0]
                      cmd[b'-m'] = old
                      cmd.append(new)
                  else:
                      if len(args) > 1:
                          cmd[b'-r'] = args[1]
                          cmd.append(args[0])
                      elif len(args) == 1:
                          cmd.append(args[0])
                  ui.status((bytes(cmd)), b"\n")
              def ispath(repo, string):
                  """
                  The first argument to git checkout can either be a revision or a path. Let's
                  generally assume it's a revision, unless it's obviously a path. There are
                  too many ways to spell revisions in git for us to reasonably catch all of
                  them, so let's be conservative.
                  """
                  if scmutil.isrevsymbol(repo, string):
                      # if it's definitely a revision let's not even check if a file of the
                      # same name exists.
                      return False
                  cwd = repo.getcwd()
                  if cwd == b'':
                      repopath = string
                  else:
                      repopath = cwd + b'/' + string
                  exists = repo.wvfs.exists(repopath)
                  if exists:
                      return True
                  manifest = repo[b'.'].manifest()
                  didexist = (repopath in manifest) or manifest.hasdir(repopath)
                  return didexist
              def checkout(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'b', b'branch', b'', b''),
                      (b'B', b'branch', b'', b''),
                      (b'f', b'force', None, b''),
                      (b'p', b'patch', None, b''),
                  ]
                  paths = []
                  if b'--' in args:
                      sepindex = args.index(b'--')
                      paths.extend(args[sepindex + 1 :])
                      args = args[:sepindex]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  rev = None
                  if args and ispath(repo, args[0]):
                      paths = args + paths
                  elif args:
                      rev = args[0]
                      paths = args[1:] + paths
                  cmd = Command(b'update')
                  if opts.get(b'force'):
                      if paths or rev:
                          cmd[b'-C'] = None
                  if opts.get(b'patch'):
                      cmd = Command(b'revert')
                      cmd[b'-i'] = None
                  if opts.get(b'branch'):
                      if len(args) == 0:
                          cmd = Command(b'bookmark')
                          cmd.append(opts.get(b'branch'))
                      else:
                          cmd.append(args[0])
                          bookcmd = Command(b'bookmark')
                          bookcmd.append(opts.get(b'branch'))
                          cmd = cmd & bookcmd
                  # if there is any path argument supplied, use revert instead of update
                  elif len(paths) > 0:
                      ui.status(_(b"note: use --no-backup to avoid creating .orig files\n\n"))
                      cmd = Command(b'revert')
                      if opts.get(b'patch'):
                          cmd[b'-i'] = None
                      if rev:
                          cmd[b'-r'] = rev
                      cmd.extend(paths)
                  elif rev:
                      if opts.get(b'patch'):
                          cmd[b'-r'] = rev
                      else:
                          cmd.append(rev)
                  elif opts.get(b'force'):
                      cmd = Command(b'revert')
                      cmd[b'--all'] = None
                  else:
                      raise error.Abort(_(b"a commit must be specified"))
                  ui.status((bytes(cmd)), b"\n")
              def cherrypick(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'continue', None, b''),
                      (b'', b'abort', None, b''),
                      (b'e', b'edit', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'graft')
                  if opts.get(b'edit'):
                      cmd[b'--edit'] = None
                  if opts.get(b'continue'):
                      cmd[b'--continue'] = None
                  elif opts.get(b'abort'):
                      ui.status(_(b"note: hg graft does not have --abort\n\n"))
                      return
                  else:
                      cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def clean(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'd', b'd', None, b''),
                      (b'f', b'force', None, b''),
                      (b'x', b'x', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'purge')
                  if opts.get(b'x'):
                      cmd[b'--all'] = None
                  cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def clone(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'bare', None, b''),
                      (b'n', b'no-checkout', None, b''),
                      (b'b', b'branch', b'', b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if len(args) == 0:
                      raise error.Abort(_(b"a repository to clone must be specified"))
                  cmd = Command(b'clone')
                  cmd.append(args[0])
                  if len(args) > 1:
                      cmd.append(args[1])
                  if opts.get(b'bare'):
                      cmd[b'-U'] = None
                      ui.status(
                          _(
                              b"note: Mercurial does not have bare clones. "
                              b"-U will clone the repo without checking out a commit\n\n"
                          )
                      )
                  elif opts.get(b'no_checkout'):
                      cmd[b'-U'] = None
                  if opts.get(b'branch'):
                      cocmd = Command(b"update")
                      cocmd.append(opts.get(b'branch'))
                      cmd = cmd & cocmd
                  ui.status((bytes(cmd)), b"\n")
              def commit(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'a', b'all', None, b''),
                      (b'm', b'message', b'', b''),
                      (b'p', b'patch', None, b''),
                      (b'C', b'reuse-message', b'', b''),
                      (b'F', b'file', b'', b''),
                      (b'', b'author', b'', b''),
                      (b'', b'date', b'', b''),
                      (b'', b'amend', None, b''),
                      (b'', b'no-edit', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'commit')
                  if opts.get(b'patch'):
                      cmd = Command(b'commit --interactive')
                  if opts.get(b'amend'):
                      if opts.get(b'no_edit'):
                          cmd = Command(b'amend')
                      else:
                          cmd[b'--amend'] = None
                  if opts.get(b'reuse_message'):
                      cmd[b'-M'] = opts.get(b'reuse_message')
                  if opts.get(b'message'):
                      cmd[b'-m'] = b"'%s'" % (opts.get(b'message'),)
                  if opts.get(b'all'):
                      ui.status(
                          _(
                              b"note: Mercurial doesn't have a staging area, "
                              b"so there is no --all. -A will add and remove files "
                              b"for you though.\n\n"
                          )
                      )
                  if opts.get(b'file'):
                      cmd[b'-l'] = opts.get(b'file')
                  if opts.get(b'author'):
                      cmd[b'-u'] = opts.get(b'author')
                  if opts.get(b'date'):
                      cmd[b'-d'] = opts.get(b'date')
                  cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def deprecated(ui, repo, *args, **kwargs):
                  ui.warn(
                      _(
                          b'this command has been deprecated in the git project, '
                          b'thus isn\'t supported by this tool\n\n'
                      )
                  )
              def diff(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'a', b'all', None, b''),
                      (b'', b'cached', None, b''),
                      (b'R', b'reverse', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'diff')
                  if opts.get(b'cached'):
                      ui.status(
                          _(
                              b'note: Mercurial has no concept of a staging area, '
                              b'so --cached does nothing\n\n'
                          )
                      )
                  if opts.get(b'reverse'):
                      cmd[b'--reverse'] = None
                  for a in list(args):
                      args.remove(a)
                      try:
                          repo.revs(a)
                          cmd[b'-r'] = a
                      except Exception:
                          cmd.append(a)
                  ui.status((bytes(cmd)), b"\n")
              def difftool(ui, repo, *args, **kwargs):
                  ui.status(
                      _(
                          b'Mercurial does not enable external difftool by default. You '
                          b'need to enable the extdiff extension in your .hgrc file by adding\n'
                          b'extdiff =\n'
                          b'to the [extensions] section and then running\n\n'
                          b'hg extdiff -p <program>\n\n'
                          b'See \'hg help extdiff\' and \'hg help -e extdiff\' for more '
                          b'information.\n'
                      )
                  )
              def fetch(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'all', None, b''),
                      (b'f', b'force', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'pull')
                  if len(args) > 0:
                      cmd.append(args[0])
                      if len(args) > 1:
                          ui.status(
                              _(
                                  b"note: Mercurial doesn't have refspecs. "
                                  b"-r can be used to specify which commits you want to "
                                  b"pull. -B can be used to specify which bookmark you "
                                  b"want to pull.\n\n"
                              )
                          )
                          for v in args[1:]:
                              if v in repo._bookmarks:
                                  cmd[b'-B'] = v
                              else:
                                  cmd[b'-r'] = v
                  ui.status((bytes(cmd)), b"\n")
              def grep(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'grep')
                  # For basic usage, git grep and hg grep are the same. They both have the
                  # pattern first, followed by paths.
                  cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def init(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'init')
                  if len(args) > 0:
                      cmd.append(args[0])
                  ui.status((bytes(cmd)), b"\n")
              def log(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'follow', None, b''),
                      (b'', b'decorate', None, b''),
                      (b'n', b'number', b'', b''),
                      (b'1', b'1', None, b''),
                      (b'', b'pretty', b'', b''),
                      (b'', b'format', b'', b''),
                      (b'', b'oneline', None, b''),
                      (b'', b'stat', None, b''),
                      (b'', b'graph', None, b''),
                      (b'p', b'patch', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  ui.status(
                      _(
                          b'note: -v prints the entire commit message like Git does. To '
                          b'print just the first line, drop the -v.\n\n'
                      )
                  )
                  ui.status(
                      _(
                          b"note: see hg help revset for information on how to filter "
                          b"log output\n\n"
                      )
                  )
                  cmd = Command(b'log')
                  cmd[b'-v'] = None
                  if opts.get(b'number'):
                      cmd[b'-l'] = opts.get(b'number')
                  if opts.get(b'1'):
                      cmd[b'-l'] = b'1'
                  if opts.get(b'stat'):
                      cmd[b'--stat'] = None
                  if opts.get(b'graph'):
                      cmd[b'-G'] = None
                  if opts.get(b'patch'):
                      cmd[b'-p'] = None
                  if opts.get(b'pretty') or opts.get(b'format') or opts.get(b'oneline'):
                      format = opts.get(b'format', b'')
                      if b'format:' in format:
                          ui.status(
                              _(
                                  b"note: --format format:??? equates to Mercurial's "
                                  b"--template. See hg help templates for more info.\n\n"
                              )
                          )
                          cmd[b'--template'] = b'???'
                      else:
                          ui.status(
                              _(
                                  b"note: --pretty/format/oneline equate to Mercurial's "
                                  b"--style or --template. See hg help templates for "
                                  b"more info.\n\n"
                              )
                          )
                          cmd[b'--style'] = b'???'
                  if len(args) > 0:
                      if b'..' in args[0]:
                          since, until = args[0].split(b'..')
                          cmd[b'-r'] = b"'%s::%s'" % (since, until)
                          del args[0]
                      cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def lsfiles(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'c', b'cached', None, b''),
                      (b'd', b'deleted', None, b''),
                      (b'm', b'modified', None, b''),
                      (b'o', b'others', None, b''),
                      (b'i', b'ignored', None, b''),
                      (b's', b'stage', None, b''),
                      (b'z', b'_zero', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if (
                      opts.get(b'modified')
                      or opts.get(b'deleted')
                      or opts.get(b'others')
                      or opts.get(b'ignored')
                  ):
                      cmd = Command(b'status')
                      if opts.get(b'deleted'):
                          cmd[b'-d'] = None
                      if opts.get(b'modified'):
                          cmd[b'-m'] = None
                      if opts.get(b'others'):
                          cmd[b'-o'] = None
                      if opts.get(b'ignored'):
                          cmd[b'-i'] = None
                  else:
                      cmd = Command(b'files')
                  if opts.get(b'stage'):
                      ui.status(
                          _(
                              b"note: Mercurial doesn't have a staging area, ignoring "
                              b"--stage\n"
                          )
                      )
                  if opts.get(b'_zero'):
                      cmd[b'-0'] = None
                  cmd.append(b'.')
                  for include in args:
                      cmd[b'-I'] = procutil.shellquote(include)
                  ui.status((bytes(cmd)), b"\n")
              def merge(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'merge')
                  if len(args) > 0:
                      cmd.append(args[len(args) - 1])
                  ui.status((bytes(cmd)), b"\n")
              def mergebase(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if len(args) != 2:
                      args = [b'A', b'B']
                  cmd = Command(
                      b"log -T '{node}\\n' -r 'ancestor(%s,%s)'" % (args[0], args[1])
                  )
                  ui.status(
                      _(b'note: ancestors() is part of the revset language\n'),
                      _(b"(learn more about revsets with 'hg help revsets')\n\n"),
                  )
                  ui.status((bytes(cmd)), b"\n")
              def mergetool(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b"resolve")
                  if len(args) == 0:
                      cmd[b'--all'] = None
                  cmd.extend(args)
                  ui.status((bytes(cmd)), b"\n")
              def mv(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'f', b'force', None, b''),
                      (b'n', b'dry-run', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'mv')
                  cmd.extend(args)
                  if opts.get(b'force'):
                      cmd[b'-f'] = None
                  if opts.get(b'dry_run'):
                      cmd[b'-n'] = None
                  ui.status((bytes(cmd)), b"\n")
              def pull(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'all', None, b''),
                      (b'f', b'force', None, b''),
                      (b'r', b'rebase', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'pull')
                  cmd[b'--rebase'] = None
                  if len(args) > 0:
                      cmd.append(args[0])
                      if len(args) > 1:
                          ui.status(
                              _(
                                  b"note: Mercurial doesn't have refspecs. "
                                  b"-r can be used to specify which commits you want to "
                                  b"pull. -B can be used to specify which bookmark you "
                                  b"want to pull.\n\n"
                              )
                          )
                          for v in args[1:]:
                              if v in repo._bookmarks:
                                  cmd[b'-B'] = v
                              else:
                                  cmd[b'-r'] = v
                  ui.status((bytes(cmd)), b"\n")
              def push(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'all', None, b''),
                      (b'f', b'force', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'push')
                  if len(args) > 0:
                      cmd.append(args[0])
                      if len(args) > 1:
                          ui.status(
                              _(
                                  b"note: Mercurial doesn't have refspecs. "
                                  b"-r can be used to specify which commits you want "
                                  b"to push. -B can be used to specify which bookmark "
                                  b"you want to push.\n\n"
                              )
                          )
                          for v in args[1:]:
                              if v in repo._bookmarks:
                                  cmd[b'-B'] = v
                              else:
                                  cmd[b'-r'] = v
                  if opts.get(b'force'):
                      cmd[b'-f'] = None
                  ui.status((bytes(cmd)), b"\n")
              def rebase(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'all', None, b''),
                      (b'i', b'interactive', None, b''),
                      (b'', b'onto', b'', b''),
                      (b'', b'abort', None, b''),
                      (b'', b'continue', None, b''),
                      (b'', b'skip', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if opts.get(b'interactive'):
                      ui.status(
                          _(
                              b"note: hg histedit does not perform a rebase. "
                              b"It just edits history.\n\n"
                          )
                      )
                      cmd = Command(b'histedit')
                      if len(args) > 0:
                          ui.status(
                              _(
                                  b"also note: 'hg histedit' will automatically detect"
                                  b" your stack, so no second argument is necessary\n\n"
                              )
                          )
                      ui.status((bytes(cmd)), b"\n")
                      return
                  if opts.get(b'skip'):
                      cmd = Command(b'revert --all -r .')
                      ui.status((bytes(cmd)), b"\n")
                  cmd = Command(b'rebase')
                  if opts.get(b'continue') or opts.get(b'skip'):
                      cmd[b'--continue'] = None
                  if opts.get(b'abort'):
                      cmd[b'--abort'] = None
                  if opts.get(b'onto'):
                      ui.status(
                          _(
                              b"note: if you're trying to lift a commit off one branch, "
                              b"try hg rebase -d <destination commit> -s <commit to be "
                              b"lifted>\n\n"
                          )
                      )
                      cmd[b'-d'] = convert(opts.get(b'onto'))
                      if len(args) < 2:
                          raise error.Abort(_(b"expected format: git rebase --onto X Y Z"))
                      cmd[b'-s'] = b"'::%s - ::%s'" % (convert(args[1]), convert(args[0]))
                  else:
                      if len(args) == 1:
                          cmd[b'-d'] = convert(args[0])
                      elif len(args) == 2:
                          cmd[b'-d'] = convert(args[0])
                          cmd[b'-b'] = convert(args[1])
                  ui.status((bytes(cmd)), b"\n")
              def reflog(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'all', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'journal')
                  if opts.get(b'all'):
                      cmd[b'--all'] = None
                  if len(args) > 0:
                      cmd.append(args[0])
                  ui.status(bytes(cmd), b"\n\n")
                  ui.status(
                      _(
                          b"note: in hg commits can be deleted from repo but we always"
                          b" have backups\n"
                      )
                  )
              def reset(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'soft', None, b''),
                      (b'', b'hard', None, b''),
                      (b'', b'mixed', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  commit = convert(args[0] if len(args) > 0 else b'.')
                  hard = opts.get(b'hard')
                  if opts.get(b'mixed'):
                      ui.status(
                          _(
                              b'note: --mixed has no meaning since Mercurial has no '
                              b'staging area\n\n'
                          )
                      )
                  if opts.get(b'soft'):
                      ui.status(
                          _(
                              b'note: --soft has no meaning since Mercurial has no '
                              b'staging area\n\n'
                          )
                      )
                  cmd = Command(b'update')
                  if hard:
                      cmd.append(b'--clean')
                  cmd.append(commit)
                  ui.status((bytes(cmd)), b"\n")
              def revert(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if len(args) > 1:
                      ui.status(
                          _(
                              b"note: hg backout doesn't support multiple commits at "
                              b"once\n\n"
                          )
                      )
                  cmd = Command(b'backout')
                  if args:
                      cmd.append(args[0])
                  ui.status((bytes(cmd)), b"\n")
              def revparse(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'show-cdup', None, b''),
                      (b'', b'show-toplevel', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if opts.get(b'show_cdup') or opts.get(b'show_toplevel'):
                      cmd = Command(b'root')
                      if opts.get(b'show_cdup'):
                          ui.status(_(b"note: hg root prints the root of the repository\n\n"))
                      ui.status((bytes(cmd)), b"\n")
                  else:
                      ui.status(_(b"note: see hg help revset for how to refer to commits\n"))
              def rm(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'f', b'force', None, b''),
                      (b'n', b'dry-run', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'rm')
                  cmd.extend(args)
                  if opts.get(b'force'):
                      cmd[b'-f'] = None
                  if opts.get(b'dry_run'):
                      cmd[b'-n'] = None
                  ui.status((bytes(cmd)), b"\n")
              def show(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'name-status', None, b''),
                      (b'', b'pretty', b'', b''),
                      (b'U', b'unified', int, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if opts.get(b'name_status'):
                      if opts.get(b'pretty') == b'format:':
                          cmd = Command(b'status')
                          cmd[b'--change'] = b'.'
                      else:
                          cmd = Command(b'log')
                          cmd.append(b'--style status')
                          cmd.append(b'-r .')
                  elif len(args) > 0:
                      if ispath(repo, args[0]):
                          cmd = Command(b'cat')
                      else:
                          cmd = Command(b'export')
                      cmd.extend(args)
                      if opts.get(b'unified'):
                          cmd.append(b'--config diff.unified=%d' % (opts[b'unified'],))
                  elif opts.get(b'unified'):
                      cmd = Command(b'export')
                      cmd.append(b'--config diff.unified=%d' % (opts[b'unified'],))
                  else:
                      cmd = Command(b'export')
                  ui.status((bytes(cmd)), b"\n")
              def stash(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'p', b'patch', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'shelve')
                  action = args[0] if len(args) > 0 else None
                  if action == b'list':
                      cmd[b'-l'] = None
                      if opts.get(b'patch'):
                          cmd[b'-p'] = None
                  elif action == b'show':
                      if opts.get(b'patch'):
                          cmd[b'-p'] = None
                      else:
                          cmd[b'--stat'] = None
                      if len(args) > 1:
                          cmd.append(args[1])
                  elif action == b'clear':
                      cmd[b'--cleanup'] = None
                  elif action == b'drop':
                      cmd[b'-d'] = None
                      if len(args) > 1:
                          cmd.append(args[1])
                      else:
                          cmd.append(b'<shelve name>')
                  elif action == b'pop' or action == b'apply':
                      cmd = Command(b'unshelve')
                      if len(args) > 1:
                          cmd.append(args[1])
                      if action == b'apply':
                          cmd[b'--keep'] = None
                  elif action == b'branch' or action == b'create':
                      ui.status(
                          _(
                              b"note: Mercurial doesn't have equivalents to the "
                              b"git stash branch or create actions\n\n"
                          )
                      )
                      return
                  else:
                      if len(args) > 0:
                          if args[0] != b'save':
                              cmd[b'--name'] = args[0]
                          elif len(args) > 1:
                              cmd[b'--name'] = args[1]
                  ui.status((bytes(cmd)), b"\n")
              def status(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'', b'ignored', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'status')
                  cmd.extend(args)
                  if opts.get(b'ignored'):
                      cmd[b'-i'] = None
                  ui.status((bytes(cmd)), b"\n")
              def svn(ui, repo, *args, **kwargs):
                  if not args:
                      raise error.Abort(_(b'missing svn command'))
                  svncmd = args[0]
                  if svncmd not in gitsvncommands:
                      raise error.Abort(_(b'unknown git svn command "%s"') % svncmd)
                  args = args[1:]
                  return gitsvncommands[svncmd](ui, repo, *args, **kwargs)
              def svndcommit(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'push')
                  ui.status((bytes(cmd)), b"\n")
              def svnfetch(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  cmd = Command(b'pull')
                  cmd.append(b'default-push')
                  ui.status((bytes(cmd)), b"\n")
              def svnfindrev(ui, repo, *args, **kwargs):
                  cmdoptions = []
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if not args:
                      raise error.Abort(_(b'missing find-rev argument'))
                  cmd = Command(b'log')
                  cmd[b'-r'] = args[0]
                  ui.status((bytes(cmd)), b"\n")
              def svnrebase(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'l', b'local', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  pullcmd = Command(b'pull')
                  pullcmd.append(b'default-push')
                  rebasecmd = Command(b'rebase')
                  rebasecmd.append(b'tip')
                  cmd = pullcmd & rebasecmd
                  ui.status((bytes(cmd)), b"\n")
              def tag(ui, repo, *args, **kwargs):
                  cmdoptions = [
                      (b'f', b'force', None, b''),
                      (b'l', b'list', None, b''),
                      (b'd', b'delete', None, b''),
                  ]
                  args, opts = parseoptions(ui, cmdoptions, args)
                  if opts.get(b'list'):
                      cmd = Command(b'tags')
                  else:
                      cmd = Command(b'tag')
                      if not args:
                          raise error.Abort(_(b'missing tag argument'))
                      cmd.append(args[0])
                      if len(args) > 1:
                          cmd[b'-r'] = args[1]
                      if opts.get(b'delete'):
                          cmd[b'--remove'] = None
                      if opts.get(b'force'):
                          cmd[b'-f'] = None
                  ui.status((bytes(cmd)), b"\n")
              gitcommands = {
                  b'add': add,
                  b'am': am,
                  b'apply': apply,
                  b'bisect': bisect,
                  b'blame': blame,
                  b'branch': branch,
                  b'checkout': checkout,
                  b'cherry-pick': cherrypick,
                  b'clean': clean,
                  b'clone': clone,
                  b'commit': commit,
                  b'diff': diff,
                  b'difftool': difftool,
                  b'fetch': fetch,
                  b'grep': grep,
                  b'init': init,
                  b'log': log,
                  b'ls-files': lsfiles,
                  b'merge': merge,
                  b'merge-base': mergebase,
                  b'mergetool': mergetool,
                  b'mv': mv,
                  b'pull': pull,
                  b'push': push,
                  b'rebase': rebase,
                  b'reflog': reflog,
                  b'reset': reset,
                  b'revert': revert,
                  b'rev-parse': revparse,
                  b'rm': rm,
                  b'show': show,
                  b'stash': stash,
                  b'status': status,
                  b'svn': svn,
                  b'tag': tag,
                  b'whatchanged': deprecated,
              }
              gitsvncommands = {
                  b'dcommit': svndcommit,
                  b'fetch': svnfetch,
                  b'find-rev': svnfindrev,
                  b'rebase': svnrebase,
              }

hgext/histedit.py

0 +1 -1

              # histedit.py - interactive history editing for mercurial
              #
              # Copyright 2009 Augie Fackler <raf@durin42.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              """interactive history editing
              With this extension installed, Mercurial gains one new command: histedit. Usage
              is as follows, assuming the following history::
               @  3[tip]   7c2fd3b9020c   2009-04-27 18:04 -0500   durin42
               |    Add delta
               |
               o  2   030b686bedc4   2009-04-27 18:04 -0500   durin42
               |    Add gamma
               |
               o  1   c561b4e977df   2009-04-27 18:04 -0500   durin42
               |    Add beta
               |
               o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
                    Add alpha
              If you were to run ``hg histedit c561b4e977df``, you would see the following
              file open in your editor::
               pick c561b4e977df Add beta
               pick 030b686bedc4 Add gamma
               pick 7c2fd3b9020c Add delta
               # Edit history between c561b4e977df and 7c2fd3b9020c
               #
               # Commits are listed from least to most recent
               #
               # Commands:
               #  p, pick = use commit
               #  e, edit = use commit, but stop for amending
               #  f, fold = use commit, but combine it with the one above
               #  r, roll = like fold, but discard this commit's description and date
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #  b, base = checkout changeset and apply further changesets from there
               #
              In this file, lines beginning with ``#`` are ignored. You must specify a rule
              for each revision in your history. For example, if you had meant to add gamma
              before beta, and then wanted to add delta in the same revision as beta, you
              would reorganize the file to look like this::
               pick 030b686bedc4 Add gamma
               pick c561b4e977df Add beta
               fold 7c2fd3b9020c Add delta
               # Edit history between c561b4e977df and 7c2fd3b9020c
               #
               # Commits are listed from least to most recent
               #
               # Commands:
               #  p, pick = use commit
               #  e, edit = use commit, but stop for amending
               #  f, fold = use commit, but combine it with the one above
               #  r, roll = like fold, but discard this commit's description and date
               #  d, drop = remove commit from history
               #  m, mess = edit commit message without changing commit content
               #  b, base = checkout changeset and apply further changesets from there
               #
              At which point you close the editor and ``histedit`` starts working. When you
              specify a ``fold`` operation, ``histedit`` will open an editor when it folds
              those revisions together, offering you a chance to clean up the commit message::
               Add beta
               ***
               Add delta
              Edit the commit message to your liking, then close the editor. The date used
              for the commit will be the later of the two commits' dates. For this example,
              let's assume that the commit message was changed to ``Add beta and delta.``
              After histedit has run and had a chance to remove any old or temporary
              revisions it needed, the history looks like this::
               @  2[tip]   989b4d060121   2009-04-27 18:04 -0500   durin42
               |    Add beta and delta.
               |
               o  1   081603921c3f   2009-04-27 18:04 -0500   durin42
               |    Add gamma
               |
               o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
                    Add alpha
              Note that ``histedit`` does *not* remove any revisions (even its own temporary
              ones) until after it has completed all the editing operations, so it will
              probably perform several strip operations when it's done. For the above example,
              it had to run strip twice. Strip can be slow depending on a variety of factors,
              so you might need to be a little patient. You can choose to keep the original
              revisions by passing the ``--keep`` flag.
              The ``edit`` operation will drop you back to a command prompt,
              allowing you to edit files freely, or even use ``hg record`` to commit
              some changes as a separate commit. When you're done, any remaining
              uncommitted changes will be committed as well. When done, run ``hg
              histedit --continue`` to finish this step. If there are uncommitted
              changes, you'll be prompted for a new commit message, but the default
              commit message will be the original message for the ``edit`` ed
              revision, and the date of the original commit will be preserved.
              The ``message`` operation will give you a chance to revise a commit
              message without changing the contents. It's a shortcut for doing
              ``edit`` immediately followed by `hg histedit --continue``.
              If ``histedit`` encounters a conflict when moving a revision (while
              handling ``pick`` or ``fold``), it'll stop in a similar manner to
              ``edit`` with the difference that it won't prompt you for a commit
              message when done. If you decide at this point that you don't like how
              much work it will be to rearrange history, or that you made a mistake,
              you can use ``hg histedit --abort`` to abandon the new changes you
              have made and return to the state before you attempted to edit your
              history.
              If we clone the histedit-ed example repository above and add four more
              changes, such that we have the following history::
                 @  6[tip]   038383181893   2009-04-27 18:04 -0500   stefan
                 |    Add theta
                 |
                 o  5   140988835471   2009-04-27 18:04 -0500   stefan
                 |    Add eta
                 |
                 o  4   122930637314   2009-04-27 18:04 -0500   stefan
                 |    Add zeta
                 |
                 o  3   836302820282   2009-04-27 18:04 -0500   stefan
                 |    Add epsilon
                 |
                 o  2   989b4d060121   2009-04-27 18:04 -0500   durin42
                 |    Add beta and delta.
                 |
                 o  1   081603921c3f   2009-04-27 18:04 -0500   durin42
                 |    Add gamma
                 |
                 o  0   d8d2fcd0e319   2009-04-27 18:04 -0500   durin42
                      Add alpha
              If you run ``hg histedit --outgoing`` on the clone then it is the same
              as running ``hg histedit 836302820282``. If you need plan to push to a
              repository that Mercurial does not detect to be related to the source
              repo, you can add a ``--force`` option.
              Config
              ------
              Histedit rule lines are truncated to 80 characters by default. You
              can customize this behavior by setting a different length in your
              configuration file::
                [histedit]
                linelen = 120      # truncate rule lines at 120 characters
              The summary of a change can be customized as well::
                [histedit]
                summary-template = '{rev} {bookmarks} {desc|firstline}'
              The customized summary should be kept short enough that rule lines
              will fit in the configured line length. See above if that requires
              customization.
              ``hg histedit`` attempts to automatically choose an appropriate base
              revision to use. To change which base revision is used, define a
              revset in your configuration file::
                [histedit]
                defaultrev = only(.) & draft()
              By default each edited revision needs to be present in histedit commands.
              To remove revision you need to use ``drop`` operation. You can configure
              the drop to be implicit for missing commits by adding::
                [histedit]
                dropmissing = True
              By default, histedit will close the transaction after each action. For
              performance purposes, you can configure histedit to use a single transaction
              across the entire histedit. WARNING: This setting introduces a significant risk
              of losing the work you've done in a histedit if the histedit aborts
              unexpectedly::
                [histedit]
                singletransaction = True
              """
              from __future__ import absolute_import
              # chistedit dependencies that are not available everywhere
              try:
                  import fcntl
                  import termios
              except ImportError:
                  fcntl = None
                  termios = None
              import functools
              import locale
              import os
              import struct
              from mercurial.i18n import _
              from mercurial.pycompat import (
                  getattr,
                  open,
              )
              from mercurial import (
                  bundle2,
                  cmdutil,
                  context,
                  copies,
                  destutil,
                  discovery,
                  encoding,
                  error,
                  exchange,
                  extensions,
                  hg,
                  logcmdutil,
                  merge as mergemod,
                  mergeutil,
                  node,
                  obsolete,
                  pycompat,
                  registrar,
                  repair,
                  scmutil,
                  state as statemod,
                  util,
              )
              from mercurial.utils import (
                  dateutil,
                  stringutil,
              )
              pickle = util.pickle
              cmdtable = {}
              command = registrar.command(cmdtable)
              configtable = {}
              configitem = registrar.configitem(configtable)
              configitem(
                  b'experimental', b'histedit.autoverb', default=False,
              )
              configitem(
                  b'histedit', b'defaultrev', default=None,
              )
              configitem(
                  b'histedit', b'dropmissing', default=False,
              )
              configitem(
                  b'histedit', b'linelen', default=80,
              )
              configitem(
                  b'histedit', b'singletransaction', default=False,
              )
              configitem(
                  b'ui', b'interface.histedit', default=None,
              )
              configitem(b'histedit', b'summary-template', default=b'{rev} {desc|firstline}')
              # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
              # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
              # be specifying the version(s) of Mercurial they are tested with, or
              # leave the attribute unspecified.
              testedwith = b'ships-with-hg-core'
              actiontable = {}
              primaryactions = set()
              secondaryactions = set()
              tertiaryactions = set()
              internalactions = set()
              def geteditcomment(ui, first, last):
                  """ construct the editor comment
                  The comment includes::
                   - an intro
                   - sorted primary commands
                   - sorted short commands
                   - sorted long commands
                   - additional hints
                  Commands are only included once.
                  """
                  intro = _(
                      """Edit history between %s and %s
              Commits are listed from least to most recent
              You can reorder changesets by reordering the lines
              Commands:
              """
                  )
                  actions = []
                  def addverb(v):
                      a = actiontable[v]
                      lines = a.message.split(b"\n")
                      if len(a.verbs):
                          v = b', '.join(sorted(a.verbs, key=lambda v: len(v)))
                      actions.append(b" %s = %s" % (v, lines[0]))
                      actions.extend([b'  %s' for l in lines[1:]])
                  for v in (
                      sorted(primaryactions)
                      + sorted(secondaryactions)
                      + sorted(tertiaryactions)
                  ):
                      addverb(v)
                  actions.append(b'')
                  hints = []
                  if ui.configbool(b'histedit', b'dropmissing'):
                      hints.append(
                          b"Deleting a changeset from the list "
                          b"will DISCARD it from the edited history!"
                      )
                  lines = (intro % (first, last)).split(b'\n') + actions + hints
                  return b''.join([b'# %s\n' % l if l else b'#\n' for l in lines])
              class histeditstate(object):
                  def __init__(self, repo):
                      self.repo = repo
                      self.actions = None
                      self.keep = None
                      self.topmost = None
                      self.parentctxnode = None
                      self.lock = None
                      self.wlock = None
                      self.backupfile = None
                      self.stateobj = statemod.cmdstate(repo, b'histedit-state')
                      self.replacements = []
                  def read(self):
                      """Load histedit state from disk and set fields appropriately."""
                      if not self.stateobj.exists():
                          cmdutil.wrongtooltocontinue(self.repo, _(b'histedit'))
                      data = self._read()
                      self.parentctxnode = data[b'parentctxnode']
                      actions = parserules(data[b'rules'], self)
                      self.actions = actions
                      self.keep = data[b'keep']
                      self.topmost = data[b'topmost']
                      self.replacements = data[b'replacements']
                      self.backupfile = data[b'backupfile']
                  def _read(self):
                      fp = self.repo.vfs.read(b'histedit-state')
                      if fp.startswith(b'v1\n'):
                          data = self._load()
                          parentctxnode, rules, keep, topmost, replacements, backupfile = data
                      else:
                          data = pickle.loads(fp)
                          parentctxnode, rules, keep, topmost, replacements = data
                          backupfile = None
                      rules = b"\n".join([b"%s %s" % (verb, rest) for [verb, rest] in rules])
                      return {
                          b'parentctxnode': parentctxnode,
                          b"rules": rules,
                          b"keep": keep,
                          b"topmost": topmost,
                          b"replacements": replacements,
                          b"backupfile": backupfile,
                      }
                  def write(self, tr=None):
                      if tr:
                          tr.addfilegenerator(
                              b'histedit-state',
                              (b'histedit-state',),
                              self._write,
                              location=b'plain',
                          )
                      else:
                          with self.repo.vfs(b"histedit-state", b"w") as f:
                              self._write(f)
                  def _write(self, fp):
                      fp.write(b'v1\n')
                      fp.write(b'%s\n' % node.hex(self.parentctxnode))
                      fp.write(b'%s\n' % node.hex(self.topmost))
                      fp.write(b'%s\n' % (b'True' if self.keep else b'False'))
                      fp.write(b'%d\n' % len(self.actions))
                      for action in self.actions:
                          fp.write(b'%s\n' % action.tostate())
                      fp.write(b'%d\n' % len(self.replacements))
                      for replacement in self.replacements:
                          fp.write(
                              b'%s%s\n'
                              % (
                                  node.hex(replacement[0]),
                                  b''.join(node.hex(r) for r in replacement[1]),
                              )
                          )
                      backupfile = self.backupfile
                      if not backupfile:
                          backupfile = b''
                      fp.write(b'%s\n' % backupfile)
                  def _load(self):
                      fp = self.repo.vfs(b'histedit-state', b'r')
                      lines = [l[:-1] for l in fp.readlines()]
                      index = 0
                      lines[index]  # version number
                      index += 1
                      parentctxnode = node.bin(lines[index])
                      index += 1
                      topmost = node.bin(lines[index])
                      index += 1
                      keep = lines[index] == b'True'
                      index += 1
                      # Rules
                      rules = []
                      rulelen = int(lines[index])
                      index += 1
                      for i in pycompat.xrange(rulelen):
                          ruleaction = lines[index]
                          index += 1
                          rule = lines[index]
                          index += 1
                          rules.append((ruleaction, rule))
                      # Replacements
                      replacements = []
                      replacementlen = int(lines[index])
                      index += 1
                      for i in pycompat.xrange(replacementlen):
                          replacement = lines[index]
                          original = node.bin(replacement[:40])
                          succ = [
                              node.bin(replacement[i : i + 40])
                              for i in range(40, len(replacement), 40)
                          ]
                          replacements.append((original, succ))
                          index += 1
                      backupfile = lines[index]
                      index += 1
                      fp.close()
                      return parentctxnode, rules, keep, topmost, replacements, backupfile
                  def clear(self):
                      if self.inprogress():
                          self.repo.vfs.unlink(b'histedit-state')
                  def inprogress(self):
                      return self.repo.vfs.exists(b'histedit-state')
              class histeditaction(object):
                  def __init__(self, state, node):
                      self.state = state
                      self.repo = state.repo
                      self.node = node
                  @classmethod
                  def fromrule(cls, state, rule):
                      """Parses the given rule, returning an instance of the histeditaction.
                      """
                      ruleid = rule.strip().split(b' ', 1)[0]
                      # ruleid can be anything from rev numbers, hashes, "bookmarks" etc
                      # Check for validation of rule ids and get the rulehash
                      try:
                          rev = node.bin(ruleid)
                      except TypeError:
                          try:
                              _ctx = scmutil.revsingle(state.repo, ruleid)
                              rulehash = _ctx.hex()
                              rev = node.bin(rulehash)
                          except error.RepoLookupError:
                              raise error.ParseError(_(b"invalid changeset %s") % ruleid)
                      return cls(state, rev)
                  def verify(self, prev, expected, seen):
                      """ Verifies semantic correctness of the rule"""
                      repo = self.repo
                      ha = node.hex(self.node)
                      self.node = scmutil.resolvehexnodeidprefix(repo, ha)
                      if self.node is None:
                          raise error.ParseError(_(b'unknown changeset %s listed') % ha[:12])
                      self._verifynodeconstraints(prev, expected, seen)
                  def _verifynodeconstraints(self, prev, expected, seen):
                      # by default command need a node in the edited list
                      if self.node not in expected:
                          raise error.ParseError(
                              _(b'%s "%s" changeset was not a candidate')
                              % (self.verb, node.short(self.node)),
                              hint=_(b'only use listed changesets'),
                          )
                      # and only one command per node
                      if self.node in seen:
                          raise error.ParseError(
                              _(b'duplicated command for changeset %s')
                              % node.short(self.node)
                          )
                  def torule(self):
                      """build a histedit rule line for an action
                      by default lines are in the form:
                      <hash> <rev> <summary>
                      """
                      ctx = self.repo[self.node]
                      ui = self.repo.ui
                      summary = (
                          cmdutil.rendertemplate(
                              ctx, ui.config(b'histedit', b'summary-template')
                          )
                          or b''
                      )
                      summary = summary.splitlines()[0]
                      line = b'%s %s %s' % (self.verb, ctx, summary)
                      # trim to 75 columns by default so it's not stupidly wide in my editor
                      # (the 5 more are left for verb)
                      maxlen = self.repo.ui.configint(b'histedit', b'linelen')
                      maxlen = max(maxlen, 22)  # avoid truncating hash
                      return stringutil.ellipsis(line, maxlen)
                  def tostate(self):
                      """Print an action in format used by histedit state files
                         (the first line is a verb, the remainder is the second)
                      """
                      return b"%s\n%s" % (self.verb, node.hex(self.node))
                  def run(self):
                      """Runs the action. The default behavior is simply apply the action's
                      rulectx onto the current parentctx."""
                      self.applychange()
                      self.continuedirty()
                      return self.continueclean()
                  def applychange(self):
                      """Applies the changes from this action's rulectx onto the current
                      parentctx, but does not commit them."""
                      repo = self.repo
                      rulectx = repo[self.node]
                      repo.ui.pushbuffer(error=True, labeled=True)
                      hg.update(repo, self.state.parentctxnode, quietempty=True)
                      repo.ui.popbuffer()
                      stats = applychanges(repo.ui, repo, rulectx, {})
                      repo.dirstate.setbranch(rulectx.branch())
                      if stats.unresolvedcount:
                          raise error.InterventionRequired(
                              _(b'Fix up the change (%s %s)')
                              % (self.verb, node.short(self.node)),
                              hint=_(b'hg histedit --continue to resume'),
                          )
                  def continuedirty(self):
                      """Continues the action when changes have been applied to the working
                      copy. The default behavior is to commit the dirty changes."""
                      repo = self.repo
                      rulectx = repo[self.node]
                      editor = self.commiteditor()
                      commit = commitfuncfor(repo, rulectx)
                      if repo.ui.configbool(b'rewrite', b'update-timestamp'):
                          date = dateutil.makedate()
                      else:
                          date = rulectx.date()
                      commit(
                          text=rulectx.description(),
                          user=rulectx.user(),
                          date=date,
                          extra=rulectx.extra(),
                          editor=editor,
                      )
                  def commiteditor(self):
                      """The editor to be used to edit the commit message."""
                      return False
                  def continueclean(self):
                      """Continues the action when the working copy is clean. The default
                      behavior is to accept the current commit as the new version of the
                      rulectx."""
                      ctx = self.repo[b'.']
                      if ctx.node() == self.state.parentctxnode:
                          self.repo.ui.warn(
                              _(b'%s: skipping changeset (no changes)\n')
                              % node.short(self.node)
                          )
                          return ctx, [(self.node, tuple())]
                      if ctx.node() == self.node:
                          # Nothing changed
                          return ctx, []
                      return ctx, [(self.node, (ctx.node(),))]
              def commitfuncfor(repo, src):
                  """Build a commit function for the replacement of <src>
                  This function ensure we apply the same treatment to all changesets.
                  - Add a 'histedit_source' entry in extra.
                  Note that fold has its own separated logic because its handling is a bit
                  different and not easily factored out of the fold method.
                  """
                  phasemin = src.phase()
                  def commitfunc(**kwargs):
                      overrides = {(b'phases', b'new-commit'): phasemin}
                      with repo.ui.configoverride(overrides, b'histedit'):
                          extra = kwargs.get('extra', {}).copy()
                          extra[b'histedit_source'] = src.hex()
                          kwargs['extra'] = extra
                          return repo.commit(**kwargs)
                  return commitfunc
              def applychanges(ui, repo, ctx, opts):
                  """Merge changeset from ctx (only) in the current working directory"""
                  wcpar = repo.dirstate.p1()
                  if ctx.p1().node() == wcpar:
                      # edits are "in place" we do not need to make any merge,
                      # just applies changes on parent for editing
                      ui.pushbuffer()
                      cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
                      stats = mergemod.updateresult(0, 0, 0, 0)
                      ui.popbuffer()
                  else:
                      try:
                          # ui.forcemerge is an internal variable, do not document
                          repo.ui.setconfig(
                              b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
                          )
                          stats = mergemod.graft(repo, ctx, ctx.p1(), [b'local', b'histedit'])
                      finally:
                          repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
                  return stats
              def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
                  """collapse the set of revisions from first to last as new one.
                  Expected commit options are:
                      - message
                      - date
                      - username
                  Commit message is edited in all cases.
                  This function works in memory."""
                  ctxs = list(repo.set(b'%d::%d', firstctx.rev(), lastctx.rev()))
                  if not ctxs:
                      return None
                  for c in ctxs:
                      if not c.mutable():
                          raise error.ParseError(
                              _(b"cannot fold into public change %s") % node.short(c.node())
                          )
                  base = firstctx.p1()
                  # commit a new version of the old changeset, including the update
                  # collect all files which might be affected
                  files = set()
                  for ctx in ctxs:
                      files.update(ctx.files())
                  # Recompute copies (avoid recording a -> b -> a)
                  copied = copies.pathcopies(base, lastctx)
                  # prune files which were reverted by the updates
                  files = [f for f in files if not cmdutil.samefile(f, lastctx, base)]
                  # commit version of these files as defined by head
                  headmf = lastctx.manifest()
                  def filectxfn(repo, ctx, path):
                      if path in headmf:
                          fctx = lastctx[path]
                          flags = fctx.flags()
                          mctx = context.memfilectx(
                              repo,
                              ctx,
                              fctx.path(),
                              fctx.data(),
                              islink=b'l' in flags,
                              isexec=b'x' in flags,
                              copysource=copied.get(path),
                          )
                          return mctx
                      return None
                  if commitopts.get(b'message'):
                      message = commitopts[b'message']
                  else:
                      message = firstctx.description()
                  user = commitopts.get(b'user')
                  date = commitopts.get(b'date')
                  extra = commitopts.get(b'extra')
                  parents = (firstctx.p1().node(), firstctx.p2().node())
                  editor = None
                  if not skipprompt:
                      editor = cmdutil.getcommiteditor(edit=True, editform=b'histedit.fold')
                  new = context.memctx(
                      repo,
                      parents=parents,
                      text=message,
                      files=files,
                      filectxfn=filectxfn,
                      user=user,
                      date=date,
                      extra=extra,
                      editor=editor,
                  )
                  return repo.commitctx(new)
              def _isdirtywc(repo):
                  return repo[None].dirty(missing=True)
              def abortdirty():
                  raise error.Abort(
                      _(b'working copy has pending changes'),
                      hint=_(
                          b'amend, commit, or revert them and run histedit '
                          b'--continue, or abort with histedit --abort'
                      ),
                  )
              def action(verbs, message, priority=False, internal=False):
                  def wrap(cls):
                      assert not priority or not internal
                      verb = verbs[0]
                      if priority:
                          primaryactions.add(verb)
                      elif internal:
                          internalactions.add(verb)
                      elif len(verbs) > 1:
                          secondaryactions.add(verb)
                      else:
                          tertiaryactions.add(verb)
                      cls.verb = verb
                      cls.verbs = verbs
                      cls.message = message
                      for verb in verbs:
                          actiontable[verb] = cls
                      return cls
                  return wrap
              @action([b'pick', b'p'], _(b'use commit'), priority=True)
              class pick(histeditaction):
                  def run(self):
                      rulectx = self.repo[self.node]
                      if rulectx.p1().node() == self.state.parentctxnode:
                          self.repo.ui.debug(b'node %s unchanged\n' % node.short(self.node))
                          return rulectx, []
                      return super(pick, self).run()
              @action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True)
              class edit(histeditaction):
                  def run(self):
                      repo = self.repo
                      rulectx = repo[self.node]
                      hg.update(repo, self.state.parentctxnode, quietempty=True)
                      applychanges(repo.ui, repo, rulectx, {})
                      raise error.InterventionRequired(
                          _(b'Editing (%s), you may commit or record as needed now.')
                          % node.short(self.node),
                          hint=_(b'hg histedit --continue to resume'),
                      )
                  def commiteditor(self):
                      return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit')
              @action([b'fold', b'f'], _(b'use commit, but combine it with the one above'))
              class fold(histeditaction):
                  def verify(self, prev, expected, seen):
                      """ Verifies semantic correctness of the fold rule"""
                      super(fold, self).verify(prev, expected, seen)
                      repo = self.repo
                      if not prev:
                          c = repo[self.node].p1()
                      elif not prev.verb in (b'pick', b'base'):
                          return
                      else:
                          c = repo[prev.node]
                      if not c.mutable():
                          raise error.ParseError(
                              _(b"cannot fold into public change %s") % node.short(c.node())
                          )
                  def continuedirty(self):
                      repo = self.repo
                      rulectx = repo[self.node]
                      commit = commitfuncfor(repo, rulectx)
                      commit(
                          text=b'fold-temp-revision %s' % node.short(self.node),
                          user=rulectx.user(),
                          date=rulectx.date(),
                          extra=rulectx.extra(),
                      )
                  def continueclean(self):
                      repo = self.repo
                      ctx = repo[b'.']
                      rulectx = repo[self.node]
                      parentctxnode = self.state.parentctxnode
                      if ctx.node() == parentctxnode:
                          repo.ui.warn(_(b'%s: empty changeset\n') % node.short(self.node))
                          return ctx, [(self.node, (parentctxnode,))]
                      parentctx = repo[parentctxnode]
                      newcommits = set(
                          c.node()
                          for c in repo.set(b'(%d::. - %d)', parentctx.rev(), parentctx.rev())
                      )
                      if not newcommits:
                          repo.ui.warn(
                              _(
                                  b'%s: cannot fold - working copy is not a '
                                  b'descendant of previous commit %s\n'
                              )
                              % (node.short(self.node), node.short(parentctxnode))
                          )
                          return ctx, [(self.node, (ctx.node(),))]
                      middlecommits = newcommits.copy()
                      middlecommits.discard(ctx.node())
                      return self.finishfold(
                          repo.ui, repo, parentctx, rulectx, ctx.node(), middlecommits
                      )
                  def skipprompt(self):
                      """Returns true if the rule should skip the message editor.
                      For example, 'fold' wants to show an editor, but 'rollup'
                      doesn't want to.
                      """
                      return False
                  def mergedescs(self):
                      """Returns true if the rule should merge messages of multiple changes.
                      This exists mainly so that 'rollup' rules can be a subclass of
                      'fold'.
                      """
                      return True
                  def firstdate(self):
                      """Returns true if the rule should preserve the date of the first
                      change.
                      This exists mainly so that 'rollup' rules can be a subclass of
                      'fold'.
                      """
                      return False
                  def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
                      parent = ctx.p1().node()
                      hg.updaterepo(repo, parent, overwrite=False)
                      ### prepare new commit data
                      commitopts = {}
                      commitopts[b'user'] = ctx.user()
                      # commit message
                      if not self.mergedescs():
                          newmessage = ctx.description()
                      else:
                          newmessage = (
                              b'\n***\n'.join(
                                  [ctx.description()]
                                  + [repo[r].description() for r in internalchanges]
                                  + [oldctx.description()]
                              )
                              + b'\n'
                          )
                      commitopts[b'message'] = newmessage
                      # date
                      if self.firstdate():
                          commitopts[b'date'] = ctx.date()
                      else:
                          commitopts[b'date'] = max(ctx.date(), oldctx.date())
                      # if date is to be updated to current
                      if ui.configbool(b'rewrite', b'update-timestamp'):
                          commitopts[b'date'] = dateutil.makedate()
                      extra = ctx.extra().copy()
                      # histedit_source
                      # note: ctx is likely a temporary commit but that the best we can do
                      #       here. This is sufficient to solve issue3681 anyway.
                      extra[b'histedit_source'] = b'%s,%s' % (ctx.hex(), oldctx.hex())
                      commitopts[b'extra'] = extra
                      phasemin = max(ctx.phase(), oldctx.phase())
                      overrides = {(b'phases', b'new-commit'): phasemin}
                      with repo.ui.configoverride(overrides, b'histedit'):
                          n = collapse(
                              repo,
                              ctx,
                              repo[newnode],
                              commitopts,
                              skipprompt=self.skipprompt(),
                          )
                      if n is None:
                          return ctx, []
                      hg.updaterepo(repo, n, overwrite=False)
                      replacements = [
                          (oldctx.node(), (newnode,)),
                          (ctx.node(), (n,)),
                          (newnode, (n,)),
                      ]
                      for ich in internalchanges:
                          replacements.append((ich, (n,)))
                      return repo[n], replacements
              @action(
                  [b'base', b'b'],
                  _(b'checkout changeset and apply further changesets from there'),
              )
              class base(histeditaction):
                  def run(self):
                      if self.repo[b'.'].node() != self.node:
                          mergemod.update(self.repo, self.node, branchmerge=False, force=True)
                      return self.continueclean()
                  def continuedirty(self):
                      abortdirty()
                  def continueclean(self):
                      basectx = self.repo[b'.']
                      return basectx, []
                  def _verifynodeconstraints(self, prev, expected, seen):
                      # base can only be use with a node not in the edited set
                      if self.node in expected:
                          msg = _(b'%s "%s" changeset was an edited list candidate')
                          raise error.ParseError(
                              msg % (self.verb, node.short(self.node)),
                              hint=_(b'base must only use unlisted changesets'),
                          )
              @action(
                  [b'_multifold'],
                  _(
                      """fold subclass used for when multiple folds happen in a row
                  We only want to fire the editor for the folded message once when
                  (say) four changes are folded down into a single change. This is
                  similar to rollup, but we should preserve both messages so that
                  when the last fold operation runs we can show the user all the
                  commit messages in their editor.
                  """
                  ),
                  internal=True,
              )
              class _multifold(fold):
                  def skipprompt(self):
                      return True
              @action(
                  [b"roll", b"r"],
                  _(b"like fold, but discard this commit's description and date"),
              )
              class rollup(fold):
                  def mergedescs(self):
                      return False
                  def skipprompt(self):
                      return True
                  def firstdate(self):
                      return True
              @action([b"drop", b"d"], _(b'remove commit from history'))
              class drop(histeditaction):
                  def run(self):
                      parentctx = self.repo[self.state.parentctxnode]
                      return parentctx, [(self.node, tuple())]
              @action(
                  [b"mess", b"m"],
                  _(b'edit commit message without changing commit content'),
                  priority=True,
              )
              class message(histeditaction):
                  def commiteditor(self):
                      return cmdutil.getcommiteditor(edit=True, editform=b'histedit.mess')
              def findoutgoing(ui, repo, remote=None, force=False, opts=None):
                  """utility function to find the first outgoing changeset
                  Used by initialization code"""
                  if opts is None:
                      opts = {}
                  dest = ui.expandpath(remote or b'default-push', remote or b'default')
                  dest, branches = hg.parseurl(dest, None)[:2]
                  ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
                  revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
                  other = hg.peer(repo, opts, dest)
                  if revs:
                      revs = [repo.lookup(rev) for rev in revs]
                  outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
                  if not outgoing.missing:
                      raise error.Abort(_(b'no outgoing ancestors'))
                  roots = list(repo.revs(b"roots(%ln)", outgoing.missing))
                  if len(roots) > 1:
                      msg = _(b'there are ambiguous outgoing revisions')
                      hint = _(b"see 'hg help histedit' for more detail")
                      raise error.Abort(msg, hint=hint)
                  return repo[roots[0]].node()
              # Curses Support
              try:
                  import curses
              except ImportError:
                  curses = None
              KEY_LIST = [b'pick', b'edit', b'fold', b'drop', b'mess', b'roll']
              ACTION_LABELS = {
                  b'fold': b'^fold',
                  b'roll': b'^roll',
              }
              COLOR_HELP, COLOR_SELECTED, COLOR_OK, COLOR_WARN, COLOR_CURRENT = 1, 2, 3, 4, 5
              COLOR_DIFF_ADD_LINE, COLOR_DIFF_DEL_LINE, COLOR_DIFF_OFFSET = 6, 7, 8
              COLOR_ROLL, COLOR_ROLL_CURRENT, COLOR_ROLL_SELECTED = 9, 10, 11
              E_QUIT, E_HISTEDIT = 1, 2
              E_PAGEDOWN, E_PAGEUP, E_LINEUP, E_LINEDOWN, E_RESIZE = 3, 4, 5, 6, 7
              MODE_INIT, MODE_PATCH, MODE_RULES, MODE_HELP = 0, 1, 2, 3
              KEYTABLE = {
                  b'global': {
                      b'h': b'next-action',
                      b'KEY_RIGHT': b'next-action',
                      b'l': b'prev-action',
                      b'KEY_LEFT': b'prev-action',
                      b'q': b'quit',
                      b'c': b'histedit',
                      b'C': b'histedit',
                      b'v': b'showpatch',
                      b'?': b'help',
                  },
                  MODE_RULES: {
                      b'd': b'action-drop',
                      b'e': b'action-edit',
                      b'f': b'action-fold',
                      b'm': b'action-mess',
                      b'p': b'action-pick',
                      b'r': b'action-roll',
                      b' ': b'select',
                      b'j': b'down',
                      b'k': b'up',
                      b'KEY_DOWN': b'down',
                      b'KEY_UP': b'up',
                      b'J': b'move-down',
                      b'K': b'move-up',
                      b'KEY_NPAGE': b'move-down',
                      b'KEY_PPAGE': b'move-up',
                      b'0': b'goto',  # Used for 0..9
                  },
                  MODE_PATCH: {
                      b' ': b'page-down',
                      b'KEY_NPAGE': b'page-down',
                      b'KEY_PPAGE': b'page-up',
                      b'j': b'line-down',
                      b'k': b'line-up',
                      b'KEY_DOWN': b'line-down',
                      b'KEY_UP': b'line-up',
                      b'J': b'down',
                      b'K': b'up',
                  },
                  MODE_HELP: {},
              }
              def screen_size():
                  return struct.unpack(b'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, b'    '))
              class histeditrule(object):
                  def __init__(self, ctx, pos, action=b'pick'):
                      self.ctx = ctx
                      self.action = action
                      self.origpos = pos
                      self.pos = pos
                      self.conflicts = []
                  def __bytes__(self):
                      # Example display of several histeditrules:
                      #
                      #  #10 pick   316392:06a16c25c053   add option to skip tests
                      #  #11 ^roll  316393:71313c964cc5   <RED>oops a fixup commit</RED>
                      #  #12 pick   316394:ab31f3973b0d   include mfbt for mozilla-config.h
                      #  #13 ^fold  316395:14ce5803f4c3   fix warnings
                      #
                      # The carets point to the changeset being folded into ("roll this
                      # changeset into the changeset above").
                      return b'%s%s' % (self.prefix, self.desc)
                  __str__ = encoding.strmethod(__bytes__)
                  @property
                  def prefix(self):
                      # Some actions ('fold' and 'roll') combine a patch with a
                      # previous one. Add a marker showing which patch they apply
                      # to.
                      action = ACTION_LABELS.get(self.action, self.action)
                      h = self.ctx.hex()[0:12]
                      r = self.ctx.rev()
                      return b"#%s %s %d:%s   " % (
                          (b'%d' % self.origpos).ljust(2),
                          action.ljust(6),
                          r,
                          h,
                      )
                  @property
                  def desc(self):
                      # This is split off from the prefix property so that we can
                      # separately make the description for 'roll' red (since it
                      # will get discarded).
                      return self.ctx.description().splitlines()[0].strip()
                  def checkconflicts(self, other):
                      if other.pos > self.pos and other.origpos <= self.origpos:
                          if set(other.ctx.files()) & set(self.ctx.files()) != set():
                              self.conflicts.append(other)
                              return self.conflicts
                      if other in self.conflicts:
                          self.conflicts.remove(other)
                      return self.conflicts
              # ============ EVENTS ===============
              def movecursor(state, oldpos, newpos):
                  '''Change the rule/changeset that the cursor is pointing to, regardless of
                  current mode (you can switch between patches from the view patch window).'''
                  state[b'pos'] = newpos
                  mode, _ = state[b'mode']
                  if mode == MODE_RULES:
                      # Scroll through the list by updating the view for MODE_RULES, so that
                      # even if we are not currently viewing the rules, switching back will
                      # result in the cursor's rule being visible.
                      modestate = state[b'modes'][MODE_RULES]
                      if newpos < modestate[b'line_offset']:
                          modestate[b'line_offset'] = newpos
                      elif newpos > modestate[b'line_offset'] + state[b'page_height'] - 1:
                          modestate[b'line_offset'] = newpos - state[b'page_height'] + 1
                  # Reset the patch view region to the top of the new patch.
                  state[b'modes'][MODE_PATCH][b'line_offset'] = 0
              def changemode(state, mode):
                  curmode, _ = state[b'mode']
                  state[b'mode'] = (mode, curmode)
                  if mode == MODE_PATCH:
                      state[b'modes'][MODE_PATCH][b'patchcontents'] = patchcontents(state)
              def makeselection(state, pos):
                  state[b'selected'] = pos
              def swap(state, oldpos, newpos):
                  """Swap two positions and calculate necessary conflicts in
                  O(|newpos-oldpos|) time"""
                  rules = state[b'rules']
                  assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
                  rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
                  # TODO: swap should not know about histeditrule's internals
                  rules[newpos].pos = newpos
                  rules[oldpos].pos = oldpos
                  start = min(oldpos, newpos)
                  end = max(oldpos, newpos)
                  for r in pycompat.xrange(start, end + 1):
                      rules[newpos].checkconflicts(rules[r])
                      rules[oldpos].checkconflicts(rules[r])
                  if state[b'selected']:
                      makeselection(state, newpos)
              def changeaction(state, pos, action):
                  """Change the action state on the given position to the new action"""
                  rules = state[b'rules']
                  assert 0 <= pos < len(rules)
                  rules[pos].action = action
              def cycleaction(state, pos, next=False):
                  """Changes the action state the next or the previous action from
                  the action list"""
                  rules = state[b'rules']
                  assert 0 <= pos < len(rules)
                  current = rules[pos].action
                  assert current in KEY_LIST
                  index = KEY_LIST.index(current)
                  if next:
                      index += 1
                  else:
                      index -= 1
                  changeaction(state, pos, KEY_LIST[index % len(KEY_LIST)])
              def changeview(state, delta, unit):
                  '''Change the region of whatever is being viewed (a patch or the list of
                  changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'.'''
                  mode, _ = state[b'mode']
                  if mode != MODE_PATCH:
                      return
                  mode_state = state[b'modes'][mode]
                  num_lines = len(mode_state[b'patchcontents'])
                  page_height = state[b'page_height']
                  unit = page_height if unit == b'page' else 1
                  num_pages = 1 + (num_lines - 1) / page_height
                  max_offset = (num_pages - 1) * page_height
                  newline = mode_state[b'line_offset'] + delta * unit
                  mode_state[b'line_offset'] = max(0, min(max_offset, newline))
              def event(state, ch):
                  """Change state based on the current character input
                  This takes the current state and based on the current character input from
                  the user we change the state.
                  """
                  selected = state[b'selected']
                  oldpos = state[b'pos']
                  rules = state[b'rules']
                  if ch in (curses.KEY_RESIZE, b"KEY_RESIZE"):
                      return E_RESIZE
                  lookup_ch = ch
                  if ch is not None and b'0' <= ch <= b'9':
                      lookup_ch = b'0'
                  curmode, prevmode = state[b'mode']
                  action = KEYTABLE[curmode].get(
                      lookup_ch, KEYTABLE[b'global'].get(lookup_ch)
                  )
                  if action is None:
                      return
                  if action in (b'down', b'move-down'):
                      newpos = min(oldpos + 1, len(rules) - 1)
                      movecursor(state, oldpos, newpos)
                      if selected is not None or action == b'move-down':
                          swap(state, oldpos, newpos)
                  elif action in (b'up', b'move-up'):
                      newpos = max(0, oldpos - 1)
                      movecursor(state, oldpos, newpos)
                      if selected is not None or action == b'move-up':
                          swap(state, oldpos, newpos)
                  elif action == b'next-action':
                      cycleaction(state, oldpos, next=True)
                  elif action == b'prev-action':
                      cycleaction(state, oldpos, next=False)
                  elif action == b'select':
                      selected = oldpos if selected is None else None
                      makeselection(state, selected)
                  elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
                      newrule = next((r for r in rules if r.origpos == int(ch)))
                      movecursor(state, oldpos, newrule.pos)
                      if selected is not None:
                          swap(state, oldpos, newrule.pos)
                  elif action.startswith(b'action-'):
                      changeaction(state, oldpos, action[7:])
                  elif action == b'showpatch':
                      changemode(state, MODE_PATCH if curmode != MODE_PATCH else prevmode)
                  elif action == b'help':
                      changemode(state, MODE_HELP if curmode != MODE_HELP else prevmode)
                  elif action == b'quit':
                      return E_QUIT
                  elif action == b'histedit':
                      return E_HISTEDIT
                  elif action == b'page-down':
                      return E_PAGEDOWN
                  elif action == b'page-up':
                      return E_PAGEUP
                  elif action == b'line-down':
                      return E_LINEDOWN
                  elif action == b'line-up':
                      return E_LINEUP
              def makecommands(rules):
                  """Returns a list of commands consumable by histedit --commands based on
                  our list of rules"""
                  commands = []
                  for rules in rules:
                      commands.append(b'%s %s\n' % (rules.action, rules.ctx))
                  return commands
              def addln(win, y, x, line, color=None):
                  """Add a line to the given window left padding but 100% filled with
                  whitespace characters, so that the color appears on the whole line"""
                  maxy, maxx = win.getmaxyx()
                  length = maxx - 1 - x
                  line = bytes(line).ljust(length)[:length]
                  if y < 0:
                      y = maxy + y
                  if x < 0:
                      x = maxx + x
                  if color:
                      win.addstr(y, x, line, color)
                  else:
                      win.addstr(y, x, line)
              def _trunc_head(line, n):
                  if len(line) <= n:
                      return line
                  return b'> ' + line[-(n - 2) :]
              def _trunc_tail(line, n):
                  if len(line) <= n:
                      return line
                  return line[: n - 2] + b' >'
              def patchcontents(state):
                  repo = state[b'repo']
                  rule = state[b'rules'][state[b'pos']]
                  displayer = logcmdutil.changesetdisplayer(
                      repo.ui, repo, {b"patch": True, b"template": b"status"}, buffered=True
                  )
                  overrides = {(b'ui', b'verbose'): True}
                  with repo.ui.configoverride(overrides, source=b'histedit'):
                      displayer.show(rule.ctx)
                      displayer.close()
                  return displayer.hunk[rule.ctx.rev()].splitlines()
              def _chisteditmain(repo, rules, stdscr):
                  try:
                      curses.use_default_colors()
                  except curses.error:
                      pass
                  # initialize color pattern
                  curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
                  curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
                  curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
                  curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
                  curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
                  curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
                  curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
                  curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
                  curses.init_pair(COLOR_ROLL, curses.COLOR_RED, -1)
                  curses.init_pair(
                      COLOR_ROLL_CURRENT, curses.COLOR_BLACK, curses.COLOR_MAGENTA
                  )
                  curses.init_pair(COLOR_ROLL_SELECTED, curses.COLOR_RED, curses.COLOR_WHITE)
                  # don't display the cursor
                  try:
                      curses.curs_set(0)
                  except curses.error:
                      pass
                  def rendercommit(win, state):
                      """Renders the commit window that shows the log of the current selected
                      commit"""
                      pos = state[b'pos']
                      rules = state[b'rules']
                      rule = rules[pos]
                      ctx = rule.ctx
                      win.box()
                      maxy, maxx = win.getmaxyx()
                      length = maxx - 3
                      line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12])
                      win.addstr(1, 1, line[:length])
                      line = b"user:      %s" % ctx.user()
                      win.addstr(2, 1, line[:length])
                      bms = repo.nodebookmarks(ctx.node())
                      line = b"bookmark:  %s" % b' '.join(bms)
                      win.addstr(3, 1, line[:length])
                      line = b"summary:   %s" % (ctx.description().splitlines()[0])
                      win.addstr(4, 1, line[:length])
                      line = b"files:     "
                      win.addstr(5, 1, line)
                      fnx = 1 + len(line)
                      fnmaxx = length - fnx + 1
                      y = 5
                      fnmaxn = maxy - (1 + y) - 1
                      files = ctx.files()
                      for i, line1 in enumerate(files):
                          if len(files) > fnmaxn and i == fnmaxn - 1:
                              win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
                              y = y + 1
                              break
                          win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
                          y = y + 1
                      conflicts = rule.conflicts
                      if len(conflicts) > 0:
                          conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts))
                          conflictstr = b"changed files overlap with %s" % conflictstr
                      else:
                          conflictstr = b'no overlap'
                      win.addstr(y, 1, conflictstr[:length])
                      win.noutrefresh()
                  def helplines(mode):
                      if mode == MODE_PATCH:
                          help = b"""\
              ?: help, k/up: line up, j/down: line down, v: stop viewing patch
              pgup: prev page, space/pgdn: next page, c: commit, q: abort
              """
                      else:
                          help = b"""\
              ?: help, k/up: move up, j/down: move down, space: select, v: view patch
              d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
              pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
              """
                      return help.splitlines()
                  def renderhelp(win, state):
                      maxy, maxx = win.getmaxyx()
                      mode, _ = state[b'mode']
                      for y, line in enumerate(helplines(mode)):
                          if y >= maxy:
                              break
                          addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
                      win.noutrefresh()
                  def renderrules(rulesscr, state):
                      rules = state[b'rules']
                      pos = state[b'pos']
                      selected = state[b'selected']
                      start = state[b'modes'][MODE_RULES][b'line_offset']
                      conflicts = [r.ctx for r in rules if r.conflicts]
                      if len(conflicts) > 0:
                          line = b"potential conflict in %s" % b','.join(
                              map(pycompat.bytestr, conflicts)
                          )
                          addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
                      for y, rule in enumerate(rules[start:]):
                          if y >= state[b'page_height']:
                              break
                          if len(rule.conflicts) > 0:
                              rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
                          else:
                              rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK)
                          if y + start == selected:
                              rollcolor = COLOR_ROLL_SELECTED
                              addln(rulesscr, y, 2, rule, curses.color_pair(COLOR_SELECTED))
                          elif y + start == pos:
                              rollcolor = COLOR_ROLL_CURRENT
                              addln(
                                  rulesscr,
                                  y,
 ,
                                  rule,
                                  curses.color_pair(COLOR_CURRENT) | curses.A_BOLD,
                              )
                          else:
                              rollcolor = COLOR_ROLL
                              addln(rulesscr, y, 2, rule)
                          if rule.action == b'roll':
                              rulesscr.addstr(
                                  y,
 + len(rule.prefix),
                                  rule.desc,
                                  curses.color_pair(rollcolor),
                              )
                      rulesscr.noutrefresh()
                  def renderstring(win, state, output, diffcolors=False):
                      maxy, maxx = win.getmaxyx()
                      length = min(maxy - 1, len(output))
                      for y in range(0, length):
                          line = output[y]
                          if diffcolors:
                              if line and line[0] == b'+':
                                  win.addstr(
                                      y, 0, line, curses.color_pair(COLOR_DIFF_ADD_LINE)
                                  )
                              elif line and line[0] == b'-':
                                  win.addstr(
                                      y, 0, line, curses.color_pair(COLOR_DIFF_DEL_LINE)
                                  )
                              elif line.startswith(b'@@ '):
                                  win.addstr(y, 0, line, curses.color_pair(COLOR_DIFF_OFFSET))
                              else:
                                  win.addstr(y, 0, line)
                          else:
                              win.addstr(y, 0, line)
                      win.noutrefresh()
                  def renderpatch(win, state):
                      start = state[b'modes'][MODE_PATCH][b'line_offset']
                      content = state[b'modes'][MODE_PATCH][b'patchcontents']
                      renderstring(win, state, content[start:], diffcolors=True)
                  def layout(mode):
                      maxy, maxx = stdscr.getmaxyx()
                      helplen = len(helplines(mode))
                      return {
                          b'commit': (12, maxx),
                          b'help': (helplen, maxx),
                          b'main': (maxy - helplen - 12, maxx),
                      }
                  def drawvertwin(size, y, x):
                      win = curses.newwin(size[0], size[1], y, x)
                      y += size[0]
                      return win, y, x
                  state = {
                      b'pos': 0,
                      b'rules': rules,
                      b'selected': None,
                      b'mode': (MODE_INIT, MODE_INIT),
                      b'page_height': None,
                      b'modes': {
                          MODE_RULES: {b'line_offset': 0,},
                          MODE_PATCH: {b'line_offset': 0,},
                      },
                      b'repo': repo,
                  }
                  # eventloop
                  ch = None
                  stdscr.clear()
                  stdscr.refresh()
                  while True:
                      try:
                          oldmode, _ = state[b'mode']
                          if oldmode == MODE_INIT:
                              changemode(state, MODE_RULES)
                          e = event(state, ch)
                          if e == E_QUIT:
                              return False
                          if e == E_HISTEDIT:
                              return state[b'rules']
                          else:
                              if e == E_RESIZE:
                                  size = screen_size()
                                  if size != stdscr.getmaxyx():
                                      curses.resizeterm(*size)
                              curmode, _ = state[b'mode']
                              sizes = layout(curmode)
                              if curmode != oldmode:
                                  state[b'page_height'] = sizes[b'main'][0]
                                  # Adjust the view to fit the current screen size.
                                  movecursor(state, state[b'pos'], state[b'pos'])
                              # Pack the windows against the top, each pane spread across the
                              # full width of the screen.
                              y, x = (0, 0)
                              helpwin, y, x = drawvertwin(sizes[b'help'], y, x)
                              mainwin, y, x = drawvertwin(sizes[b'main'], y, x)
                              commitwin, y, x = drawvertwin(sizes[b'commit'], y, x)
                              if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP):
                                  if e == E_PAGEDOWN:
                                      changeview(state, +1, b'page')
                                  elif e == E_PAGEUP:
                                      changeview(state, -1, b'page')
                                  elif e == E_LINEDOWN:
                                      changeview(state, +1, b'line')
                                  elif e == E_LINEUP:
                                      changeview(state, -1, b'line')
                              # start rendering
                              commitwin.erase()
                              helpwin.erase()
                              mainwin.erase()
                              if curmode == MODE_PATCH:
                                  renderpatch(mainwin, state)
                              elif curmode == MODE_HELP:
                                  renderstring(mainwin, state, __doc__.strip().splitlines())
                              else:
                                  renderrules(mainwin, state)
                                  rendercommit(commitwin, state)
                              renderhelp(helpwin, state)
                              curses.doupdate()
                              # done rendering
                              ch = encoding.strtolocal(stdscr.getkey())
                      except curses.error:
                          pass
              def _chistedit(ui, repo, *freeargs, **opts):
                  """interactively edit changeset history via a curses interface
                  Provides a ncurses interface to histedit. Press ? in chistedit mode
                  to see an extensive help. Requires python-curses to be installed."""
                  if curses is None:
                      raise error.Abort(_(b"Python curses library required"))
                  # disable color
                  ui._colormode = None
                  try:
                      keep = opts.get(b'keep')
                      revs = opts.get(b'rev', [])[:]
                      cmdutil.checkunfinished(repo)
                      cmdutil.bailifchanged(repo)
                      if os.path.exists(os.path.join(repo.path, b'histedit-state')):
                          raise error.Abort(
                              _(
                                  b'history edit already in progress, try '
                                  b'--continue or --abort'
                              )
                          )
                      revs.extend(freeargs)
                      if not revs:
                          defaultrev = destutil.desthistedit(ui, repo)
                          if defaultrev is not None:
                              revs.append(defaultrev)
                      if len(revs) != 1:
                          raise error.Abort(
                              _(b'histedit requires exactly one ancestor revision')
                          )
                      rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
                      if len(rr) != 1:
                          raise error.Abort(
                              _(
                                  b'The specified revisions must have '
                                  b'exactly one common root'
                              )
                          )
                      root = rr[0].node()
                      topmost = repo.dirstate.p1()
                      revs = between(repo, root, topmost, keep)
                      if not revs:
                          raise error.Abort(
                              _(b'%s is not an ancestor of working directory')
                              % node.short(root)
                          )
                      ctxs = []
                      for i, r in enumerate(revs):
                          ctxs.append(histeditrule(repo[r], i))
                      # Curses requires setting the locale or it will default to the C
                      # locale. This sets the locale to the user's default system
                      # locale.
                      locale.setlocale(locale.LC_ALL, '')
                      rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
                      curses.echo()
                      curses.endwin()
                      if rc is False:
                          ui.write(_(b"histedit aborted\n"))
                          return 0
                      if type(rc) is list:
                          ui.status(_(b"performing changes\n"))
                          rules = makecommands(rc)
                          with repo.vfs(b'chistedit', b'w+') as fp:
                              for r in rules:
                                  fp.write(r)
                              opts['commands'] = fp.name
                          return _texthistedit(ui, repo, *freeargs, **opts)
                  except KeyboardInterrupt:
                      pass
                  return -1
              @command(
                  b'histedit',
                  [
                      (
                          b'',
                          b'commands',
                          b'',
                          _(b'read history edits from the specified file'),
                          _(b'FILE'),
                      ),
                      (b'c', b'continue', False, _(b'continue an edit already in progress')),
                      (b'', b'edit-plan', False, _(b'edit remaining actions list')),
                      (
                          b'k',
                          b'keep',
                          False,
                          _(b"don't strip old nodes after edit is complete"),
                      ),
                      (b'', b'abort', False, _(b'abort an edit in progress')),
                      (b'o', b'outgoing', False, _(b'changesets not found in destination')),
                      (
                          b'f',
                          b'force',
                          False,
                          _(b'force outgoing even for unrelated repositories'),
                      ),
                      (b'r', b'rev', [], _(b'first revision to be edited'), _(b'REV')),
                  ]
                  + cmdutil.formatteropts,
                  _(b"[OPTIONS] ([ANCESTOR] | --outgoing [URL])"),
                  helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
              )
              def histedit(ui, repo, *freeargs, **opts):
                  """interactively edit changeset history
                  This command lets you edit a linear series of changesets (up to
                  and including the working directory, which should be clean).
                  You can:
                  - `pick` to [re]order a changeset
                  - `drop` to omit changeset
                  - `mess` to reword the changeset commit message
                  - `fold` to combine it with the preceding changeset (using the later date)
                  - `roll` like fold, but discarding this commit's description and date
                  - `edit` to edit this changeset (preserving date)
                  - `base` to checkout changeset and apply further changesets from there
                  There are a number of ways to select the root changeset:
                  - Specify ANCESTOR directly
                  - Use --outgoing -- it will be the first linear changeset not
                    included in destination. (See :hg:`help config.paths.default-push`)
                  - Otherwise, the value from the "histedit.defaultrev" config option
                    is used as a revset to select the base revision when ANCESTOR is not
                    specified. The first revision returned by the revset is used. By
                    default, this selects the editable history that is unique to the
                    ancestry of the working directory.
                  .. container:: verbose
                     If you use --outgoing, this command will abort if there are ambiguous
                     outgoing revisions. For example, if there are multiple branches
                     containing outgoing revisions.
                     Use "min(outgoing() and ::.)" or similar revset specification
                     instead of --outgoing to specify edit target revision exactly in
                     such ambiguous situation. See :hg:`help revsets` for detail about
                     selecting revisions.
                  .. container:: verbose
                     Examples:
                       - A number of changes have been made.
                         Revision 3 is no longer needed.
                         Start history editing from revision 3::
                           hg histedit -r 3
                         An editor opens, containing the list of revisions,
                         with specific actions specified::
                           pick 5339bf82f0ca 3 Zworgle the foobar
                           pick 8ef592ce7cc4 4 Bedazzle the zerlog
                           pick 0a9639fcda9d 5 Morgify the cromulancy
                         Additional information about the possible actions
                         to take appears below the list of revisions.
                         To remove revision 3 from the history,
                         its action (at the beginning of the relevant line)
                         is changed to 'drop'::
                           drop 5339bf82f0ca 3 Zworgle the foobar
                           pick 8ef592ce7cc4 4 Bedazzle the zerlog
                           pick 0a9639fcda9d 5 Morgify the cromulancy
                       - A number of changes have been made.
                         Revision 2 and 4 need to be swapped.
                         Start history editing from revision 2::
                           hg histedit -r 2
                         An editor opens, containing the list of revisions,
                         with specific actions specified::
                           pick 252a1af424ad 2 Blorb a morgwazzle
                           pick 5339bf82f0ca 3 Zworgle the foobar
                           pick 8ef592ce7cc4 4 Bedazzle the zerlog
                         To swap revision 2 and 4, its lines are swapped
                         in the editor::
                           pick 8ef592ce7cc4 4 Bedazzle the zerlog
                           pick 5339bf82f0ca 3 Zworgle the foobar
                           pick 252a1af424ad 2 Blorb a morgwazzle
                  Returns 0 on success, 1 if user intervention is required (not only
                  for intentional "edit" command, but also for resolving unexpected
                  conflicts).
                  """
                  # kludge: _chistedit only works for starting an edit, not aborting
                  # or continuing, so fall back to regular _texthistedit for those
                  # operations.
                  if (
                      ui.interface(b'histedit') == b'curses'
                      and _getgoal(pycompat.byteskwargs(opts)) == goalnew
                  ):
                      return _chistedit(ui, repo, *freeargs, **opts)
                  return _texthistedit(ui, repo, *freeargs, **opts)
              def _texthistedit(ui, repo, *freeargs, **opts):
                  state = histeditstate(repo)
                  with repo.wlock() as wlock, repo.lock() as lock:
                      state.wlock = wlock
                      state.lock = lock
                      _histedit(ui, repo, state, *freeargs, **opts)
              goalcontinue = b'continue'
              goalabort = b'abort'
              goaleditplan = b'edit-plan'
              goalnew = b'new'
              def _getgoal(opts):
                  if opts.get(b'continue'):
                      return goalcontinue
                  if opts.get(b'abort'):
                      return goalabort
                  if opts.get(b'edit_plan'):
                      return goaleditplan
                  return goalnew
              def _readfile(ui, path):
                  if path == b'-':
                      with ui.timeblockedsection(b'histedit'):
                          return ui.fin.read()
                  else:
                      with open(path, b'rb') as f:
                          return f.read()
              def _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs):
                  # TODO only abort if we try to histedit mq patches, not just
                  # blanket if mq patches are applied somewhere
                  mq = getattr(repo, 'mq', None)
                  if mq and mq.applied:
                      raise error.Abort(_(b'source has mq patches applied'))
                  # basic argument incompatibility processing
                  outg = opts.get(b'outgoing')
                  editplan = opts.get(b'edit_plan')
                  abort = opts.get(b'abort')
                  force = opts.get(b'force')
                  if force and not outg:
                      raise error.Abort(_(b'--force only allowed with --outgoing'))
                  if goal == b'continue':
                      if any((outg, abort, revs, freeargs, rules, editplan)):
                          raise error.Abort(_(b'no arguments allowed with --continue'))
                  elif goal == b'abort':
                      if any((outg, revs, freeargs, rules, editplan)):
                          raise error.Abort(_(b'no arguments allowed with --abort'))
                  elif goal == b'edit-plan':
                      if any((outg, revs, freeargs)):
                          raise error.Abort(
                              _(b'only --commands argument allowed with --edit-plan')
                          )
                  else:
                      if state.inprogress():
                          raise error.Abort(
                              _(
                                  b'history edit already in progress, try '
                                  b'--continue or --abort'
                              )
                          )
                      if outg:
                          if revs:
                              raise error.Abort(_(b'no revisions allowed with --outgoing'))
                          if len(freeargs) > 1:
                              raise error.Abort(
                                  _(b'only one repo argument allowed with --outgoing')
                              )
                      else:
                          revs.extend(freeargs)
                          if len(revs) == 0:
                              defaultrev = destutil.desthistedit(ui, repo)
                              if defaultrev is not None:
                                  revs.append(defaultrev)
                          if len(revs) != 1:
                              raise error.Abort(
                                  _(b'histedit requires exactly one ancestor revision')
                              )
              def _histedit(ui, repo, state, *freeargs, **opts):
                  opts = pycompat.byteskwargs(opts)
                  fm = ui.formatter(b'histedit', opts)
                  fm.startitem()
                  goal = _getgoal(opts)
                  revs = opts.get(b'rev', [])
                  nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
                  rules = opts.get(b'commands', b'')
                  state.keep = opts.get(b'keep', False)
                  _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
                  hastags = False
                  if revs:
                      revs = scmutil.revrange(repo, revs)
                      ctxs = [repo[rev] for rev in revs]
                      for ctx in ctxs:
                          tags = [tag for tag in ctx.tags() if tag != b'tip']
                          if not hastags:
                              hastags = len(tags)
                  if hastags:
                      if ui.promptchoice(
                          _(
                              b'warning: tags associated with the given'
                              b' changeset will be lost after histedit.\n'
                              b'do you want to continue (yN)? $$ &Yes $$ &No'
                          ),
                          default=1,
                      ):
                          raise error.Abort(_(b'histedit cancelled\n'))
                  # rebuild state
                  if goal == goalcontinue:
                      state.read()
                      state = bootstrapcontinue(ui, state, opts)
                  elif goal == goaleditplan:
                      _edithisteditplan(ui, repo, state, rules)
                      return
                  elif goal == goalabort:
                      _aborthistedit(ui, repo, state, nobackup=nobackup)
                      return
                  else:
                      # goal == goalnew
                      _newhistedit(ui, repo, state, revs, freeargs, opts)
                  _continuehistedit(ui, repo, state)
                  _finishhistedit(ui, repo, state, fm)
                  fm.end()
              def _continuehistedit(ui, repo, state):
                  """This function runs after either:
                  - bootstrapcontinue (if the goal is 'continue')
                  - _newhistedit (if the goal is 'new')
                  """
                  # preprocess rules so that we can hide inner folds from the user
                  # and only show one editor
                  actions = state.actions[:]
                  for idx, (action, nextact) in enumerate(zip(actions, actions[1:] + [None])):
                      if action.verb == b'fold' and nextact and nextact.verb == b'fold':
                          state.actions[idx].__class__ = _multifold
                  # Force an initial state file write, so the user can run --abort/continue
                  # even if there's an exception before the first transaction serialize.
                  state.write()
                  tr = None
                  # Don't use singletransaction by default since it rolls the entire
                  # transaction back if an unexpected exception happens (like a
                  # pretxncommit hook throws, or the user aborts the commit msg editor).
                  if ui.configbool(b"histedit", b"singletransaction"):
                      # Don't use a 'with' for the transaction, since actions may close
                      # and reopen a transaction. For example, if the action executes an
                      # external process it may choose to commit the transaction first.
                      tr = repo.transaction(b'histedit')
                  progress = ui.makeprogress(
                      _(b"editing"), unit=_(b'changes'), total=len(state.actions)
                  )
                  with progress, util.acceptintervention(tr):
                      while state.actions:
                          state.write(tr=tr)
                          actobj = state.actions[0]
                          progress.increment(item=actobj.torule())
                          ui.debug(
                              b'histedit: processing %s %s\n' % (actobj.verb, actobj.torule())
                          )
                          parentctx, replacement_ = actobj.run()
                          state.parentctxnode = parentctx.node()
                          state.replacements.extend(replacement_)
                          state.actions.pop(0)
                  state.write()
              def _finishhistedit(ui, repo, state, fm):
                  """This action runs when histedit is finishing its session"""
                  hg.updaterepo(repo, state.parentctxnode, overwrite=False)
                  mapping, tmpnodes, created, ntm = processreplacement(state)
                  if mapping:
                      for prec, succs in pycompat.iteritems(mapping):
                          if not succs:
                              ui.debug(b'histedit: %s is dropped\n' % node.short(prec))
                          else:
                              ui.debug(
                                  b'histedit: %s is replaced by %s\n'
                                  % (node.short(prec), node.short(succs[0]))
                              )
                              if len(succs) > 1:
                                  m = b'histedit:                            %s'
                                  for n in succs[1:]:
                                      ui.debug(m % node.short(n))
                  if not state.keep:
                      if mapping:
                          movetopmostbookmarks(repo, state.topmost, ntm)
                          # TODO update mq state
                  else:
                      mapping = {}
                  for n in tmpnodes:
                      if n in repo:
                          mapping[n] = ()
                  # remove entries about unknown nodes
                  has_node = repo.unfiltered().changelog.index.has_node
                  mapping = {
                      k: v
                      for k, v in mapping.items()
                      if has_node(k) and all(has_node(n) for n in v)
                  }
                  scmutil.cleanupnodes(repo, mapping, b'histedit')
                  hf = fm.hexfunc
                  fl = fm.formatlist
                  fd = fm.formatdict
                  nodechanges = fd(
                      {
                          hf(oldn): fl([hf(n) for n in newn], name=b'node')
                          for oldn, newn in pycompat.iteritems(mapping)
                      },
                      key=b"oldnode",
                      value=b"newnodes",
                  )
                  fm.data(nodechanges=nodechanges)
                  state.clear()
                  if os.path.exists(repo.sjoin(b'undo')):
                      os.unlink(repo.sjoin(b'undo'))
                  if repo.vfs.exists(b'histedit-last-edit.txt'):
                      repo.vfs.unlink(b'histedit-last-edit.txt')
              def _aborthistedit(ui, repo, state, nobackup=False):
                  try:
                      state.read()
                      __, leafs, tmpnodes, __ = processreplacement(state)
                      ui.debug(b'restore wc to old parent %s\n' % node.short(state.topmost))
                      # Recover our old commits if necessary
                      if not state.topmost in repo and state.backupfile:
                          backupfile = repo.vfs.join(state.backupfile)
                          f = hg.openpath(ui, backupfile)
                          gen = exchange.readbundle(ui, f, backupfile)
                          with repo.transaction(b'histedit.abort') as tr:
                              bundle2.applybundle(
                                  repo,
                                  gen,
                                  tr,
                                  source=b'histedit',
                                  url=b'bundle:' + backupfile,
                              )
                          os.remove(backupfile)
                      # check whether we should update away
                      if repo.unfiltered().revs(
                          b'parents() and (%n  or %ln::)',
                          state.parentctxnode,
                          leafs | tmpnodes,
                      ):
                          hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
                      cleanupnode(ui, repo, tmpnodes, nobackup=nobackup)
                      cleanupnode(ui, repo, leafs, nobackup=nobackup)
                  except Exception:
                      if state.inprogress():
                          ui.warn(
                              _(
                                  b'warning: encountered an exception during histedit '
                                  b'--abort; the repository may not have been completely '
                                  b'cleaned up\n'
                              )
                          )
                      raise
                  finally:
                      state.clear()
              def hgaborthistedit(ui, repo):
                  state = histeditstate(repo)
                  nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
                  with repo.wlock() as wlock, repo.lock() as lock:
                      state.wlock = wlock
                      state.lock = lock
                      _aborthistedit(ui, repo, state, nobackup=nobackup)
              def _edithisteditplan(ui, repo, state, rules):
                  state.read()
                  if not rules:
                      comment = geteditcomment(
                          ui, node.short(state.parentctxnode), node.short(state.topmost)
                      )
                      rules = ruleeditor(repo, ui, state.actions, comment)
                  else:
                      rules = _readfile(ui, rules)
                  actions = parserules(rules, state)
                  ctxs = [repo[act.node] for act in state.actions if act.node]
                  warnverifyactions(ui, repo, actions, state, ctxs)
                  state.actions = actions
                  state.write()
              def _newhistedit(ui, repo, state, revs, freeargs, opts):
                  outg = opts.get(b'outgoing')
                  rules = opts.get(b'commands', b'')
                  force = opts.get(b'force')
                  cmdutil.checkunfinished(repo)
                  cmdutil.bailifchanged(repo)
                  topmost = repo.dirstate.p1()
                  if outg:
                      if freeargs:
                          remote = freeargs[0]
                      else:
                          remote = None
                      root = findoutgoing(ui, repo, remote, force, opts)
                  else:
                      rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
                      if len(rr) != 1:
                          raise error.Abort(
                              _(
                                  b'The specified revisions must have '
                                  b'exactly one common root'
                              )
                          )
                      root = rr[0].node()
                  revs = between(repo, root, topmost, state.keep)
                  if not revs:
                      raise error.Abort(
                          _(b'%s is not an ancestor of working directory') % node.short(root)
                      )
                  ctxs = [repo[r] for r in revs]
                  wctx = repo[None]
                  # Please don't ask me why `ancestors` is this value. I figured it
                  # out with print-debugging, not by actually understanding what the
                  # merge code is doing. :(
                  ancs = [repo[b'.']]
                  # Sniff-test to make sure we won't collide with untracked files in
                  # the working directory. If we don't do this, we can get a
                  # collision after we've started histedit and backing out gets ugly
                  # for everyone, especially the user.
                  for c in [ctxs[0].p1()] + ctxs:
                      try:
                          mergemod.calculateupdates(
                              repo,
                              wctx,
                              c,
                              ancs,
                              # These parameters were determined by print-debugging
                              # what happens later on inside histedit.
                              branchmerge=False,
                              force=False,
                              acceptremote=False,
                              followcopies=False,
                          )
                      except error.Abort:
                          raise error.Abort(
                              _(
                                  b"untracked files in working directory conflict with files in %s"
                              )
                              % c
                          )
                  if not rules:
                      comment = geteditcomment(ui, node.short(root), node.short(topmost))
                      actions = [pick(state, r) for r in revs]
                      rules = ruleeditor(repo, ui, actions, comment)
                  else:
                      rules = _readfile(ui, rules)
                  actions = parserules(rules, state)
                  warnverifyactions(ui, repo, actions, state, ctxs)
                  parentctxnode = repo[root].p1().node()
                  state.parentctxnode = parentctxnode
                  state.actions = actions
                  state.topmost = topmost
                  state.replacements = []
                  ui.log(
                      b"histedit",
                      b"%d actions to histedit\n",
                      len(actions),
                      histedit_num_actions=len(actions),
                  )
                  # Create a backup so we can always abort completely.
                  backupfile = None
                  if not obsolete.isenabled(repo, obsolete.createmarkersopt):
                      backupfile = repair.backupbundle(
                          repo, [parentctxnode], [topmost], root, b'histedit'
                      )
                  state.backupfile = backupfile
              def _getsummary(ctx):
                  # a common pattern is to extract the summary but default to the empty
                  # string
                  summary = ctx.description() or b''
                  if summary:
                      summary = summary.splitlines()[0]
                  return summary
              def bootstrapcontinue(ui, state, opts):
                  repo = state.repo
                  ms = mergemod.mergestate.read(repo)
                  mergeutil.checkunresolved(ms)
                  if state.actions:
                      actobj = state.actions.pop(0)
                      if _isdirtywc(repo):
                          actobj.continuedirty()
                          if _isdirtywc(repo):
                              abortdirty()
                      parentctx, replacements = actobj.continueclean()
                      state.parentctxnode = parentctx.node()
                      state.replacements.extend(replacements)
                  return state
              def between(repo, old, new, keep):
                  """select and validate the set of revision to edit
                  When keep is false, the specified set can't have children."""
                  revs = repo.revs(b'%n::%n', old, new)
                  if revs and not keep:
                      if not obsolete.isenabled(
                          repo, obsolete.allowunstableopt
                      ) and repo.revs(b'(%ld::) - (%ld)', revs, revs):
                          raise error.Abort(
                              _(
                                  b'can only histedit a changeset together '
                                  b'with all its descendants'
                              )
                          )
                      if repo.revs(b'(%ld) and merge()', revs):
                          raise error.Abort(_(b'cannot edit history that contains merges'))
                      root = repo[revs.first()]  # list is already sorted by repo.revs()
                      if not root.mutable():
                          raise error.Abort(
                              _(b'cannot edit public changeset: %s') % root,
                              hint=_(b"see 'hg help phases' for details"),
                          )
                  return pycompat.maplist(repo.changelog.node, revs)
              def ruleeditor(repo, ui, actions, editcomment=b""):
                  """open an editor to edit rules
                  rules are in the format [ [act, ctx], ...] like in state.rules
                  """
                  if repo.ui.configbool(b"experimental", b"histedit.autoverb"):
                      newact = util.sortdict()
                      for act in actions:
                          ctx = repo[act.node]
                          summary = _getsummary(ctx)
                          fword = summary.split(b' ', 1)[0].lower()
                          added = False
                          # if it doesn't end with the special character '!' just skip this
                          if fword.endswith(b'!'):
                              fword = fword[:-1]
                              if fword in primaryactions | secondaryactions | tertiaryactions:
                                  act.verb = fword
                                  # get the target summary
                                  tsum = summary[len(fword) + 1 :].lstrip()
                                  # safe but slow: reverse iterate over the actions so we
                                  # don't clash on two commits having the same summary
                                  for na, l in reversed(list(pycompat.iteritems(newact))):
                                      actx = repo[na.node]
                                      asum = _getsummary(actx)
                                      if asum == tsum:
                                          added = True
                                          l.append(act)
                                          break
                          if not added:
                              newact[act] = []
                      # copy over and flatten the new list
                      actions = []
                      for na, l in pycompat.iteritems(newact):
                          actions.append(na)
                          actions += l
                  rules = b'\n'.join([act.torule() for act in actions])
                  rules += b'\n\n'
                  rules += editcomment
                  rules = ui.edit(
                      rules,
                      ui.username(),
                      {b'prefix': b'histedit'},
                      repopath=repo.path,
                      action=b'histedit',
                  )
                  # Save edit rules in .hg/histedit-last-edit.txt in case
                  # the user needs to ask for help after something
                  # surprising happens.
                  with repo.vfs(b'histedit-last-edit.txt', b'wb') as f:
                      f.write(rules)
                  return rules
              def parserules(rules, state):
                  """Read the histedit rules string and return list of action objects """
                  rules = [
                      l
                      for l in (r.strip() for r in rules.splitlines())
                      if l and not l.startswith(b'#')
                  ]
                  actions = []
                  for r in rules:
                      if b' ' not in r:
                          raise error.ParseError(_(b'malformed line "%s"') % r)
                      verb, rest = r.split(b' ', 1)
                      if verb not in actiontable:
                          raise error.ParseError(_(b'unknown action "%s"') % verb)
                      action = actiontable[verb].fromrule(state, rest)
                      actions.append(action)
                  return actions
              def warnverifyactions(ui, repo, actions, state, ctxs):
                  try:
                      verifyactions(actions, state, ctxs)
                  except error.ParseError:
                      if repo.vfs.exists(b'histedit-last-edit.txt'):
                          ui.warn(
                              _(
                                  b'warning: histedit rules saved '
                                  b'to: .hg/histedit-last-edit.txt\n'
                              )
                          )
                      raise
              def verifyactions(actions, state, ctxs):
                  """Verify that there exists exactly one action per given changeset and
                  other constraints.
                  Will abort if there are to many or too few rules, a malformed rule,
                  or a rule on a changeset outside of the user-given range.
                  """
                  expected = set(c.node() for c in ctxs)
                  seen = set()
                  prev = None
                  if actions and actions[0].verb in [b'roll', b'fold']:
                      raise error.ParseError(
                          _(b'first changeset cannot use verb "%s"') % actions[0].verb
                      )
                  for action in actions:
                      action.verify(prev, expected, seen)
                      prev = action
                      if action.node is not None:
                          seen.add(action.node)
                  missing = sorted(expected - seen)  # sort to stabilize output
                  if state.repo.ui.configbool(b'histedit', b'dropmissing'):
                      if len(actions) == 0:
                          raise error.ParseError(
                              _(b'no rules provided'),
                              hint=_(b'use strip extension to remove commits'),
                          )
                      drops = [drop(state, n) for n in missing]
                      # put the in the beginning so they execute immediately and
                      # don't show in the edit-plan in the future
                      actions[:0] = drops
                  elif missing:
                      raise error.ParseError(
                          _(b'missing rules for changeset %s') % node.short(missing[0]),
                          hint=_(
                              b'use "drop %s" to discard, see also: '
                              b"'hg help -e histedit.config'"
                          )
                          % node.short(missing[0]),
                      )
              def adjustreplacementsfrommarkers(repo, oldreplacements):
                  """Adjust replacements from obsolescence markers
                  Replacements structure is originally generated based on
                  histedit's state and does not account for changes that are
                  not recorded there. This function fixes that by adding
                  data read from obsolescence markers"""
                  if not obsolete.isenabled(repo, obsolete.createmarkersopt):
                      return oldreplacements
                  unfi = repo.unfiltered()
                  get_rev = unfi.changelog.index.get_rev
                  obsstore = repo.obsstore
                  newreplacements = list(oldreplacements)
                  oldsuccs = [r[1] for r in oldreplacements]
                  # successors that have already been added to succstocheck once
                  seensuccs = set().union(
                      *oldsuccs
                  )  # create a set from an iterable of tuples
                  succstocheck = list(seensuccs)
                  while succstocheck:
                      n = succstocheck.pop()
                      missing = get_rev(n) is None
                      markers = obsstore.successors.get(n, ())
                      if missing and not markers:
                          # dead end, mark it as such
                          newreplacements.append((n, ()))
                      for marker in markers:
                          nsuccs = marker[1]
                          newreplacements.append((n, nsuccs))
                          for nsucc in nsuccs:
                              if nsucc not in seensuccs:
                                  seensuccs.add(nsucc)
                                  succstocheck.append(nsucc)
                  return newreplacements
              def processreplacement(state):
                  """process the list of replacements to return
 ) the final mapping between original and created nodes
 ) the list of temporary node created by histedit
 ) the list of new commit created by histedit"""
                  replacements = adjustreplacementsfrommarkers(state.repo, state.replacements)
                  allsuccs = set()
                  replaced = set()
                  fullmapping = {}
                  # initialize basic set
                  # fullmapping records all operations recorded in replacement
                  for rep in replacements:
                      allsuccs.update(rep[1])
                      replaced.add(rep[0])
                      fullmapping.setdefault(rep[0], set()).update(rep[1])
                  new = allsuccs - replaced
                  tmpnodes = allsuccs & replaced
                  # Reduce content fullmapping into direct relation between original nodes
                  # and final node created during history edition
                  # Dropped changeset are replaced by an empty list
                  toproceed = set(fullmapping)
                  final = {}
                  while toproceed:
                      for x in list(toproceed):
                          succs = fullmapping[x]
                          for s in list(succs):
                              if s in toproceed:
                                  # non final node with unknown closure
                                  # We can't process this now
                                  break
                              elif s in final:
                                  # non final node, replace with closure
                                  succs.remove(s)
                                  succs.update(final[s])
                          else:
                              final[x] = succs
                              toproceed.remove(x)
                  # remove tmpnodes from final mapping
                  for n in tmpnodes:
                      del final[n]
                  # we expect all changes involved in final to exist in the repo
                  # turn `final` into list (topologically sorted)
                  get_rev = state.repo.changelog.index.get_rev
                  for prec, succs in final.items():
                      final[prec] = sorted(succs, key=get_rev)
                  # computed topmost element (necessary for bookmark)
                  if new:
                      newtopmost = sorted(new, key=state.repo.changelog.rev)[-1]
                  elif not final:
                      # Nothing rewritten at all. we won't need `newtopmost`
                      # It is the same as `oldtopmost` and `processreplacement` know it
                      newtopmost = None
                  else:
                      # every body died. The newtopmost is the parent of the root.
                      r = state.repo.changelog.rev
                      newtopmost = state.repo[sorted(final, key=r)[0]].p1().node()
                  return final, tmpnodes, new, newtopmost
              def movetopmostbookmarks(repo, oldtopmost, newtopmost):
                  """Move bookmark from oldtopmost to newly created topmost
                  This is arguably a feature and we may only want that for the active
                  bookmark. But the behavior is kept compatible with the old version for now.
                  """
                  if not oldtopmost or not newtopmost:
                      return
                  oldbmarks = repo.nodebookmarks(oldtopmost)
                  if oldbmarks:
                      with repo.lock(), repo.transaction(b'histedit') as tr:
                          marks = repo._bookmarks
                          changes = []
                          for name in oldbmarks:
                              changes.append((name, newtopmost))
                          marks.applychanges(repo, tr, changes)
              def cleanupnode(ui, repo, nodes, nobackup=False):
                  """strip a group of nodes from the repository
                  The set of node to strip may contains unknown nodes."""
                  with repo.lock():
                      # do not let filtering get in the way of the cleanse
                      # we should probably get rid of obsolescence marker created during the
                      # histedit, but we currently do not have such information.
                      repo = repo.unfiltered()
                      # Find all nodes that need to be stripped
                      # (we use %lr instead of %ln to silently ignore unknown items)
                      has_node = repo.changelog.index.has_node
                      nodes = sorted(n for n in nodes if has_node(n))
                      roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)]
                      if roots:
                          backup = not nobackup
                          repair.strip(ui, repo, roots, backup=backup)
              def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
-                 if isinstance(nodelist, str):
+                 if isinstance(nodelist, bytes):
                      nodelist = [nodelist]
                  state = histeditstate(repo)
                  if state.inprogress():
                      state.read()
                      histedit_nodes = {
                          action.node for action in state.actions if action.node
                      }
                      common_nodes = histedit_nodes & set(nodelist)
                      if common_nodes:
                          raise error.Abort(
                              _(b"histedit in progress, can't strip %s")
                              % b', '.join(node.short(x) for x in common_nodes)
                          )
                  return orig(ui, repo, nodelist, *args, **kwargs)
              extensions.wrapfunction(repair, b'strip', stripwrapper)
              def summaryhook(ui, repo):
                  state = histeditstate(repo)
                  if not state.inprogress():
                      return
                  state.read()
                  if state.actions:
                      # i18n: column positioning for "hg summary"
                      ui.write(
                          _(b'hist:   %s (histedit --continue)\n')
                          % (
                              ui.label(_(b'%d remaining'), b'histedit.remaining')
                              % len(state.actions)
                          )
                      )
              def extsetup(ui):
                  cmdutil.summaryhooks.add(b'histedit', summaryhook)
                  statemod.addunfinished(
                      b'histedit',
                      fname=b'histedit-state',
                      allowcommit=True,
                      continueflag=True,
                      abortfunc=hgaborthistedit,
                  )

hgext/win32mbcs.py

0 +1 -1

              # win32mbcs.py -- MBCS filename support for Mercurial
              #
              # Copyright (c) 2008 Shun-ichi Goto <shunichi.goto@gmail.com>
              #
              # Version: 0.3
              # Author:  Shun-ichi Goto <shunichi.goto@gmail.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              #
              '''allow the use of MBCS paths with problematic encodings
              Some MBCS encodings are not good for some path operations (i.e.
              splitting path, case conversion, etc.) with its encoded bytes. We call
              such a encoding (i.e. shift_jis and big5) as "problematic encoding".
              This extension can be used to fix the issue with those encodings by
              wrapping some functions to convert to Unicode string before path
              operation.
              This extension is useful for:
              - Japanese Windows users using shift_jis encoding.
              - Chinese Windows users using big5 encoding.
              - All users who use a repository with one of problematic encodings on
                case-insensitive file system.
              This extension is not needed for:
              - Any user who use only ASCII chars in path.
              - Any user who do not use any of problematic encodings.
              Note that there are some limitations on using this extension:
              - You should use single encoding in one repository.
              - If the repository path ends with 0x5c, .hg/hgrc cannot be read.
              - win32mbcs is not compatible with fixutf8 extension.
              By default, win32mbcs uses encoding.encoding decided by Mercurial.
              You can specify the encoding by config option::
               [win32mbcs]
               encoding = sjis
              It is useful for the users who want to commit with UTF-8 log message.
              '''
              from __future__ import absolute_import
              import os
              import sys
              from mercurial.i18n import _
              from mercurial.pycompat import getattr, setattr
              from mercurial import (
                  encoding,
                  error,
                  pycompat,
                  registrar,
              )
              # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
              # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
              # be specifying the version(s) of Mercurial they are tested with, or
              # leave the attribute unspecified.
              testedwith = b'ships-with-hg-core'
              configtable = {}
              configitem = registrar.configitem(configtable)
              # Encoding.encoding may be updated by --encoding option.
              # Use a lambda do delay the resolution.
              configitem(
                  b'win32mbcs', b'encoding', default=lambda: encoding.encoding,
              )
              _encoding = None  # see extsetup
              def decode(arg):
-                 if isinstance(arg, str):
+                 if isinstance(arg, bytes):
                      uarg = arg.decode(_encoding)
                      if arg == uarg.encode(_encoding):
                          return uarg
                      raise UnicodeError(b"Not local encoding")
                  elif isinstance(arg, tuple):
                      return tuple(map(decode, arg))
                  elif isinstance(arg, list):
                      return map(decode, arg)
                  elif isinstance(arg, dict):
                      for k, v in arg.items():
                          arg[k] = decode(v)
                  return arg
              def encode(arg):
                  if isinstance(arg, pycompat.unicode):
                      return arg.encode(_encoding)
                  elif isinstance(arg, tuple):
                      return tuple(map(encode, arg))
                  elif isinstance(arg, list):
                      return map(encode, arg)
                  elif isinstance(arg, dict):
                      for k, v in arg.items():
                          arg[k] = encode(v)
                  return arg
              def appendsep(s):
                  # ensure the path ends with os.sep, appending it if necessary.
                  try:
                      us = decode(s)
                  except UnicodeError:
                      us = s
                  if us and us[-1] not in b':/\\':
                      s += pycompat.ossep
                  return s
              def basewrapper(func, argtype, enc, dec, args, kwds):
                  # check check already converted, then call original
                  for arg in args:
                      if isinstance(arg, argtype):
                          return func(*args, **kwds)
                  try:
                      # convert string arguments, call func, then convert back the
                      # return value.
                      return enc(func(*dec(args), **dec(kwds)))
                  except UnicodeError:
                      raise error.Abort(
                          _(b"[win32mbcs] filename conversion failed with %s encoding\n")
                          % _encoding
                      )
              def wrapper(func, args, kwds):
                  return basewrapper(func, pycompat.unicode, encode, decode, args, kwds)
              def reversewrapper(func, args, kwds):
                  return basewrapper(func, str, decode, encode, args, kwds)
              def wrapperforlistdir(func, args, kwds):
                  # Ensure 'path' argument ends with os.sep to avoids
                  # misinterpreting last 0x5c of MBCS 2nd byte as path separator.
                  if args:
                      args = list(args)
                      args[0] = appendsep(args[0])
                  if b'path' in kwds:
                      kwds[b'path'] = appendsep(kwds[b'path'])
                  return func(*args, **kwds)
              def wrapname(name, wrapper):
                  module, name = name.rsplit(b'.', 1)
                  module = sys.modules[module]
                  func = getattr(module, name)
                  def f(*args, **kwds):
                      return wrapper(func, args, kwds)
                  f.__name__ = func.__name__
                  setattr(module, name, f)
              # List of functions to be wrapped.
              # NOTE: os.path.dirname() and os.path.basename() are safe because
              #       they use result of os.path.split()
              funcs = b'''os.path.join os.path.split os.path.splitext
               os.path.normpath os.makedirs mercurial.util.endswithsep
               mercurial.util.splitpath mercurial.util.fscasesensitive
               mercurial.util.fspath mercurial.util.pconvert mercurial.util.normpath
               mercurial.util.checkwinfilename mercurial.util.checkosfilename
               mercurial.util.split'''
              # These functions are required to be called with local encoded string
              # because they expects argument is local encoded string and cause
              # problem with unicode string.
              rfuncs = b'''mercurial.encoding.upper mercurial.encoding.lower
               mercurial.util._filenamebytestr'''
              # List of Windows specific functions to be wrapped.
              winfuncs = b'''os.path.splitunc'''
              # codec and alias names of sjis and big5 to be faked.
              problematic_encodings = b'''big5 big5-tw csbig5 big5hkscs big5-hkscs
               hkscs cp932 932 ms932 mskanji ms-kanji shift_jis csshiftjis shiftjis
               sjis s_jis shift_jis_2004 shiftjis2004 sjis_2004 sjis2004
               shift_jisx0213 shiftjisx0213 sjisx0213 s_jisx0213 950 cp950 ms950 '''
              def extsetup(ui):
                  # TODO: decide use of config section for this extension
                  if (not os.path.supports_unicode_filenames) and (
                      pycompat.sysplatform != b'cygwin'
                  ):
                      ui.warn(_(b"[win32mbcs] cannot activate on this platform.\n"))
                      return
                  # determine encoding for filename
                  global _encoding
                  _encoding = ui.config(b'win32mbcs', b'encoding')
                  # fake is only for relevant environment.
                  if _encoding.lower() in problematic_encodings.split():
                      for f in funcs.split():
                          wrapname(f, wrapper)
                      if pycompat.iswindows:
                          for f in winfuncs.split():
                              wrapname(f, wrapper)
                      wrapname(b"mercurial.util.listdir", wrapperforlistdir)
                      wrapname(b"mercurial.windows.listdir", wrapperforlistdir)
                      # wrap functions to be called with local byte string arguments
                      for f in rfuncs.split():
                          wrapname(f, reversewrapper)
                      # Check sys.args manually instead of using ui.debug() because
                      # command line options is not yet applied when
                      # extensions.loadall() is called.
                      if b'--debug' in sys.argv:
                          ui.writenoi18n(
                              b"[win32mbcs] activated with encoding: %s\n" % _encoding
                          )

mercurial/hgweb/common.py

0 +1 -1

              # hgweb/common.py - Utility functions needed by hgweb_mod and hgwebdir_mod
              #
              # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
              # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import base64
              import errno
              import mimetypes
              import os
              import stat
              from ..pycompat import (
                  getattr,
                  open,
              )
              from .. import (
                  encoding,
                  pycompat,
                  util,
              )
              httpserver = util.httpserver
              HTTP_OK = 200
              HTTP_CREATED = 201
              HTTP_NOT_MODIFIED = 304
              HTTP_BAD_REQUEST = 400
              HTTP_UNAUTHORIZED = 401
              HTTP_FORBIDDEN = 403
              HTTP_NOT_FOUND = 404
              HTTP_METHOD_NOT_ALLOWED = 405
              HTTP_NOT_ACCEPTABLE = 406
              HTTP_UNSUPPORTED_MEDIA_TYPE = 415
              HTTP_SERVER_ERROR = 500
              def ismember(ui, username, userlist):
                  """Check if username is a member of userlist.
                  If userlist has a single '*' member, all users are considered members.
                  Can be overridden by extensions to provide more complex authorization
                  schemes.
                  """
                  return userlist == [b'*'] or username in userlist
              def checkauthz(hgweb, req, op):
                  '''Check permission for operation based on request data (including
                  authentication info). Return if op allowed, else raise an ErrorResponse
                  exception.'''
                  user = req.remoteuser
                  deny_read = hgweb.configlist(b'web', b'deny_read')
                  if deny_read and (not user or ismember(hgweb.repo.ui, user, deny_read)):
                      raise ErrorResponse(HTTP_UNAUTHORIZED, b'read not authorized')
                  allow_read = hgweb.configlist(b'web', b'allow_read')
                  if allow_read and (not ismember(hgweb.repo.ui, user, allow_read)):
                      raise ErrorResponse(HTTP_UNAUTHORIZED, b'read not authorized')
                  if op == b'pull' and not hgweb.allowpull:
                      raise ErrorResponse(HTTP_UNAUTHORIZED, b'pull not authorized')
                  elif op == b'pull' or op is None:  # op is None for interface requests
                      return
                  # Allow LFS uploading via PUT requests
                  if op == b'upload':
                      if req.method != b'PUT':
                          msg = b'upload requires PUT request'
                          raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg)
                  # enforce that you can only push using POST requests
                  elif req.method != b'POST':
                      msg = b'push requires POST request'
                      raise ErrorResponse(HTTP_METHOD_NOT_ALLOWED, msg)
                  # require ssl by default for pushing, auth info cannot be sniffed
                  # and replayed
                  if hgweb.configbool(b'web', b'push_ssl') and req.urlscheme != b'https':
                      raise ErrorResponse(HTTP_FORBIDDEN, b'ssl required')
                  deny = hgweb.configlist(b'web', b'deny_push')
                  if deny and (not user or ismember(hgweb.repo.ui, user, deny)):
                      raise ErrorResponse(HTTP_UNAUTHORIZED, b'push not authorized')
                  allow = hgweb.configlist(b'web', b'allow-push')
                  if not (allow and ismember(hgweb.repo.ui, user, allow)):
                      raise ErrorResponse(HTTP_UNAUTHORIZED, b'push not authorized')
              # Hooks for hgweb permission checks; extensions can add hooks here.
              # Each hook is invoked like this: hook(hgweb, request, operation),
              # where operation is either read, pull, push or upload. Hooks should either
              # raise an ErrorResponse exception, or just return.
              #
              # It is possible to do both authentication and authorization through
              # this.
              permhooks = [checkauthz]
              class ErrorResponse(Exception):
                  def __init__(self, code, message=None, headers=None):
                      if message is None:
                          message = _statusmessage(code)
                      Exception.__init__(self, pycompat.sysstr(message))
                      self.code = code
                      if headers is None:
                          headers = []
                      self.headers = headers
                      self.message = message
              class continuereader(object):
                  """File object wrapper to handle HTTP 100-continue.
                  This is used by servers so they automatically handle Expect: 100-continue
                  request headers. On first read of the request body, the 100 Continue
                  response is sent. This should trigger the client into actually sending
                  the request body.
                  """
                  def __init__(self, f, write):
                      self.f = f
                      self._write = write
                      self.continued = False
                  def read(self, amt=-1):
                      if not self.continued:
                          self.continued = True
                          self._write(b'HTTP/1.1 100 Continue\r\n\r\n')
                      return self.f.read(amt)
                  def __getattr__(self, attr):
                      if attr in (b'close', b'readline', b'readlines', b'__iter__'):
                          return getattr(self.f, attr)
                      raise AttributeError
              def _statusmessage(code):
                  responses = httpserver.basehttprequesthandler.responses
                  return pycompat.bytesurl(responses.get(code, ('Error', 'Unknown error'))[0])
              def statusmessage(code, message=None):
                  return b'%d %s' % (code, message or _statusmessage(code))
              def get_stat(spath, fn):
                  """stat fn if it exists, spath otherwise"""
                  cl_path = os.path.join(spath, fn)
                  if os.path.exists(cl_path):
                      return os.stat(cl_path)
                  else:
                      return os.stat(spath)
              def get_mtime(spath):
                  return get_stat(spath, b"00changelog.i")[stat.ST_MTIME]
              def ispathsafe(path):
                  """Determine if a path is safe to use for filesystem access."""
                  parts = path.split(b'/')
                  for part in parts:
                      if (
                          part in (b'', pycompat.oscurdir, pycompat.ospardir)
                          or pycompat.ossep in part
                          or pycompat.osaltsep is not None
                          and pycompat.osaltsep in part
                      ):
                          return False
                  return True
              def staticfile(directory, fname, res):
                  """return a file inside directory with guessed Content-Type header
                  fname always uses '/' as directory separator and isn't allowed to
                  contain unusual path components.
                  Content-Type is guessed using the mimetypes module.
                  Return an empty string if fname is illegal or file not found.
                  """
                  if not ispathsafe(fname):
                      return
                  fpath = os.path.join(*fname.split(b'/'))
-                 if isinstance(directory, str):
+                 if isinstance(directory, bytes):
                      directory = [directory]
                  for d in directory:
                      path = os.path.join(d, fpath)
                      if os.path.exists(path):
                          break
                  try:
                      os.stat(path)
                      ct = pycompat.sysbytes(
                          mimetypes.guess_type(pycompat.fsdecode(path))[0] or r"text/plain"
                      )
                      with open(path, b'rb') as fh:
                          data = fh.read()
                      res.headers[b'Content-Type'] = ct
                      res.setbodybytes(data)
                      return res
                  except TypeError:
                      raise ErrorResponse(HTTP_SERVER_ERROR, b'illegal filename')
                  except OSError as err:
                      if err.errno == errno.ENOENT:
                          raise ErrorResponse(HTTP_NOT_FOUND)
                      else:
                          raise ErrorResponse(
                              HTTP_SERVER_ERROR, encoding.strtolocal(err.strerror)
                          )
              def paritygen(stripecount, offset=0):
                  """count parity of horizontal stripes for easier reading"""
                  if stripecount and offset:
                      # account for offset, e.g. due to building the list in reverse
                      count = (stripecount + offset) % stripecount
                      parity = (stripecount + offset) // stripecount & 1
                  else:
                      count = 0
                      parity = 0
                  while True:
                      yield parity
                      count += 1
                      if stripecount and count >= stripecount:
                          parity = 1 - parity
                          count = 0
              def get_contact(config):
                  """Return repo contact information or empty string.
                  web.contact is the primary source, but if that is not set, try
                  ui.username or $EMAIL as a fallback to display something useful.
                  """
                  return (
                      config(b"web", b"contact")
                      or config(b"ui", b"username")
                      or encoding.environ.get(b"EMAIL")
                      or b""
                  )
              def cspvalues(ui):
                  """Obtain the Content-Security-Policy header and nonce value.
                  Returns a 2-tuple of the CSP header value and the nonce value.
                  First value is ``None`` if CSP isn't enabled. Second value is ``None``
                  if CSP isn't enabled or if the CSP header doesn't need a nonce.
                  """
                  # Without demandimport, "import uuid" could have an immediate side-effect
                  # running "ldconfig" on Linux trying to find libuuid.
                  # With Python <= 2.7.12, that "ldconfig" is run via a shell and the shell
                  # may pollute the terminal with:
                  #
                  #   shell-init: error retrieving current directory: getcwd: cannot access
                  #   parent directories: No such file or directory
                  #
                  # Python >= 2.7.13 has fixed it by running "ldconfig" directly without a
                  # shell (hg changeset a09ae70f3489).
                  #
                  # Moved "import uuid" from here so it's executed after we know we have
                  # a sane cwd (i.e. after dispatch.py cwd check).
                  #
                  # We can move it back once we no longer need Python <= 2.7.12 support.
                  import uuid
                  # Don't allow untrusted CSP setting since it be disable protections
                  # from a trusted/global source.
                  csp = ui.config(b'web', b'csp', untrusted=False)
                  nonce = None
                  if csp and b'%nonce%' in csp:
                      nonce = base64.urlsafe_b64encode(uuid.uuid4().bytes).rstrip(b'=')
                      csp = csp.replace(b'%nonce%', nonce)
                  return csp, nonce

mercurial/hgweb/hgwebdir_mod.py

0 +1 -1

              # hgweb/hgwebdir_mod.py - Web interface for a directory of repositories.
              #
              # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
              # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import gc
              import os
              import time
              from ..i18n import _
              from .common import (
                  ErrorResponse,
                  HTTP_SERVER_ERROR,
                  cspvalues,
                  get_contact,
                  get_mtime,
                  ismember,
                  paritygen,
                  staticfile,
                  statusmessage,
              )
              from .. import (
                  configitems,
                  encoding,
                  error,
                  extensions,
                  hg,
                  pathutil,
                  profiling,
                  pycompat,
                  registrar,
                  scmutil,
                  templater,
                  templateutil,
                  ui as uimod,
                  util,
              )
              from . import (
                  hgweb_mod,
                  request as requestmod,
                  webutil,
                  wsgicgi,
              )
              from ..utils import dateutil
              def cleannames(items):
                  return [(util.pconvert(name).strip(b'/'), path) for name, path in items]
              def findrepos(paths):
                  repos = []
                  for prefix, root in cleannames(paths):
                      roothead, roottail = os.path.split(root)
                      # "foo = /bar/*" or "foo = /bar/**" lets every repo /bar/N in or below
                      # /bar/ be served as as foo/N .
                      # '*' will not search inside dirs with .hg (except .hg/patches),
                      # '**' will search inside dirs with .hg (and thus also find subrepos).
                      try:
                          recurse = {b'*': False, b'**': True}[roottail]
                      except KeyError:
                          repos.append((prefix, root))
                          continue
                      roothead = os.path.normpath(os.path.abspath(roothead))
                      paths = scmutil.walkrepos(roothead, followsym=True, recurse=recurse)
                      repos.extend(urlrepos(prefix, roothead, paths))
                  return repos
              def urlrepos(prefix, roothead, paths):
                  """yield url paths and filesystem paths from a list of repo paths
                  >>> conv = lambda seq: [(v, util.pconvert(p)) for v,p in seq]
                  >>> conv(urlrepos(b'hg', b'/opt', [b'/opt/r', b'/opt/r/r', b'/opt']))
                  [('hg/r', '/opt/r'), ('hg/r/r', '/opt/r/r'), ('hg', '/opt')]
                  >>> conv(urlrepos(b'', b'/opt', [b'/opt/r', b'/opt/r/r', b'/opt']))
                  [('r', '/opt/r'), ('r/r', '/opt/r/r'), ('', '/opt')]
                  """
                  for path in paths:
                      path = os.path.normpath(path)
                      yield (
                          prefix + b'/' + util.pconvert(path[len(roothead) :]).lstrip(b'/')
                      ).strip(b'/'), path
              def readallowed(ui, req):
                  """Check allow_read and deny_read config options of a repo's ui object
                  to determine user permissions.  By default, with neither option set (or
                  both empty), allow all users to read the repo.  There are two ways a
                  user can be denied read access:  (1) deny_read is not empty, and the
                  user is unauthenticated or deny_read contains user (or *), and (2)
                  allow_read is not empty and the user is not in allow_read.  Return True
                  if user is allowed to read the repo, else return False."""
                  user = req.remoteuser
                  deny_read = ui.configlist(b'web', b'deny_read', untrusted=True)
                  if deny_read and (not user or ismember(ui, user, deny_read)):
                      return False
                  allow_read = ui.configlist(b'web', b'allow_read', untrusted=True)
                  # by default, allow reading if no allow_read option has been set
                  if not allow_read or ismember(ui, user, allow_read):
                      return True
                  return False
              def rawindexentries(ui, repos, req, subdir=b''):
                  descend = ui.configbool(b'web', b'descend')
                  collapse = ui.configbool(b'web', b'collapse')
                  seenrepos = set()
                  seendirs = set()
                  for name, path in repos:
                      if not name.startswith(subdir):
                          continue
                      name = name[len(subdir) :]
                      directory = False
                      if b'/' in name:
                          if not descend:
                              continue
                          nameparts = name.split(b'/')
                          rootname = nameparts[0]
                          if not collapse:
                              pass
                          elif rootname in seendirs:
                              continue
                          elif rootname in seenrepos:
                              pass
                          else:
                              directory = True
                              name = rootname
                              # redefine the path to refer to the directory
                              discarded = b'/'.join(nameparts[1:])
                              # remove name parts plus accompanying slash
                              path = path[: -len(discarded) - 1]
                              try:
                                  hg.repository(ui, path)
                                  directory = False
                              except (IOError, error.RepoError):
                                  pass
                      parts = [
                          req.apppath.strip(b'/'),
                          subdir.strip(b'/'),
                          name.strip(b'/'),
                      ]
                      url = b'/' + b'/'.join(p for p in parts if p) + b'/'
                      # show either a directory entry or a repository
                      if directory:
                          # get the directory's time information
                          try:
                              d = (get_mtime(path), dateutil.makedate()[1])
                          except OSError:
                              continue
                          # add '/' to the name to make it obvious that
                          # the entry is a directory, not a regular repository
                          row = {
                              b'contact': b"",
                              b'contact_sort': b"",
                              b'name': name + b'/',
                              b'name_sort': name,
                              b'url': url,
                              b'description': b"",
                              b'description_sort': b"",
                              b'lastchange': d,
                              b'lastchange_sort': d[1] - d[0],
                              b'archives': templateutil.mappinglist([]),
                              b'isdirectory': True,
                              b'labels': templateutil.hybridlist([], name=b'label'),
                          }
                          seendirs.add(name)
                          yield row
                          continue
                      u = ui.copy()
                      try:
                          u.readconfig(os.path.join(path, b'.hg', b'hgrc'))
                      except Exception as e:
                          u.warn(_(b'error reading %s/.hg/hgrc: %s\n') % (path, e))
                          continue
                      def get(section, name, default=uimod._unset):
                          return u.config(section, name, default, untrusted=True)
                      if u.configbool(b"web", b"hidden", untrusted=True):
                          continue
                      if not readallowed(u, req):
                          continue
                      # update time with local timezone
                      try:
                          r = hg.repository(ui, path)
                      except IOError:
                          u.warn(_(b'error accessing repository at %s\n') % path)
                          continue
                      except error.RepoError:
                          u.warn(_(b'error accessing repository at %s\n') % path)
                          continue
                      try:
                          d = (get_mtime(r.spath), dateutil.makedate()[1])
                      except OSError:
                          continue
                      contact = get_contact(get)
                      description = get(b"web", b"description")
                      seenrepos.add(name)
                      name = get(b"web", b"name", name)
                      labels = u.configlist(b'web', b'labels', untrusted=True)
                      row = {
                          b'contact': contact or b"unknown",
                          b'contact_sort': contact.upper() or b"unknown",
                          b'name': name,
                          b'name_sort': name,
                          b'url': url,
                          b'description': description or b"unknown",
                          b'description_sort': description.upper() or b"unknown",
                          b'lastchange': d,
                          b'lastchange_sort': d[1] - d[0],
                          b'archives': webutil.archivelist(u, b"tip", url),
                          b'isdirectory': None,
                          b'labels': templateutil.hybridlist(labels, name=b'label'),
                      }
                      yield row
              def _indexentriesgen(
                  context, ui, repos, req, stripecount, sortcolumn, descending, subdir
              ):
                  rows = rawindexentries(ui, repos, req, subdir=subdir)
                  sortdefault = None, False
                  if sortcolumn and sortdefault != (sortcolumn, descending):
                      sortkey = b'%s_sort' % sortcolumn
                      rows = sorted(rows, key=lambda x: x[sortkey], reverse=descending)
                  for row, parity in zip(rows, paritygen(stripecount)):
                      row[b'parity'] = parity
                      yield row
              def indexentries(
                  ui, repos, req, stripecount, sortcolumn=b'', descending=False, subdir=b''
              ):
                  args = (ui, repos, req, stripecount, sortcolumn, descending, subdir)
                  return templateutil.mappinggenerator(_indexentriesgen, args=args)
              class hgwebdir(object):
                  """HTTP server for multiple repositories.
                  Given a configuration, different repositories will be served depending
                  on the request path.
                  Instances are typically used as WSGI applications.
                  """
                  def __init__(self, conf, baseui=None):
                      self.conf = conf
                      self.baseui = baseui
                      self.ui = None
                      self.lastrefresh = 0
                      self.motd = None
                      self.refresh()
                      if not baseui:
                          # set up environment for new ui
                          extensions.loadall(self.ui)
                          extensions.populateui(self.ui)
                  def refresh(self):
                      if self.ui:
                          refreshinterval = self.ui.configint(b'web', b'refreshinterval')
                      else:
                          item = configitems.coreitems[b'web'][b'refreshinterval']
                          refreshinterval = item.default
                      # refreshinterval <= 0 means to always refresh.
                      if (
                          refreshinterval > 0
                          and self.lastrefresh + refreshinterval > time.time()
                      ):
                          return
                      if self.baseui:
                          u = self.baseui.copy()
                      else:
                          u = uimod.ui.load()
                          u.setconfig(b'ui', b'report_untrusted', b'off', b'hgwebdir')
                          u.setconfig(b'ui', b'nontty', b'true', b'hgwebdir')
                          # displaying bundling progress bar while serving feels wrong and may
                          # break some wsgi implementations.
                          u.setconfig(b'progress', b'disable', b'true', b'hgweb')
                      if not isinstance(self.conf, (dict, list, tuple)):
                          map = {b'paths': b'hgweb-paths'}
                          if not os.path.exists(self.conf):
                              raise error.Abort(_(b'config file %s not found!') % self.conf)
                          u.readconfig(self.conf, remap=map, trust=True)
                          paths = []
                          for name, ignored in u.configitems(b'hgweb-paths'):
                              for path in u.configlist(b'hgweb-paths', name):
                                  paths.append((name, path))
                      elif isinstance(self.conf, (list, tuple)):
                          paths = self.conf
                      elif isinstance(self.conf, dict):
                          paths = self.conf.items()
                      extensions.populateui(u)
                      repos = findrepos(paths)
                      for prefix, root in u.configitems(b'collections'):
                          prefix = util.pconvert(prefix)
                          for path in scmutil.walkrepos(root, followsym=True):
                              repo = os.path.normpath(path)
                              name = util.pconvert(repo)
                              if name.startswith(prefix):
                                  name = name[len(prefix) :]
                              repos.append((name.lstrip(b'/'), repo))
                      self.repos = repos
                      self.ui = u
                      encoding.encoding = self.ui.config(b'web', b'encoding')
                      self.style = self.ui.config(b'web', b'style')
                      self.templatepath = self.ui.config(
                          b'web', b'templates', untrusted=False
                      )
                      self.stripecount = self.ui.config(b'web', b'stripes')
                      if self.stripecount:
                          self.stripecount = int(self.stripecount)
                      prefix = self.ui.config(b'web', b'prefix')
                      if prefix.startswith(b'/'):
                          prefix = prefix[1:]
                      if prefix.endswith(b'/'):
                          prefix = prefix[:-1]
                      self.prefix = prefix
                      self.lastrefresh = time.time()
                  def run(self):
                      if not encoding.environ.get(b'GATEWAY_INTERFACE', b'').startswith(
                          b"CGI/1."
                      ):
                          raise RuntimeError(
                              b"This function is only intended to be "
                              b"called while running as a CGI script."
                          )
                      wsgicgi.launch(self)
                  def __call__(self, env, respond):
                      baseurl = self.ui.config(b'web', b'baseurl')
                      req = requestmod.parserequestfromenv(env, altbaseurl=baseurl)
                      res = requestmod.wsgiresponse(req, respond)
                      return self.run_wsgi(req, res)
                  def run_wsgi(self, req, res):
                      profile = self.ui.configbool(b'profiling', b'enabled')
                      with profiling.profile(self.ui, enabled=profile):
                          try:
                              for r in self._runwsgi(req, res):
                                  yield r
                          finally:
                              # There are known cycles in localrepository that prevent
                              # those objects (and tons of held references) from being
                              # collected through normal refcounting. We mitigate those
                              # leaks by performing an explicit GC on every request.
                              # TODO remove this once leaks are fixed.
                              # TODO only run this on requests that create localrepository
                              # instances instead of every request.
                              gc.collect()
                  def _runwsgi(self, req, res):
                      try:
                          self.refresh()
                          csp, nonce = cspvalues(self.ui)
                          if csp:
                              res.headers[b'Content-Security-Policy'] = csp
                          virtual = req.dispatchpath.strip(b'/')
                          tmpl = self.templater(req, nonce)
                          ctype = tmpl.render(b'mimetype', {b'encoding': encoding.encoding})
                          # Global defaults. These can be overridden by any handler.
                          res.status = b'200 Script output follows'
                          res.headers[b'Content-Type'] = ctype
                          # a static file
                          if virtual.startswith(b'static/') or b'static' in req.qsparams:
                              if virtual.startswith(b'static/'):
                                  fname = virtual[7:]
                              else:
                                  fname = req.qsparams[b'static']
                              static = self.ui.config(b"web", b"static", untrusted=False)
                              if not static:
                                  tp = self.templatepath or templater.templatepaths()
-                                 if isinstance(tp, str):
+                                 if isinstance(tp, bytes):
                                      tp = [tp]
                                  static = [os.path.join(p, b'static') for p in tp]
                              staticfile(static, fname, res)
                              return res.sendresponse()
                          # top-level index
                          repos = dict(self.repos)
                          if (not virtual or virtual == b'index') and virtual not in repos:
                              return self.makeindex(req, res, tmpl)
                          # nested indexes and hgwebs
                          if virtual.endswith(b'/index') and virtual not in repos:
                              subdir = virtual[: -len(b'index')]
                              if any(r.startswith(subdir) for r in repos):
                                  return self.makeindex(req, res, tmpl, subdir)
                          def _virtualdirs():
                              # Check the full virtual path, and each parent
                              yield virtual
                              for p in pathutil.finddirs(virtual):
                                  yield p
                          for virtualrepo in _virtualdirs():
                              real = repos.get(virtualrepo)
                              if real:
                                  # Re-parse the WSGI environment to take into account our
                                  # repository path component.
                                  uenv = req.rawenv
                                  if pycompat.ispy3:
                                      uenv = {
                                          k.decode('latin1'): v
                                          for k, v in pycompat.iteritems(uenv)
                                      }
                                  req = requestmod.parserequestfromenv(
                                      uenv,
                                      reponame=virtualrepo,
                                      altbaseurl=self.ui.config(b'web', b'baseurl'),
                                      # Reuse wrapped body file object otherwise state
                                      # tracking can get confused.
                                      bodyfh=req.bodyfh,
                                  )
                                  try:
                                      # ensure caller gets private copy of ui
                                      repo = hg.repository(self.ui.copy(), real)
                                      return hgweb_mod.hgweb(repo).run_wsgi(req, res)
                                  except IOError as inst:
                                      msg = encoding.strtolocal(inst.strerror)
                                      raise ErrorResponse(HTTP_SERVER_ERROR, msg)
                                  except error.RepoError as inst:
                                      raise ErrorResponse(HTTP_SERVER_ERROR, bytes(inst))
                          # browse subdirectories
                          subdir = virtual + b'/'
                          if [r for r in repos if r.startswith(subdir)]:
                              return self.makeindex(req, res, tmpl, subdir)
                          # prefixes not found
                          res.status = b'404 Not Found'
                          res.setbodygen(tmpl.generate(b'notfound', {b'repo': virtual}))
                          return res.sendresponse()
                      except ErrorResponse as e:
                          res.status = statusmessage(e.code, pycompat.bytestr(e))
                          res.setbodygen(
                              tmpl.generate(b'error', {b'error': e.message or b''})
                          )
                          return res.sendresponse()
                      finally:
                          tmpl = None
                  def makeindex(self, req, res, tmpl, subdir=b""):
                      self.refresh()
                      sortable = [b"name", b"description", b"contact", b"lastchange"]
                      sortcolumn, descending = None, False
                      if b'sort' in req.qsparams:
                          sortcolumn = req.qsparams[b'sort']
                          descending = sortcolumn.startswith(b'-')
                          if descending:
                              sortcolumn = sortcolumn[1:]
                          if sortcolumn not in sortable:
                              sortcolumn = b""
                      sort = [
                          (
                              b"sort_%s" % column,
                              b"%s%s"
                              % (
                                  (not descending and column == sortcolumn) and b"-" or b"",
                                  column,
                              ),
                          )
                          for column in sortable
                      ]
                      self.refresh()
                      entries = indexentries(
                          self.ui,
                          self.repos,
                          req,
                          self.stripecount,
                          sortcolumn=sortcolumn,
                          descending=descending,
                          subdir=subdir,
                      )
                      mapping = {
                          b'entries': entries,
                          b'subdir': subdir,
                          b'pathdef': hgweb_mod.makebreadcrumb(b'/' + subdir, self.prefix),
                          b'sortcolumn': sortcolumn,
                          b'descending': descending,
                      }
                      mapping.update(sort)
                      res.setbodygen(tmpl.generate(b'index', mapping))
                      return res.sendresponse()
                  def templater(self, req, nonce):
                      def config(section, name, default=uimod._unset, untrusted=True):
                          return self.ui.config(section, name, default, untrusted)
                      vars = {}
                      styles, (style, mapfile) = hgweb_mod.getstyle(
                          req, config, self.templatepath
                      )
                      if style == styles[0]:
                          vars[b'style'] = style
                      sessionvars = webutil.sessionvars(vars, b'?')
                      logourl = config(b'web', b'logourl')
                      logoimg = config(b'web', b'logoimg')
                      staticurl = (
                          config(b'web', b'staticurl')
                          or req.apppath.rstrip(b'/') + b'/static/'
                      )
                      if not staticurl.endswith(b'/'):
                          staticurl += b'/'
                      defaults = {
                          b"encoding": encoding.encoding,
                          b"url": req.apppath + b'/',
                          b"logourl": logourl,
                          b"logoimg": logoimg,
                          b"staticurl": staticurl,
                          b"sessionvars": sessionvars,
                          b"style": style,
                          b"nonce": nonce,
                      }
                      templatekeyword = registrar.templatekeyword(defaults)
                      @templatekeyword(b'motd', requires=())
                      def motd(context, mapping):
                          if self.motd is not None:
                              yield self.motd
                          else:
                              yield config(b'web', b'motd')
                      tmpl = templater.templater.frommapfile(mapfile, defaults=defaults)
                      return tmpl

mercurial/hgweb/webcommands.py

0 +1 -1

              #
              # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
              # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import copy
              import mimetypes
              import os
              import re
              from ..i18n import _
              from ..node import hex, short
              from ..pycompat import getattr
              from .common import (
                  ErrorResponse,
                  HTTP_FORBIDDEN,
                  HTTP_NOT_FOUND,
                  get_contact,
                  paritygen,
                  staticfile,
              )
              from .. import (
                  archival,
                  dagop,
                  encoding,
                  error,
                  graphmod,
                  pycompat,
                  revset,
                  revsetlang,
                  scmutil,
                  smartset,
                  templater,
                  templateutil,
              )
              from ..utils import stringutil
              from . import webutil
              __all__ = []
              commands = {}
              class webcommand(object):
                  """Decorator used to register a web command handler.
                  The decorator takes as its positional arguments the name/path the
                  command should be accessible under.
                  When called, functions receive as arguments a ``requestcontext``,
                  ``wsgirequest``, and a templater instance for generatoring output.
                  The functions should populate the ``rctx.res`` object with details
                  about the HTTP response.
                  The function returns a generator to be consumed by the WSGI application.
                  For most commands, this should be the result from
                  ``web.res.sendresponse()``. Many commands will call ``web.sendtemplate()``
                  to render a template.
                  Usage:
                  @webcommand('mycommand')
                  def mycommand(web):
                      pass
                  """
                  def __init__(self, name):
                      self.name = name
                  def __call__(self, func):
                      __all__.append(self.name)
                      commands[self.name] = func
                      return func
              @webcommand(b'log')
              def log(web):
                  """
                  /log[/{revision}[/{path}]]
                  --------------------------
                  Show repository or file history.
                  For URLs of the form ``/log/{revision}``, a list of changesets starting at
                  the specified changeset identifier is shown. If ``{revision}`` is not
                  defined, the default is ``tip``. This form is equivalent to the
                  ``changelog`` handler.
                  For URLs of the form ``/log/{revision}/{file}``, the history for a specific
                  file will be shown. This form is equivalent to the ``filelog`` handler.
                  """
                  if web.req.qsparams.get(b'file'):
                      return filelog(web)
                  else:
                      return changelog(web)
              @webcommand(b'rawfile')
              def rawfile(web):
                  guessmime = web.configbool(b'web', b'guessmime')
                  path = webutil.cleanpath(web.repo, web.req.qsparams.get(b'file', b''))
                  if not path:
                      return manifest(web)
                  try:
                      fctx = webutil.filectx(web.repo, web.req)
                  except error.LookupError as inst:
                      try:
                          return manifest(web)
                      except ErrorResponse:
                          raise inst
                  path = fctx.path()
                  text = fctx.data()
                  mt = b'application/binary'
                  if guessmime:
                      mt = mimetypes.guess_type(pycompat.fsdecode(path))[0]
                      if mt is None:
                          if stringutil.binary(text):
                              mt = b'application/binary'
                          else:
                              mt = b'text/plain'
                      else:
                          mt = pycompat.sysbytes(mt)
                  if mt.startswith(b'text/'):
                      mt += b'; charset="%s"' % encoding.encoding
                  web.res.headers[b'Content-Type'] = mt
                  filename = (
                      path.rpartition(b'/')[-1].replace(b'\\', b'\\\\').replace(b'"', b'\\"')
                  )
                  web.res.headers[b'Content-Disposition'] = (
                      b'inline; filename="%s"' % filename
                  )
                  web.res.setbodybytes(text)
                  return web.res.sendresponse()
              def _filerevision(web, fctx):
                  f = fctx.path()
                  text = fctx.data()
                  parity = paritygen(web.stripecount)
                  ishead = fctx.filenode() in fctx.filelog().heads()
                  if stringutil.binary(text):
                      mt = pycompat.sysbytes(
                          mimetypes.guess_type(pycompat.fsdecode(f))[0]
                          or r'application/octet-stream'
                      )
                      text = b'(binary:%s)' % mt
                  def lines(context):
                      for lineno, t in enumerate(text.splitlines(True)):
                          yield {
                              b"line": t,
                              b"lineid": b"l%d" % (lineno + 1),
                              b"linenumber": b"% 6d" % (lineno + 1),
                              b"parity": next(parity),
                          }
                  return web.sendtemplate(
                      b'filerevision',
                      file=f,
                      path=webutil.up(f),
                      text=templateutil.mappinggenerator(lines),
                      symrev=webutil.symrevorshortnode(web.req, fctx),
                      rename=webutil.renamelink(fctx),
                      permissions=fctx.manifest().flags(f),
                      ishead=int(ishead),
                      **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))
                  )
              @webcommand(b'file')
              def file(web):
                  """
                  /file/{revision}[/{path}]
                  -------------------------
                  Show information about a directory or file in the repository.
                  Info about the ``path`` given as a URL parameter will be rendered.
                  If ``path`` is a directory, information about the entries in that
                  directory will be rendered. This form is equivalent to the ``manifest``
                  handler.
                  If ``path`` is a file, information about that file will be shown via
                  the ``filerevision`` template.
                  If ``path`` is not defined, information about the root directory will
                  be rendered.
                  """
                  if web.req.qsparams.get(b'style') == b'raw':
                      return rawfile(web)
                  path = webutil.cleanpath(web.repo, web.req.qsparams.get(b'file', b''))
                  if not path:
                      return manifest(web)
                  try:
                      return _filerevision(web, webutil.filectx(web.repo, web.req))
                  except error.LookupError as inst:
                      try:
                          return manifest(web)
                      except ErrorResponse:
                          raise inst
              def _search(web):
                  MODE_REVISION = b'rev'
                  MODE_KEYWORD = b'keyword'
                  MODE_REVSET = b'revset'
                  def revsearch(ctx):
                      yield ctx
                  def keywordsearch(query):
                      lower = encoding.lower
                      qw = lower(query).split()
                      def revgen():
                          cl = web.repo.changelog
                          for i in pycompat.xrange(len(web.repo) - 1, 0, -100):
                              l = []
                              for j in cl.revs(max(0, i - 99), i):
                                  ctx = web.repo[j]
                                  l.append(ctx)
                              l.reverse()
                              for e in l:
                                  yield e
                      for ctx in revgen():
                          miss = 0
                          for q in qw:
                              if not (
                                  q in lower(ctx.user())
                                  or q in lower(ctx.description())
                                  or q in lower(b" ".join(ctx.files()))
                              ):
                                  miss = 1
                                  break
                          if miss:
                              continue
                          yield ctx
                  def revsetsearch(revs):
                      for r in revs:
                          yield web.repo[r]
                  searchfuncs = {
                      MODE_REVISION: (revsearch, b'exact revision search'),
                      MODE_KEYWORD: (keywordsearch, b'literal keyword search'),
                      MODE_REVSET: (revsetsearch, b'revset expression search'),
                  }
                  def getsearchmode(query):
                      try:
                          ctx = scmutil.revsymbol(web.repo, query)
                      except (error.RepoError, error.LookupError):
                          # query is not an exact revision pointer, need to
                          # decide if it's a revset expression or keywords
                          pass
                      else:
                          return MODE_REVISION, ctx
                      revdef = b'reverse(%s)' % query
                      try:
                          tree = revsetlang.parse(revdef)
                      except error.ParseError:
                          # can't parse to a revset tree
                          return MODE_KEYWORD, query
                      if revsetlang.depth(tree) <= 2:
                          # no revset syntax used
                          return MODE_KEYWORD, query
                      if any(
                          (token, (value or b'')[:3]) == (b'string', b're:')
                          for token, value, pos in revsetlang.tokenize(revdef)
                      ):
                          return MODE_KEYWORD, query
                      funcsused = revsetlang.funcsused(tree)
                      if not funcsused.issubset(revset.safesymbols):
                          return MODE_KEYWORD, query
                      try:
                          mfunc = revset.match(
                              web.repo.ui, revdef, lookup=revset.lookupfn(web.repo)
                          )
                          revs = mfunc(web.repo)
                          return MODE_REVSET, revs
                          # ParseError: wrongly placed tokens, wrongs arguments, etc
                          # RepoLookupError: no such revision, e.g. in 'revision:'
                          # Abort: bookmark/tag not exists
                          # LookupError: ambiguous identifier, e.g. in '(bc)' on a large repo
                      except (
                          error.ParseError,
                          error.RepoLookupError,
                          error.Abort,
                          LookupError,
                      ):
                          return MODE_KEYWORD, query
                  def changelist(context):
                      count = 0
                      for ctx in searchfunc[0](funcarg):
                          count += 1
                          n = scmutil.binnode(ctx)
                          showtags = webutil.showtag(web.repo, b'changelogtag', n)
                          files = webutil.listfilediffs(ctx.files(), n, web.maxfiles)
                          lm = webutil.commonentry(web.repo, ctx)
                          lm.update(
                              {
                                  b'parity': next(parity),
                                  b'changelogtag': showtags,
                                  b'files': files,
                              }
                          )
                          yield lm
                          if count >= revcount:
                              break
                  query = web.req.qsparams[b'rev']
                  revcount = web.maxchanges
                  if b'revcount' in web.req.qsparams:
                      try:
                          revcount = int(web.req.qsparams.get(b'revcount', revcount))
                          revcount = max(revcount, 1)
                          web.tmpl.defaults[b'sessionvars'][b'revcount'] = revcount
                      except ValueError:
                          pass
                  lessvars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  lessvars[b'revcount'] = max(revcount // 2, 1)
                  lessvars[b'rev'] = query
                  morevars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  morevars[b'revcount'] = revcount * 2
                  morevars[b'rev'] = query
                  mode, funcarg = getsearchmode(query)
                  if b'forcekw' in web.req.qsparams:
                      showforcekw = b''
                      showunforcekw = searchfuncs[mode][1]
                      mode = MODE_KEYWORD
                      funcarg = query
                  else:
                      if mode != MODE_KEYWORD:
                          showforcekw = searchfuncs[MODE_KEYWORD][1]
                      else:
                          showforcekw = b''
                      showunforcekw = b''
                  searchfunc = searchfuncs[mode]
                  tip = web.repo[b'tip']
                  parity = paritygen(web.stripecount)
                  return web.sendtemplate(
                      b'search',
                      query=query,
                      node=tip.hex(),
                      symrev=b'tip',
                      entries=templateutil.mappinggenerator(changelist, name=b'searchentry'),
                      archives=web.archivelist(b'tip'),
                      morevars=morevars,
                      lessvars=lessvars,
                      modedesc=searchfunc[1],
                      showforcekw=showforcekw,
                      showunforcekw=showunforcekw,
                  )
              @webcommand(b'changelog')
              def changelog(web, shortlog=False):
                  """
                  /changelog[/{revision}]
                  -----------------------
                  Show information about multiple changesets.
                  If the optional ``revision`` URL argument is absent, information about
                  all changesets starting at ``tip`` will be rendered. If the ``revision``
                  argument is present, changesets will be shown starting from the specified
                  revision.
                  If ``revision`` is absent, the ``rev`` query string argument may be
                  defined. This will perform a search for changesets.
                  The argument for ``rev`` can be a single revision, a revision set,
                  or a literal keyword to search for in changeset data (equivalent to
                  :hg:`log -k`).
                  The ``revcount`` query string argument defines the maximum numbers of
                  changesets to render.
                  For non-searches, the ``changelog`` template will be rendered.
                  """
                  query = b''
                  if b'node' in web.req.qsparams:
                      ctx = webutil.changectx(web.repo, web.req)
                      symrev = webutil.symrevorshortnode(web.req, ctx)
                  elif b'rev' in web.req.qsparams:
                      return _search(web)
                  else:
                      ctx = web.repo[b'tip']
                      symrev = b'tip'
                  def changelist(maxcount):
                      revs = []
                      if pos != -1:
                          revs = web.repo.changelog.revs(pos, 0)
                      for entry in webutil.changelistentries(web, revs, maxcount, parity):
                          yield entry
                  if shortlog:
                      revcount = web.maxshortchanges
                  else:
                      revcount = web.maxchanges
                  if b'revcount' in web.req.qsparams:
                      try:
                          revcount = int(web.req.qsparams.get(b'revcount', revcount))
                          revcount = max(revcount, 1)
                          web.tmpl.defaults[b'sessionvars'][b'revcount'] = revcount
                      except ValueError:
                          pass
                  lessvars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  lessvars[b'revcount'] = max(revcount // 2, 1)
                  morevars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  morevars[b'revcount'] = revcount * 2
                  count = len(web.repo)
                  pos = ctx.rev()
                  parity = paritygen(web.stripecount)
                  changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
                  entries = list(changelist(revcount + 1))
                  latestentry = entries[:1]
                  if len(entries) > revcount:
                      nextentry = entries[-1:]
                      entries = entries[:-1]
                  else:
                      nextentry = []
                  return web.sendtemplate(
                      b'shortlog' if shortlog else b'changelog',
                      changenav=changenav,
                      node=ctx.hex(),
                      rev=pos,
                      symrev=symrev,
                      changesets=count,
                      entries=templateutil.mappinglist(entries),
                      latestentry=templateutil.mappinglist(latestentry),
                      nextentry=templateutil.mappinglist(nextentry),
                      archives=web.archivelist(b'tip'),
                      revcount=revcount,
                      morevars=morevars,
                      lessvars=lessvars,
                      query=query,
                  )
              @webcommand(b'shortlog')
              def shortlog(web):
                  """
                  /shortlog
                  ---------
                  Show basic information about a set of changesets.
                  This accepts the same parameters as the ``changelog`` handler. The only
                  difference is the ``shortlog`` template will be rendered instead of the
                  ``changelog`` template.
                  """
                  return changelog(web, shortlog=True)
              @webcommand(b'changeset')
              def changeset(web):
                  """
                  /changeset[/{revision}]
                  -----------------------
                  Show information about a single changeset.
                  A URL path argument is the changeset identifier to show. See ``hg help
                  revisions`` for possible values. If not defined, the ``tip`` changeset
                  will be shown.
                  The ``changeset`` template is rendered. Contents of the ``changesettag``,
                  ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many
                  templates related to diffs may all be used to produce the output.
                  """
                  ctx = webutil.changectx(web.repo, web.req)
                  return web.sendtemplate(b'changeset', **webutil.changesetentry(web, ctx))
              rev = webcommand(b'rev')(changeset)
              def decodepath(path):
                  """Hook for mapping a path in the repository to a path in the
                  working copy.
                  Extensions (e.g., largefiles) can override this to remap files in
                  the virtual file system presented by the manifest command below."""
                  return path
              @webcommand(b'manifest')
              def manifest(web):
                  """
                  /manifest[/{revision}[/{path}]]
                  -------------------------------
                  Show information about a directory.
                  If the URL path arguments are omitted, information about the root
                  directory for the ``tip`` changeset will be shown.
                  Because this handler can only show information for directories, it
                  is recommended to use the ``file`` handler instead, as it can handle both
                  directories and files.
                  The ``manifest`` template will be rendered for this handler.
                  """
                  if b'node' in web.req.qsparams:
                      ctx = webutil.changectx(web.repo, web.req)
                      symrev = webutil.symrevorshortnode(web.req, ctx)
                  else:
                      ctx = web.repo[b'tip']
                      symrev = b'tip'
                  path = webutil.cleanpath(web.repo, web.req.qsparams.get(b'file', b''))
                  mf = ctx.manifest()
                  node = scmutil.binnode(ctx)
                  files = {}
                  dirs = {}
                  parity = paritygen(web.stripecount)
                  if path and path[-1:] != b"/":
                      path += b"/"
                  l = len(path)
                  abspath = b"/" + path
                  for full, n in pycompat.iteritems(mf):
                      # the virtual path (working copy path) used for the full
                      # (repository) path
                      f = decodepath(full)
                      if f[:l] != path:
                          continue
                      remain = f[l:]
                      elements = remain.split(b'/')
                      if len(elements) == 1:
                          files[remain] = full
                      else:
                          h = dirs  # need to retain ref to dirs (root)
                          for elem in elements[0:-1]:
                              if elem not in h:
                                  h[elem] = {}
                              h = h[elem]
                              if len(h) > 1:
                                  break
                          h[None] = None  # denotes files present
                  if mf and not files and not dirs:
                      raise ErrorResponse(HTTP_NOT_FOUND, b'path not found: ' + path)
                  def filelist(context):
                      for f in sorted(files):
                          full = files[f]
                          fctx = ctx.filectx(full)
                          yield {
                              b"file": full,
                              b"parity": next(parity),
                              b"basename": f,
                              b"date": fctx.date(),
                              b"size": fctx.size(),
                              b"permissions": mf.flags(full),
                          }
                  def dirlist(context):
                      for d in sorted(dirs):
                          emptydirs = []
                          h = dirs[d]
                          while isinstance(h, dict) and len(h) == 1:
                              k, v = next(iter(h.items()))
                              if v:
                                  emptydirs.append(k)
                              h = v
                          path = b"%s%s" % (abspath, d)
                          yield {
                              b"parity": next(parity),
                              b"path": path,
                              b"emptydirs": b"/".join(emptydirs),
                              b"basename": d,
                          }
                  return web.sendtemplate(
                      b'manifest',
                      symrev=symrev,
                      path=abspath,
                      up=webutil.up(abspath),
                      upparity=next(parity),
                      fentries=templateutil.mappinggenerator(filelist),
                      dentries=templateutil.mappinggenerator(dirlist),
                      archives=web.archivelist(hex(node)),
                      **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))
                  )
              @webcommand(b'tags')
              def tags(web):
                  """
                  /tags
                  -----
                  Show information about tags.
                  No arguments are accepted.
                  The ``tags`` template is rendered.
                  """
                  i = list(reversed(web.repo.tagslist()))
                  parity = paritygen(web.stripecount)
                  def entries(context, notip, latestonly):
                      t = i
                      if notip:
                          t = [(k, n) for k, n in i if k != b"tip"]
                      if latestonly:
                          t = t[:1]
                      for k, n in t:
                          yield {
                              b"parity": next(parity),
                              b"tag": k,
                              b"date": web.repo[n].date(),
                              b"node": hex(n),
                          }
                  return web.sendtemplate(
                      b'tags',
                      node=hex(web.repo.changelog.tip()),
                      entries=templateutil.mappinggenerator(entries, args=(False, False)),
                      entriesnotip=templateutil.mappinggenerator(entries, args=(True, False)),
                      latestentry=templateutil.mappinggenerator(entries, args=(True, True)),
                  )
              @webcommand(b'bookmarks')
              def bookmarks(web):
                  """
                  /bookmarks
                  ----------
                  Show information about bookmarks.
                  No arguments are accepted.
                  The ``bookmarks`` template is rendered.
                  """
                  i = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
                  sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
                  i = sorted(i, key=sortkey, reverse=True)
                  parity = paritygen(web.stripecount)
                  def entries(context, latestonly):
                      t = i
                      if latestonly:
                          t = i[:1]
                      for k, n in t:
                          yield {
                              b"parity": next(parity),
                              b"bookmark": k,
                              b"date": web.repo[n].date(),
                              b"node": hex(n),
                          }
                  if i:
                      latestrev = i[0][1]
                  else:
                      latestrev = -1
                  lastdate = web.repo[latestrev].date()
                  return web.sendtemplate(
                      b'bookmarks',
                      node=hex(web.repo.changelog.tip()),
                      lastchange=templateutil.mappinglist([{b'date': lastdate}]),
                      entries=templateutil.mappinggenerator(entries, args=(False,)),
                      latestentry=templateutil.mappinggenerator(entries, args=(True,)),
                  )
              @webcommand(b'branches')
              def branches(web):
                  """
                  /branches
                  ---------
                  Show information about branches.
                  All known branches are contained in the output, even closed branches.
                  No arguments are accepted.
                  The ``branches`` template is rendered.
                  """
                  entries = webutil.branchentries(web.repo, web.stripecount)
                  latestentry = webutil.branchentries(web.repo, web.stripecount, 1)
                  return web.sendtemplate(
                      b'branches',
                      node=hex(web.repo.changelog.tip()),
                      entries=entries,
                      latestentry=latestentry,
                  )
              @webcommand(b'summary')
              def summary(web):
                  """
                  /summary
                  --------
                  Show a summary of repository state.
                  Information about the latest changesets, bookmarks, tags, and branches
                  is captured by this handler.
                  The ``summary`` template is rendered.
                  """
                  i = reversed(web.repo.tagslist())
                  def tagentries(context):
                      parity = paritygen(web.stripecount)
                      count = 0
                      for k, n in i:
                          if k == b"tip":  # skip tip
                              continue
                          count += 1
                          if count > 10:  # limit to 10 tags
                              break
                          yield {
                              b'parity': next(parity),
                              b'tag': k,
                              b'node': hex(n),
                              b'date': web.repo[n].date(),
                          }
                  def bookmarks(context):
                      parity = paritygen(web.stripecount)
                      marks = [b for b in web.repo._bookmarks.items() if b[1] in web.repo]
                      sortkey = lambda b: (web.repo[b[1]].rev(), b[0])
                      marks = sorted(marks, key=sortkey, reverse=True)
                      for k, n in marks[:10]:  # limit to 10 bookmarks
                          yield {
                              b'parity': next(parity),
                              b'bookmark': k,
                              b'date': web.repo[n].date(),
                              b'node': hex(n),
                          }
                  def changelist(context):
                      parity = paritygen(web.stripecount, offset=start - end)
                      l = []  # build a list in forward order for efficiency
                      revs = []
                      if start < end:
                          revs = web.repo.changelog.revs(start, end - 1)
                      for i in revs:
                          ctx = web.repo[i]
                          lm = webutil.commonentry(web.repo, ctx)
                          lm[b'parity'] = next(parity)
                          l.append(lm)
                      for entry in reversed(l):
                          yield entry
                  tip = web.repo[b'tip']
                  count = len(web.repo)
                  start = max(0, count - web.maxchanges)
                  end = min(count, start + web.maxchanges)
                  desc = web.config(b"web", b"description")
                  if not desc:
                      desc = b'unknown'
                  labels = web.configlist(b'web', b'labels')
                  return web.sendtemplate(
                      b'summary',
                      desc=desc,
                      owner=get_contact(web.config) or b'unknown',
                      lastchange=tip.date(),
                      tags=templateutil.mappinggenerator(tagentries, name=b'tagentry'),
                      bookmarks=templateutil.mappinggenerator(bookmarks),
                      branches=webutil.branchentries(web.repo, web.stripecount, 10),
                      shortlog=templateutil.mappinggenerator(
                          changelist, name=b'shortlogentry'
                      ),
                      node=tip.hex(),
                      symrev=b'tip',
                      archives=web.archivelist(b'tip'),
                      labels=templateutil.hybridlist(labels, name=b'label'),
                  )
              @webcommand(b'filediff')
              def filediff(web):
                  """
                  /diff/{revision}/{path}
                  -----------------------
                  Show how a file changed in a particular commit.
                  The ``filediff`` template is rendered.
                  This handler is registered under both the ``/diff`` and ``/filediff``
                  paths. ``/diff`` is used in modern code.
                  """
                  fctx, ctx = None, None
                  try:
                      fctx = webutil.filectx(web.repo, web.req)
                  except LookupError:
                      ctx = webutil.changectx(web.repo, web.req)
                      path = webutil.cleanpath(web.repo, web.req.qsparams[b'file'])
                      if path not in ctx.files():
                          raise
                  if fctx is not None:
                      path = fctx.path()
                      ctx = fctx.changectx()
                  basectx = ctx.p1()
                  style = web.config(b'web', b'style')
                  if b'style' in web.req.qsparams:
                      style = web.req.qsparams[b'style']
                  diffs = webutil.diffs(web, ctx, basectx, [path], style)
                  if fctx is not None:
                      rename = webutil.renamelink(fctx)
                      ctx = fctx
                  else:
                      rename = templateutil.mappinglist([])
                      ctx = ctx
                  return web.sendtemplate(
                      b'filediff',
                      file=path,
                      symrev=webutil.symrevorshortnode(web.req, ctx),
                      rename=rename,
                      diff=diffs,
                      **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))
                  )
              diff = webcommand(b'diff')(filediff)
              @webcommand(b'comparison')
              def comparison(web):
                  """
                  /comparison/{revision}/{path}
                  -----------------------------
                  Show a comparison between the old and new versions of a file from changes
                  made on a particular revision.
                  This is similar to the ``diff`` handler. However, this form features
                  a split or side-by-side diff rather than a unified diff.
                  The ``context`` query string argument can be used to control the lines of
                  context in the diff.
                  The ``filecomparison`` template is rendered.
                  """
                  ctx = webutil.changectx(web.repo, web.req)
                  if b'file' not in web.req.qsparams:
                      raise ErrorResponse(HTTP_NOT_FOUND, b'file not given')
                  path = webutil.cleanpath(web.repo, web.req.qsparams[b'file'])
                  parsecontext = lambda v: v == b'full' and -1 or int(v)
                  if b'context' in web.req.qsparams:
                      context = parsecontext(web.req.qsparams[b'context'])
                  else:
                      context = parsecontext(web.config(b'web', b'comparisoncontext'))
                  def filelines(f):
                      if f.isbinary():
                          mt = pycompat.sysbytes(
                              mimetypes.guess_type(pycompat.fsdecode(f.path()))[0]
                              or r'application/octet-stream'
                          )
                          return [_(b'(binary file %s, hash: %s)') % (mt, hex(f.filenode()))]
                      return f.data().splitlines()
                  fctx = None
                  parent = ctx.p1()
                  leftrev = parent.rev()
                  leftnode = parent.node()
                  rightrev = ctx.rev()
                  rightnode = scmutil.binnode(ctx)
                  if path in ctx:
                      fctx = ctx[path]
                      rightlines = filelines(fctx)
                      if path not in parent:
                          leftlines = ()
                      else:
                          pfctx = parent[path]
                          leftlines = filelines(pfctx)
                  else:
                      rightlines = ()
                      pfctx = ctx.p1()[path]
                      leftlines = filelines(pfctx)
                  comparison = webutil.compare(context, leftlines, rightlines)
                  if fctx is not None:
                      rename = webutil.renamelink(fctx)
                      ctx = fctx
                  else:
                      rename = templateutil.mappinglist([])
                      ctx = ctx
                  return web.sendtemplate(
                      b'filecomparison',
                      file=path,
                      symrev=webutil.symrevorshortnode(web.req, ctx),
                      rename=rename,
                      leftrev=leftrev,
                      leftnode=hex(leftnode),
                      rightrev=rightrev,
                      rightnode=hex(rightnode),
                      comparison=comparison,
                      **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))
                  )
              @webcommand(b'annotate')
              def annotate(web):
                  """
                  /annotate/{revision}/{path}
                  ---------------------------
                  Show changeset information for each line in a file.
                  The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and
                  ``ignoreblanklines`` query string arguments have the same meaning as
                  their ``[annotate]`` config equivalents. It uses the hgrc boolean
                  parsing logic to interpret the value. e.g. ``0`` and ``false`` are
                  false and ``1`` and ``true`` are true. If not defined, the server
                  default settings are used.
                  The ``fileannotate`` template is rendered.
                  """
                  fctx = webutil.filectx(web.repo, web.req)
                  f = fctx.path()
                  parity = paritygen(web.stripecount)
                  ishead = fctx.filenode() in fctx.filelog().heads()
                  # parents() is called once per line and several lines likely belong to
                  # same revision. So it is worth caching.
                  # TODO there are still redundant operations within basefilectx.parents()
                  # and from the fctx.annotate() call itself that could be cached.
                  parentscache = {}
                  def parents(context, f):
                      rev = f.rev()
                      if rev not in parentscache:
                          parentscache[rev] = []
                          for p in f.parents():
                              entry = {
                                  b'node': p.hex(),
                                  b'rev': p.rev(),
                              }
                              parentscache[rev].append(entry)
                      for p in parentscache[rev]:
                          yield p
                  def annotate(context):
                      if fctx.isbinary():
                          mt = pycompat.sysbytes(
                              mimetypes.guess_type(pycompat.fsdecode(fctx.path()))[0]
                              or r'application/octet-stream'
                          )
                          lines = [
                              dagop.annotateline(
                                  fctx=fctx.filectx(fctx.filerev()),
                                  lineno=1,
                                  text=b'(binary:%s)' % mt,
                              )
                          ]
                      else:
                          lines = webutil.annotate(web.req, fctx, web.repo.ui)
                      previousrev = None
                      blockparitygen = paritygen(1)
                      for lineno, aline in enumerate(lines):
                          f = aline.fctx
                          rev = f.rev()
                          if rev != previousrev:
                              blockhead = True
                              blockparity = next(blockparitygen)
                          else:
                              blockhead = None
                          previousrev = rev
                          yield {
                              b"parity": next(parity),
                              b"node": f.hex(),
                              b"rev": rev,
                              b"author": f.user(),
                              b"parents": templateutil.mappinggenerator(parents, args=(f,)),
                              b"desc": f.description(),
                              b"extra": f.extra(),
                              b"file": f.path(),
                              b"blockhead": blockhead,
                              b"blockparity": blockparity,
                              b"targetline": aline.lineno,
                              b"line": aline.text,
                              b"lineno": lineno + 1,
                              b"lineid": b"l%d" % (lineno + 1),
                              b"linenumber": b"% 6d" % (lineno + 1),
                              b"revdate": f.date(),
                          }
                  diffopts = webutil.difffeatureopts(web.req, web.repo.ui, b'annotate')
                  diffopts = {k: getattr(diffopts, k) for k in diffopts.defaults}
                  return web.sendtemplate(
                      b'fileannotate',
                      file=f,
                      annotate=templateutil.mappinggenerator(annotate),
                      path=webutil.up(f),
                      symrev=webutil.symrevorshortnode(web.req, fctx),
                      rename=webutil.renamelink(fctx),
                      permissions=fctx.manifest().flags(f),
                      ishead=int(ishead),
                      diffopts=templateutil.hybriddict(diffopts),
                      **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))
                  )
              @webcommand(b'filelog')
              def filelog(web):
                  """
                  /filelog/{revision}/{path}
                  --------------------------
                  Show information about the history of a file in the repository.
                  The ``revcount`` query string argument can be defined to control the
                  maximum number of entries to show.
                  The ``filelog`` template will be rendered.
                  """
                  try:
                      fctx = webutil.filectx(web.repo, web.req)
                      f = fctx.path()
                      fl = fctx.filelog()
                  except error.LookupError:
                      f = webutil.cleanpath(web.repo, web.req.qsparams[b'file'])
                      fl = web.repo.file(f)
                      numrevs = len(fl)
                      if not numrevs:  # file doesn't exist at all
                          raise
                      rev = webutil.changectx(web.repo, web.req).rev()
                      first = fl.linkrev(0)
                      if rev < first:  # current rev is from before file existed
                          raise
                      frev = numrevs - 1
                      while fl.linkrev(frev) > rev:
                          frev -= 1
                      fctx = web.repo.filectx(f, fl.linkrev(frev))
                  revcount = web.maxshortchanges
                  if b'revcount' in web.req.qsparams:
                      try:
                          revcount = int(web.req.qsparams.get(b'revcount', revcount))
                          revcount = max(revcount, 1)
                          web.tmpl.defaults[b'sessionvars'][b'revcount'] = revcount
                      except ValueError:
                          pass
                  lrange = webutil.linerange(web.req)
                  lessvars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  lessvars[b'revcount'] = max(revcount // 2, 1)
                  morevars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  morevars[b'revcount'] = revcount * 2
                  patch = b'patch' in web.req.qsparams
                  if patch:
                      lessvars[b'patch'] = morevars[b'patch'] = web.req.qsparams[b'patch']
                  descend = b'descend' in web.req.qsparams
                  if descend:
                      lessvars[b'descend'] = morevars[b'descend'] = web.req.qsparams[
                          b'descend'
                      ]
                  count = fctx.filerev() + 1
                  start = max(0, count - revcount)  # first rev on this page
                  end = min(count, start + revcount)  # last rev on this page
                  parity = paritygen(web.stripecount, offset=start - end)
                  repo = web.repo
                  filelog = fctx.filelog()
                  revs = [
                      filerev
                      for filerev in filelog.revs(start, end - 1)
                      if filelog.linkrev(filerev) in repo
                  ]
                  entries = []
                  diffstyle = web.config(b'web', b'style')
                  if b'style' in web.req.qsparams:
                      diffstyle = web.req.qsparams[b'style']
                  def diff(fctx, linerange=None):
                      ctx = fctx.changectx()
                      basectx = ctx.p1()
                      path = fctx.path()
                      return webutil.diffs(
                          web,
                          ctx,
                          basectx,
                          [path],
                          diffstyle,
                          linerange=linerange,
                          lineidprefix=b'%s-' % ctx.hex()[:12],
                      )
                  linerange = None
                  if lrange is not None:
                      linerange = webutil.formatlinerange(*lrange)
                      # deactivate numeric nav links when linerange is specified as this
                      # would required a dedicated "revnav" class
                      nav = templateutil.mappinglist([])
                      if descend:
                          it = dagop.blockdescendants(fctx, *lrange)
                      else:
                          it = dagop.blockancestors(fctx, *lrange)
                      for i, (c, lr) in enumerate(it, 1):
                          diffs = None
                          if patch:
                              diffs = diff(c, linerange=lr)
                          # follow renames accross filtered (not in range) revisions
                          path = c.path()
                          lm = webutil.commonentry(repo, c)
                          lm.update(
                              {
                                  b'parity': next(parity),
                                  b'filerev': c.rev(),
                                  b'file': path,
                                  b'diff': diffs,
                                  b'linerange': webutil.formatlinerange(*lr),
                                  b'rename': templateutil.mappinglist([]),
                              }
                          )
                          entries.append(lm)
                          if i == revcount:
                              break
                      lessvars[b'linerange'] = webutil.formatlinerange(*lrange)
                      morevars[b'linerange'] = lessvars[b'linerange']
                  else:
                      for i in revs:
                          iterfctx = fctx.filectx(i)
                          diffs = None
                          if patch:
                              diffs = diff(iterfctx)
                          lm = webutil.commonentry(repo, iterfctx)
                          lm.update(
                              {
                                  b'parity': next(parity),
                                  b'filerev': i,
                                  b'file': f,
                                  b'diff': diffs,
                                  b'rename': webutil.renamelink(iterfctx),
                              }
                          )
                          entries.append(lm)
                      entries.reverse()
                      revnav = webutil.filerevnav(web.repo, fctx.path())
                      nav = revnav.gen(end - 1, revcount, count)
                  latestentry = entries[:1]
                  return web.sendtemplate(
                      b'filelog',
                      file=f,
                      nav=nav,
                      symrev=webutil.symrevorshortnode(web.req, fctx),
                      entries=templateutil.mappinglist(entries),
                      descend=descend,
                      patch=patch,
                      latestentry=templateutil.mappinglist(latestentry),
                      linerange=linerange,
                      revcount=revcount,
                      morevars=morevars,
                      lessvars=lessvars,
                      **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))
                  )
              @webcommand(b'archive')
              def archive(web):
                  """
                  /archive/{revision}.{format}[/{path}]
                  -------------------------------------
                  Obtain an archive of repository content.
                  The content and type of the archive is defined by a URL path parameter.
                  ``format`` is the file extension of the archive type to be generated. e.g.
                  ``zip`` or ``tar.bz2``. Not all archive types may be allowed by your
                  server configuration.
                  The optional ``path`` URL parameter controls content to include in the
                  archive. If omitted, every file in the specified revision is present in the
                  archive. If included, only the specified file or contents of the specified
                  directory will be included in the archive.
                  No template is used for this handler. Raw, binary content is generated.
                  """
                  type_ = web.req.qsparams.get(b'type')
                  allowed = web.configlist(b"web", b"allow-archive")
                  key = web.req.qsparams[b'node']
                  if type_ not in webutil.archivespecs:
                      msg = b'Unsupported archive type: %s' % stringutil.pprint(type_)
                      raise ErrorResponse(HTTP_NOT_FOUND, msg)
                  if not ((type_ in allowed or web.configbool(b"web", b"allow" + type_))):
                      msg = b'Archive type not allowed: %s' % type_
                      raise ErrorResponse(HTTP_FORBIDDEN, msg)
                  reponame = re.sub(br"\W+", b"-", os.path.basename(web.reponame))
                  cnode = web.repo.lookup(key)
                  arch_version = key
                  if cnode == key or key == b'tip':
                      arch_version = short(cnode)
                  name = b"%s-%s" % (reponame, arch_version)
                  ctx = webutil.changectx(web.repo, web.req)
                  pats = []
                  match = scmutil.match(ctx, [])
                  file = web.req.qsparams.get(b'file')
                  if file:
                      pats = [b'path:' + file]
                      match = scmutil.match(ctx, pats, default=b'path')
                      if pats:
                          files = [f for f in ctx.manifest().keys() if match(f)]
                          if not files:
                              raise ErrorResponse(
                                  HTTP_NOT_FOUND, b'file(s) not found: %s' % file
                              )
                  mimetype, artype, extension, encoding = webutil.archivespecs[type_]
                  web.res.headers[b'Content-Type'] = mimetype
                  web.res.headers[b'Content-Disposition'] = b'attachment; filename=%s%s' % (
                      name,
                      extension,
                  )
                  if encoding:
                      web.res.headers[b'Content-Encoding'] = encoding
                  web.res.setbodywillwrite()
                  if list(web.res.sendresponse()):
                      raise error.ProgrammingError(
                          b'sendresponse() should not emit data if writing later'
                      )
                  bodyfh = web.res.getbodyfile()
                  archival.archive(
                      web.repo,
                      bodyfh,
                      cnode,
                      artype,
                      prefix=name,
                      match=match,
                      subrepos=web.configbool(b"web", b"archivesubrepos"),
                  )
                  return []
              @webcommand(b'static')
              def static(web):
                  fname = web.req.qsparams[b'file']
                  # a repo owner may set web.static in .hg/hgrc to get any file
                  # readable by the user running the CGI script
                  static = web.config(b"web", b"static", untrusted=False)
                  if not static:
                      tp = web.templatepath or templater.templatepaths()
-                     if isinstance(tp, str):
+                     if isinstance(tp, bytes):
                          tp = [tp]
                      static = [os.path.join(p, b'static') for p in tp]
                  staticfile(static, fname, web.res)
                  return web.res.sendresponse()
              @webcommand(b'graph')
              def graph(web):
                  """
                  /graph[/{revision}]
                  -------------------
                  Show information about the graphical topology of the repository.
                  Information rendered by this handler can be used to create visual
                  representations of repository topology.
                  The ``revision`` URL parameter controls the starting changeset. If it's
                  absent, the default is ``tip``.
                  The ``revcount`` query string argument can define the number of changesets
                  to show information for.
                  The ``graphtop`` query string argument can specify the starting changeset
                  for producing ``jsdata`` variable that is used for rendering graph in
                  JavaScript. By default it has the same value as ``revision``.
                  This handler will render the ``graph`` template.
                  """
                  if b'node' in web.req.qsparams:
                      ctx = webutil.changectx(web.repo, web.req)
                      symrev = webutil.symrevorshortnode(web.req, ctx)
                  else:
                      ctx = web.repo[b'tip']
                      symrev = b'tip'
                  rev = ctx.rev()
                  bg_height = 39
                  revcount = web.maxshortchanges
                  if b'revcount' in web.req.qsparams:
                      try:
                          revcount = int(web.req.qsparams.get(b'revcount', revcount))
                          revcount = max(revcount, 1)
                          web.tmpl.defaults[b'sessionvars'][b'revcount'] = revcount
                      except ValueError:
                          pass
                  lessvars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  lessvars[b'revcount'] = max(revcount // 2, 1)
                  morevars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  morevars[b'revcount'] = revcount * 2
                  graphtop = web.req.qsparams.get(b'graphtop', ctx.hex())
                  graphvars = copy.copy(web.tmpl.defaults[b'sessionvars'])
                  graphvars[b'graphtop'] = graphtop
                  count = len(web.repo)
                  pos = rev
                  uprev = min(max(0, count - 1), rev + revcount)
                  downrev = max(0, rev - revcount)
                  changenav = webutil.revnav(web.repo).gen(pos, revcount, count)
                  tree = []
                  nextentry = []
                  lastrev = 0
                  if pos != -1:
                      allrevs = web.repo.changelog.revs(pos, 0)
                      revs = []
                      for i in allrevs:
                          revs.append(i)
                          if len(revs) >= revcount + 1:
                              break
                      if len(revs) > revcount:
                          nextentry = [webutil.commonentry(web.repo, web.repo[revs[-1]])]
                          revs = revs[:-1]
                      lastrev = revs[-1]
                      # We have to feed a baseset to dagwalker as it is expecting smartset
                      # object. This does not have a big impact on hgweb performance itself
                      # since hgweb graphing code is not itself lazy yet.
                      dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
                      # As we said one line above... not lazy.
                      tree = list(
                          item
                          for item in graphmod.colored(dag, web.repo)
                          if item[1] == graphmod.CHANGESET
                      )
                  def fulltree():
                      pos = web.repo[graphtop].rev()
                      tree = []
                      if pos != -1:
                          revs = web.repo.changelog.revs(pos, lastrev)
                          dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
                          tree = list(
                              item
                              for item in graphmod.colored(dag, web.repo)
                              if item[1] == graphmod.CHANGESET
                          )
                      return tree
                  def jsdata(context):
                      for (id, type, ctx, vtx, edges) in fulltree():
                          yield {
                              b'node': pycompat.bytestr(ctx),
                              b'graphnode': webutil.getgraphnode(web.repo, ctx),
                              b'vertex': vtx,
                              b'edges': edges,
                          }
                  def nodes(context):
                      parity = paritygen(web.stripecount)
                      for row, (id, type, ctx, vtx, edges) in enumerate(tree):
                          entry = webutil.commonentry(web.repo, ctx)
                          edgedata = [
                              {
                                  b'col': edge[0],
                                  b'nextcol': edge[1],
                                  b'color': (edge[2] - 1) % 6 + 1,
                                  b'width': edge[3],
                                  b'bcolor': edge[4],
                              }
                              for edge in edges
                          ]
                          entry.update(
                              {
                                  b'col': vtx[0],
                                  b'color': (vtx[1] - 1) % 6 + 1,
                                  b'parity': next(parity),
                                  b'edges': templateutil.mappinglist(edgedata),
                                  b'row': row,
                                  b'nextrow': row + 1,
                              }
                          )
                          yield entry
                  rows = len(tree)
                  return web.sendtemplate(
                      b'graph',
                      rev=rev,
                      symrev=symrev,
                      revcount=revcount,
                      uprev=uprev,
                      lessvars=lessvars,
                      morevars=morevars,
                      downrev=downrev,
                      graphvars=graphvars,
                      rows=rows,
                      bg_height=bg_height,
                      changesets=count,
                      nextentry=templateutil.mappinglist(nextentry),
                      jsdata=templateutil.mappinggenerator(jsdata),
                      nodes=templateutil.mappinggenerator(nodes),
                      node=ctx.hex(),
                      archives=web.archivelist(b'tip'),
                      changenav=changenav,
                  )
              def _getdoc(e):
                  doc = e[0].__doc__
                  if doc:
                      doc = _(doc).partition(b'\n')[0]
                  else:
                      doc = _(b'(no help text available)')
                  return doc
              @webcommand(b'help')
              def help(web):
                  """
                  /help[/{topic}]
                  ---------------
                  Render help documentation.
                  This web command is roughly equivalent to :hg:`help`. If a ``topic``
                  is defined, that help topic will be rendered. If not, an index of
                  available help topics will be rendered.
                  The ``help`` template will be rendered when requesting help for a topic.
                  ``helptopics`` will be rendered for the index of help topics.
                  """
                  from .. import commands, help as helpmod  # avoid cycle
                  topicname = web.req.qsparams.get(b'node')
                  if not topicname:
                      def topics(context):
                          for h in helpmod.helptable:
                              entries, summary, _doc = h[0:3]
                              yield {b'topic': entries[0], b'summary': summary}
                      early, other = [], []
                      primary = lambda s: s.partition(b'|')[0]
                      for c, e in pycompat.iteritems(commands.table):
                          doc = _getdoc(e)
                          if b'DEPRECATED' in doc or c.startswith(b'debug'):
                              continue
                          cmd = primary(c)
                          if getattr(e[0], 'helpbasic', False):
                              early.append((cmd, doc))
                          else:
                              other.append((cmd, doc))
                      early.sort()
                      other.sort()
                      def earlycommands(context):
                          for c, doc in early:
                              yield {b'topic': c, b'summary': doc}
                      def othercommands(context):
                          for c, doc in other:
                              yield {b'topic': c, b'summary': doc}
                      return web.sendtemplate(
                          b'helptopics',
                          topics=templateutil.mappinggenerator(topics),
                          earlycommands=templateutil.mappinggenerator(earlycommands),
                          othercommands=templateutil.mappinggenerator(othercommands),
                          title=b'Index',
                      )
                  # Render an index of sub-topics.
                  if topicname in helpmod.subtopics:
                      topics = []
                      for entries, summary, _doc in helpmod.subtopics[topicname]:
                          topics.append(
                              {
                                  b'topic': b'%s.%s' % (topicname, entries[0]),
                                  b'basename': entries[0],
                                  b'summary': summary,
                              }
                          )
                      return web.sendtemplate(
                          b'helptopics',
                          topics=templateutil.mappinglist(topics),
                          title=topicname,
                          subindex=True,
                      )
                  u = webutil.wsgiui.load()
                  u.verbose = True
                  # Render a page from a sub-topic.
                  if b'.' in topicname:
                      # TODO implement support for rendering sections, like
                      # `hg help` works.
                      topic, subtopic = topicname.split(b'.', 1)
                      if topic not in helpmod.subtopics:
                          raise ErrorResponse(HTTP_NOT_FOUND)
                  else:
                      topic = topicname
                      subtopic = None
                  try:
                      doc = helpmod.help_(u, commands, topic, subtopic=subtopic)
                  except error.Abort:
                      raise ErrorResponse(HTTP_NOT_FOUND)
                  return web.sendtemplate(b'help', topic=topicname, doc=doc)
              # tell hggettext to extract docstrings from these functions:
              i18nfunctions = commands.values()

mercurial/hgweb/webutil.py

0 +1 -1

              # hgweb/webutil.py - utility library for the web interface.
              #
              # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
              # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import copy
              import difflib
              import os
              import re
              from ..i18n import _
              from ..node import hex, nullid, short
              from ..pycompat import setattr
              from .common import (
                  ErrorResponse,
                  HTTP_BAD_REQUEST,
                  HTTP_NOT_FOUND,
                  paritygen,
              )
              from .. import (
                  context,
                  diffutil,
                  error,
                  match,
                  mdiff,
                  obsutil,
                  patch,
                  pathutil,
                  pycompat,
                  scmutil,
                  templatefilters,
                  templatekw,
                  templateutil,
                  ui as uimod,
                  util,
              )
              from ..utils import stringutil
              archivespecs = util.sortdict(
                  (
                      (b'zip', (b'application/zip', b'zip', b'.zip', None)),
                      (b'gz', (b'application/x-gzip', b'tgz', b'.tar.gz', None)),
                      (b'bz2', (b'application/x-bzip2', b'tbz2', b'.tar.bz2', None)),
                  )
              )
              def archivelist(ui, nodeid, url=None):
                  allowed = ui.configlist(b'web', b'allow-archive', untrusted=True)
                  archives = []
                  for typ, spec in pycompat.iteritems(archivespecs):
                      if typ in allowed or ui.configbool(
                          b'web', b'allow' + typ, untrusted=True
                      ):
                          archives.append(
                              {
                                  b'type': typ,
                                  b'extension': spec[2],
                                  b'node': nodeid,
                                  b'url': url,
                              }
                          )
                  return templateutil.mappinglist(archives)
              def up(p):
                  if p[0:1] != b"/":
                      p = b"/" + p
                  if p[-1:] == b"/":
                      p = p[:-1]
                  up = os.path.dirname(p)
                  if up == b"/":
                      return b"/"
                  return up + b"/"
              def _navseq(step, firststep=None):
                  if firststep:
                      yield firststep
                      if firststep >= 20 and firststep <= 40:
                          firststep = 50
                          yield firststep
                      assert step > 0
                      assert firststep > 0
                      while step <= firststep:
                          step *= 10
                  while True:
                      yield 1 * step
                      yield 3 * step
                      step *= 10
              class revnav(object):
                  def __init__(self, repo):
                      """Navigation generation object
                      :repo: repo object we generate nav for
                      """
                      # used for hex generation
                      self._revlog = repo.changelog
                  def __nonzero__(self):
                      """return True if any revision to navigate over"""
                      return self._first() is not None
                  __bool__ = __nonzero__
                  def _first(self):
                      """return the minimum non-filtered changeset or None"""
                      try:
                          return next(iter(self._revlog))
                      except StopIteration:
                          return None
                  def hex(self, rev):
                      return hex(self._revlog.node(rev))
                  def gen(self, pos, pagelen, limit):
                      """computes label and revision id for navigation link
                      :pos: is the revision relative to which we generate navigation.
                      :pagelen: the size of each navigation page
                      :limit: how far shall we link
                      The return is:
                          - a single element mappinglist
                          - containing a dictionary with a `before` and `after` key
                          - values are dictionaries with `label` and `node` keys
                      """
                      if not self:
                          # empty repo
                          return templateutil.mappinglist(
                              [
                                  {
                                      b'before': templateutil.mappinglist([]),
                                      b'after': templateutil.mappinglist([]),
                                  },
                              ]
                          )
                      targets = []
                      for f in _navseq(1, pagelen):
                          if f > limit:
                              break
                          targets.append(pos + f)
                          targets.append(pos - f)
                      targets.sort()
                      first = self._first()
                      navbefore = [{b'label': b'(%i)' % first, b'node': self.hex(first)}]
                      navafter = []
                      for rev in targets:
                          if rev not in self._revlog:
                              continue
                          if pos < rev < limit:
                              navafter.append(
                                  {b'label': b'+%d' % abs(rev - pos), b'node': self.hex(rev)}
                              )
                          if 0 < rev < pos:
                              navbefore.append(
                                  {b'label': b'-%d' % abs(rev - pos), b'node': self.hex(rev)}
                              )
                      navafter.append({b'label': b'tip', b'node': b'tip'})
                      # TODO: maybe this can be a scalar object supporting tomap()
                      return templateutil.mappinglist(
                          [
                              {
                                  b'before': templateutil.mappinglist(navbefore),
                                  b'after': templateutil.mappinglist(navafter),
                              },
                          ]
                      )
              class filerevnav(revnav):
                  def __init__(self, repo, path):
                      """Navigation generation object
                      :repo: repo object we generate nav for
                      :path: path of the file we generate nav for
                      """
                      # used for iteration
                      self._changelog = repo.unfiltered().changelog
                      # used for hex generation
                      self._revlog = repo.file(path)
                  def hex(self, rev):
                      return hex(self._changelog.node(self._revlog.linkrev(rev)))
              # TODO: maybe this can be a wrapper class for changectx/filectx list, which
              # yields {'ctx': ctx}
              def _ctxsgen(context, ctxs):
                  for s in ctxs:
                      d = {
                          b'node': s.hex(),
                          b'rev': s.rev(),
                          b'user': s.user(),
                          b'date': s.date(),
                          b'description': s.description(),
                          b'branch': s.branch(),
                      }
                      if util.safehasattr(s, b'path'):
                          d[b'file'] = s.path()
                      yield d
              def _siblings(siblings=None, hiderev=None):
                  if siblings is None:
                      siblings = []
                  siblings = [s for s in siblings if s.node() != nullid]
                  if len(siblings) == 1 and siblings[0].rev() == hiderev:
                      siblings = []
                  return templateutil.mappinggenerator(_ctxsgen, args=(siblings,))
              def difffeatureopts(req, ui, section):
                  diffopts = diffutil.difffeatureopts(
                      ui, untrusted=True, section=section, whitespace=True
                  )
                  for k in (
                      b'ignorews',
                      b'ignorewsamount',
                      b'ignorewseol',
                      b'ignoreblanklines',
                  ):
                      v = req.qsparams.get(k)
                      if v is not None:
                          v = stringutil.parsebool(v)
                          setattr(diffopts, k, v if v is not None else True)
                  return diffopts
              def annotate(req, fctx, ui):
                  diffopts = difffeatureopts(req, ui, b'annotate')
                  return fctx.annotate(follow=True, diffopts=diffopts)
              def parents(ctx, hide=None):
                  if isinstance(ctx, context.basefilectx):
                      introrev = ctx.introrev()
                      if ctx.changectx().rev() != introrev:
                          return _siblings([ctx.repo()[introrev]], hide)
                  return _siblings(ctx.parents(), hide)
              def children(ctx, hide=None):
                  return _siblings(ctx.children(), hide)
              def renamelink(fctx):
                  r = fctx.renamed()
                  if r:
                      return templateutil.mappinglist([{b'file': r[0], b'node': hex(r[1])}])
                  return templateutil.mappinglist([])
              def nodetagsdict(repo, node):
                  return templateutil.hybridlist(repo.nodetags(node), name=b'name')
              def nodebookmarksdict(repo, node):
                  return templateutil.hybridlist(repo.nodebookmarks(node), name=b'name')
              def nodebranchdict(repo, ctx):
                  branches = []
                  branch = ctx.branch()
                  # If this is an empty repo, ctx.node() == nullid,
                  # ctx.branch() == 'default'.
                  try:
                      branchnode = repo.branchtip(branch)
                  except error.RepoLookupError:
                      branchnode = None
                  if branchnode == ctx.node():
                      branches.append(branch)
                  return templateutil.hybridlist(branches, name=b'name')
              def nodeinbranch(repo, ctx):
                  branches = []
                  branch = ctx.branch()
                  try:
                      branchnode = repo.branchtip(branch)
                  except error.RepoLookupError:
                      branchnode = None
                  if branch != b'default' and branchnode != ctx.node():
                      branches.append(branch)
                  return templateutil.hybridlist(branches, name=b'name')
              def nodebranchnodefault(ctx):
                  branches = []
                  branch = ctx.branch()
                  if branch != b'default':
                      branches.append(branch)
                  return templateutil.hybridlist(branches, name=b'name')
              def _nodenamesgen(context, f, node, name):
                  for t in f(node):
                      yield {name: t}
              def showtag(repo, t1, node=nullid):
                  args = (repo.nodetags, node, b'tag')
                  return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1)
              def showbookmark(repo, t1, node=nullid):
                  args = (repo.nodebookmarks, node, b'bookmark')
                  return templateutil.mappinggenerator(_nodenamesgen, args=args, name=t1)
              def branchentries(repo, stripecount, limit=0):
                  tips = []
                  heads = repo.heads()
                  parity = paritygen(stripecount)
                  sortkey = lambda item: (not item[1], item[0].rev())
                  def entries(context):
                      count = 0
                      if not tips:
                          for tag, hs, tip, closed in repo.branchmap().iterbranches():
                              tips.append((repo[tip], closed))
                      for ctx, closed in sorted(tips, key=sortkey, reverse=True):
                          if limit > 0 and count >= limit:
                              return
                          count += 1
                          if closed:
                              status = b'closed'
                          elif ctx.node() not in heads:
                              status = b'inactive'
                          else:
                              status = b'open'
                          yield {
                              b'parity': next(parity),
                              b'branch': ctx.branch(),
                              b'status': status,
                              b'node': ctx.hex(),
                              b'date': ctx.date(),
                          }
                  return templateutil.mappinggenerator(entries)
              def cleanpath(repo, path):
                  path = path.lstrip(b'/')
                  auditor = pathutil.pathauditor(repo.root, realfs=False)
                  return pathutil.canonpath(repo.root, b'', path, auditor=auditor)
              def changectx(repo, req):
                  changeid = b"tip"
                  if b'node' in req.qsparams:
                      changeid = req.qsparams[b'node']
                      ipos = changeid.find(b':')
                      if ipos != -1:
                          changeid = changeid[(ipos + 1) :]
                  return scmutil.revsymbol(repo, changeid)
              def basechangectx(repo, req):
                  if b'node' in req.qsparams:
                      changeid = req.qsparams[b'node']
                      ipos = changeid.find(b':')
                      if ipos != -1:
                          changeid = changeid[:ipos]
                          return scmutil.revsymbol(repo, changeid)
                  return None
              def filectx(repo, req):
                  if b'file' not in req.qsparams:
                      raise ErrorResponse(HTTP_NOT_FOUND, b'file not given')
                  path = cleanpath(repo, req.qsparams[b'file'])
                  if b'node' in req.qsparams:
                      changeid = req.qsparams[b'node']
                  elif b'filenode' in req.qsparams:
                      changeid = req.qsparams[b'filenode']
                  else:
                      raise ErrorResponse(HTTP_NOT_FOUND, b'node or filenode not given')
                  try:
                      fctx = scmutil.revsymbol(repo, changeid)[path]
                  except error.RepoError:
                      fctx = repo.filectx(path, fileid=changeid)
                  return fctx
              def linerange(req):
                  linerange = req.qsparams.getall(b'linerange')
                  if not linerange:
                      return None
                  if len(linerange) > 1:
                      raise ErrorResponse(HTTP_BAD_REQUEST, b'redundant linerange parameter')
                  try:
                      fromline, toline = map(int, linerange[0].split(b':', 1))
                  except ValueError:
                      raise ErrorResponse(HTTP_BAD_REQUEST, b'invalid linerange parameter')
                  try:
                      return util.processlinerange(fromline, toline)
                  except error.ParseError as exc:
                      raise ErrorResponse(HTTP_BAD_REQUEST, pycompat.bytestr(exc))
              def formatlinerange(fromline, toline):
                  return b'%d:%d' % (fromline + 1, toline)
              def _succsandmarkersgen(context, mapping):
                  repo = context.resource(mapping, b'repo')
                  itemmappings = templatekw.showsuccsandmarkers(context, mapping)
                  for item in itemmappings.tovalue(context, mapping):
                      item[b'successors'] = _siblings(
                          repo[successor] for successor in item[b'successors']
                      )
                      yield item
              def succsandmarkers(context, mapping):
                  return templateutil.mappinggenerator(_succsandmarkersgen, args=(mapping,))
              # teach templater succsandmarkers is switched to (context, mapping) API
              succsandmarkers._requires = {b'repo', b'ctx'}
              def _whyunstablegen(context, mapping):
                  repo = context.resource(mapping, b'repo')
                  ctx = context.resource(mapping, b'ctx')
                  entries = obsutil.whyunstable(repo, ctx)
                  for entry in entries:
                      if entry.get(b'divergentnodes'):
                          entry[b'divergentnodes'] = _siblings(entry[b'divergentnodes'])
                      yield entry
              def whyunstable(context, mapping):
                  return templateutil.mappinggenerator(_whyunstablegen, args=(mapping,))
              whyunstable._requires = {b'repo', b'ctx'}
              def commonentry(repo, ctx):
                  node = scmutil.binnode(ctx)
                  return {
                      # TODO: perhaps ctx.changectx() should be assigned if ctx is a
                      # filectx, but I'm not pretty sure if that would always work because
                      # fctx.parents() != fctx.changectx.parents() for example.
                      b'ctx': ctx,
                      b'rev': ctx.rev(),
                      b'node': hex(node),
                      b'author': ctx.user(),
                      b'desc': ctx.description(),
                      b'date': ctx.date(),
                      b'extra': ctx.extra(),
                      b'phase': ctx.phasestr(),
                      b'obsolete': ctx.obsolete(),
                      b'succsandmarkers': succsandmarkers,
                      b'instabilities': templateutil.hybridlist(
                          ctx.instabilities(), name=b'instability'
                      ),
                      b'whyunstable': whyunstable,
                      b'branch': nodebranchnodefault(ctx),
                      b'inbranch': nodeinbranch(repo, ctx),
                      b'branches': nodebranchdict(repo, ctx),
                      b'tags': nodetagsdict(repo, node),
                      b'bookmarks': nodebookmarksdict(repo, node),
                      b'parent': lambda context, mapping: parents(ctx),
                      b'child': lambda context, mapping: children(ctx),
                  }
              def changelistentry(web, ctx):
                  '''Obtain a dictionary to be used for entries in a changelist.
                  This function is called when producing items for the "entries" list passed
                  to the "shortlog" and "changelog" templates.
                  '''
                  repo = web.repo
                  rev = ctx.rev()
                  n = scmutil.binnode(ctx)
                  showtags = showtag(repo, b'changelogtag', n)
                  files = listfilediffs(ctx.files(), n, web.maxfiles)
                  entry = commonentry(repo, ctx)
                  entry.update(
                      {
                          b'allparents': lambda context, mapping: parents(ctx),
                          b'parent': lambda context, mapping: parents(ctx, rev - 1),
                          b'child': lambda context, mapping: children(ctx, rev + 1),
                          b'changelogtag': showtags,
                          b'files': files,
                      }
                  )
                  return entry
              def changelistentries(web, revs, maxcount, parityfn):
                  """Emit up to N records for an iterable of revisions."""
                  repo = web.repo
                  count = 0
                  for rev in revs:
                      if count >= maxcount:
                          break
                      count += 1
                      entry = changelistentry(web, repo[rev])
                      entry[b'parity'] = next(parityfn)
                      yield entry
              def symrevorshortnode(req, ctx):
                  if b'node' in req.qsparams:
                      return templatefilters.revescape(req.qsparams[b'node'])
                  else:
                      return short(scmutil.binnode(ctx))
              def _listfilesgen(context, ctx, stripecount):
                  parity = paritygen(stripecount)
                  filesadded = ctx.filesadded()
                  for blockno, f in enumerate(ctx.files()):
                      if f not in ctx:
                          status = b'removed'
                      elif f in filesadded:
                          status = b'added'
                      else:
                          status = b'modified'
                      template = b'filenolink' if status == b'removed' else b'filenodelink'
                      yield context.process(
                          template,
                          {
                              b'node': ctx.hex(),
                              b'file': f,
                              b'blockno': blockno + 1,
                              b'parity': next(parity),
                              b'status': status,
                          },
                      )
              def changesetentry(web, ctx):
                  '''Obtain a dictionary to be used to render the "changeset" template.'''
                  showtags = showtag(web.repo, b'changesettag', scmutil.binnode(ctx))
                  showbookmarks = showbookmark(
                      web.repo, b'changesetbookmark', scmutil.binnode(ctx)
                  )
                  showbranch = nodebranchnodefault(ctx)
                  basectx = basechangectx(web.repo, web.req)
                  if basectx is None:
                      basectx = ctx.p1()
                  style = web.config(b'web', b'style')
                  if b'style' in web.req.qsparams:
                      style = web.req.qsparams[b'style']
                  diff = diffs(web, ctx, basectx, None, style)
                  parity = paritygen(web.stripecount)
                  diffstatsgen = diffstatgen(web.repo.ui, ctx, basectx)
                  diffstats = diffstat(ctx, diffstatsgen, parity)
                  return dict(
                      diff=diff,
                      symrev=symrevorshortnode(web.req, ctx),
                      basenode=basectx.hex(),
                      changesettag=showtags,
                      changesetbookmark=showbookmarks,
                      changesetbranch=showbranch,
                      files=templateutil.mappedgenerator(
                          _listfilesgen, args=(ctx, web.stripecount)
                      ),
                      diffsummary=lambda context, mapping: diffsummary(diffstatsgen),
                      diffstat=diffstats,
                      archives=web.archivelist(ctx.hex()),
                      **pycompat.strkwargs(commonentry(web.repo, ctx))
                  )
              def _listfilediffsgen(context, files, node, max):
                  for f in files[:max]:
                      yield context.process(b'filedifflink', {b'node': hex(node), b'file': f})
                  if len(files) > max:
                      yield context.process(b'fileellipses', {})
              def listfilediffs(files, node, max):
                  return templateutil.mappedgenerator(
                      _listfilediffsgen, args=(files, node, max)
                  )
              def _prettyprintdifflines(context, lines, blockno, lineidprefix):
                  for lineno, l in enumerate(lines, 1):
                      difflineno = b"%d.%d" % (blockno, lineno)
                      if l.startswith(b'+'):
                          ltype = b"difflineplus"
                      elif l.startswith(b'-'):
                          ltype = b"difflineminus"
                      elif l.startswith(b'@'):
                          ltype = b"difflineat"
                      else:
                          ltype = b"diffline"
                      yield context.process(
                          ltype,
                          {
                              b'line': l,
                              b'lineno': lineno,
                              b'lineid': lineidprefix + b"l%s" % difflineno,
                              b'linenumber': b"% 8s" % difflineno,
                          },
                      )
              def _diffsgen(
                  context,
                  repo,
                  ctx,
                  basectx,
                  files,
                  style,
                  stripecount,
                  linerange,
                  lineidprefix,
              ):
                  if files:
                      m = match.exact(files)
                  else:
                      m = match.always()
                  diffopts = patch.diffopts(repo.ui, untrusted=True)
                  parity = paritygen(stripecount)
                  diffhunks = patch.diffhunks(repo, basectx, ctx, m, opts=diffopts)
                  for blockno, (fctx1, fctx2, header, hunks) in enumerate(diffhunks, 1):
                      if style != b'raw':
                          header = header[1:]
                      lines = [h + b'\n' for h in header]
                      for hunkrange, hunklines in hunks:
                          if linerange is not None and hunkrange is not None:
                              s1, l1, s2, l2 = hunkrange
                              if not mdiff.hunkinrange((s2, l2), linerange):
                                  continue
                          lines.extend(hunklines)
                      if lines:
                          l = templateutil.mappedgenerator(
                              _prettyprintdifflines, args=(lines, blockno, lineidprefix)
                          )
                          yield {
                              b'parity': next(parity),
                              b'blockno': blockno,
                              b'lines': l,
                          }
              def diffs(web, ctx, basectx, files, style, linerange=None, lineidprefix=b''):
                  args = (
                      web.repo,
                      ctx,
                      basectx,
                      files,
                      style,
                      web.stripecount,
                      linerange,
                      lineidprefix,
                  )
                  return templateutil.mappinggenerator(
                      _diffsgen, args=args, name=b'diffblock'
                  )
              def _compline(type, leftlineno, leftline, rightlineno, rightline):
                  lineid = leftlineno and (b"l%d" % leftlineno) or b''
                  lineid += rightlineno and (b"r%d" % rightlineno) or b''
                  llno = b'%d' % leftlineno if leftlineno else b''
                  rlno = b'%d' % rightlineno if rightlineno else b''
                  return {
                      b'type': type,
                      b'lineid': lineid,
                      b'leftlineno': leftlineno,
                      b'leftlinenumber': b"% 6s" % llno,
                      b'leftline': leftline or b'',
                      b'rightlineno': rightlineno,
                      b'rightlinenumber': b"% 6s" % rlno,
                      b'rightline': rightline or b'',
                  }
              def _getcompblockgen(context, leftlines, rightlines, opcodes):
                  for type, llo, lhi, rlo, rhi in opcodes:
                      type = pycompat.sysbytes(type)
                      len1 = lhi - llo
                      len2 = rhi - rlo
                      count = min(len1, len2)
                      for i in pycompat.xrange(count):
                          yield _compline(
                              type=type,
                              leftlineno=llo + i + 1,
                              leftline=leftlines[llo + i],
                              rightlineno=rlo + i + 1,
                              rightline=rightlines[rlo + i],
                          )
                      if len1 > len2:
                          for i in pycompat.xrange(llo + count, lhi):
                              yield _compline(
                                  type=type,
                                  leftlineno=i + 1,
                                  leftline=leftlines[i],
                                  rightlineno=None,
                                  rightline=None,
                              )
                      elif len2 > len1:
                          for i in pycompat.xrange(rlo + count, rhi):
                              yield _compline(
                                  type=type,
                                  leftlineno=None,
                                  leftline=None,
                                  rightlineno=i + 1,
                                  rightline=rightlines[i],
                              )
              def _getcompblock(leftlines, rightlines, opcodes):
                  args = (leftlines, rightlines, opcodes)
                  return templateutil.mappinggenerator(
                      _getcompblockgen, args=args, name=b'comparisonline'
                  )
              def _comparegen(context, contextnum, leftlines, rightlines):
                  '''Generator function that provides side-by-side comparison data.'''
                  s = difflib.SequenceMatcher(None, leftlines, rightlines)
                  if contextnum < 0:
                      l = _getcompblock(leftlines, rightlines, s.get_opcodes())
                      yield {b'lines': l}
                  else:
                      for oc in s.get_grouped_opcodes(n=contextnum):
                          l = _getcompblock(leftlines, rightlines, oc)
                          yield {b'lines': l}
              def compare(contextnum, leftlines, rightlines):
                  args = (contextnum, leftlines, rightlines)
                  return templateutil.mappinggenerator(
                      _comparegen, args=args, name=b'comparisonblock'
                  )
              def diffstatgen(ui, ctx, basectx):
                  '''Generator function that provides the diffstat data.'''
                  diffopts = patch.diffopts(ui, {b'noprefix': False})
                  stats = patch.diffstatdata(util.iterlines(ctx.diff(basectx, opts=diffopts)))
                  maxname, maxtotal, addtotal, removetotal, binary = patch.diffstatsum(stats)
                  while True:
                      yield stats, maxname, maxtotal, addtotal, removetotal, binary
              def diffsummary(statgen):
                  '''Return a short summary of the diff.'''
                  stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen)
                  return _(b' %d files changed, %d insertions(+), %d deletions(-)\n') % (
                      len(stats),
                      addtotal,
                      removetotal,
                  )
              def _diffstattmplgen(context, ctx, statgen, parity):
                  stats, maxname, maxtotal, addtotal, removetotal, binary = next(statgen)
                  files = ctx.files()
                  def pct(i):
                      if maxtotal == 0:
                          return 0
                      return (float(i) / maxtotal) * 100
                  fileno = 0
                  for filename, adds, removes, isbinary in stats:
                      template = b'diffstatlink' if filename in files else b'diffstatnolink'
                      total = adds + removes
                      fileno += 1
                      yield context.process(
                          template,
                          {
                              b'node': ctx.hex(),
                              b'file': filename,
                              b'fileno': fileno,
                              b'total': total,
                              b'addpct': pct(adds),
                              b'removepct': pct(removes),
                              b'parity': next(parity),
                          },
                      )
              def diffstat(ctx, statgen, parity):
                  '''Return a diffstat template for each file in the diff.'''
                  args = (ctx, statgen, parity)
                  return templateutil.mappedgenerator(_diffstattmplgen, args=args)
              class sessionvars(templateutil.wrapped):
                  def __init__(self, vars, start=b'?'):
                      self._start = start
                      self._vars = vars
                  def __getitem__(self, key):
                      return self._vars[key]
                  def __setitem__(self, key, value):
                      self._vars[key] = value
                  def __copy__(self):
                      return sessionvars(copy.copy(self._vars), self._start)
                  def contains(self, context, mapping, item):
                      item = templateutil.unwrapvalue(context, mapping, item)
                      return item in self._vars
                  def getmember(self, context, mapping, key):
                      key = templateutil.unwrapvalue(context, mapping, key)
                      return self._vars.get(key)
                  def getmin(self, context, mapping):
                      raise error.ParseError(_(b'not comparable'))
                  def getmax(self, context, mapping):
                      raise error.ParseError(_(b'not comparable'))
                  def filter(self, context, mapping, select):
                      # implement if necessary
                      raise error.ParseError(_(b'not filterable'))
                  def itermaps(self, context):
                      separator = self._start
                      for key, value in sorted(pycompat.iteritems(self._vars)):
                          yield {
                              b'name': key,
                              b'value': pycompat.bytestr(value),
                              b'separator': separator,
                          }
                          separator = b'&'
                  def join(self, context, mapping, sep):
                      # could be '{separator}{name}={value|urlescape}'
                      raise error.ParseError(_(b'not displayable without template'))
                  def show(self, context, mapping):
-                     return self.join(context, b'')
+                     return self.join(context, mapping, b'')
                  def tobool(self, context, mapping):
                      return bool(self._vars)
                  def tovalue(self, context, mapping):
                      return self._vars
              class wsgiui(uimod.ui):
                  # default termwidth breaks under mod_wsgi
                  def termwidth(self):
                      return 80
              def getwebsubs(repo):
                  websubtable = []
                  websubdefs = repo.ui.configitems(b'websub')
                  # we must maintain interhg backwards compatibility
                  websubdefs += repo.ui.configitems(b'interhg')
                  for key, pattern in websubdefs:
                      # grab the delimiter from the character after the "s"
                      unesc = pattern[1:2]
                      delim = stringutil.reescape(unesc)
                      # identify portions of the pattern, taking care to avoid escaped
                      # delimiters. the replace format and flags are optional, but
                      # delimiters are required.
                      match = re.match(
                          br'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$'
                          % (delim, delim, delim),
                          pattern,
                      )
                      if not match:
                          repo.ui.warn(
                              _(b"websub: invalid pattern for %s: %s\n") % (key, pattern)
                          )
                          continue
                      # we need to unescape the delimiter for regexp and format
                      delim_re = re.compile(br'(?<!\\)\\%s' % delim)
                      regexp = delim_re.sub(unesc, match.group(1))
                      format = delim_re.sub(unesc, match.group(2))
                      # the pattern allows for 6 regexp flags, so set them if necessary
                      flagin = match.group(3)
                      flags = 0
                      if flagin:
                          for flag in pycompat.sysstr(flagin.upper()):
                              flags |= re.__dict__[flag]
                      try:
                          regexp = re.compile(regexp, flags)
                          websubtable.append((regexp, format))
                      except re.error:
                          repo.ui.warn(
                              _(b"websub: invalid regexp for %s: %s\n") % (key, regexp)
                          )
                  return websubtable
              def getgraphnode(repo, ctx):
                  return templatekw.getgraphnodecurrent(
                      repo, ctx
                  ) + templatekw.getgraphnodesymbol(ctx)

mercurial/logcmdutil.py

0 +4 -2

              # logcmdutil.py - utility for log-like commands
              #
              # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import itertools
              import os
              import posixpath
              from .i18n import _
              from .node import (
                  nullid,
                  wdirid,
                  wdirrev,
              )
              from . import (
                  dagop,
                  error,
                  formatter,
                  graphmod,
                  match as matchmod,
                  mdiff,
                  patch,
                  pathutil,
                  pycompat,
                  revset,
                  revsetlang,
                  scmutil,
                  smartset,
                  templatekw,
                  templater,
                  util,
              )
              from .utils import (
                  dateutil,
                  stringutil,
              )
              if pycompat.TYPE_CHECKING:
                  from typing import (
                      Any,
                      Optional,
                      Tuple,
                  )
                  for t in (Any, Optional, Tuple):
                      assert t
              def getlimit(opts):
                  """get the log limit according to option -l/--limit"""
                  limit = opts.get(b'limit')
                  if limit:
                      try:
                          limit = int(limit)
                      except ValueError:
                          raise error.Abort(_(b'limit must be a positive integer'))
                      if limit <= 0:
                          raise error.Abort(_(b'limit must be positive'))
                  else:
                      limit = None
                  return limit
              def diffordiffstat(
                  ui,
                  repo,
                  diffopts,
                  node1,
                  node2,
                  match,
                  changes=None,
                  stat=False,
                  fp=None,
                  graphwidth=0,
                  prefix=b'',
                  root=b'',
                  listsubrepos=False,
                  hunksfilterfn=None,
              ):
                  '''show diff or diffstat.'''
                  ctx1 = repo[node1]
                  ctx2 = repo[node2]
                  if root:
                      relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
                  else:
                      relroot = b''
                  copysourcematch = None
                  def compose(f, g):
                      return lambda x: f(g(x))
                  def pathfn(f):
                      return posixpath.join(prefix, f)
                  if relroot != b'':
                      # XXX relative roots currently don't work if the root is within a
                      # subrepo
                      uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
                      uirelroot = uipathfn(pathfn(relroot))
                      relroot += b'/'
                      for matchroot in match.files():
                          if not matchroot.startswith(relroot):
                              ui.warn(
                                  _(b'warning: %s not inside relative root %s\n')
                                  % (uipathfn(pathfn(matchroot)), uirelroot)
                              )
                      relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path')
                      match = matchmod.intersectmatchers(match, relrootmatch)
                      copysourcematch = relrootmatch
                      checkroot = repo.ui.configbool(
                          b'devel', b'all-warnings'
                      ) or repo.ui.configbool(b'devel', b'check-relroot')
                      def relrootpathfn(f):
                          if checkroot and not f.startswith(relroot):
                              raise AssertionError(
                                  b"file %s doesn't start with relroot %s" % (f, relroot)
                              )
                          return f[len(relroot) :]
                      pathfn = compose(relrootpathfn, pathfn)
                  if stat:
                      diffopts = diffopts.copy(context=0, noprefix=False)
                      width = 80
                      if not ui.plain():
                          width = ui.termwidth() - graphwidth
                      # If an explicit --root was given, don't respect ui.relative-paths
                      if not relroot:
                          pathfn = compose(scmutil.getuipathfn(repo), pathfn)
                  chunks = ctx2.diff(
                      ctx1,
                      match,
                      changes,
                      opts=diffopts,
                      pathfn=pathfn,
                      copysourcematch=copysourcematch,
                      hunksfilterfn=hunksfilterfn,
                  )
                  if fp is not None or ui.canwritewithoutlabels():
                      out = fp or ui
                      if stat:
                          chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
                      for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
                          out.write(chunk)
                  else:
                      if stat:
                          chunks = patch.diffstatui(util.iterlines(chunks), width=width)
                      else:
                          chunks = patch.difflabel(
                              lambda chunks, **kwargs: chunks, chunks, opts=diffopts
                          )
                      if ui.canbatchlabeledwrites():
                          def gen():
                              for chunk, label in chunks:
                                  yield ui.label(chunk, label=label)
                          for chunk in util.filechunkiter(util.chunkbuffer(gen())):
                              ui.write(chunk)
                      else:
                          for chunk, label in chunks:
                              ui.write(chunk, label=label)
                  for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
                      tempnode2 = node2
                      try:
                          if node2 is not None:
                              tempnode2 = ctx2.substate[subpath][1]
                      except KeyError:
                          # A subrepo that existed in node1 was deleted between node1 and
                          # node2 (inclusive). Thus, ctx2's substate won't contain that
                          # subpath. The best we can do is to ignore it.
                          tempnode2 = None
                      submatch = matchmod.subdirmatcher(subpath, match)
                      subprefix = repo.wvfs.reljoin(prefix, subpath)
                      if listsubrepos or match.exact(subpath) or any(submatch.files()):
                          sub.diff(
                              ui,
                              diffopts,
                              tempnode2,
                              submatch,
                              changes=changes,
                              stat=stat,
                              fp=fp,
                              prefix=subprefix,
                          )
              class changesetdiffer(object):
                  """Generate diff of changeset with pre-configured filtering functions"""
                  def _makefilematcher(self, ctx):
                      return scmutil.matchall(ctx.repo())
                  def _makehunksfilter(self, ctx):
                      return None
                  def showdiff(self, ui, ctx, diffopts, graphwidth=0, stat=False):
                      repo = ctx.repo()
                      node = ctx.node()
                      prev = ctx.p1().node()
                      diffordiffstat(
                          ui,
                          repo,
                          diffopts,
                          prev,
                          node,
                          match=self._makefilematcher(ctx),
                          stat=stat,
                          graphwidth=graphwidth,
                          hunksfilterfn=self._makehunksfilter(ctx),
                      )
              def changesetlabels(ctx):
                  labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()]
                  if ctx.obsolete():
                      labels.append(b'changeset.obsolete')
                  if ctx.isunstable():
                      labels.append(b'changeset.unstable')
                      for instability in ctx.instabilities():
                          labels.append(b'instability.%s' % instability)
                  return b' '.join(labels)
              class changesetprinter(object):
                  '''show changeset information when templating not requested.'''
                  def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
                      self.ui = ui
                      self.repo = repo
                      self.buffered = buffered
                      self._differ = differ or changesetdiffer()
                      self._diffopts = patch.diffallopts(ui, diffopts)
                      self._includestat = diffopts and diffopts.get(b'stat')
                      self._includediff = diffopts and diffopts.get(b'patch')
                      self.header = {}
                      self.hunk = {}
                      self.lastheader = None
                      self.footer = None
                      self._columns = templatekw.getlogcolumns()
                  def flush(self, ctx):
                      rev = ctx.rev()
                      if rev in self.header:
                          h = self.header[rev]
                          if h != self.lastheader:
                              self.lastheader = h
                              self.ui.write(h)
                          del self.header[rev]
                      if rev in self.hunk:
                          self.ui.write(self.hunk[rev])
                          del self.hunk[rev]
                  def close(self):
                      if self.footer:
                          self.ui.write(self.footer)
                  def show(self, ctx, copies=None, **props):
                      props = pycompat.byteskwargs(props)
                      if self.buffered:
                          self.ui.pushbuffer(labeled=True)
                          self._show(ctx, copies, props)
                          self.hunk[ctx.rev()] = self.ui.popbuffer()
                      else:
                          self._show(ctx, copies, props)
                  def _show(self, ctx, copies, props):
                      '''show a single changeset or file revision'''
                      changenode = ctx.node()
                      graphwidth = props.get(b'graphwidth', 0)
                      if self.ui.quiet:
                          self.ui.write(
                              b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node'
                          )
                          return
                      columns = self._columns
                      self.ui.write(
                          columns[b'changeset'] % scmutil.formatchangeid(ctx),
                          label=changesetlabels(ctx),
                      )
                      # branches are shown first before any other names due to backwards
                      # compatibility
                      branch = ctx.branch()
                      # don't show the default branch name
                      if branch != b'default':
                          self.ui.write(columns[b'branch'] % branch, label=b'log.branch')
                      for nsname, ns in pycompat.iteritems(self.repo.names):
                          # branches has special logic already handled above, so here we just
                          # skip it
                          if nsname == b'branches':
                              continue
                          # we will use the templatename as the color name since those two
                          # should be the same
                          for name in ns.names(self.repo, changenode):
                              self.ui.write(ns.logfmt % name, label=b'log.%s' % ns.colorname)
                      if self.ui.debugflag:
                          self.ui.write(
                              columns[b'phase'] % ctx.phasestr(), label=b'log.phase'
                          )
                      for pctx in scmutil.meaningfulparents(self.repo, ctx):
                          label = b'log.parent changeset.%s' % pctx.phasestr()
                          self.ui.write(
                              columns[b'parent'] % scmutil.formatchangeid(pctx), label=label
                          )
                      if self.ui.debugflag:
                          mnode = ctx.manifestnode()
                          if mnode is None:
                              mnode = wdirid
                              mrev = wdirrev
                          else:
                              mrev = self.repo.manifestlog.rev(mnode)
                          self.ui.write(
                              columns[b'manifest']
                              % scmutil.formatrevnode(self.ui, mrev, mnode),
                              label=b'ui.debug log.manifest',
                          )
                      self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user')
                      self.ui.write(
                          columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date'
                      )
                      if ctx.isunstable():
                          instabilities = ctx.instabilities()
                          self.ui.write(
                              columns[b'instability'] % b', '.join(instabilities),
                              label=b'log.instability',
                          )
                      elif ctx.obsolete():
                          self._showobsfate(ctx)
                      self._exthook(ctx)
                      if self.ui.debugflag:
                          files = ctx.p1().status(ctx)
                          for key, value in zip(
                              [b'files', b'files+', b'files-'],
                              [files.modified, files.added, files.removed],
                          ):
                              if value:
                                  self.ui.write(
                                      columns[key] % b" ".join(value),
                                      label=b'ui.debug log.files',
                                  )
                      elif ctx.files() and self.ui.verbose:
                          self.ui.write(
                              columns[b'files'] % b" ".join(ctx.files()),
                              label=b'ui.note log.files',
                          )
                      if copies and self.ui.verbose:
                          copies = [b'%s (%s)' % c for c in copies]
                          self.ui.write(
                              columns[b'copies'] % b' '.join(copies),
                              label=b'ui.note log.copies',
                          )
                      extra = ctx.extra()
                      if extra and self.ui.debugflag:
                          for key, value in sorted(extra.items()):
                              self.ui.write(
                                  columns[b'extra'] % (key, stringutil.escapestr(value)),
                                  label=b'ui.debug log.extra',
                              )
                      description = ctx.description().strip()
                      if description:
                          if self.ui.verbose:
                              self.ui.write(
                                  _(b"description:\n"), label=b'ui.note log.description'
                              )
                              self.ui.write(description, label=b'ui.note log.description')
                              self.ui.write(b"\n\n")
                          else:
                              self.ui.write(
                                  columns[b'summary'] % description.splitlines()[0],
                                  label=b'log.summary',
                              )
                      self.ui.write(b"\n")
                      self._showpatch(ctx, graphwidth)
                  def _showobsfate(self, ctx):
                      # TODO: do not depend on templater
                      tres = formatter.templateresources(self.repo.ui, self.repo)
                      t = formatter.maketemplater(
                          self.repo.ui,
                          b'{join(obsfate, "\n")}',
                          defaults=templatekw.keywords,
                          resources=tres,
                      )
                      obsfate = t.renderdefault({b'ctx': ctx}).splitlines()
                      if obsfate:
                          for obsfateline in obsfate:
                              self.ui.write(
                                  self._columns[b'obsolete'] % obsfateline,
                                  label=b'log.obsfate',
                              )
                  def _exthook(self, ctx):
                      '''empty method used by extension as a hook point
                      '''
                  def _showpatch(self, ctx, graphwidth=0):
                      if self._includestat:
                          self._differ.showdiff(
                              self.ui, ctx, self._diffopts, graphwidth, stat=True
                          )
                      if self._includestat and self._includediff:
                          self.ui.write(b"\n")
                      if self._includediff:
                          self._differ.showdiff(
                              self.ui, ctx, self._diffopts, graphwidth, stat=False
                          )
                      if self._includestat or self._includediff:
                          self.ui.write(b"\n")
              class changesetformatter(changesetprinter):
                  """Format changeset information by generic formatter"""
                  def __init__(
                      self, ui, repo, fm, differ=None, diffopts=None, buffered=False
                  ):
                      changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
                      self._diffopts = patch.difffeatureopts(ui, diffopts, git=True)
                      self._fm = fm
                  def close(self):
                      self._fm.end()
                  def _show(self, ctx, copies, props):
                      '''show a single changeset or file revision'''
                      fm = self._fm
                      fm.startitem()
                      fm.context(ctx=ctx)
                      fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx)))
                      datahint = fm.datahint()
                      if self.ui.quiet and not datahint:
                          return
                      fm.data(
                          branch=ctx.branch(),
                          phase=ctx.phasestr(),
                          user=ctx.user(),
                          date=fm.formatdate(ctx.date()),
                          desc=ctx.description(),
                          bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'),
                          tags=fm.formatlist(ctx.tags(), name=b'tag'),
                          parents=fm.formatlist(
                              [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node'
                          ),
                      )
                      if self.ui.debugflag or b'manifest' in datahint:
                          fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid))
                      if self.ui.debugflag or b'extra' in datahint:
                          fm.data(extra=fm.formatdict(ctx.extra()))
                      if (
                          self.ui.debugflag
                          or b'modified' in datahint
                          or b'added' in datahint
                          or b'removed' in datahint
                      ):
                          files = ctx.p1().status(ctx)
                          fm.data(
                              modified=fm.formatlist(files.modified, name=b'file'),
                              added=fm.formatlist(files.added, name=b'file'),
                              removed=fm.formatlist(files.removed, name=b'file'),
                          )
                      verbose = not self.ui.debugflag and self.ui.verbose
                      if verbose or b'files' in datahint:
                          fm.data(files=fm.formatlist(ctx.files(), name=b'file'))
                      if verbose and copies or b'copies' in datahint:
                          fm.data(
                              copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
                          )
                      if self._includestat or b'diffstat' in datahint:
                          self.ui.pushbuffer()
                          self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True)
                          fm.data(diffstat=self.ui.popbuffer())
                      if self._includediff or b'diff' in datahint:
                          self.ui.pushbuffer()
                          self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False)
                          fm.data(diff=self.ui.popbuffer())
              class changesettemplater(changesetprinter):
                  '''format changeset information.
                  Note: there are a variety of convenience functions to build a
                  changesettemplater for common cases. See functions such as:
                  maketemplater, changesetdisplayer, buildcommittemplate, or other
                  functions that use changesest_templater.
                  '''
                  # Arguments before "buffered" used to be positional. Consider not
                  # adding/removing arguments before "buffered" to not break callers.
                  def __init__(
                      self, ui, repo, tmplspec, differ=None, diffopts=None, buffered=False
                  ):
                      changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
                      # tres is shared with _graphnodeformatter()
                      self._tresources = tres = formatter.templateresources(ui, repo)
                      self.t = formatter.loadtemplater(
                          ui,
                          tmplspec,
                          defaults=templatekw.keywords,
                          resources=tres,
                          cache=templatekw.defaulttempl,
                      )
                      self._counter = itertools.count()
                      self._tref = tmplspec.ref
                      self._parts = {
                          b'header': b'',
                          b'footer': b'',
                          tmplspec.ref: tmplspec.ref,
                          b'docheader': b'',
                          b'docfooter': b'',
                          b'separator': b'',
                      }
                      if tmplspec.mapfile:
                          # find correct templates for current mode, for backward
                          # compatibility with 'log -v/-q/--debug' using a mapfile
                          tmplmodes = [
                              (True, b''),
                              (self.ui.verbose, b'_verbose'),
                              (self.ui.quiet, b'_quiet'),
                              (self.ui.debugflag, b'_debug'),
                          ]
                          for mode, postfix in tmplmodes:
                              for t in self._parts:
                                  cur = t + postfix
                                  if mode and cur in self.t:
                                      self._parts[t] = cur
                      else:
                          partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
                          m = formatter.templatepartsmap(tmplspec, self.t, partnames)
                          self._parts.update(m)
                      if self._parts[b'docheader']:
                          self.ui.write(self.t.render(self._parts[b'docheader'], {}))
                  def close(self):
                      if self._parts[b'docfooter']:
                          if not self.footer:
                              self.footer = b""
                          self.footer += self.t.render(self._parts[b'docfooter'], {})
                      return super(changesettemplater, self).close()
                  def _show(self, ctx, copies, props):
                      '''show a single changeset or file revision'''
                      props = props.copy()
                      props[b'ctx'] = ctx
                      props[b'index'] = index = next(self._counter)
                      props[b'revcache'] = {b'copies': copies}
                      graphwidth = props.get(b'graphwidth', 0)
                      # write separator, which wouldn't work well with the header part below
                      # since there's inherently a conflict between header (across items) and
                      # separator (per item)
                      if self._parts[b'separator'] and index > 0:
                          self.ui.write(self.t.render(self._parts[b'separator'], {}))
                      # write header
                      if self._parts[b'header']:
                          h = self.t.render(self._parts[b'header'], props)
                          if self.buffered:
                              self.header[ctx.rev()] = h
                          else:
                              if self.lastheader != h:
                                  self.lastheader = h
                                  self.ui.write(h)
                      # write changeset metadata, then patch if requested
                      key = self._parts[self._tref]
                      self.ui.write(self.t.render(key, props))
                      self._showpatch(ctx, graphwidth)
                      if self._parts[b'footer']:
                          if not self.footer:
                              self.footer = self.t.render(self._parts[b'footer'], props)
              def templatespec(tmpl, mapfile):
                  if pycompat.ispy3:
                      assert not isinstance(tmpl, str), b'tmpl must not be a str'
                  if mapfile:
                      return formatter.templatespec(b'changeset', tmpl, mapfile)
                  else:
                      return formatter.templatespec(b'', tmpl, None)
              def _lookuptemplate(ui, tmpl, style):
                  """Find the template matching the given template spec or style
                  See formatter.lookuptemplate() for details.
                  """
                  # ui settings
                  if not tmpl and not style:  # template are stronger than style
                      tmpl = ui.config(b'ui', b'logtemplate')
                      if tmpl:
                          return templatespec(templater.unquotestring(tmpl), None)
                      else:
                          style = util.expandpath(ui.config(b'ui', b'style'))
                  if not tmpl and style:
                      mapfile = style
                      if not os.path.split(mapfile)[0]:
                          mapname = templater.templatepath(
                              b'map-cmdline.' + mapfile
                          ) or templater.templatepath(mapfile)
                          if mapname:
                              mapfile = mapname
                      return templatespec(None, mapfile)
                  return formatter.lookuptemplate(ui, b'changeset', tmpl)
              def maketemplater(ui, repo, tmpl, buffered=False):
                  """Create a changesettemplater from a literal template 'tmpl'
                  byte-string."""
                  spec = templatespec(tmpl, None)
                  return changesettemplater(ui, repo, spec, buffered=buffered)
              def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
                  """show one changeset using template or regular display.
                  Display format will be the first non-empty hit of:
 . option 'template'
 . option 'style'
 . [ui] setting 'logtemplate'
 . [ui] setting 'style'
                  If all of these values are either the unset or the empty string,
                  regular display via changesetprinter() is done.
                  """
                  postargs = (differ, opts, buffered)
                  spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style'))
                  # machine-readable formats have slightly different keyword set than
                  # plain templates, which are handled by changesetformatter.
                  # note that {b'pickle', b'debug'} can also be added to the list if needed.
                  if spec.ref in {b'cbor', b'json'}:
                      fm = ui.formatter(b'log', opts)
                      return changesetformatter(ui, repo, fm, *postargs)
                  if not spec.ref and not spec.tmpl and not spec.mapfile:
                      return changesetprinter(ui, repo, *postargs)
                  return changesettemplater(ui, repo, spec, *postargs)
              def _makematcher(repo, revs, pats, opts):
                  """Build matcher and expanded patterns from log options
                  If --follow, revs are the revisions to follow from.
                  Returns (match, pats, slowpath) where
                  - match: a matcher built from the given pats and -I/-X opts
                  - pats: patterns used (globs are expanded on Windows)
                  - slowpath: True if patterns aren't as simple as scanning filelogs
                  """
                  # pats/include/exclude are passed to match.match() directly in
                  # _matchfiles() revset but walkchangerevs() builds its matcher with
                  # scmutil.match(). The difference is input pats are globbed on
                  # platforms without shell expansion (windows).
                  wctx = repo[None]
                  match, pats = scmutil.matchandpats(wctx, pats, opts)
                  slowpath = match.anypats() or (not match.always() and opts.get(b'removed'))
                  if not slowpath:
                      follow = opts.get(b'follow') or opts.get(b'follow_first')
                      startctxs = []
                      if follow and opts.get(b'rev'):
                          startctxs = [repo[r] for r in revs]
                      for f in match.files():
                          if follow and startctxs:
                              # No idea if the path was a directory at that revision, so
                              # take the slow path.
                              if any(f not in c for c in startctxs):
                                  slowpath = True
                                  continue
                          elif follow and f not in wctx:
                              # If the file exists, it may be a directory, so let it
                              # take the slow path.
                              if os.path.exists(repo.wjoin(f)):
                                  slowpath = True
                                  continue
                              else:
                                  raise error.Abort(
                                      _(
                                          b'cannot follow file not in parent '
                                          b'revision: "%s"'
                                      )
                                      % f
                                  )
                          filelog = repo.file(f)
                          if not filelog:
                              # A zero count may be a directory or deleted file, so
                              # try to find matching entries on the slow path.
                              if follow:
                                  raise error.Abort(
                                      _(b'cannot follow nonexistent file: "%s"') % f
                                  )
                              slowpath = True
                      # We decided to fall back to the slowpath because at least one
                      # of the paths was not a file. Check to see if at least one of them
                      # existed in history - in that case, we'll continue down the
                      # slowpath; otherwise, we can turn off the slowpath
                      if slowpath:
                          for path in match.files():
                              if path == b'.' or path in repo.store:
                                  break
                          else:
                              slowpath = False
                  return match, pats, slowpath
              def _fileancestors(repo, revs, match, followfirst):
                  fctxs = []
                  for r in revs:
                      ctx = repo[r]
                      fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
                  # When displaying a revision with --patch --follow FILE, we have
                  # to know which file of the revision must be diffed. With
                  # --follow, we want the names of the ancestors of FILE in the
                  # revision, stored in "fcache". "fcache" is populated as a side effect
                  # of the graph traversal.
                  fcache = {}
                  def filematcher(ctx):
                      return scmutil.matchfiles(repo, fcache.get(ctx.rev(), []))
                  def revgen():
                      for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
                          fcache[rev] = [c.path() for c in cs]
                          yield rev
                  return smartset.generatorset(revgen(), iterasc=False), filematcher
              def _makenofollowfilematcher(repo, pats, opts):
                  '''hook for extensions to override the filematcher for non-follow cases'''
                  return None
              _opt2logrevset = {
                  b'no_merges': (b'not merge()', None),
                  b'only_merges': (b'merge()', None),
                  b'_matchfiles': (None, b'_matchfiles(%ps)'),
                  b'date': (b'date(%s)', None),
                  b'branch': (b'branch(%s)', b'%lr'),
                  b'_patslog': (b'filelog(%s)', b'%lr'),
                  b'keyword': (b'keyword(%s)', b'%lr'),
                  b'prune': (b'ancestors(%s)', b'not %lr'),
                  b'user': (b'user(%s)', b'%lr'),
              }
              def _makerevset(repo, match, pats, slowpath, opts):
                  """Return a revset string built from log options and file patterns"""
                  opts = dict(opts)
                  # follow or not follow?
                  follow = opts.get(b'follow') or opts.get(b'follow_first')
                  # branch and only_branch are really aliases and must be handled at
                  # the same time
                  opts[b'branch'] = opts.get(b'branch', []) + opts.get(b'only_branch', [])
                  opts[b'branch'] = [repo.lookupbranch(b) for b in opts[b'branch']]
                  if slowpath:
                      # See walkchangerevs() slow path.
                      #
                      # pats/include/exclude cannot be represented as separate
                      # revset expressions as their filtering logic applies at file
                      # level. For instance "-I a -X b" matches a revision touching
                      # "a" and "b" while "file(a) and not file(b)" does
                      # not. Besides, filesets are evaluated against the working
                      # directory.
                      matchargs = [b'r:', b'd:relpath']
                      for p in pats:
                          matchargs.append(b'p:' + p)
                      for p in opts.get(b'include', []):
                          matchargs.append(b'i:' + p)
                      for p in opts.get(b'exclude', []):
                          matchargs.append(b'x:' + p)
                      opts[b'_matchfiles'] = matchargs
                  elif not follow:
                      opts[b'_patslog'] = list(pats)
                  expr = []
                  for op, val in sorted(pycompat.iteritems(opts)):
                      if not val:
                          continue
                      if op not in _opt2logrevset:
                          continue
                      revop, listop = _opt2logrevset[op]
                      if revop and b'%' not in revop:
                          expr.append(revop)
                      elif not listop:
                          expr.append(revsetlang.formatspec(revop, val))
                      else:
                          if revop:
                              val = [revsetlang.formatspec(revop, v) for v in val]
                          expr.append(revsetlang.formatspec(listop, val))
                  if expr:
                      expr = b'(' + b' and '.join(expr) + b')'
                  else:
                      expr = None
                  return expr
              def _initialrevs(repo, opts):
                  """Return the initial set of revisions to be filtered or followed"""
                  follow = opts.get(b'follow') or opts.get(b'follow_first')
                  if opts.get(b'rev'):
                      revs = scmutil.revrange(repo, opts[b'rev'])
                  elif follow and repo.dirstate.p1() == nullid:
                      revs = smartset.baseset()
                  elif follow:
                      revs = repo.revs(b'.')
                  else:
                      revs = smartset.spanset(repo)
                      revs.reverse()
                  return revs
              def getrevs(repo, pats, opts):
                  # type: (Any, Any, Any) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]]
                  """Return (revs, differ) where revs is a smartset
                  differ is a changesetdiffer with pre-configured file matcher.
                  """
                  follow = opts.get(b'follow') or opts.get(b'follow_first')
                  followfirst = opts.get(b'follow_first')
                  limit = getlimit(opts)
                  revs = _initialrevs(repo, opts)
                  if not revs:
                      return smartset.baseset(), None
                  match, pats, slowpath = _makematcher(repo, revs, pats, opts)
                  filematcher = None
                  if follow:
                      if slowpath or match.always():
                          revs = dagop.revancestors(repo, revs, followfirst=followfirst)
                      else:
                          revs, filematcher = _fileancestors(repo, revs, match, followfirst)
                      revs.reverse()
                  if filematcher is None:
                      filematcher = _makenofollowfilematcher(repo, pats, opts)
                  if filematcher is None:
                      def filematcher(ctx):
                          return match
                  expr = _makerevset(repo, match, pats, slowpath, opts)
                  if opts.get(b'graph'):
                      # User-specified revs might be unsorted, but don't sort before
                      # _makerevset because it might depend on the order of revs
                      if repo.ui.configbool(b'experimental', b'log.topo'):
                          if not revs.istopo():
                              revs = dagop.toposort(revs, repo.changelog.parentrevs)
                              # TODO: try to iterate the set lazily
                              revs = revset.baseset(list(revs), istopo=True)
                      elif not (revs.isdescending() or revs.istopo()):
                          revs.sort(reverse=True)
                  if expr:
                      matcher = revset.match(None, expr)
                      revs = matcher(repo, revs)
                  if limit is not None:
                      revs = revs.slice(0, limit)
                  differ = changesetdiffer()
                  differ._makefilematcher = filematcher
                  return revs, differ
              def _parselinerangeopt(repo, opts):
                  """Parse --line-range log option and return a list of tuples (filename,
                  (fromline, toline)).
                  """
                  linerangebyfname = []
                  for pat in opts.get(b'line_range', []):
                      try:
                          pat, linerange = pat.rsplit(b',', 1)
                      except ValueError:
                          raise error.Abort(_(b'malformatted line-range pattern %s') % pat)
                      try:
                          fromline, toline = map(int, linerange.split(b':'))
                      except ValueError:
                          raise error.Abort(_(b"invalid line range for %s") % pat)
                      msg = _(b"line range pattern '%s' must match exactly one file") % pat
                      fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
                      linerangebyfname.append(
                          (fname, util.processlinerange(fromline, toline))
                      )
                  return linerangebyfname
              def getlinerangerevs(repo, userrevs, opts):
                  """Return (revs, differ).
                  "revs" are revisions obtained by processing "line-range" log options and
                  walking block ancestors of each specified file/line-range.
                  "differ" is a changesetdiffer with pre-configured file matcher and hunks
                  filter.
                  """
                  wctx = repo[None]
                  # Two-levels map of "rev -> file ctx -> [line range]".
                  linerangesbyrev = {}
                  for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
                      if fname not in wctx:
                          raise error.Abort(
                              _(b'cannot follow file not in parent revision: "%s"') % fname
                          )
                      fctx = wctx.filectx(fname)
                      for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
                          rev = fctx.introrev()
+                         if rev is None:
+                             rev = wdirrev
                          if rev not in userrevs:
                              continue
                          linerangesbyrev.setdefault(rev, {}).setdefault(
                              fctx.path(), []
                          ).append(linerange)
                  def nofilterhunksfn(fctx, hunks):
                      return hunks
                  def hunksfilter(ctx):
-                     fctxlineranges = linerangesbyrev.get(ctx.rev())
+                     fctxlineranges = linerangesbyrev.get(scmutil.intrev(ctx))
                      if fctxlineranges is None:
                          return nofilterhunksfn
                      def filterfn(fctx, hunks):
                          lineranges = fctxlineranges.get(fctx.path())
                          if lineranges is not None:
                              for hr, lines in hunks:
                                  if hr is None:  # binary
                                      yield hr, lines
                                      continue
                                  if any(mdiff.hunkinrange(hr[2:], lr) for lr in lineranges):
                                      yield hr, lines
                          else:
                              for hunk in hunks:
                                  yield hunk
                      return filterfn
                  def filematcher(ctx):
-                     files = list(linerangesbyrev.get(ctx.rev(), []))
+                     files = list(linerangesbyrev.get(scmutil.intrev(ctx), []))
                      return scmutil.matchfiles(repo, files)
                  revs = sorted(linerangesbyrev, reverse=True)
                  differ = changesetdiffer()
                  differ._makefilematcher = filematcher
                  differ._makehunksfilter = hunksfilter
                  return smartset.baseset(revs), differ
              def _graphnodeformatter(ui, displayer):
                  spec = ui.config(b'ui', b'graphnodetemplate')
                  if not spec:
                      return templatekw.getgraphnode  # fast path for "{graphnode}"
                  spec = templater.unquotestring(spec)
                  if isinstance(displayer, changesettemplater):
                      # reuse cache of slow templates
                      tres = displayer._tresources
                  else:
                      tres = formatter.templateresources(ui)
                  templ = formatter.maketemplater(
                      ui, spec, defaults=templatekw.keywords, resources=tres
                  )
                  def formatnode(repo, ctx):
                      props = {b'ctx': ctx, b'repo': repo}
                      return templ.renderdefault(props)
                  return formatnode
              def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
                  props = props or {}
                  formatnode = _graphnodeformatter(ui, displayer)
                  state = graphmod.asciistate()
                  styles = state.styles
                  # only set graph styling if HGPLAIN is not set.
                  if ui.plain(b'graph'):
                      # set all edge styles to |, the default pre-3.8 behaviour
                      styles.update(dict.fromkeys(styles, b'|'))
                  else:
                      edgetypes = {
                          b'parent': graphmod.PARENT,
                          b'grandparent': graphmod.GRANDPARENT,
                          b'missing': graphmod.MISSINGPARENT,
                      }
                      for name, key in edgetypes.items():
                          # experimental config: experimental.graphstyle.*
                          styles[key] = ui.config(
                              b'experimental', b'graphstyle.%s' % name, styles[key]
                          )
                          if not styles[key]:
                              styles[key] = None
                      # experimental config: experimental.graphshorten
                      state.graphshorten = ui.configbool(b'experimental', b'graphshorten')
                  for rev, type, ctx, parents in dag:
                      char = formatnode(repo, ctx)
                      copies = getcopies(ctx) if getcopies else None
                      edges = edgefn(type, char, state, rev, parents)
                      firstedge = next(edges)
                      width = firstedge[2]
                      displayer.show(
                          ctx, copies=copies, graphwidth=width, **pycompat.strkwargs(props)
                      )
                      lines = displayer.hunk.pop(rev).split(b'\n')
                      if not lines[-1]:
                          del lines[-1]
                      displayer.flush(ctx)
                      for type, char, width, coldata in itertools.chain([firstedge], edges):
                          graphmod.ascii(ui, state, type, char, lines, coldata)
                          lines = []
                  displayer.close()
              def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
                  revdag = graphmod.dagwalker(repo, revs)
                  displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
              def displayrevs(ui, repo, revs, displayer, getcopies):
                  for rev in revs:
                      ctx = repo[rev]
                      copies = getcopies(ctx) if getcopies else None
                      displayer.show(ctx, copies=copies)
                      displayer.flush(ctx)
                  displayer.close()
              def checkunsupportedgraphflags(pats, opts):
                  for op in [b"newest_first"]:
                      if op in opts and opts[op]:
                          raise error.Abort(
                              _(b"-G/--graph option is incompatible with --%s")
                              % op.replace(b"_", b"-")
                          )
              def graphrevs(repo, nodes, opts):
                  limit = getlimit(opts)
                  nodes.reverse()
                  if limit is not None:
                      nodes = nodes[:limit]
                  return graphmod.nodes(repo, nodes)

mercurial/pvec.py

0 +1 -1

              # pvec.py - probabilistic vector clocks for Mercurial
              #
              # Copyright 2012 Matt Mackall <mpm@selenic.com>
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              '''
              A "pvec" is a changeset property based on the theory of vector clocks
              that can be compared to discover relatedness without consulting a
              graph. This can be useful for tasks like determining how a
              disconnected patch relates to a repository.
              Currently a pvec consist of 448 bits, of which 24 are 'depth' and the
              remainder are a bit vector. It is represented as a 70-character base85
              string.
              Construction:
              - a root changeset has a depth of 0 and a bit vector based on its hash
              - a normal commit has a changeset where depth is increased by one and
                one bit vector bit is flipped based on its hash
              - a merge changeset pvec is constructed by copying changes from one pvec into
                the other to balance its depth
              Properties:
              - for linear changes, difference in depth is always <= hamming distance
              - otherwise, changes are probably divergent
              - when hamming distance is < 200, we can reliably detect when pvecs are near
              Issues:
              - hamming distance ceases to work over distances of ~ 200
              - detecting divergence is less accurate when the common ancestor is very close
                to either revision or total distance is high
              - this could probably be improved by modeling the relation between
                delta and hdist
              Uses:
              - a patch pvec can be used to locate the nearest available common ancestor for
                resolving conflicts
              - ordering of patches can be established without a DAG
              - two head pvecs can be compared to determine whether push/pull/merge is needed
                and approximately how many changesets are involved
              - can be used to find a heuristic divergence measure between changesets on
                different branches
              '''
              from __future__ import absolute_import, division
              from .node import nullrev
              from . import (
                  pycompat,
                  util,
              )
              _size = 448  # 70 chars b85-encoded
              _bytes = _size // 8
              _depthbits = 24
              _depthbytes = _depthbits // 8
              _vecbytes = _bytes - _depthbytes
              _vecbits = _vecbytes * 8
              _radius = (_vecbits - 30) // 2  # high probability vectors are related
              def _bin(bs):
                  '''convert a bytestring to a long'''
                  v = 0
                  for b in bs:
                      v = v * 256 + ord(b)
                  return v
              def _str(v, l):
                  # type: (int, int) -> bytes
                  bs = b""
                  for p in pycompat.xrange(l):
                      bs = pycompat.bytechr(v & 255) + bs
                      v >>= 8
                  return bs
              def _split(b):
                  '''depth and bitvec'''
                  return _bin(b[:_depthbytes]), _bin(b[_depthbytes:])
              def _join(depth, bitvec):
                  return _str(depth, _depthbytes) + _str(bitvec, _vecbytes)
              def _hweight(x):
                  c = 0
                  while x:
                      if x & 1:
                          c += 1
                      x >>= 1
                  return c
              _htab = [_hweight(x) for x in pycompat.xrange(256)]
              def _hamming(a, b):
                  '''find the hamming distance between two longs'''
                  d = a ^ b
                  c = 0
                  while d:
                      c += _htab[d & 0xFF]
                      d >>= 8
                  return c
              def _mergevec(x, y, c):
                  # Ideally, this function would be x ^ y ^ ancestor, but finding
                  # ancestors is a nuisance. So instead we find the minimal number
                  # of changes to balance the depth and hamming distance
                  d1, v1 = x
                  d2, v2 = y
                  if d1 < d2:
                      d1, d2, v1, v2 = d2, d1, v2, v1
                  hdist = _hamming(v1, v2)
                  ddist = d1 - d2
                  v = v1
                  m = v1 ^ v2  # mask of different bits
                  i = 1
                  if hdist > ddist:
                      # if delta = 10 and hdist = 100, then we need to go up 55 steps
                      # to the ancestor and down 45
                      changes = (hdist - ddist + 1) // 2
                  else:
                      # must make at least one change
                      changes = 1
                  depth = d1 + changes
                  # copy changes from v2
                  if m:
                      while changes:
                          if m & i:
                              v ^= i
                              changes -= 1
                          i <<= 1
                  else:
                      v = _flipbit(v, c)
                  return depth, v
              def _flipbit(v, node):
                  # converting bit strings to longs is slow
                  bit = (hash(node) & 0xFFFFFFFF) % _vecbits
                  return v ^ (1 << bit)
              def ctxpvec(ctx):
                  '''construct a pvec for ctx while filling in the cache'''
                  r = ctx.repo()
                  if not util.safehasattr(r, "_pveccache"):
                      r._pveccache = {}
                  pvc = r._pveccache
                  if ctx.rev() not in pvc:
                      cl = r.changelog
                      for n in pycompat.xrange(ctx.rev() + 1):
                          if n not in pvc:
                              node = cl.node(n)
                              p1, p2 = cl.parentrevs(n)
                              if p1 == nullrev:
                                  # start with a 'random' vector at root
                                  pvc[n] = (0, _bin((node * 3)[:_vecbytes]))
                              elif p2 == nullrev:
                                  d, v = pvc[p1]
                                  pvc[n] = (d + 1, _flipbit(v, node))
                              else:
                                  pvc[n] = _mergevec(pvc[p1], pvc[p2], node)
                  bs = _join(*pvc[ctx.rev()])
                  return pvec(util.b85encode(bs))
              class pvec(object):
                  def __init__(self, hashorctx):
-                     if isinstance(hashorctx, str):
+                     if isinstance(hashorctx, bytes):
                          self._bs = hashorctx
                          self._depth, self._vec = _split(util.b85decode(hashorctx))
                      else:
                          self._vec = ctxpvec(hashorctx)
                  def __str__(self):
                      return self._bs
                  def __eq__(self, b):
                      return self._vec == b._vec and self._depth == b._depth
                  def __lt__(self, b):
                      delta = b._depth - self._depth
                      if delta < 0:
                          return False  # always correct
                      if _hamming(self._vec, b._vec) > delta:
                          return False
                      return True
                  def __gt__(self, b):
                      return b < self
                  def __or__(self, b):
                      delta = abs(b._depth - self._depth)
                      if _hamming(self._vec, b._vec) <= delta:
                          return False
                      return True
                  def __sub__(self, b):
                      if self | b:
                          raise ValueError(b"concurrent pvecs")
                      return self._depth - b._depth
                  def distance(self, b):
                      d = abs(b._depth - self._depth)
                      h = _hamming(self._vec, b._vec)
                      return max(d, h)
                  def near(self, b):
                      dist = abs(b.depth - self._depth)
                      if dist > _radius or _hamming(self._vec, b._vec) > _radius:
                          return False

mercurial/repair.py

0 +1 -1

              # repair.py - functions for repository repair for mercurial
              #
              # Copyright 2005, 2006 Chris Mason <mason@suse.com>
              # Copyright 2007 Matt Mackall
              #
              # This software may be used and distributed according to the terms of the
              # GNU General Public License version 2 or any later version.
              from __future__ import absolute_import
              import errno
              import hashlib
              from .i18n import _
              from .node import (
                  hex,
                  short,
              )
              from . import (
                  bundle2,
                  changegroup,
                  discovery,
                  error,
                  exchange,
                  obsolete,
                  obsutil,
                  pathutil,
                  phases,
                  pycompat,
                  util,
              )
              from .utils import stringutil
              def backupbundle(
                  repo, bases, heads, node, suffix, compress=True, obsolescence=True
              ):
                  """create a bundle with the specified revisions as a backup"""
                  backupdir = b"strip-backup"
                  vfs = repo.vfs
                  if not vfs.isdir(backupdir):
                      vfs.mkdir(backupdir)
                  # Include a hash of all the nodes in the filename for uniqueness
                  allcommits = repo.set(b'%ln::%ln', bases, heads)
                  allhashes = sorted(c.hex() for c in allcommits)
                  totalhash = hashlib.sha1(b''.join(allhashes)).digest()
                  name = b"%s/%s-%s-%s.hg" % (
                      backupdir,
                      short(node),
                      hex(totalhash[:4]),
                      suffix,
                  )
                  cgversion = changegroup.localversion(repo)
                  comp = None
                  if cgversion != b'01':
                      bundletype = b"HG20"
                      if compress:
                          comp = b'BZ'
                  elif compress:
                      bundletype = b"HG10BZ"
                  else:
                      bundletype = b"HG10UN"
                  outgoing = discovery.outgoing(repo, missingroots=bases, missingheads=heads)
                  contentopts = {
                      b'cg.version': cgversion,
                      b'obsolescence': obsolescence,
                      b'phases': True,
                  }
                  return bundle2.writenewbundle(
                      repo.ui,
                      repo,
                      b'strip',
                      name,
                      bundletype,
                      outgoing,
                      contentopts,
                      vfs,
                      compression=comp,
                  )
              def _collectfiles(repo, striprev):
                  """find out the filelogs affected by the strip"""
                  files = set()
                  for x in pycompat.xrange(striprev, len(repo)):
                      files.update(repo[x].files())
                  return sorted(files)
              def _collectrevlog(revlog, striprev):
                  _, brokenset = revlog.getstrippoint(striprev)
                  return [revlog.linkrev(r) for r in brokenset]
              def _collectbrokencsets(repo, files, striprev):
                  """return the changesets which will be broken by the truncation"""
                  s = set()
                  for revlog in manifestrevlogs(repo):
                      s.update(_collectrevlog(revlog, striprev))
                  for fname in files:
                      s.update(_collectrevlog(repo.file(fname), striprev))
                  return s
              def strip(ui, repo, nodelist, backup=True, topic=b'backup'):
                  # This function requires the caller to lock the repo, but it operates
                  # within a transaction of its own, and thus requires there to be no current
                  # transaction when it is called.
                  if repo.currenttransaction() is not None:
                      raise error.ProgrammingError(b'cannot strip from inside a transaction')
                  # Simple way to maintain backwards compatibility for this
                  # argument.
                  if backup in [b'none', b'strip']:
                      backup = False
                  repo = repo.unfiltered()
                  repo.destroying()
                  vfs = repo.vfs
                  # load bookmark before changelog to avoid side effect from outdated
                  # changelog (see repo._refreshchangelog)
                  repo._bookmarks
                  cl = repo.changelog
                  # TODO handle undo of merge sets
-                 if isinstance(nodelist, str):
+                 if isinstance(nodelist, bytes):
                      nodelist = [nodelist]
                  striplist = [cl.rev(node) for node in nodelist]
                  striprev = min(striplist)
                  files = _collectfiles(repo, striprev)
                  saverevs = _collectbrokencsets(repo, files, striprev)
                  # Some revisions with rev > striprev may not be descendants of striprev.
                  # We have to find these revisions and put them in a bundle, so that
                  # we can restore them after the truncations.
                  # To create the bundle we use repo.changegroupsubset which requires
                  # the list of heads and bases of the set of interesting revisions.
                  # (head = revision in the set that has no descendant in the set;
                  #  base = revision in the set that has no ancestor in the set)
                  tostrip = set(striplist)
                  saveheads = set(saverevs)
                  for r in cl.revs(start=striprev + 1):
                      if any(p in tostrip for p in cl.parentrevs(r)):
                          tostrip.add(r)
                      if r not in tostrip:
                          saverevs.add(r)
                          saveheads.difference_update(cl.parentrevs(r))
                          saveheads.add(r)
                  saveheads = [cl.node(r) for r in saveheads]
                  # compute base nodes
                  if saverevs:
                      descendants = set(cl.descendants(saverevs))
                      saverevs.difference_update(descendants)
                  savebases = [cl.node(r) for r in saverevs]
                  stripbases = [cl.node(r) for r in tostrip]
                  stripobsidx = obsmarkers = ()
                  if repo.ui.configbool(b'devel', b'strip-obsmarkers'):
                      obsmarkers = obsutil.exclusivemarkers(repo, stripbases)
                  if obsmarkers:
                      stripobsidx = [
                          i for i, m in enumerate(repo.obsstore) if m in obsmarkers
                      ]
                  newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
                  backupfile = None
                  node = nodelist[-1]
                  if backup:
                      backupfile = _createstripbackup(repo, stripbases, node, topic)
                  # create a changegroup for all the branches we need to keep
                  tmpbundlefile = None
                  if saveheads:
                      # do not compress temporary bundle if we remove it from disk later
                      #
                      # We do not include obsolescence, it might re-introduce prune markers
                      # we are trying to strip.  This is harmless since the stripped markers
                      # are already backed up and we did not touched the markers for the
                      # saved changesets.
                      tmpbundlefile = backupbundle(
                          repo,
                          savebases,
                          saveheads,
                          node,
                          b'temp',
                          compress=False,
                          obsolescence=False,
                      )
                  with ui.uninterruptible():
                      try:
                          with repo.transaction(b"strip") as tr:
                              # TODO this code violates the interface abstraction of the
                              # transaction and makes assumptions that file storage is
                              # using append-only files. We'll need some kind of storage
                              # API to handle stripping for us.
                              offset = len(tr._entries)
                              tr.startgroup()
                              cl.strip(striprev, tr)
                              stripmanifest(repo, striprev, tr, files)
                              for fn in files:
                                  repo.file(fn).strip(striprev, tr)
                              tr.endgroup()
                              for i in pycompat.xrange(offset, len(tr._entries)):
                                  file, troffset, ignore = tr._entries[i]
                                  with repo.svfs(file, b'a', checkambig=True) as fp:
                                      fp.truncate(troffset)
                                  if troffset == 0:
                                      repo.store.markremoved(file)
                              deleteobsmarkers(repo.obsstore, stripobsidx)
                              del repo.obsstore
                              repo.invalidatevolatilesets()
                              repo._phasecache.filterunknown(repo)
                          if tmpbundlefile:
                              ui.note(_(b"adding branch\n"))
                              f = vfs.open(tmpbundlefile, b"rb")
                              gen = exchange.readbundle(ui, f, tmpbundlefile, vfs)
                              if not repo.ui.verbose:
                                  # silence internal shuffling chatter
                                  repo.ui.pushbuffer()
                              tmpbundleurl = b'bundle:' + vfs.join(tmpbundlefile)
                              txnname = b'strip'
                              if not isinstance(gen, bundle2.unbundle20):
                                  txnname = b"strip\n%s" % util.hidepassword(tmpbundleurl)
                              with repo.transaction(txnname) as tr:
                                  bundle2.applybundle(
                                      repo, gen, tr, source=b'strip', url=tmpbundleurl
                                  )
                              if not repo.ui.verbose:
                                  repo.ui.popbuffer()
                              f.close()
                          with repo.transaction(b'repair') as tr:
                              bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
                              repo._bookmarks.applychanges(repo, tr, bmchanges)
                          # remove undo files
                          for undovfs, undofile in repo.undofiles():
                              try:
                                  undovfs.unlink(undofile)
                              except OSError as e:
                                  if e.errno != errno.ENOENT:
                                      ui.warn(
                                          _(b'error removing %s: %s\n')
                                          % (
                                              undovfs.join(undofile),
                                              stringutil.forcebytestr(e),
                                          )
                                      )
                      except:  # re-raises
                          if backupfile:
                              ui.warn(
                                  _(b"strip failed, backup bundle stored in '%s'\n")
                                  % vfs.join(backupfile)
                              )
                          if tmpbundlefile:
                              ui.warn(
                                  _(b"strip failed, unrecovered changes stored in '%s'\n")
                                  % vfs.join(tmpbundlefile)
                              )
                              ui.warn(
                                  _(
                                      b"(fix the problem, then recover the changesets with "
                                      b"\"hg unbundle '%s'\")\n"
                                  )
                                  % vfs.join(tmpbundlefile)
                              )
                          raise
                      else:
                          if tmpbundlefile:
                              # Remove temporary bundle only if there were no exceptions
                              vfs.unlink(tmpbundlefile)
                  repo.destroyed()
                  # return the backup file path (or None if 'backup' was False) so
                  # extensions can use it
                  return backupfile
              def softstrip(ui, repo, nodelist, backup=True, topic=b'backup'):
                  """perform a "soft" strip using the archived phase"""
                  tostrip = [c.node() for c in repo.set(b'sort(%ln::)', nodelist)]
                  if not tostrip:
                      return None
                  newbmtarget, updatebm = _bookmarkmovements(repo, tostrip)
                  if backup:
                      node = tostrip[0]
                      backupfile = _createstripbackup(repo, tostrip, node, topic)
                  with repo.transaction(b'strip') as tr:
                      phases.retractboundary(repo, tr, phases.archived, tostrip)
                      bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm]
                      repo._bookmarks.applychanges(repo, tr, bmchanges)
                  return backupfile
              def _bookmarkmovements(repo, tostrip):
                  # compute necessary bookmark movement
                  bm = repo._bookmarks
                  updatebm = []
                  for m in bm:
                      rev = repo[bm[m]].rev()
                      if rev in tostrip:
                          updatebm.append(m)
                  newbmtarget = None
                  # If we need to move bookmarks, compute bookmark
                  # targets. Otherwise we can skip doing this logic.
                  if updatebm:
                      # For a set s, max(parents(s) - s) is the same as max(heads(::s - s)),
                      # but is much faster
                      newbmtarget = repo.revs(b'max(parents(%ld) - (%ld))', tostrip, tostrip)
                      if newbmtarget:
                          newbmtarget = repo[newbmtarget.first()].node()
                      else:
                          newbmtarget = b'.'
                  return newbmtarget, updatebm
              def _createstripbackup(repo, stripbases, node, topic):
                  # backup the changeset we are about to strip
                  vfs = repo.vfs
                  cl = repo.changelog
                  backupfile = backupbundle(repo, stripbases, cl.heads(), node, topic)
                  repo.ui.status(_(b"saved backup bundle to %s\n") % vfs.join(backupfile))
                  repo.ui.log(
                      b"backupbundle", b"saved backup bundle to %s\n", vfs.join(backupfile)
                  )
                  return backupfile
              def safestriproots(ui, repo, nodes):
                  """return list of roots of nodes where descendants are covered by nodes"""
                  torev = repo.unfiltered().changelog.rev
                  revs = set(torev(n) for n in nodes)
                  # tostrip = wanted - unsafe = wanted - ancestors(orphaned)
                  # orphaned = affected - wanted
                  # affected = descendants(roots(wanted))
                  # wanted = revs
                  revset = b'%ld - ( ::( (roots(%ld):: and not _phase(%s)) -%ld) )'
                  tostrip = set(repo.revs(revset, revs, revs, phases.internal, revs))
                  notstrip = revs - tostrip
                  if notstrip:
                      nodestr = b', '.join(sorted(short(repo[n].node()) for n in notstrip))
                      ui.warn(
                          _(b'warning: orphaned descendants detected, not stripping %s\n')
                          % nodestr
                      )
                  return [c.node() for c in repo.set(b'roots(%ld)', tostrip)]
              class stripcallback(object):
                  """used as a transaction postclose callback"""
                  def __init__(self, ui, repo, backup, topic):
                      self.ui = ui
                      self.repo = repo
                      self.backup = backup
                      self.topic = topic or b'backup'
                      self.nodelist = []
                  def addnodes(self, nodes):
                      self.nodelist.extend(nodes)
                  def __call__(self, tr):
                      roots = safestriproots(self.ui, self.repo, self.nodelist)
                      if roots:
                          strip(self.ui, self.repo, roots, self.backup, self.topic)
              def delayedstrip(ui, repo, nodelist, topic=None, backup=True):
                  """like strip, but works inside transaction and won't strip irreverent revs
                  nodelist must explicitly contain all descendants. Otherwise a warning will
                  be printed that some nodes are not stripped.
                  Will do a backup if `backup` is True. The last non-None "topic" will be
                  used as the backup topic name. The default backup topic name is "backup".
                  """
                  tr = repo.currenttransaction()
                  if not tr:
                      nodes = safestriproots(ui, repo, nodelist)
                      return strip(ui, repo, nodes, backup=backup, topic=topic)
                  # transaction postclose callbacks are called in alphabet order.
                  # use '\xff' as prefix so we are likely to be called last.
                  callback = tr.getpostclose(b'\xffstrip')
                  if callback is None:
                      callback = stripcallback(ui, repo, backup=backup, topic=topic)
                      tr.addpostclose(b'\xffstrip', callback)
                  if topic:
                      callback.topic = topic
                  callback.addnodes(nodelist)
              def stripmanifest(repo, striprev, tr, files):
                  for revlog in manifestrevlogs(repo):
                      revlog.strip(striprev, tr)
              def manifestrevlogs(repo):
                  yield repo.manifestlog.getstorage(b'')
                  if b'treemanifest' in repo.requirements:
                      # This logic is safe if treemanifest isn't enabled, but also
                      # pointless, so we skip it if treemanifest isn't enabled.
                      for unencoded, encoded, size in repo.store.datafiles():
                          if unencoded.startswith(b'meta/') and unencoded.endswith(
                              b'00manifest.i'
                          ):
                              dir = unencoded[5:-12]
                              yield repo.manifestlog.getstorage(dir)
              def rebuildfncache(ui, repo):
                  """Rebuilds the fncache file from repo history.
                  Missing entries will be added. Extra entries will be removed.
                  """
                  repo = repo.unfiltered()
                  if b'fncache' not in repo.requirements:
                      ui.warn(
                          _(
                              b'(not rebuilding fncache because repository does not '
                              b'support fncache)\n'
                          )
                      )
                      return
                  with repo.lock():
                      fnc = repo.store.fncache
                      fnc.ensureloaded(warn=ui.warn)
                      oldentries = set(fnc.entries)
                      newentries = set()
                      seenfiles = set()
                      progress = ui.makeprogress(
                          _(b'rebuilding'), unit=_(b'changesets'), total=len(repo)
                      )
                      for rev in repo:
                          progress.update(rev)
                          ctx = repo[rev]
                          for f in ctx.files():
                              # This is to minimize I/O.
                              if f in seenfiles:
                                  continue
                              seenfiles.add(f)
                              i = b'data/%s.i' % f
                              d = b'data/%s.d' % f
                              if repo.store._exists(i):
                                  newentries.add(i)
                              if repo.store._exists(d):
                                  newentries.add(d)
                      progress.complete()
                      if b'treemanifest' in repo.requirements:
                          # This logic is safe if treemanifest isn't enabled, but also
                          # pointless, so we skip it if treemanifest isn't enabled.
                          for dir in pathutil.dirs(seenfiles):
                              i = b'meta/%s/00manifest.i' % dir
                              d = b'meta/%s/00manifest.d' % dir
                              if repo.store._exists(i):
                                  newentries.add(i)
                              if repo.store._exists(d):
                                  newentries.add(d)
                      addcount = len(newentries - oldentries)
                      removecount = len(oldentries - newentries)
                      for p in sorted(oldentries - newentries):
                          ui.write(_(b'removing %s\n') % p)
                      for p in sorted(newentries - oldentries):
                          ui.write(_(b'adding %s\n') % p)
                      if addcount or removecount:
                          ui.write(
                              _(b'%d items added, %d removed from fncache\n')
                              % (addcount, removecount)
                          )
                          fnc.entries = newentries
                          fnc._dirty = True
                          with repo.transaction(b'fncache') as tr:
                              fnc.write(tr)
                      else:
                          ui.write(_(b'fncache already up to date\n'))
              def deleteobsmarkers(obsstore, indices):
                  """Delete some obsmarkers from obsstore and return how many were deleted
                  'indices' is a list of ints which are the indices
                  of the markers to be deleted.
                  Every invocation of this function completely rewrites the obsstore file,
                  skipping the markers we want to be removed. The new temporary file is
                  created, remaining markers are written there and on .close() this file
                  gets atomically renamed to obsstore, thus guaranteeing consistency."""
                  if not indices:
                      # we don't want to rewrite the obsstore with the same content
                      return
                  left = []
                  current = obsstore._all
                  n = 0
                  for i, m in enumerate(current):
                      if i in indices:
                          n += 1
                          continue
                      left.append(m)
                  newobsstorefile = obsstore.svfs(b'obsstore', b'w', atomictemp=True)
                  for bytes in obsolete.encodemarkers(left, True, obsstore._version):
                      newobsstorefile.write(bytes)
                  newobsstorefile.close()
                  return n

mercurial/scmwindows.py

0 +1 -1

              from __future__ import absolute_import
              import os
              from . import (
                  encoding,
                  pycompat,
                  util,
                  win32,
              )
              try:
                  import _winreg as winreg  # pytype: disable=import-error
                  winreg.CloseKey
              except ImportError:
                  # py2 only
                  import winreg  # pytype: disable=import-error
              # MS-DOS 'more' is the only pager available by default on Windows.
              fallbackpager = b'more'
              def systemrcpath():
                  '''return default os-specific hgrc search path'''
                  rcpath = []
                  filename = win32.executablepath()
                  # Use mercurial.ini found in directory with hg.exe
                  progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')
                  rcpath.append(progrc)
                  # Use hgrc.d found in directory with hg.exe
                  progrcd = os.path.join(os.path.dirname(filename), b'hgrc.d')
                  if os.path.isdir(progrcd):
                      for f, kind in util.listdir(progrcd):
                          if f.endswith(b'.rc'):
                              rcpath.append(os.path.join(progrcd, f))
                  # else look for a system rcpath in the registry
                  value = util.lookupreg(
                      b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
                  )
-                 if not isinstance(value, str) or not value:
+                 if not isinstance(value, bytes) or not value:
                      return rcpath
                  value = util.localpath(value)
                  for p in value.split(pycompat.ospathsep):
                      if p.lower().endswith(b'mercurial.ini'):
                          rcpath.append(p)
                      elif os.path.isdir(p):
                          for f, kind in util.listdir(p):
                              if f.endswith(b'.rc'):
                                  rcpath.append(os.path.join(p, f))
                  return rcpath
              def userrcpath():
                  '''return os-specific hgrc search path to the user dir'''
                  home = os.path.expanduser(b'~')
                  path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]
                  userprofile = encoding.environ.get(b'USERPROFILE')
                  if userprofile and userprofile != home:
                      path.append(os.path.join(userprofile, b'mercurial.ini'))
                      path.append(os.path.join(userprofile, b'.hgrc'))
                  return path
              def termsize(ui):
                  return win32.termsize()

tests/test-githelp.t

0 +4 0

                $ cat >> $HGRCPATH << EOF
                > [extensions]
                > githelp =
                > EOF
                $ hg init repo
                $ cd repo
                $ echo foo > test_file
                $ mkdir dir
                $ echo foo > dir/file
                $ echo foo > removed_file
                $ echo foo > deleted_file
                $ hg add -q .
                $ hg commit -m 'bar'
                $ hg bookmark both
                $ touch both
                $ touch untracked_file
                $ hg remove removed_file
                $ rm deleted_file
              githelp on a single command should succeed
                $ hg githelp -- commit
                hg commit
                $ hg githelp -- git commit
                hg commit
              githelp should fail nicely if we don't give it arguments
                $ hg githelp
                abort: missing git command - usage: hg githelp -- <git command>
                [255]
                $ hg githelp -- git
                abort: missing git command - usage: hg githelp -- <git command>
                [255]
              githelp on a command with options should succeed
                $ hg githelp -- commit -pm "abc"
                hg commit --interactive -m 'abc'
              githelp on a command with standalone unrecognized option should succeed with warning
                $ hg githelp -- commit -p -v
                ignoring unknown option -v
                hg commit --interactive
              githelp on a command with unrecognized option packed with other options should fail with error
                $ hg githelp -- commit -pv
                abort: unknown option 'v' packed with other options
                (please try passing the option as its own flag: -v)
                [255]
              githelp for git rebase --skip
                $ hg githelp -- git rebase --skip
                hg revert --all -r .
                hg rebase --continue
              githelp for git commit --amend (hg commit --amend pulls up an editor)
                $ hg githelp -- commit --amend
                hg commit --amend
              githelp for git commit --amend --no-edit (hg amend does not pull up an editor)
                $ hg githelp -- commit --amend --no-edit
                hg amend
              githelp for git checkout -- . (checking out a directory)
                $ hg githelp -- checkout -- .
                note: use --no-backup to avoid creating .orig files
                hg revert .
              githelp for git checkout "HEAD^" (should still work to pass a rev)
                $ hg githelp -- checkout "HEAD^"
                hg update .^
              githelp checkout: args after -- should be treated as paths no matter what
                $ hg githelp -- checkout -- HEAD
                note: use --no-backup to avoid creating .orig files
                hg revert HEAD
              githelp for git checkout with rev and path
                $ hg githelp -- checkout "HEAD^" -- file.txt
                note: use --no-backup to avoid creating .orig files
                hg revert -r .^ file.txt
              githelp for git with rev and path, without separator
                $ hg githelp -- checkout "HEAD^" file.txt
                note: use --no-backup to avoid creating .orig files
                hg revert -r .^ file.txt
              githelp for checkout with a file as first argument
                $ hg githelp -- checkout test_file
                note: use --no-backup to avoid creating .orig files
                hg revert test_file
              githelp for checkout with a removed file as first argument
                $ hg githelp -- checkout removed_file
                note: use --no-backup to avoid creating .orig files
                hg revert removed_file
              githelp for checkout with a deleted file as first argument
                $ hg githelp -- checkout deleted_file
                note: use --no-backup to avoid creating .orig files
                hg revert deleted_file
              githelp for checkout with a untracked file as first argument
                $ hg githelp -- checkout untracked_file
                note: use --no-backup to avoid creating .orig files
                hg revert untracked_file
              githelp for checkout with a directory as first argument
                $ hg githelp -- checkout dir
                note: use --no-backup to avoid creating .orig files
                hg revert dir
              githelp for checkout when not in repo root
                $ cd dir
                $ hg githelp -- checkout file
                note: use --no-backup to avoid creating .orig files
                hg revert file
                $ cd ..
              githelp for checkout with an argument that is both a file and a revision
                $ hg githelp -- checkout both
                hg update both
              githelp for checkout with the -p option
                $ hg githelp -- git checkout -p xyz
                hg revert -i -r xyz
                $ hg githelp -- git checkout -p xyz -- abc
                note: use --no-backup to avoid creating .orig files
                hg revert -i -r xyz abc
              githelp for checkout with the -f option and a rev
                $ hg githelp -- git checkout -f xyz
                hg update -C xyz
                $ hg githelp -- git checkout --force xyz
                hg update -C xyz
              githelp for checkout with the -f option without an arg
                $ hg githelp -- git checkout -f
                hg revert --all
                $ hg githelp -- git checkout --force
                hg revert --all
              githelp for grep with pattern and path
                $ hg githelp -- grep shrubbery flib/intern/
                hg grep shrubbery flib/intern/
              githelp for reset, checking ~ in git becomes ~1 in mercurial
                $ hg githelp -- reset HEAD~
                hg update .~1
                $ hg githelp -- reset "HEAD^"
                hg update .^
                $ hg githelp -- reset HEAD~3
                hg update .~3
                $ hg githelp -- reset --mixed HEAD
                note: --mixed has no meaning since Mercurial has no staging area
                hg update .
                $ hg githelp -- reset --soft HEAD
                note: --soft has no meaning since Mercurial has no staging area
                hg update .
                $ hg githelp -- reset --hard HEAD
                hg update --clean .
              githelp for git show --name-status
                $ hg githelp -- git show --name-status
                hg log --style status -r .
              githelp for git show --pretty=format: --name-status
                $ hg githelp -- git show --pretty=format: --name-status
                hg status --change .
              githelp for show with no arguments
                $ hg githelp -- show
                hg export
              githelp for show with a path
                $ hg githelp -- show test_file
                hg cat test_file
              githelp for show with not a path:
                $ hg githelp -- show rev
                hg export rev
              githelp for show with many arguments
                $ hg githelp -- show argone argtwo
                hg export argone argtwo
                $ hg githelp -- show test_file argone argtwo
                hg cat test_file argone argtwo
              githelp for show with --unified options
                $ hg githelp -- show --unified=10
                hg export --config diff.unified=10
                $ hg githelp -- show -U100
                hg export --config diff.unified=100
              githelp for show with a path and --unified
                $ hg githelp -- show -U20 test_file
                hg cat test_file --config diff.unified=20
              githelp for stash drop without name
                $ hg githelp -- git stash drop
                hg shelve -d <shelve name>
              githelp for stash drop with name
                $ hg githelp -- git stash drop xyz
                hg shelve -d xyz
              githelp for stash list with patch
                $ hg githelp -- git stash list -p
                hg shelve -l -p
              githelp for stash show
                $ hg githelp -- git stash show
                hg shelve --stat
              githelp for stash show with patch and name
                $ hg githelp -- git stash show -p mystash
                hg shelve -p mystash
              githelp for stash clear
                $ hg githelp -- git stash clear
                hg shelve --cleanup
              githelp for whatchanged should show deprecated message
                $ hg githelp -- whatchanged -p
                this command has been deprecated in the git project, thus isn't supported by this tool
              githelp for git branch -m renaming
                $ hg githelp -- git branch -m old new
                hg bookmark -m old new
              When the old name is omitted, git branch -m new renames the current branch.
                $ hg githelp -- git branch -m new
                hg bookmark -m `hg log -T"{activebookmark}" -r .` new
              Branch deletion in git strips commits
                $ hg githelp -- git branch -d
                hg strip -B
                $ hg githelp -- git branch -d feature
                hg strip -B feature -B
                $ hg githelp -- git branch --delete experiment1 experiment2
                hg strip -B experiment1 -B experiment2 -B
              githelp for reuse message using the shorthand
                $ hg githelp -- git commit -C deadbeef
                hg commit -M deadbeef
              githelp for reuse message using the the long version
                $ hg githelp -- git commit --reuse-message deadbeef
                hg commit -M deadbeef
+             githelp for reuse message using HEAD
+               $ hg githelp -- git commit --reuse-message HEAD~
+               hg commit -M .~1
              githelp for apply with no options
                $ hg githelp -- apply
                hg import --no-commit
              githelp for apply with directory strip custom
                $ hg githelp -- apply -p 5
                hg import --no-commit -p 5
              githelp for apply with prefix directory
                $ hg githelp -- apply --directory=modules
                hg import --no-commit --prefix modules
              git merge-base
                $ hg githelp -- git merge-base --is-ancestor
                ignoring unknown option --is-ancestor
                note: ancestors() is part of the revset language
                (learn more about revsets with 'hg help revsets')
                hg log -T '{node}\n' -r 'ancestor(A,B)'
              githelp for git blame
                $ hg githelp -- git blame
                hg annotate -udl
              githelp for add
                $ hg githelp -- git add
                hg add
                $ hg githelp -- git add -p
                note: Mercurial will commit when complete, as there is no staging area in Mercurial
                hg commit --interactive
                $ hg githelp -- git add --all
                note: use hg addremove to remove files that have been deleted
                hg add
              githelp for reflog
                $ hg githelp -- git reflog
                hg journal
                note: in hg commits can be deleted from repo but we always have backups
                $ hg githelp -- git reflog --all
                hg journal --all
                note: in hg commits can be deleted from repo but we always have backups

tests/test-log-linerange.t

0 +125 0

                $ cat >> $HGRCPATH << EOF
                > [diff]
                > git = true
                > EOF
                $ hg init
                $ cat > foo << EOF
                > 0
                > 1
                > 2
                > 3
                > 4
                > EOF
                $ hg ci -Am init
                adding foo
                $ cat > foo << EOF
                > 0
                > 0
                > 0
                > 0
                > 1
                > 2
                > 3
                > 4
                > EOF
                $ hg ci -m 'more 0'
                $ sed 's/2/2+/' foo > foo.new
                $ mv foo.new foo
                $ cat > bar << EOF
                > a
                > b
                > c
                > d
                > e
                > EOF
                $ hg add bar
                $ hg ci -Am "2 -> 2+; added bar"
                $ cat >> foo << EOF
                > 5
                > 6
                > 7
                > 8
                > 9
                > 10
                > 11
                > EOF
                $ hg ci -m "to 11"
              Add some changes with two diff hunks
                $ sed 's/^1$/ 1/' foo > foo.new
                $ mv foo.new foo
                $ sed 's/^11$/11+/' foo > foo.new
                $ mv foo.new foo
                $ hg ci -m '11 -> 11+; leading space before "1"'
              (make sure there are two hunks in "foo")
                $ hg diff -c .
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
@@ -12,4 +12,4 @@
 
 
 
                -11
                +11+
                $ sed 's/3/3+/' foo > foo.new
                $ mv foo.new foo
                $ sed 's/^11+$/11-/' foo > foo.new
                $ mv foo.new foo
                $ sed 's/a/a+/' bar > bar.new
                $ mv bar.new bar
                $ hg ci -m 'foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+'
              (make sure there are two hunks in "foo")
                $ hg diff -c . foo
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
@@ -12,4 +12,4 @@
 
 
 
                -11+
                +11-
                $ hg log -f -L foo,5:7 -p
                changeset:   5:cfdf972b3971
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
                changeset:   4:eaec41c1a0c9
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     11 -> 11+; leading space before "1"
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
                $ hg log -f --graph -L foo,5:7 -p
                @  changeset:   5:cfdf972b3971
                |  tag:         tip
                |  user:        test
                |  date:        Thu Jan 01 00:00:00 1970 +0000
                |  summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                |
                |  diff --git a/foo b/foo
                |  --- a/foo
                |  +++ b/foo
                |  @@ -4,7 +4,7 @@
                |   0
                |    1
                |   2+
                |  -3
                |  +3+
                |   4
                |   5
                |   6
                |
                o  changeset:   4:eaec41c1a0c9
                :  user:        test
                :  date:        Thu Jan 01 00:00:00 1970 +0000
                :  summary:     11 -> 11+; leading space before "1"
                :
                :  diff --git a/foo b/foo
                :  --- a/foo
                :  +++ b/foo
                :  @@ -2,7 +2,7 @@
                :   0
                :   0
                :   0
                :  -1
                :  + 1
                :   2+
                :   3
                :   4
                :
                o  changeset:   2:63a884426fd0
                :  user:        test
                :  date:        Thu Jan 01 00:00:00 1970 +0000
                :  summary:     2 -> 2+; added bar
                :
                :  diff --git a/foo b/foo
                :  --- a/foo
                :  +++ b/foo
                :  @@ -3,6 +3,6 @@
                :   0
                :   0
                :   1
                :  -2
                :  +2+
                :   3
                :   4
                :
                o  changeset:   0:5ae1f82b9a00
                   user:        test
                   date:        Thu Jan 01 00:00:00 1970 +0000
                   summary:     init
                   diff --git a/foo b/foo
                   new file mode 100644
                   --- /dev/null
                   +++ b/foo
@@ -0,0 +1,5 @@
                   +0
                   +1
                   +2
                   +3
                   +4
              With --template.
                $ hg log -f -L foo,5:7 -T '{rev}:{node|short} {desc|firstline}\n'
 :cfdf972b3971 foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
 :eaec41c1a0c9 11 -> 11+; leading space before "1"
 :63a884426fd0 2 -> 2+; added bar
 :5ae1f82b9a00 init
                $ hg log -f -L foo,5:7 -T json
                [
                 {
                  "bookmarks": [],
                  "branch": "default",
                  "date": [0, 0],
                  "desc": "foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+",
                  "node": "cfdf972b3971a2a59638bf9583c0debbffee5404",
                  "parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"],
                  "phase": "draft",
                  "rev": 5,
                  "tags": ["tip"],
                  "user": "test"
                 },
                 {
                  "bookmarks": [],
                  "branch": "default",
                  "date": [0, 0],
                  "desc": "11 -> 11+; leading space before \"1\"",
                  "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c",
                  "parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"],
                  "phase": "draft",
                  "rev": 4,
                  "tags": [],
                  "user": "test"
                 },
                 {
                  "bookmarks": [],
                  "branch": "default",
                  "date": [0, 0],
                  "desc": "2 -> 2+; added bar",
                  "node": "63a884426fd0b277fcd55895bbb2f230434576eb",
                  "parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"],
                  "phase": "draft",
                  "rev": 2,
                  "tags": [],
                  "user": "test"
                 },
                 {
                  "bookmarks": [],
                  "branch": "default",
                  "date": [0, 0],
                  "desc": "init",
                  "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4",
                  "parents": ["0000000000000000000000000000000000000000"],
                  "phase": "draft",
                  "rev": 0,
                  "tags": [],
                  "user": "test"
                 }
                ]
              With some white-space diff option, respective revisions are skipped.
                $ hg log -f -L foo,5:7 -p --config diff.ignorews=true
                changeset:   5:cfdf972b3971
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
              Regular file patterns are not allowed.
                $ hg log -f -L foo,5:7 -p bar
                abort: FILE arguments are not compatible with --line-range option
                [255]
              Option --rev acts as a restriction.
                $ hg log -f -L foo,5:7 -p -r 'desc(2)'
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
              With several -L patterns, changes touching any files in their respective line
              range are show.
                $ hg log -f -L foo,5:7 -L bar,1:2 -p
                changeset:   5:cfdf972b3971
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/bar b/bar
                --- a/bar
                +++ b/bar
@@ -1,4 +1,4 @@
                -a
                +a+
                 b
                 c
                 d
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
                changeset:   4:eaec41c1a0c9
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     11 -> 11+; leading space before "1"
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/bar b/bar
                new file mode 100644
                --- /dev/null
                +++ b/bar
@@ -0,0 +1,5 @@
                +a
                +b
                +c
                +d
                +e
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
              Multiple -L options with the same file yields changes touching any of
              specified line ranges.
                $ hg log -f -L foo,5:7 -L foo,14:15 -p
                changeset:   5:cfdf972b3971
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
@@ -12,4 +12,4 @@
 
 
 
                -11+
                +11-
                changeset:   4:eaec41c1a0c9
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     11 -> 11+; leading space before "1"
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
@@ -12,4 +12,4 @@
 
 
 
                -11
                +11+
                changeset:   3:730a61fbaecf
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     to 11
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -6,3 +6,10 @@
 +
 
 
                +5
                +6
                +7
                +8
                +9
                +10
                +11
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
              A file with a comma in its name.
                $ cat > ba,z << EOF
                > q
                > w
                > e
                > r
                > t
                > y
                > EOF
                $ hg ci -Am 'querty'
                adding ba,z
                $ cat >> ba,z << EOF
                > u
                > i
                > o
                > p
                > EOF
                $ hg ci -m 'more keys'
                $ cat > ba,z << EOF
                > a
                > z
                > e
                > r
                > t
                > y
                > u
                > i
                > o
                > p
                > EOF
                $ hg ci -m 'azerty'
                $ hg log -f -L ba,z,1:2 -p
                changeset:   8:52373265138b
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     azerty
                diff --git a/ba,z b/ba,z
                --- a/ba,z
                +++ b/ba,z
@@ -1,5 +1,5 @@
                -q
                -w
                +a
                +z
                 e
                 r
                 t
                changeset:   6:96ba8850f316
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     querty
                diff --git a/ba,z b/ba,z
                new file mode 100644
                --- /dev/null
                +++ b/ba,z
@@ -0,0 +1,6 @@
                +q
                +w
                +e
                +r
                +t
                +y
              Exact prefix kinds work in -L options.
                $ mkdir dir
                $ cd dir
                $ hg log -f -L path:foo,5:7 -p
                changeset:   5:cfdf972b3971
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
                changeset:   4:eaec41c1a0c9
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     11 -> 11+; leading space before "1"
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
              Renames are followed.
                $ hg mv ../foo baz
                $ sed 's/1/1+/' baz > baz.new
                $ mv baz.new baz
                $ hg ci -m 'foo -> dir/baz; 1-1+'
                $ hg diff -c .
                diff --git a/foo b/dir/baz
                rename from foo
                rename to dir/baz
                --- a/foo
                +++ b/dir/baz
@@ -2,7 +2,7 @@
 
 
 
                - 1
                + 1+
 +
 +
 
@@ -11,5 +11,5 @@
 
 
 
                -10
                -11-
                +1+0
                +1+1-
                $ hg log -f -L relpath:baz,5:7 -p
                changeset:   9:6af29c3a778f
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo -> dir/baz; 1-1+
                diff --git a/foo b/dir/baz
                copy from foo
                copy to dir/baz
                --- a/foo
                +++ b/dir/baz
@@ -2,7 +2,7 @@
 
 
 
                - 1
                + 1+
 +
 +
 
                changeset:   5:cfdf972b3971
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -4,7 +4,7 @@
 
 
 +
                -3
                +3+
 
 
 
                changeset:   4:eaec41c1a0c9
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     11 -> 11+; leading space before "1"
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -2,7 +2,7 @@
 
 
 
                -1
                + 1
 +
 
 
                changeset:   2:63a884426fd0
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     2 -> 2+; added bar
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -3,6 +3,6 @@
 
 
 
                -2
                +2+
 
 
                changeset:   0:5ae1f82b9a00
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     init
                diff --git a/foo b/foo
                new file mode 100644
                --- /dev/null
                +++ b/foo
@@ -0,0 +1,5 @@
                +0
                +1
                +2
                +3
                +4
+             Uncommitted changes with a rename
+               $ hg mv baz bazn
+               $ hg log -f -L bazn,5:7
+               changeset:   9:6af29c3a778f
+               tag:         tip
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     foo -> dir/baz; 1-1+
+               changeset:   5:cfdf972b3971
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
+               changeset:   4:eaec41c1a0c9
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     11 -> 11+; leading space before "1"
+               changeset:   2:63a884426fd0
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     2 -> 2+; added bar
+               changeset:   0:5ae1f82b9a00
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     init
+             Uncommitted changes in requested line range
+               $ sed 's/2/  /' bazn > bazn.new
+               $ mv bazn.new bazn
+               $ hg diff
+               diff --git a/dir/baz b/dir/bazn
+               rename from dir/baz
+               rename to dir/bazn
+               --- a/dir/baz
+               +++ b/dir/bazn
+               @@ -3,7 +3,7 @@
++
+               -2+
+               +  +
++
+               $ hg log -f -L bazn,5:7
+               changeset:   9:6af29c3a778f
+               tag:         tip
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     foo -> dir/baz; 1-1+
+               changeset:   5:cfdf972b3971
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
+               changeset:   4:eaec41c1a0c9
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     11 -> 11+; leading space before "1"
+               changeset:   2:63a884426fd0
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     2 -> 2+; added bar
+               changeset:   0:5ae1f82b9a00
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     init
+             Uncommitted changes in line-range + wdir()
+               $ hg log -r 'wdir()' -f -L bazn,5:7 --limit 2 -p
+               changeset:   2147483647:ffffffffffff
+               parent:      9:6af29c3a778f
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               diff --git a/dir/baz b/dir/bazn
+               copy from dir/baz
+               copy to dir/bazn
+               --- a/dir/baz
+               +++ b/dir/bazn
+               @@ -3,7 +3,7 @@
++
+               -2+
+               +  +
++
+               changeset:   9:6af29c3a778f
+               tag:         tip
+               user:        test
+               date:        Thu Jan 01 00:00:00 1970 +0000
+               summary:     foo -> dir/baz; 1-1+
+               diff --git a/foo b/dir/baz
+               copy from foo
+               copy to dir/baz
+               --- a/foo
+               +++ b/dir/baz
+               @@ -2,7 +2,7 @@
+               - 1
+               + 1+
++
++
+               $ hg revert -a -C -q
              Copies.
                $ hg copy baz bbaz
                $ sed 's/6/6+/' bbaz > bbaz.new
                $ mv bbaz.new bbaz
                $ hg commit -m 'cp baz bbaz; 6-6+'
                $ hg diff -c .
                diff --git a/dir/baz b/dir/bbaz
                copy from dir/baz
                copy to dir/bbaz
                --- a/dir/baz
                +++ b/dir/bbaz
@@ -7,7 +7,7 @@
 +
 
 
                -6
                +6+
 
 
 
                $ hg log --copies -f -L bbaz,10:11 -p
                changeset:   10:91a3d3b6c546
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     cp baz bbaz; 6-6+
                diff --git a/dir/baz b/dir/bbaz
                copy from dir/baz
                copy to dir/bbaz
                --- a/dir/baz
                +++ b/dir/bbaz
@@ -7,7 +7,7 @@
 +
 
 
                -6
                +6+
 
 
 
                changeset:   3:730a61fbaecf
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     to 11
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -6,3 +6,10 @@
 +
 
 
                +5
                +6
                +7
                +8
                +9
                +10
                +11
                $ hg log -f -L bbaz,10:11 -p
                changeset:   10:91a3d3b6c546
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     cp baz bbaz; 6-6+
                diff --git a/dir/baz b/dir/bbaz
                copy from dir/baz
                copy to dir/bbaz
                --- a/dir/baz
                +++ b/dir/bbaz
@@ -7,7 +7,7 @@
 +
 
 
                -6
                +6+
 
 
 
                changeset:   3:730a61fbaecf
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     to 11
                diff --git a/foo b/foo
                --- a/foo
                +++ b/foo
@@ -6,3 +6,10 @@
 +
 
 
                +5
                +6
                +7
                +8
                +9
                +10
                +11
              Binary files work but without diff hunks filtering.
              (Checking w/ and w/o diff.git option.)
                >>> open('binary', 'wb').write(b'this\nis\na\nbinary\0') and None
                $ hg add binary
                $ hg ci -m 'add a binary file' --quiet
                $ hg log -f -L binary,1:2 -p
                changeset:   11:dc865b608edf
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     add a binary file
                diff --git a/dir/binary b/dir/binary
                new file mode 100644
                index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2e1fbed209fe919b3f189a6a31950e9adf61e45
                GIT binary patch
                literal 17
                Wc$_QA$SmdpqC~Ew%)G>+N(KNlNClYy
                $ hg log -f -L binary,1:2 -p --config diff.git=false
                changeset:   11:dc865b608edf
                tag:         tip
                user:        test
                date:        Thu Jan 01 00:00:00 1970 +0000
                summary:     add a binary file
                diff -r 91a3d3b6c546 -r dc865b608edf dir/binary
                Binary file dir/binary has changed
              Option --follow is required.
                $ hg log -L foo,5:7
                abort: --line-range requires --follow
                [255]
              Non-exact pattern kinds are not allowed.
                $ cd ..
                $ hg log -f -L glob:*a*,1:2
                hg: parse error: line range pattern 'glob:*a*' must match exactly one file
                [255]
              We get an error for removed files.
                $ hg rm dir/baz
                $ hg ci -m 'remove baz' --quiet
                $ hg log -f -L dir/baz,5:7 -p
                abort: cannot follow file not in parent revision: "dir/baz"
                [255]

tests/test-merge-tools.t

0 +3 -3

              test merge-tools configuration - mostly exercising filemerge.py
                $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
                $ cat >> $HGRCPATH << EOF
                > [ui]
                > merge=
                > EOF
                $ hg init repo
                $ cd repo
              revision 0
                $ echo "revision 0" > f
                $ echo "space" >> f
                $ hg commit -Am "revision 0"
                adding f
              revision 1
                $ echo "revision 1" > f
                $ echo "space" >> f
                $ hg commit -Am "revision 1"
                $ hg update 0 > /dev/null
              revision 2
                $ echo "revision 2" > f
                $ echo "space" >> f
                $ hg commit -Am "revision 2"
                created new head
                $ hg update 0 > /dev/null
              revision 3 - simple to merge
                $ echo "revision 3" >> f
                $ hg commit -Am "revision 3"
                created new head
              revision 4 - hard to merge
                $ hg update 0 > /dev/null
                $ echo "revision 4" > f
                $ hg commit -Am "revision 4"
                created new head
                $ echo "[merge-tools]" > .hg/hgrc
                $ beforemerge() {
                >   cat .hg/hgrc
                >   echo "# hg update -C 1"
                >   hg update -C 1 > /dev/null
                > }
                $ aftermerge() {
                >   echo "# cat f"
                >   cat f
                >   echo "# hg stat"
                >   hg stat
                >   echo "# hg resolve --list"
                >   hg resolve --list
                >   rm -f f.orig
                > }
              Tool selection
              default is internal merge:
                $ beforemerge
                [merge-tools]
                # hg update -C 1
              hg merge -r 2
              override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
              running from a devel copy, not a temp installation
-               $ PATH="$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
+               $ PATH="/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
                merging f
                warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                =======
                revision 2
                >>>>>>> merge rev:    0185f4e0cf02 - test: revision 2
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              simplest hgrc using false for merge:
                $ echo "false.whatever=" >> .hg/hgrc
                $ beforemerge
                [merge-tools]
                false.whatever=
                # hg update -C 1
                $ hg merge -r 2
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              #if unix-permissions
              unexecutable file in $PATH shouldn't be found:
                $ echo "echo fail" > false
                $ hg up -qC 1
-               $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
+               $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
                merging f
                warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ rm false
              #endif
              executable directory in $PATH shouldn't be found:
                $ mkdir false
                $ hg up -qC 1
-               $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
+               $ PATH="`pwd`:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2
                merging f
                warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ rmdir false
              true with higher .priority gets precedence:
                $ echo "true.priority=1" >> .hg/hgrc
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              unless lowered on command line:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.priority=-7
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              or false set higher on command line:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.false.priority=117
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              or true set to disabled:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.disabled=yes
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              or true.executable not found in PATH:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              or true.executable with bogus path:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              but true.executable set to cat found in PATH works:
                $ echo "true.executable=cat" >> .hg/hgrc
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2
                merging f
                revision 1
                space
                revision 0
                space
                revision 2
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              and true.executable set to cat with path works:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=cat
                merging f
                revision 1
                space
                revision 0
                space
                revision 2
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              executable set to python script that succeeds:
                $ cat > "$TESTTMP/myworkingmerge.py" <<EOF
                > def myworkingmergefn(ui, repo, args, **kwargs):
                >     return False
                > EOF
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:myworkingmergefn"
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              executable set to python script that fails:
                $ cat > "$TESTTMP/mybrokenmerge.py" <<EOF
                > def mybrokenmergefn(ui, repo, args, **kwargs):
                >     ui.write(b"some fail message\n")
                >     return True
                > EOF
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/mybrokenmerge.py:mybrokenmergefn"
                merging f
                some fail message
                abort: $TESTTMP/mybrokenmerge.py hook failed
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                ? f.orig
                # hg resolve --list
                U f
              executable set to python script that is missing function:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:missingFunction"
                merging f
                abort: $TESTTMP/myworkingmerge.py does not have function: missingFunction
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                ? f.orig
                # hg resolve --list
                U f
              executable set to missing python script:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/missingpythonscript.py:mergefn"
                merging f
                abort: loading python merge script failed: $TESTTMP/missingpythonscript.py
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                ? f.orig
                # hg resolve --list
                U f
              executable set to python script but callable function is missing:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py"
                abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                # hg resolve --list
                U f
              executable set to python script but callable function is empty string:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/myworkingmerge.py:"
                abort: invalid 'python:' syntax: python:$TESTTMP/myworkingmerge.py:
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                # hg resolve --list
                U f
              executable set to python script but callable function is missing and path contains colon:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable="python:$TESTTMP/some:dir/myworkingmerge.py"
                abort: invalid 'python:' syntax: python:$TESTTMP/some:dir/myworkingmerge.py
                [255]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                # hg resolve --list
                U f
              executable set to python script filename that contains spaces:
                $ mkdir -p "$TESTTMP/my path"
                $ cat > "$TESTTMP/my path/my working merge with spaces in filename.py" <<EOF
                > def myworkingmergefn(ui, repo, args, **kwargs):
                >     return False
                > EOF
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config "merge-tools.true.executable=python:$TESTTMP/my path/my working merge with spaces in filename.py:myworkingmergefn"
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              #if unix-permissions
              environment variables in true.executable are handled:
                $ echo 'echo "custom merge tool"' > .hg/merge.sh
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args=.hg/merge.sh \
                >    merge -r 2
                merging f
                custom merge tool
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              #endif
              Tool selection and merge-patterns
              merge-patterns specifies new tool false:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-patterns.f=false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              merge-patterns specifies executable not found in PATH and gets warning:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
                couldn't find merge tool true (for pattern f)
                merging f
                couldn't find merge tool true (for pattern f)
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              merge-patterns specifies executable with bogus path and gets warning:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
                couldn't find merge tool true (for pattern f)
                merging f
                couldn't find merge tool true (for pattern f)
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              ui.merge overrules priority
              ui.merge specifies false:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              ui.merge specifies internal:fail:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:fail
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                U f
              ui.merge specifies :local (without internal prefix):
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=:local
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              ui.merge specifies internal:other:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:other
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 2
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              ui.merge specifies internal:prompt:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:prompt
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do? u
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                U f
              ui.merge specifies :prompt, with 'leave unresolved' chosen
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
                > u
                > EOF
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do? u
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                U f
              prompt with EOF
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do?
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                U f
                $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do?
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
                $ rm f
                $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do?
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                U f
                $ hg resolve --all --config ui.merge=internal:prompt
                file 'f' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do? u
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              ui.merge specifies internal:dump:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:dump
                merging f
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.base
                ? f.local
                ? f.orig
                ? f.other
                # hg resolve --list
                U f
              f.base:
                $ cat f.base
                revision 0
                space
              f.local:
                $ cat f.local
                revision 1
                space
              f.other:
                $ cat f.other
                revision 2
                space
                $ rm f.base f.local f.other
              check that internal:dump doesn't dump files if premerge runs
              successfully
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 3 --config ui.merge=internal:dump
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                revision 3
                # hg stat
                M f
                # hg resolve --list
                R f
              check that internal:forcedump dumps files, even if local and other can
              be merged easily
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 3 --config ui.merge=internal:forcedump
                merging f
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.base
                ? f.local
                ? f.orig
                ? f.other
                # hg resolve --list
                U f
                $ cat f.base
                revision 0
                space
                $ cat f.local
                revision 1
                space
                $ cat f.other
                revision 0
                space
                revision 3
                $ rm -f f.base f.local f.other
              ui.merge specifies internal:other but is overruled by pattern for false:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              Premerge
              ui.merge specifies internal:other but is overruled by --tool=false
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config ui.merge=internal:other --tool=false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              HGMERGE specifies internal:other but is overruled by --tool=false
                $ HGMERGE=internal:other ; export HGMERGE
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --tool=false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
                $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
              update is a merge ...
              (this also tests that files reverted with '--rev REV' are treated as
              "modified", even if none of mode, size and timestamp of them isn't
              changed on the filesystem (see also issue4583))
                $ cat >> $HGRCPATH <<EOF
                > [fakedirstatewritetime]
                > # emulate invoking dirstate.write() via repo.status()
                > # at 2000-01-01 00:00
                > fakenow = 200001010000
                > EOF
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg update -q 0
                $ f -s f
                f: size=17
                $ touch -t 200001010000 f
                $ hg debugrebuildstate
                $ cat >> $HGRCPATH <<EOF
                > [extensions]
                > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
                > EOF
                $ hg revert -q -r 1 .
                $ cat >> $HGRCPATH <<EOF
                > [extensions]
                > fakedirstatewritetime = !
                > EOF
                $ f -s f
                f: size=17
                $ touch -t 200001010000 f
                $ hg status f
                M f
                $ hg update -r 2
                merging f
                revision 1
                space
                revision 0
                space
                revision 2
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              update should also have --tool
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg update -q 0
                $ f -s f
                f: size=17
                $ touch -t 200001010000 f
                $ hg debugrebuildstate
                $ cat >> $HGRCPATH <<EOF
                > [extensions]
                > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
                > EOF
                $ hg revert -q -r 1 .
                $ cat >> $HGRCPATH <<EOF
                > [extensions]
                > fakedirstatewritetime = !
                > EOF
                $ f -s f
                f: size=17
                $ touch -t 200001010000 f
                $ hg status f
                M f
                $ hg update -r 2 --tool false
                merging f
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              Default is silent simplemerge:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 3
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                revision 3
                # hg stat
                M f
                # hg resolve --list
                R f
              .premerge=True is same:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 3 --config merge-tools.true.premerge=True
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                revision 3
                # hg stat
                M f
                # hg resolve --list
                R f
              .premerge=False executes merge-tool:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 3 --config merge-tools.true.premerge=False
                merging f
                revision 1
                space
                revision 0
                space
                revision 0
                space
                revision 3
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep keeps conflict markers in:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep
                merging f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep-merge3 keeps conflict markers with base content:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
                merging f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                ||||||| base
                revision 0
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                ||||||| base
                revision 0
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep respects ui.mergemarkers=basic:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep --config ui.mergemarkers=basic
                merging f
                <<<<<<< working copy
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep ignores ui.mergemarkers=basic if true.mergemarkers=detailed:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep \
                >     --config ui.mergemarkers=basic \
                >     --config merge-tools.true.mergemarkers=detailed
                merging f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy: ef83787e2614 - test: revision 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    81448d39c9a0 - test: revision 4
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep respects ui.mergemarkertemplate instead of
              true.mergemarkertemplate if true.mergemarkers=basic:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}'
                merging f
                <<<<<<< working copy: uitmpl 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    uitmpl 4
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy: uitmpl 1
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    uitmpl 4
                # hg stat
                M f
                # hg resolve --list
                R f
              premerge=keep respects true.mergemarkertemplate instead of
              true.mergemarkertemplate if true.mergemarkers=detailed:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 4 --config merge-tools.true.premerge=keep \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config merge-tools.true.mergemarkers=detailed
                merging f
                <<<<<<< working copy: tooltmpl ef83787e2614
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    tooltmpl 81448d39c9a0
                revision 0
                space
                revision 4
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                <<<<<<< working copy: tooltmpl ef83787e2614
                revision 1
                space
                =======
                revision 4
                >>>>>>> merge rev:    tooltmpl 81448d39c9a0
                # hg stat
                M f
                # hg resolve --list
                R f
              Tool execution
              set tools.args explicit to include $base $local $other $output:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
                >   | sed 's,==> .* <==,==> ... <==,g'
                merging f
                ==> ... <==
                revision 0
                space
                ==> ... <==
                revision 1
                space
                ==> ... <==
                revision 2
                space
                ==> ... <==
                revision 1
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              Merge with "echo mergeresult > $local":
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                mergeresult
                # hg stat
                M f
                # hg resolve --list
                R f
              - and $local is the file f:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                mergeresult
                # hg stat
                M f
                # hg resolve --list
                R f
              Merge with "echo mergeresult > $output" - the variable is a bit magic:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ aftermerge
                # cat f
                mergeresult
                # hg stat
                M f
                # hg resolve --list
                R f
              Merge using tool with a path that must be quoted:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > 'my merge tool'
                > cat "\$1" "\$2" "\$3" > "\$4"
                > EOF
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \
                >    merge -r 2
                merging f
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'my merge tool'
                $ aftermerge
                # cat f
                revision 0
                space
                revision 1
                space
                revision 2
                space
                # hg stat
                M f
                # hg resolve --list
                R f
              Merge using a tool that supports labellocal, labelother, and labelbase, checking
              that they're quoted properly as well. This is using the default 'basic'
              mergemarkers even though ui.mergemarkers is 'detailed', so it's ignoring both
              mergemarkertemplate settings:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > printargs_merge_tool
                > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
                > EOF
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config ui.mergemarkers=detailed \
                >    merge -r 2
                merging f
                arg: "ll:working copy"
                arg: "lo:"
                arg: "merge rev"
                arg: "lb:base: */f~base.*" (glob)
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'printargs_merge_tool'
              Same test with experimental.mergetempdirprefix set:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > printargs_merge_tool
                > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
                > EOF
                $ hg --config experimental.mergetempdirprefix=$TESTTMP/hgmerge. \
                >    --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config ui.mergemarkers=detailed \
                >    merge -r 2
                merging f
                arg: "ll:working copy"
                arg: "lo:"
                arg: "merge rev"
                arg: "lb:base: */hgmerge.*/f~base" (glob)
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'printargs_merge_tool'
              Merge using a tool that supports labellocal, labelother, and labelbase, checking
              that they're quoted properly as well. This is using 'detailed' mergemarkers,
              even though ui.mergemarkers is 'basic', and using the tool's
              mergemarkertemplate:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > printargs_merge_tool
                > while test \$# -gt 0; do echo arg: \"\$1\"; shift; done
                > EOF
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='./printargs_merge_tool ll:$labellocal lo: $labelother lb:$labelbase": "$base' \
                >    --config merge-tools.true.mergemarkers=detailed \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config ui.mergemarkers=basic \
                >    merge -r 2
                merging f
                arg: "ll:working copy: tooltmpl ef83787e2614"
                arg: "lo:"
                arg: "merge rev: tooltmpl 0185f4e0cf02"
                arg: "lb:base: */f~base.*" (glob)
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'printargs_merge_tool'
              The merge tool still gets labellocal and labelother as 'basic' even when
              premerge=keep is used and has 'detailed' markers:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > mytool
                > echo labellocal: \"\$1\"
                > echo labelother: \"\$2\"
                > echo "output (arg)": \"\$3\"
                > echo "output (contents)":
                > cat "\$3"
                > EOF
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='mytool $labellocal $labelother $output' \
                >    --config merge-tools.true.premerge=keep \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config ui.mergemarkers=detailed \
                >    merge -r 2
                merging f
                labellocal: "working copy"
                labelother: "merge rev"
                output (arg): "$TESTTMP/repo/f"
                output (contents):
                <<<<<<< working copy: uitmpl 1
                revision 1
                =======
                revision 2
                >>>>>>> merge rev:    uitmpl 2
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'mytool'
              premerge=keep uses the *tool's* mergemarkertemplate if tool's
              mergemarkers=detailed; labellocal and labelother also use the tool's template
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ cat <<EOF > mytool
                > echo labellocal: \"\$1\"
                > echo labelother: \"\$2\"
                > echo "output (arg)": \"\$3\"
                > echo "output (contents)":
                > cat "\$3"
                > EOF
                $ hg --config merge-tools.true.executable='sh' \
                >    --config merge-tools.true.args='mytool $labellocal $labelother $output' \
                >    --config merge-tools.true.premerge=keep \
                >    --config merge-tools.true.mergemarkers=detailed \
                >    --config merge-tools.true.mergemarkertemplate='tooltmpl {short(node)}' \
                >    --config ui.mergemarkertemplate='uitmpl {rev}' \
                >    --config ui.mergemarkers=detailed \
                >    merge -r 2
                merging f
                labellocal: "working copy: tooltmpl ef83787e2614"
                labelother: "merge rev: tooltmpl 0185f4e0cf02"
                output (arg): "$TESTTMP/repo/f"
                output (contents):
                <<<<<<< working copy: tooltmpl ef83787e2614
                revision 1
                =======
                revision 2
                >>>>>>> merge rev:    tooltmpl 0185f4e0cf02
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ rm -f 'mytool'
              Issue3581: Merging a filename that needs to be quoted
              (This test doesn't work on Windows filesystems even on Linux, so check
              for Unix-like permission)
              #if unix-permissions
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ echo "revision 5" > '"; exit 1; echo "'
                $ hg commit -Am "revision 5"
                adding "; exit 1; echo "
                warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
                $ hg update -C 1 > /dev/null
                $ echo "revision 6" > '"; exit 1; echo "'
                $ hg commit -Am "revision 6"
                adding "; exit 1; echo "
                warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
                created new head
                $ hg merge --config merge-tools.true.executable="true" -r 5
                merging "; exit 1; echo "
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ hg update -C 1 > /dev/null
              #else
              Match the non-portable filename commits above for test stability
                $ hg import --bypass -q - << EOF
                > # HG changeset patch
                > revision 5
                >
                > diff --git a/"; exit 1; echo " b/"; exit 1; echo "
                > new file mode 100644
                > --- /dev/null
                > +++ b/"; exit 1; echo "
                > @@ -0,0 +1,1 @@
                > +revision 5
                > EOF
                $ hg import --bypass -q - << EOF
                > # HG changeset patch
                > revision 6
                >
                > diff --git a/"; exit 1; echo " b/"; exit 1; echo "
                > new file mode 100644
                > --- /dev/null
                > +++ b/"; exit 1; echo "
                > @@ -0,0 +1,1 @@
                > +revision 6
                > EOF
              #endif
              Merge post-processing
              cat is a bad merge-tool and doesn't change:
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                # hg update -C 1
                $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1
                merging f
                revision 1
                space
                revision 0
                space
                revision 2
                space
                 output file f appears unchanged
                was merge successful (yn)? n
                merging f failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ aftermerge
                # cat f
                revision 1
                space
                # hg stat
                M f
                ? f.orig
                # hg resolve --list
                U f
              missingbinary is a merge-tool that doesn't exist:
                $ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                missingbinary.executable=doesnotexist
                # hg update -C 1
                $ hg merge -y -r 2 --config ui.merge=missingbinary
                couldn't find merge tool missingbinary (for pattern f)
                merging f
                couldn't find merge tool missingbinary (for pattern f)
                revision 1
                space
                revision 0
                space
                revision 2
                space
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ hg update -q -C 1
                $ rm f
              internal merge cannot handle symlinks and shouldn't try:
              #if symlink
                $ ln -s symlink f
                $ hg commit -qm 'f is symlink'
              #else
                $ hg import --bypass -q - << EOF
                > # HG changeset patch
                > f is symlink
                >
                > diff --git a/f b/f
                > old mode 100644
                > new mode 120000
                > --- a/f
                > +++ b/f
                > @@ -1,2 +1,1 @@
                > -revision 1
                > -space
                > +symlink
                > \ No newline at end of file
                > EOF
              Resolve 'other [destination] changed f which local [working copy] deleted' prompt
                $ hg up -q -C --config ui.interactive=True << EOF
                > c
                > EOF
              #endif
                $ hg merge -r 2 --tool internal:merge
                merging f
                warning: internal :merge cannot merge symlinks for f
                warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
              Verify naming of temporary files and that extension is preserved:
                $ hg update -q -C 1
                $ hg mv f f.txt
                $ hg ci -qm "f.txt"
                $ hg update -q -C 2
                $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
                merging f and f.txt to f.txt
                */f~base.* */f~local.*.txt */f~other.*.txt $TESTTMP/repo/f.txt (glob)
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
              Verify naming of temporary files and that extension is preserved
              (experimental.mergetempdirprefix version):
                $ hg update -q -C 1
                $ hg mv f f.txt
                $ hg ci -qm "f.txt"
                $ hg update -q -C 2
                $ hg merge -y -r tip --tool echo \
                >    --config merge-tools.echo.args='$base $local $other $output' \
                >    --config experimental.mergetempdirprefix=$TESTTMP/hgmerge.
                merging f and f.txt to f.txt
                $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob)
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
              Binary files capability checking
                $ hg update -q -C 0
                $ python <<EOF
                > with open('b', 'wb') as fp:
                >     fp.write(b'\x00\x01\x02\x03')
                > EOF
                $ hg add b
                $ hg commit -qm "add binary file (#1)"
                $ hg update -q -C 0
                $ python <<EOF
                > with open('b', 'wb') as fp:
                >     fp.write(b'\x03\x02\x01\x00')
                > EOF
                $ hg add b
                $ hg commit -qm "add binary file (#2)"
              By default, binary files capability of internal merge tools is not
              checked strictly.
              (for merge-patterns, chosen unintentionally)
                $ hg merge 9 \
                > --config merge-patterns.b=:merge-other \
                > --config merge-patterns.re:[a-z]=:other
                warning: check merge-patterns configurations, if ':merge-other' for binary file 'b' is unintentional
                (see 'hg help merge-tools' for binary files capability)
                merging b
                warning: b looks like a binary file.
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ hg merge --abort -q
              (for ui.merge, ignored unintentionally)
                $ hg merge 9 \
                > --config merge-tools.:other.binary=true \
                > --config ui.merge=:other
                tool :other (for pattern b) can't handle binary
                tool true can't handle binary
                tool :other can't handle binary
                tool false can't handle binary
                no tool found to merge b
                file 'b' needs to be resolved.
                You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
                What do you want to do? u
 files updated, 0 files merged, 0 files removed, 1 files unresolved
                use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
                [1]
                $ hg merge --abort -q
              With merge.strict-capability-check=true, binary files capability of
              internal merge tools is checked strictly.
                $ f --hexdump b
                b:
 : 03 02 01 00                                     |....|
              (for merge-patterns)
                $ hg merge 9 --config merge.strict-capability-check=true \
                > --config merge-tools.:merge-other.binary=true \
                > --config merge-patterns.b=:merge-other \
                > --config merge-patterns.re:[a-z]=:other
                tool :merge-other (for pattern b) can't handle binary
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ f --hexdump b
                b:
 : 00 01 02 03                                     |....|
                $ hg merge --abort -q
              (for ui.merge)
                $ hg merge 9 --config merge.strict-capability-check=true \
                > --config ui.merge=:other
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
                $ f --hexdump b
                b:
 : 00 01 02 03                                     |....|
                $ hg merge --abort -q
              Check that the extra information is printed correctly
                $ hg merge 9 \
                >   --config merge-tools.testecho.executable='echo' \
                >   --config merge-tools.testecho.args='merge runs here ...' \
                >   --config merge-tools.testecho.binary=True \
                >   --config ui.merge=testecho \
                >   --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \
                >   --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"'
                merging b
                Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !)
                Running merge tool for b (*/bin/echo): (glob) (no-windows !)
                - local (working copy): 10:2d1f533d add binary file (#2) tip default
                -          base (base): -1:00000000  default
                -    other (merge rev): 9:1e7ad7d7 add binary file (#1) default
                merge runs here ...
 files updated, 1 files merged, 0 files removed, 0 files unresolved
                (branch merge, don't forget to commit)
              Check that debugpicktool examines which merge tool is chosen for
              specified file as expected
                $ beforemerge
                [merge-tools]
                false.whatever=
                true.priority=1
                true.executable=cat
                missingbinary.executable=doesnotexist
                # hg update -C 1
              (default behavior: checking files in the working parent context)
                $ hg manifest
                f
                $ hg debugpickmergetool
                f = true
              (-X/-I and file patterns limmit examination targets)
                $ hg debugpickmergetool -X f
                $ hg debugpickmergetool unknown
                unknown: no such file in rev ef83787e2614
              (--changedelete emulates merging change and delete)
                $ hg debugpickmergetool --changedelete
                f = :prompt
              (-r REV causes checking files in specified revision)
                $ hg manifest -r 8
                f.txt
                $ hg debugpickmergetool -r 8
                f.txt = true
              #if symlink
              (symlink causes chosing :prompt)
                $ hg debugpickmergetool -r 6d00b3726f6e
                f = :prompt
              (by default, it is assumed that no internal merge tools has symlinks
              capability)
                $ hg debugpickmergetool \
                > -r 6d00b3726f6e \
                > --config merge-tools.:merge-other.symlink=true \
                > --config merge-patterns.f=:merge-other \
                > --config merge-patterns.re:[f]=:merge-local \
                > --config merge-patterns.re:[a-z]=:other
                f = :prompt
                $ hg debugpickmergetool \
                > -r 6d00b3726f6e \
                > --config merge-tools.:other.symlink=true \
                > --config ui.merge=:other
                f = :prompt
              (with strict-capability-check=true, actual symlink capabilities are
              checked striclty)
                $ hg debugpickmergetool --config merge.strict-capability-check=true \
                > -r 6d00b3726f6e \
                > --config merge-tools.:merge-other.symlink=true \
                > --config merge-patterns.f=:merge-other \
                > --config merge-patterns.re:[f]=:merge-local \
                > --config merge-patterns.re:[a-z]=:other
                f = :other
                $ hg debugpickmergetool --config merge.strict-capability-check=true \
                > -r 6d00b3726f6e \
                > --config ui.merge=:other
                f = :other
                $ hg debugpickmergetool --config merge.strict-capability-check=true \
                > -r 6d00b3726f6e \
                > --config merge-tools.:merge-other.symlink=true \
                > --config ui.merge=:merge-other
                f = :prompt
              #endif
              (--verbose shows some configurations)
                $ hg debugpickmergetool --tool foobar -v
                with --tool 'foobar'
                f = foobar
                $ HGMERGE=false hg debugpickmergetool -v
                with HGMERGE='false'
                f = false
                $ hg debugpickmergetool --config ui.merge=false -v
                with ui.merge='false'
                f = false
              (--debug shows errors detected intermediately)
                $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f
                couldn't find merge tool true (for pattern f)
                couldn't find merge tool true
                f = false
                $ cd ..

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages