Show More
@@ -0,0 +1,174 b'' | |||||
|
1 | It is common for machines (as opposed to humans) to consume Mercurial. | |||
|
2 | This help topic describes some of the considerations for interfacing | |||
|
3 | machines with Mercurial. | |||
|
4 | ||||
|
5 | Choosing an Interface | |||
|
6 | ===================== | |||
|
7 | ||||
|
8 | Machines have a choice of several methods to interface with Mercurial. | |||
|
9 | These include: | |||
|
10 | ||||
|
11 | - Executing the ``hg`` process | |||
|
12 | - Querying a HTTP server | |||
|
13 | - Calling out to a command server | |||
|
14 | ||||
|
15 | Executing ``hg`` processes is very similar to how humans interact with | |||
|
16 | Mercurial in the shell. It should already be familar to you. | |||
|
17 | ||||
|
18 | :hg:`serve` can be used to start a server. By default, this will start | |||
|
19 | a "hgweb" HTTP server. This HTTP server has support for machine-readable | |||
|
20 | output, such as JSON. For more, see :hg:`help hgweb`. | |||
|
21 | ||||
|
22 | :hg:`serve` can also start a "command server." Clients can connect | |||
|
23 | to this server and issue Mercurial commands over a special protocol. | |||
|
24 | For more details on the command server, including links to client | |||
|
25 | libraries, see https://mercurial.selenic.com/wiki/CommandServer. | |||
|
26 | ||||
|
27 | :hg:`serve` based interfaces (the hgweb and command servers) have the | |||
|
28 | advantage over simple ``hg`` process invocations in that they are | |||
|
29 | likely more efficient. This is because there is significant overhead | |||
|
30 | to spawn new Python processes. | |||
|
31 | ||||
|
32 | .. tip:: | |||
|
33 | ||||
|
34 | If you need to invoke several ``hg`` processes in short order and/or | |||
|
35 | performance is important to you, use of a server-based interface | |||
|
36 | is highly recommended. | |||
|
37 | ||||
|
38 | Environment Variables | |||
|
39 | ===================== | |||
|
40 | ||||
|
41 | As documented in :hg:`help environment`, various environment variables | |||
|
42 | influence the operation of Mercurial. The following are particularly | |||
|
43 | relevant for machines consuming Mercurial: | |||
|
44 | ||||
|
45 | HGPLAIN | |||
|
46 | If not set, Mercurial's output could be influenced by configuration | |||
|
47 | settings that impact its encoding, verbose mode, localization, etc. | |||
|
48 | ||||
|
49 | It is highly recommended for machines to set this variable when | |||
|
50 | invoking ``hg`` processes. | |||
|
51 | ||||
|
52 | HGENCODING | |||
|
53 | If not set, the locale used by Mercurial will be detected from the | |||
|
54 | environment. If the determined locale does not support display of | |||
|
55 | certain characters, Mercurial may render these character sequences | |||
|
56 | incorrectly (often by using "?" as a placeholder for invalid | |||
|
57 | characters in the current locale). | |||
|
58 | ||||
|
59 | Explcitly setting this environment variable is a good practice to | |||
|
60 | guarantee consistent results. "utf-8" is a good choice on UNIX-like | |||
|
61 | environments. | |||
|
62 | ||||
|
63 | HGRCPATH | |||
|
64 | If not set, Mercurial will inherit config options from config files | |||
|
65 | using the process described in :hg:`help config`. This includes | |||
|
66 | inheriting user or system-wide config files. | |||
|
67 | ||||
|
68 | When utmost control over the Mercurial configuration is desired, the | |||
|
69 | value of ``HGRCPATH`` can be set to an explicit file with known good | |||
|
70 | configs. In rare cases, the value can be set to an empty file or the | |||
|
71 | null device (often ``/dev/null``) to bypass loading of any user or | |||
|
72 | system config files. Note that these approaches can have unintended | |||
|
73 | consequences, as the user and system config files often define things | |||
|
74 | like the username and extensions that may be required to interface | |||
|
75 | with a repository. | |||
|
76 | ||||
|
77 | Consuming Command Output | |||
|
78 | ======================== | |||
|
79 | ||||
|
80 | It is common for machines to need to parse the output of Mercurial | |||
|
81 | commands for relevant data. This section describes the various | |||
|
82 | techniques for doing so. | |||
|
83 | ||||
|
84 | Parsing Raw Command Output | |||
|
85 | -------------------------- | |||
|
86 | ||||
|
87 | Likely the simplest and most effective solution for consuming command | |||
|
88 | output is to simply invoke ``hg`` commands as you would as a user and | |||
|
89 | parse their output. | |||
|
90 | ||||
|
91 | The output of many commands can easily be parsed with tools like | |||
|
92 | ``grep``, ``sed``, and ``awk``. | |||
|
93 | ||||
|
94 | A potential downside with parsing command output is that the output | |||
|
95 | of commands can change when Mercurial is upgraded. While Mercurial | |||
|
96 | does generally strive for strong backwards compatibility, command | |||
|
97 | output does occasionally change. Having tests for your automated | |||
|
98 | interactions with ``hg`` commands is generally recommended, but is | |||
|
99 | even more important when raw command output parsing is involved. | |||
|
100 | ||||
|
101 | Using Templates to Control Output | |||
|
102 | --------------------------------- | |||
|
103 | ||||
|
104 | Many ``hg`` commands support templatized output via the | |||
|
105 | ``-T/--template`` argument. For more, see :hg:`help templates`. | |||
|
106 | ||||
|
107 | Templates are useful for explicitly controlling output so that | |||
|
108 | you get exactly the data you want formatted how you want it. For | |||
|
109 | example, ``log -T {node}\n`` can be used to print a newline | |||
|
110 | delimited list of changeset nodes instead of a human-tailored | |||
|
111 | output containing authors, dates, descriptions, etc. | |||
|
112 | ||||
|
113 | .. tip:: | |||
|
114 | ||||
|
115 | If parsing raw command output is too complicated, consider | |||
|
116 | using templates to make your life easier. | |||
|
117 | ||||
|
118 | The ``-T/--template`` argument allows specifying pre-defined styles. | |||
|
119 | Mercurial ships with the machine-readable styles ``json`` and ``xml``, | |||
|
120 | which provide JSON and XML output, respectively. These are useful for | |||
|
121 | producing output that is machine readable as-is. | |||
|
122 | ||||
|
123 | .. important:: | |||
|
124 | ||||
|
125 | The ``json`` and ``xml`` styles are considered experimental. While | |||
|
126 | they may be attractive to use for easily obtaining machine-readable | |||
|
127 | output, their behavior may change in subsequent versions. | |||
|
128 | ||||
|
129 | These styles may also exhibit unexpected results when dealing with | |||
|
130 | certain encodings. Mercurial treats things like filenames as a | |||
|
131 | series of bytes and normalizing certain byte sequences to JSON | |||
|
132 | or XML with certain encoding settings can lead to surprises. | |||
|
133 | ||||
|
134 | Command Server Output | |||
|
135 | --------------------- | |||
|
136 | ||||
|
137 | If using the command server to interact with Mercurial, you are likely | |||
|
138 | using an existing library/API that abstracts implementation details of | |||
|
139 | the command server. If so, this interface layer may perform parsing for | |||
|
140 | you, saving you the work of implementing it yourself. | |||
|
141 | ||||
|
142 | Output Verbosity | |||
|
143 | ---------------- | |||
|
144 | ||||
|
145 | Commands often have varying output verbosity, even when machine | |||
|
146 | readable styles are being used (e.g. ``-T json``). Adding | |||
|
147 | ``-v/--verbose`` and ``--debug`` to the command's arguments can | |||
|
148 | increase the amount of data exposed by Mercurial. | |||
|
149 | ||||
|
150 | An alternate way to get the data you need is by explicitly specifying | |||
|
151 | a template. | |||
|
152 | ||||
|
153 | Other Topics | |||
|
154 | ============ | |||
|
155 | ||||
|
156 | revsets | |||
|
157 | Revisions sets is a functional query language for selecting a set | |||
|
158 | of revisions. Think of it as SQL for Mercurial repositories. Revsets | |||
|
159 | are useful for querying repositories for specific data. | |||
|
160 | ||||
|
161 | See :hg:`help revsets` for more. | |||
|
162 | ||||
|
163 | share extension | |||
|
164 | The ``share`` extension provides functionality for sharing | |||
|
165 | repository data across several working copies. It can even | |||
|
166 | automatically "pool" storage for logically related repositories when | |||
|
167 | cloning. | |||
|
168 | ||||
|
169 | Configuring the ``share`` extension can lead to significant resource | |||
|
170 | utilization reduction, particularly around disk space and the | |||
|
171 | network. This is especially true for continuous integration (CI) | |||
|
172 | environments. | |||
|
173 | ||||
|
174 | See :hg:`help -e share` for more. |
@@ -109,3 +109,5 b' e89f909edffad558b56f4affa8239e4832f88de0' | |||||
109 | 8cc6036bca532e06681c5a8fa37efaa812de67b5 0 iQIVAwUAVUP0xCBXgaxoKi1yAQLIChAAme3kg1Z0V8t5PnWKDoIvscIeAsD2s6EhMy1SofmdZ4wvYD1VmGC6TgXMCY7ssvRBhxqwG3GxwYpwELASuw2GYfVot2scN7+b8Hs5jHtkQevKbxarYni+ZI9mw/KldnJixD1yW3j+LoJFh/Fu6GD2yrfGIhimFLozcwUu3EbLk7JzyHSn7/8NFjLJz0foAYfcbowU9/BFwNVLrQPnsUbWcEifsq5bYso9MBO9k+25yLgqHoqMbGpJcgjubNy1cWoKnlKS+lOJl0/waAk+aIjHXMzFpRRuJDjxEZn7V4VdV5d23nrBTcit1BfMzga5df7VrLPVRbom1Bi0kQ0BDeDex3hHNqHS5X+HSrd/njzP1xp8twG8hTE+njv85PWoGBTo1eUGW/esChIJKA5f3/F4B9ErgBNNOKnYmRgxixd562OWAwAQZK0r0roe2H/Mfg2VvgxT0kHd22NQLoAv0YI4jcXcCFrnV/80vHUQ8AsAYAbkLcz1jkfk3YwYDP8jbJCqcwJRt9ialYKJwvXlEe0TMeGdq7EjCO0z/pIpu82k2R/C0FtCFih3bUvJEmWoVVx8UGkDDQEORLbzxQCt0IOiQGFcoCCxgQmL0x9ZoljCWg5vZuuhU4uSOuRTuM+aa4xoLkeOcvgGRSOXrqfkV8JpWKoJB4dmY2qSuxw8LsAAzK0= |
|
109 | 8cc6036bca532e06681c5a8fa37efaa812de67b5 0 iQIVAwUAVUP0xCBXgaxoKi1yAQLIChAAme3kg1Z0V8t5PnWKDoIvscIeAsD2s6EhMy1SofmdZ4wvYD1VmGC6TgXMCY7ssvRBhxqwG3GxwYpwELASuw2GYfVot2scN7+b8Hs5jHtkQevKbxarYni+ZI9mw/KldnJixD1yW3j+LoJFh/Fu6GD2yrfGIhimFLozcwUu3EbLk7JzyHSn7/8NFjLJz0foAYfcbowU9/BFwNVLrQPnsUbWcEifsq5bYso9MBO9k+25yLgqHoqMbGpJcgjubNy1cWoKnlKS+lOJl0/waAk+aIjHXMzFpRRuJDjxEZn7V4VdV5d23nrBTcit1BfMzga5df7VrLPVRbom1Bi0kQ0BDeDex3hHNqHS5X+HSrd/njzP1xp8twG8hTE+njv85PWoGBTo1eUGW/esChIJKA5f3/F4B9ErgBNNOKnYmRgxixd562OWAwAQZK0r0roe2H/Mfg2VvgxT0kHd22NQLoAv0YI4jcXcCFrnV/80vHUQ8AsAYAbkLcz1jkfk3YwYDP8jbJCqcwJRt9ialYKJwvXlEe0TMeGdq7EjCO0z/pIpu82k2R/C0FtCFih3bUvJEmWoVVx8UGkDDQEORLbzxQCt0IOiQGFcoCCxgQmL0x9ZoljCWg5vZuuhU4uSOuRTuM+aa4xoLkeOcvgGRSOXrqfkV8JpWKoJB4dmY2qSuxw8LsAAzK0= | |
110 | 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= |
|
110 | 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= | |
111 | 540cd0ddac49c1125b2e013aa2ff18ecbd4dd954 0 iQIVAwUAVZRtzSBXgaxoKi1yAQJVLhAAtfn+8OzHIp6wRC4NUbkImAJRLsNTRPKeRSWPCF5O5XXQ84hp+86qjhndIE6mcJSAt4cVP8uky6sEa8ULd6b3ACRBvtgZtsecA9S/KtRjyE9CKr8nP+ogBNqJPaYlTz9RuwGedOd+8I9lYgsnRjfaHSByNMX08WEHtWqAWhSkAz/HO32ardS38cN97fckCgQtA8v7c77nBT7vcw4epgxyUQvMUxUhqmCVVhVfz8JXa5hyJxFrOtqgaVuQ1B5Y/EKxcyZT+JNHPtu3V1uc1awS/w16CEPstNBSFHax5MuT9UbY0mV2ZITP99EkM+vdomh82VHdnMo0i7Pz7XF45ychD4cteroO9gGqDDt9j7hd1rubBX1bfkPsd/APJlyeshusyTj+FqsUD/HDlvM9LRjY1HpU7i7yAlLQQ3851XKMLUPNFYu2r3bo8Wt/CCHtJvB4wYuH+7Wo3muudpU01ziJBxQrUWwPbUrG+7LvO1iEEVxB8l+8Vq0mU3Te7lJi1kGetm6xHNbtvQip5P2YUqvv+lLo/K8KoJDxsh63Y01JGwdmUDb8mnFlRx4J7hQJaoNEvz3cgnc4X8gDJD8sUOjGOPnbtz2QwTY+zj/5+FdLxWDCxNrHX5vvkVdJHcCqEfVvQTKfDMOUeKuhjI7GD7t3xRPfUxq19jjoLPe7aqn1Z1s= |
|
111 | 540cd0ddac49c1125b2e013aa2ff18ecbd4dd954 0 iQIVAwUAVZRtzSBXgaxoKi1yAQJVLhAAtfn+8OzHIp6wRC4NUbkImAJRLsNTRPKeRSWPCF5O5XXQ84hp+86qjhndIE6mcJSAt4cVP8uky6sEa8ULd6b3ACRBvtgZtsecA9S/KtRjyE9CKr8nP+ogBNqJPaYlTz9RuwGedOd+8I9lYgsnRjfaHSByNMX08WEHtWqAWhSkAz/HO32ardS38cN97fckCgQtA8v7c77nBT7vcw4epgxyUQvMUxUhqmCVVhVfz8JXa5hyJxFrOtqgaVuQ1B5Y/EKxcyZT+JNHPtu3V1uc1awS/w16CEPstNBSFHax5MuT9UbY0mV2ZITP99EkM+vdomh82VHdnMo0i7Pz7XF45ychD4cteroO9gGqDDt9j7hd1rubBX1bfkPsd/APJlyeshusyTj+FqsUD/HDlvM9LRjY1HpU7i7yAlLQQ3851XKMLUPNFYu2r3bo8Wt/CCHtJvB4wYuH+7Wo3muudpU01ziJBxQrUWwPbUrG+7LvO1iEEVxB8l+8Vq0mU3Te7lJi1kGetm6xHNbtvQip5P2YUqvv+lLo/K8KoJDxsh63Y01JGwdmUDb8mnFlRx4J7hQJaoNEvz3cgnc4X8gDJD8sUOjGOPnbtz2QwTY+zj/5+FdLxWDCxNrHX5vvkVdJHcCqEfVvQTKfDMOUeKuhjI7GD7t3xRPfUxq19jjoLPe7aqn1Z1s= | |
|
112 | 96a38d44ba093bd1d1ecfd34119e94056030278b 0 iQIVAwUAVarUUyBXgaxoKi1yAQIfJw/+MG/0736F/9IvzgCTF6omIC+9kS8JH0n/JBGPhpbPAHK4xxjhOOz6m3Ia3c3HNoy+I6calwU6YV7k5dUzlyLhM0Z5oYpdrH+OBNxDEsD5SfhclfR63MK1kmgtD33izijsZ++6a+ZaVfyxpMTksKOktWSIDD63a5b/avb6nKY64KwJcbbeXPdelxvXV7TXYm0GvWc46BgvrHOJpYHCDaXorAn6BMq7EQF8sxdNK4GVMNMVk1njve0HOg3Kz8llPB/7QmddZXYLFGmWqICyUn1IsJDfePxzh8sOYVCbxAgitTJHJJmmH5gzVzw7t7ljtmxSJpcUGQJB2MphejmNFGfgvJPB9c6xOCfUqDjxN5m24V+UYesZntpfgs3lpfvE7785IpVnf6WfKG4PKty01ome/joHlDlrRTekKMlpiBapGMfv8EHvPBrOA+5yAHNfKsmcyCcjD1nvXYZ2/X9qY35AhdcBuNkyp55oPDOdtYIHfnOIxlYMKG1dusDx3Z4eveF0lQTzfRVoE5w+k9A2Ov3Zx0aiSkFFevJjrq5QBfs9dAiT8JYgBmWhaJzCtJm12lQirRMKR/br88Vwt/ry/UVY9cereMNvRYUGOGfC8CGGDCw4WDD+qWvyB3mmrXVuMlXxQRIZRJy5KazaQXsBWuIsx4kgGqC5Uo+yzpiQ1VMuCyI= | |||
|
113 | 21aa1c313b05b1a85f8ffa1120d51579ddf6bf24 0 iQIVAwUAVbuouCBXgaxoKi1yAQL2ng//eI1w51F4YkDiUAhrZuc8RE/chEd2o4F6Jyu9laA03vbim598ntqGjX3+UkOyTQ/zGVeZfW2cNG8zkJjSLk138DHCYl2YPPD/yxqMOJp/a7U34+HrA0aE5Y2pcfx+FofZHRvRtt40UCngicjKivko8au7Ezayidpa/vQbc6dNvGrwwk4KMgOP2HYIfHgCirR5UmaWtNpzlLhf9E7JSNL5ZXij3nt6AgEPyn0OvmmOLyUARO/JTJ6vVyLEtwiXg7B3sF5RpmyFDhrkZ+MbFHgL4k/3y9Lb97WaZl8nXJIaNPOTPJqkApFY/56S12PKYK4js2OgU+QsX1XWvouAhEx6CC6Jk9EHhr6+9qxYFhBJw7RjbswUG6LvJy/kBe+Ei5UbYg9dATf3VxQ6Gqs19lebtzltERH2yNwaHyVeqqakPSonOaUyxGMRRosvNHyrTTor38j8d27KksgpocXzBPZcc1MlS3vJg2nIwZlc9EKM9z5R0J1KAi1Z/+xzBjiGRYg5EZY6ElAw30eCjGta7tXlBssJiKeHut7QTLxCZHQuX1tKxDDs1qlXlGCMbrFqo0EiF9hTssptRG3ZyLwMdzEjnh4ki6gzONZKDI8uayAS3N+CEtWcGUtiA9OwuiFXTwodmles/Mh14LEhiVZoDK3L9TPcY22o2qRuku/6wq6QKsg= |
@@ -122,3 +122,5 b' e89f909edffad558b56f4affa8239e4832f88de0' | |||||
122 | 8cc6036bca532e06681c5a8fa37efaa812de67b5 3.4 |
|
122 | 8cc6036bca532e06681c5a8fa37efaa812de67b5 3.4 | |
123 | ed18f4acf435a2824c6f49fba40f42b9df5da7ad 3.4.1 |
|
123 | ed18f4acf435a2824c6f49fba40f42b9df5da7ad 3.4.1 | |
124 | 540cd0ddac49c1125b2e013aa2ff18ecbd4dd954 3.4.2 |
|
124 | 540cd0ddac49c1125b2e013aa2ff18ecbd4dd954 3.4.2 | |
|
125 | 96a38d44ba093bd1d1ecfd34119e94056030278b 3.5-rc | |||
|
126 | 21aa1c313b05b1a85f8ffa1120d51579ddf6bf24 3.5 |
@@ -70,15 +70,15 b' Source: contrib\\win32\\ReadMe.html; DestD' | |||||
70 | Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt |
|
70 | Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt | |
71 | Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') |
|
71 | Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') | |
72 | #if ARCH == "x64" |
|
72 | #if ARCH == "x64" | |
73 | Source: dist\*.dll; Destdir: {app} |
|
73 | Source: dist\lib\*.dll; Destdir: {app}\lib | |
74 | Source: dist\*.pyd; Destdir: {app} |
|
74 | Source: dist\lib\*.pyd; Destdir: {app}\lib | |
75 | #else |
|
75 | #else | |
|
76 | Source: dist\w9xpopen.exe; DestDir: {app} | |||
|
77 | #endif | |||
76 | Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist |
|
78 | Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist | |
77 | Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist |
|
79 | Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist | |
78 | Source: dist\w9xpopen.exe; DestDir: {app} |
|
|||
79 | #endif |
|
|||
80 | Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist |
|
80 | Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist | |
81 | Source: dist\library.zip; DestDir: {app} |
|
81 | Source: dist\lib\library.zip; DestDir: {app}\lib | |
82 | Source: dist\add_path.exe; DestDir: {app} |
|
82 | Source: dist\add_path.exe; DestDir: {app} | |
83 | Source: doc\*.html; DestDir: {app}\Docs |
|
83 | Source: doc\*.html; DestDir: {app}\Docs | |
84 | Source: doc\style.css; DestDir: {app}\Docs |
|
84 | Source: doc\style.css; DestDir: {app}\Docs |
@@ -192,6 +192,9 b' def convert(ui, src, dest=None, revmapfi' | |||||
192 | (forces target IDs to change). It takes a boolean argument and |
|
192 | (forces target IDs to change). It takes a boolean argument and | |
193 | defaults to False. |
|
193 | defaults to False. | |
194 |
|
194 | |||
|
195 | :convert.hg.startrev: specify the initial Mercurial revision. | |||
|
196 | The default is 0. | |||
|
197 | ||||
195 | :convert.hg.revs: revset specifying the source revisions to convert. |
|
198 | :convert.hg.revs: revset specifying the source revisions to convert. | |
196 |
|
199 | |||
197 | CVS Source |
|
200 | CVS Source | |
@@ -323,8 +326,11 b' def convert(ui, src, dest=None, revmapfi' | |||||
323 | usually should specify a target directory, because otherwise the |
|
326 | usually should specify a target directory, because otherwise the | |
324 | target may be named ``...-hg``. |
|
327 | target may be named ``...-hg``. | |
325 |
|
328 | |||
326 | It is possible to limit the amount of source history to be |
|
329 | The following options can be set with ``--config``: | |
327 | converted by specifying an initial Perforce revision: |
|
330 | ||
|
331 | :convert.p4.encoding: specify the encoding to use when decoding standard | |||
|
332 | output of the Perforce command line tool. The default is default system | |||
|
333 | encoding. | |||
328 |
|
334 | |||
329 | :convert.p4.startrev: specify initial Perforce revision (a |
|
335 | :convert.p4.startrev: specify initial Perforce revision (a | |
330 | Perforce changelist number). |
|
336 | Perforce changelist number). |
@@ -39,6 +39,9 b' def decodefilename(filename):' | |||||
39 |
|
39 | |||
40 | class p4_source(converter_source): |
|
40 | class p4_source(converter_source): | |
41 | def __init__(self, ui, path, revs=None): |
|
41 | def __init__(self, ui, path, revs=None): | |
|
42 | # avoid import cycle | |||
|
43 | import convcmd | |||
|
44 | ||||
42 | super(p4_source, self).__init__(ui, path, revs=revs) |
|
45 | super(p4_source, self).__init__(ui, path, revs=revs) | |
43 |
|
46 | |||
44 | if "/" in path and not path.startswith('//'): |
|
47 | if "/" in path and not path.startswith('//'): | |
@@ -54,7 +57,8 b' class p4_source(converter_source):' | |||||
54 | self.tags = {} |
|
57 | self.tags = {} | |
55 | self.lastbranch = {} |
|
58 | self.lastbranch = {} | |
56 | self.parent = {} |
|
59 | self.parent = {} | |
57 | self.encoding = "latin_1" |
|
60 | self.encoding = self.ui.config('convert', 'p4.encoding', | |
|
61 | default=convcmd.orig_encoding) | |||
58 | self.depotname = {} # mapping from local name to depot name |
|
62 | self.depotname = {} # mapping from local name to depot name | |
59 | self.localname = {} # mapping from depot name to local name |
|
63 | self.localname = {} # mapping from depot name to local name | |
60 | self.re_type = re.compile( |
|
64 | self.re_type = re.compile( | |
@@ -216,7 +220,7 b' class p4_source(converter_source):' | |||||
216 | stdout = util.popen(cmd, mode='rb') |
|
220 | stdout = util.popen(cmd, mode='rb') | |
217 |
|
221 | |||
218 | mode = None |
|
222 | mode = None | |
219 |
contents = |
|
223 | contents = [] | |
220 | keywords = None |
|
224 | keywords = None | |
221 |
|
225 | |||
222 | for d in loaditer(stdout): |
|
226 | for d in loaditer(stdout): | |
@@ -252,7 +256,7 b' class p4_source(converter_source):' | |||||
252 | keywords = self.re_keywords |
|
256 | keywords = self.re_keywords | |
253 |
|
257 | |||
254 | elif code == "text" or code == "binary": |
|
258 | elif code == "text" or code == "binary": | |
255 |
contents |
|
259 | contents.append(data) | |
256 |
|
260 | |||
257 | lasterror = None |
|
261 | lasterror = None | |
258 |
|
262 | |||
@@ -262,6 +266,8 b' class p4_source(converter_source):' | |||||
262 | if mode is None: |
|
266 | if mode is None: | |
263 | return None, None |
|
267 | return None, None | |
264 |
|
268 | |||
|
269 | contents = ''.join(contents) | |||
|
270 | ||||
265 | if keywords: |
|
271 | if keywords: | |
266 | contents = keywords.sub("$\\1$", contents) |
|
272 | contents = keywords.sub("$\\1$", contents) | |
267 | if mode == "l" and contents.endswith("\n"): |
|
273 | if mode == "l" and contents.endswith("\n"): |
@@ -101,12 +101,8 b' def snapshot(ui, repo, files, node, tmpr' | |||||
101 | matchfn=scmutil.matchfiles(repo, files), |
|
101 | matchfn=scmutil.matchfiles(repo, files), | |
102 | subrepos=listsubrepos) |
|
102 | subrepos=listsubrepos) | |
103 |
|
103 | |||
104 | ctx = repo[node] |
|
|||
105 | for fn in sorted(files): |
|
104 | for fn in sorted(files): | |
106 | wfn = util.pconvert(fn) |
|
105 | wfn = util.pconvert(fn) | |
107 | if wfn not in ctx: |
|
|||
108 | # File doesn't exist; could be a bogus modify |
|
|||
109 | continue |
|
|||
110 | ui.note(' %s\n' % wfn) |
|
106 | ui.note(' %s\n' % wfn) | |
111 |
|
107 | |||
112 | if node is None: |
|
108 | if node is None: |
@@ -51,12 +51,9 b' def pygmentize(field, fctx, style, tmpl)' | |||||
51 | except (ClassNotFound, ValueError): |
|
51 | except (ClassNotFound, ValueError): | |
52 | lexer = TextLexer(stripnl=False) |
|
52 | lexer = TextLexer(stripnl=False) | |
53 |
|
53 | |||
54 | formatter = HtmlFormatter(style=style) |
|
54 | formatter = HtmlFormatter(nowrap=True, style=style) | |
55 |
|
55 | |||
56 | colorized = highlight(text, lexer, formatter) |
|
56 | colorized = highlight(text, lexer, formatter) | |
57 | # strip wrapping div |
|
|||
58 | colorized = colorized[:colorized.find('\n</pre>')] |
|
|||
59 | colorized = colorized[colorized.find('<pre>') + 5:] |
|
|||
60 | coloriter = (s.encode(encoding.encoding, 'replace') |
|
57 | coloriter = (s.encode(encoding.encoding, 'replace') | |
61 | for s in colorized.splitlines()) |
|
58 | for s in colorized.splitlines()) | |
62 |
|
59 |
@@ -125,9 +125,10 b' class transplanter(object):' | |||||
125 | diffopts = patch.difffeatureopts(self.ui, opts) |
|
125 | diffopts = patch.difffeatureopts(self.ui, opts) | |
126 | diffopts.git = True |
|
126 | diffopts.git = True | |
127 |
|
127 | |||
128 | lock = wlock = tr = None |
|
128 | lock = wlock = tr = dsguard = None | |
129 | try: |
|
129 | try: | |
130 | wlock = repo.wlock() |
|
130 | wlock = repo.wlock() | |
|
131 | dsguard = cmdutil.dirstateguard(repo, 'transplant') | |||
131 | lock = repo.lock() |
|
132 | lock = repo.lock() | |
132 | tr = repo.transaction('transplant') |
|
133 | tr = repo.transaction('transplant') | |
133 | for rev in revs: |
|
134 | for rev in revs: | |
@@ -200,6 +201,7 b' class transplanter(object):' | |||||
200 | # Do not rollback, it is up to the user to |
|
201 | # Do not rollback, it is up to the user to | |
201 | # fix the merge or cancel everything |
|
202 | # fix the merge or cancel everything | |
202 | tr.close() |
|
203 | tr.close() | |
|
204 | dsguard.close() | |||
203 | raise |
|
205 | raise | |
204 | if n and domerge: |
|
206 | if n and domerge: | |
205 | self.ui.status(_('%s merged at %s\n') % (revstr, |
|
207 | self.ui.status(_('%s merged at %s\n') % (revstr, | |
@@ -212,6 +214,7 b' class transplanter(object):' | |||||
212 | if patchfile: |
|
214 | if patchfile: | |
213 | os.unlink(patchfile) |
|
215 | os.unlink(patchfile) | |
214 | tr.close() |
|
216 | tr.close() | |
|
217 | dsguard.close() | |||
215 | if pulls: |
|
218 | if pulls: | |
216 | exchange.pull(repo, source.peer(), heads=pulls) |
|
219 | exchange.pull(repo, source.peer(), heads=pulls) | |
217 | merge.update(repo, pulls[-1], False, False, None) |
|
220 | merge.update(repo, pulls[-1], False, False, None) | |
@@ -220,7 +223,10 b' class transplanter(object):' | |||||
220 | self.transplants.write() |
|
223 | self.transplants.write() | |
221 | if tr: |
|
224 | if tr: | |
222 | tr.release() |
|
225 | tr.release() | |
223 |
lock |
|
226 | if lock: | |
|
227 | lock.release() | |||
|
228 | if dsguard: | |||
|
229 | dsguard.release() | |||
224 | wlock.release() |
|
230 | wlock.release() | |
225 |
|
231 | |||
226 | def filter(self, filter, node, changelog, patchfile): |
|
232 | def filter(self, filter, node, changelog, patchfile): |
This diff has been collapsed as it changes many lines, (1213 lines changed) Show them Hide them | |||||
@@ -114,6 +114,7 b'' | |||||
114 | # platform 稼働環境 |
|
114 | # platform 稼働環境 | |
115 | # pop(patch) (パッチの)適用解除 |
|
115 | # pop(patch) (パッチの)適用解除 | |
116 | # progress (, in) 未完了(interrupted rebase/graft/histedit/transplant) |
|
116 | # progress (, in) 未完了(interrupted rebase/graft/histedit/transplant) | |
|
117 | # programming error 内部エラー | |||
117 | # pruned xxxxx (obsoleted with no successors) xxxxxx |
|
118 | # pruned xxxxx (obsoleted with no successors) xxxxxx | |
118 | # pull (追加リビジョンの)取り込み |
|
119 | # pull (追加リビジョンの)取り込み | |
119 | # push (追加リビジョンの)反映 |
|
120 | # push (追加リビジョンの)反映 | |
@@ -159,8 +160,8 b' msgid ""' | |||||
159 | msgstr "" |
|
160 | msgstr "" | |
160 | "Project-Id-Version: Mercurial\n" |
|
161 | "Project-Id-Version: Mercurial\n" | |
161 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
162 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
162 |
"POT-Creation-Date: 2015-0 |
|
163 | "POT-Creation-Date: 2015-07-30 18:57+0900\n" | |
163 |
"PO-Revision-Date: 2015-0 |
|
164 | "PO-Revision-Date: 2015-07-31 18:37+0900\n" | |
164 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" |
|
165 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" | |
165 | "Language-Team: Japanese\n" |
|
166 | "Language-Team: Japanese\n" | |
166 | "Language: ja\n" |
|
167 | "Language: ja\n" | |
@@ -1428,6 +1429,9 b' msgstr "\xe6\xa4\x9c\xe9\x96\xb2\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"' | |||||
1428 | msgid "must specify revision to censor" |
|
1429 | msgid "must specify revision to censor" | |
1429 | msgstr "検閲対象リビジョンを指定してください" |
|
1430 | msgstr "検閲対象リビジョンを指定してください" | |
1430 |
|
1431 | |||
|
1432 | msgid "can only specify an explicit filename" | |||
|
1433 | msgstr "明示的なファイル名以外は指定できません" | |||
|
1434 | ||||
1431 | msgid "cannot censor file with no history" |
|
1435 | msgid "cannot censor file with no history" | |
1432 | msgstr "履歴のないファイルは検閲できません" |
|
1436 | msgstr "履歴のないファイルは検閲できません" | |
1433 |
|
1437 | |||
@@ -1792,8 +1796,8 b' msgstr ""' | |||||
1792 | " resolve.unresolved = red bold\n" |
|
1796 | " resolve.unresolved = red bold\n" | |
1793 | " resolve.resolved = green bold" |
|
1797 | " resolve.resolved = green bold" | |
1794 |
|
1798 | |||
1795 |
msgid " bookmarks. |
|
1799 | msgid " bookmarks.active = green" | |
1796 |
msgstr " bookmarks. |
|
1800 | msgstr " bookmarks.active = green" | |
1797 |
|
1801 | |||
1798 | msgid "" |
|
1802 | msgid "" | |
1799 | " branches.active = none\n" |
|
1803 | " branches.active = none\n" | |
@@ -2543,6 +2547,13 b' msgstr ""' | |||||
2543 | " 効果を持ちません。 デフォルト値は False。" |
|
2547 | " 効果を持ちません。 デフォルト値は False。" | |
2544 |
|
2548 | |||
2545 | msgid "" |
|
2549 | msgid "" | |
|
2550 | " :convert.git.remoteprefix: remote refs are converted as bookmarks with\n" | |||
|
2551 | " ``convert.git.remoteprefix`` as a prefix followed by a /. The " | |||
|
2552 | "default\n" | |||
|
2553 | " is 'remote'." | |||
|
2554 | msgstr "" | |||
|
2555 | ||||
|
2556 | msgid "" | |||
2546 | " Perforce Source\n" |
|
2557 | " Perforce Source\n" | |
2547 | " ###############" |
|
2558 | " ###############" | |
2548 | msgstr "" |
|
2559 | msgstr "" | |
@@ -2585,6 +2596,43 b' msgstr ""' | |||||
2585 | " Mercurial 形式への変換\n" |
|
2596 | " Mercurial 形式への変換\n" | |
2586 | " ######################" |
|
2597 | " ######################" | |
2587 |
|
2598 | |||
|
2599 | msgid "" | |||
|
2600 | " The Mercurial destination will recognize Mercurial subrepositories in " | |||
|
2601 | "the\n" | |||
|
2602 | " destination directory, and update the .hgsubstate file automatically if " | |||
|
2603 | "the\n" | |||
|
2604 | " destination subrepositories contain the <dest>/<sub>/.hg/shamap file.\n" | |||
|
2605 | " Converting a repository with subrepositories requires converting a " | |||
|
2606 | "single\n" | |||
|
2607 | " repository at a time, from the bottom up." | |||
|
2608 | msgstr "" | |||
|
2609 | " Mercurial 形式への変換で、 変換先ディレクトリ配下のサブリポジトリに、\n" | |||
|
2610 | " <dest>/<sub>/.hg/shamap がある場合、 親リポジトリの .hgsubstate は、\n" | |||
|
2611 | " 自動的に更新されます。 サブリポジトリを含むリポジトリの変換は、\n" | |||
|
2612 | " 個々のリポジトリの変換を、 ボトムアップで実施してください。" | |||
|
2613 | ||||
|
2614 | msgid "" | |||
|
2615 | " An example showing how to convert a repository with subrepositories::" | |||
|
2616 | msgstr " サブリポジトリを含むリポジトリの変換例を示します::" | |||
|
2617 | ||||
|
2618 | msgid "" | |||
|
2619 | " # so convert knows the type when it sees a non empty destination\n" | |||
|
2620 | " $ hg init converted" | |||
|
2621 | msgstr "" | |||
|
2622 | " # 変換先 converted が hg init 済みであることから\n" | |||
|
2623 | " # converted への hg convert 実行の際には\n" | |||
|
2624 | " # 変換先形式 (= Mercurial形式) が自動的に特定されます\n" | |||
|
2625 | " $ hg init converted" | |||
|
2626 | ||||
|
2627 | msgid "" | |||
|
2628 | " $ hg convert orig/sub1 converted/sub1\n" | |||
|
2629 | " $ hg convert orig/sub2 converted/sub2\n" | |||
|
2630 | " $ hg convert orig converted" | |||
|
2631 | msgstr "" | |||
|
2632 | " $ hg convert orig/sub1 converted/sub1\n" | |||
|
2633 | " $ hg convert orig/sub2 converted/sub2\n" | |||
|
2634 | " $ hg convert orig converted" | |||
|
2635 | ||||
2588 | msgid " The following options are supported:" |
|
2636 | msgid " The following options are supported:" | |
2589 | msgstr " 以下のオプションを指定できます:" |
|
2637 | msgstr " 以下のオプションを指定できます:" | |
2590 |
|
2638 | |||
@@ -2604,11 +2652,38 b' msgstr ""' | |||||
2604 |
|
2652 | |||
2605 | msgid "" |
|
2653 | msgid "" | |
2606 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" |
|
2654 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |
2607 |
" True. |
|
2655 | " True." | |
2608 | " " |
|
|||
2609 | msgstr "" |
|
2656 | msgstr "" | |
2610 | " :convert.hg.usebranchnames: 変換元におけるブランチ名の維持の要否。\n" |
|
2657 | " :convert.hg.usebranchnames: 変換元におけるブランチ名の維持の要否。\n" | |
2611 |
" デフォルト値は True。 |
|
2658 | " デフォルト値は True。" | |
|
2659 | ||||
|
2660 | msgid "" | |||
|
2661 | " :convert.hg.sourcename: records the given string as a 'convert_source' " | |||
|
2662 | "extra\n" | |||
|
2663 | " value on each commit made in the target repository. The default is " | |||
|
2664 | "None." | |||
|
2665 | msgstr "" | |||
|
2666 | " :convert.hg.sourcename: 指定文字列を extra メタデータ 'convert_source'\n" | |||
|
2667 | " として変換先の各リビジョンに記録します。 デフォルト値: 無指定" | |||
|
2668 | ||||
|
2669 | msgid "" | |||
|
2670 | " All Destinations\n" | |||
|
2671 | " ################" | |||
|
2672 | msgstr "" | |||
|
2673 | " 全変換先形式共通\n" | |||
|
2674 | " ################" | |||
|
2675 | ||||
|
2676 | msgid " All destination types accept the following options:" | |||
|
2677 | msgstr " 以下のオプションは、 全ての変換先形式に対して氏愛知可能です:" | |||
|
2678 | ||||
|
2679 | msgid "" | |||
|
2680 | " :convert.skiptags: does not convert tags from the source repo to the " | |||
|
2681 | "target\n" | |||
|
2682 | " repo. The default is False.\n" | |||
|
2683 | " " | |||
|
2684 | msgstr "" | |||
|
2685 | " :convert.skiptags: 変換元から変換先へのタグ情報の反映を抑止します。\n" | |||
|
2686 | " デフォルト値: False\n" | |||
2612 | " " |
|
2687 | " " | |
2613 |
|
2688 | |||
2614 | msgid "only return changes on specified branches" |
|
2689 | msgid "only return changes on specified branches" | |
@@ -2828,6 +2903,9 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xae\xe5\xa4\x89\xe6\x8f\x9b\xe5\x85\x83\xe3\x81\xaf --closesort \xe3\x81\x8c\xe6\x9c\xaa\xe3\x82\xb5\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88\xe3\x81\xa7\xe3\x81\x99"' | |||||
2828 | msgid "%s does not look like a CVS checkout" |
|
2903 | msgid "%s does not look like a CVS checkout" | |
2829 | msgstr "%s は CVS 作業領域ではないと思われます" |
|
2904 | msgstr "%s は CVS 作業領域ではないと思われます" | |
2830 |
|
2905 | |||
|
2906 | msgid "cvs source does not support specifying multiple revs" | |||
|
2907 | msgstr "cvs 形式からの変換では、複数リビジョン指定は未サポートです" | |||
|
2908 | ||||
2831 | #, python-format |
|
2909 | #, python-format | |
2832 | msgid "revision %s is not a patchset number" |
|
2910 | msgid "revision %s is not a patchset number" | |
2833 | msgstr "リビジョン %s はパッチセット番号ではありません" |
|
2911 | msgstr "リビジョン %s はパッチセット番号ではありません" | |
@@ -2992,6 +3070,10 b' msgid "cannot retrieve git heads"' | |||||
2992 | msgstr "git のヘッドが取得できません" |
|
3070 | msgstr "git のヘッドが取得できません" | |
2993 |
|
3071 | |||
2994 | #, python-format |
|
3072 | #, python-format | |
|
3073 | msgid "cannot retrieve git head \"%s\"" | |||
|
3074 | msgstr "git のヘッド \"%s\" 取得できません" | |||
|
3075 | ||||
|
3076 | #, python-format | |||
2995 | msgid "cannot read %r object at %s" |
|
3077 | msgid "cannot read %r object at %s" | |
2996 | msgstr "%r オブジェクトが %s から読み込めません" |
|
3078 | msgstr "%r オブジェクトが %s から読み込めません" | |
2997 |
|
3079 | |||
@@ -3000,8 +3082,12 b' msgid "cannot read %r object at %s: unex' | |||||
3000 | msgstr "%r オブジェクトが %s から読み込めません: 想定外のサイズ" |
|
3082 | msgstr "%r オブジェクトが %s から読み込めません: 想定外のサイズ" | |
3001 |
|
3083 | |||
3002 | #, python-format |
|
3084 | #, python-format | |
3003 | msgid "cannot read submodules config file in %s" |
|
3085 | msgid "warning: cannot read submodules config file in %s\n" | |
3004 | msgstr "%s におけるサブモジュールの設定ファイルが読み込めません" |
|
3086 | msgstr "警告: %s におけるサブモジュールの設定ファイルが読み込めません\n" | |
|
3087 | ||||
|
3088 | #, python-format | |||
|
3089 | msgid "warning: unable to parse .gitmodules in %s\n" | |||
|
3090 | msgstr "警告: %s における .gitmodules の解析に失敗\n" | |||
3005 |
|
3091 | |||
3006 | msgid "convert from git do not support --full" |
|
3092 | msgid "convert from git do not support --full" | |
3007 | msgstr "git からの変換では --full は未サポートです" |
|
3093 | msgstr "git からの変換では --full は未サポートです" | |
@@ -3053,6 +3139,14 b' msgstr "\xe5\xa4\x89\xe6\x8f\x9b\xe5\x85\x88\xe3\x81\xae Mercurial \xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %s \xe3\x81\x8c\xe7\x94\x9f\xe6\x88\x90\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
3053 | msgid "pulling from %s into %s\n" |
|
3139 | msgid "pulling from %s into %s\n" | |
3054 | msgstr "%s から %s に取り込み中\n" |
|
3140 | msgstr "%s から %s に取り込み中\n" | |
3055 |
|
3141 | |||
|
3142 | #, python-format | |||
|
3143 | msgid "no \".hgsubstate\" updates will be made for \"%s\"\n" | |||
|
3144 | msgstr "\"%s\" の \".hgsubstate\" は更新されません\n" | |||
|
3145 | ||||
|
3146 | #, python-format | |||
|
3147 | msgid "%s is missing from %s/.hg/shamap\n" | |||
|
3148 | msgstr "%s は %s/.hg/shamap 中にはありません\n" | |||
|
3149 | ||||
3056 | msgid "filtering out empty revision\n" |
|
3150 | msgid "filtering out empty revision\n" | |
3057 | msgstr "空リビジョンの除外中\n" |
|
3151 | msgstr "空リビジョンの除外中\n" | |
3058 |
|
3152 | |||
@@ -3070,6 +3164,9 b' msgstr ""' | |||||
3070 | "変換先リポジトリにリビジョン %s がありません(clonebranches=true での検索は未" |
|
3164 | "変換先リポジトリにリビジョン %s がありません(clonebranches=true での検索は未" | |
3071 | "実装です)" |
|
3165 | "実装です)" | |
3072 |
|
3166 | |||
|
3167 | msgid "mercurial source does not support specifying multiple revisions" | |||
|
3168 | msgstr "mercurial 形式からの変換では、複数リビジョン指定は未サポートです" | |||
|
3169 | ||||
3073 | #, python-format |
|
3170 | #, python-format | |
3074 | msgid "%s is not a valid start revision" |
|
3171 | msgid "%s is not a valid start revision" | |
3075 | msgstr "%s は正しい開始リビジョンではありません" |
|
3172 | msgstr "%s は正しい開始リビジョンではありません" | |
@@ -3081,6 +3178,9 b' msgstr "hg.revs \xe3\x81\xaf hg.startrev \xe3\x82\x84 --rev \xe3\x81\xa8\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
3081 | msgid "ignoring: %s\n" |
|
3178 | msgid "ignoring: %s\n" | |
3082 | msgstr "例外を無視: %s\n" |
|
3179 | msgstr "例外を無視: %s\n" | |
3083 |
|
3180 | |||
|
3181 | msgid "monotone source does not support specifying multiple revs" | |||
|
3182 | msgstr "monotone 形式からの変換では、複数リビジョン指定は未サポートです" | |||
|
3183 | ||||
3084 | #, python-format |
|
3184 | #, python-format | |
3085 | msgid "%s does not look like a monotone repository" |
|
3185 | msgid "%s does not look like a monotone repository" | |
3086 | msgstr "%s は monotone 形式ではないと思われます" |
|
3186 | msgstr "%s は monotone 形式ではないと思われます" | |
@@ -3131,12 +3231,19 b' msgstr "mtn automate stdio \xe3\x83\x98\xe3\x83\x83\xe3\x83\x80\xe3\x82\x92\xe6\x9c\x80\xe5\xbe\x8c\xe3\x81\xbe\xe3\x81\xa7\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x82\x81\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x97\xe3\x81\x9f"' | |||||
3131 | msgid "%s does not look like a P4 repository" |
|
3231 | msgid "%s does not look like a P4 repository" | |
3132 | msgstr "%s は P4 形式ではないと思われます" |
|
3232 | msgstr "%s は P4 形式ではないと思われます" | |
3133 |
|
3233 | |||
|
3234 | msgid "p4 source does not support specifying multiple revisions" | |||
|
3235 | msgstr "p4 形式からの変換では、複数リビジョン指定は未サポートです" | |||
|
3236 | ||||
3134 | msgid "reading p4 views\n" |
|
3237 | msgid "reading p4 views\n" | |
3135 | msgstr "p4 ビューの読み込み中\n" |
|
3238 | msgstr "p4 ビューの読み込み中\n" | |
3136 |
|
3239 | |||
3137 | msgid "collecting p4 changelists\n" |
|
3240 | msgid "collecting p4 changelists\n" | |
3138 | msgstr "p4 チェンジリストの収集中\n" |
|
3241 | msgstr "p4 チェンジリストの収集中\n" | |
3139 |
|
3242 | |||
|
3243 | #, python-format | |||
|
3244 | msgid "cannot find source for copied file: %s@%s\n" | |||
|
3245 | msgstr "複製元ファイルが見つかりません: %s@%s\n" | |||
|
3246 | ||||
3140 | msgid "convert from p4 do not support --full" |
|
3247 | msgid "convert from p4 do not support --full" | |
3141 | msgstr "p4 からの変換では --full は未サポートです" |
|
3248 | msgstr "p4 からの変換では --full は未サポートです" | |
3142 |
|
3249 | |||
@@ -3175,6 +3282,9 b' msgstr "Subversion python \xe3\x83\x90\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x87\xe3\x82\xa3\xe3\x83\xb3\xe3\x82\xb0\xe3\x81\xaf 1.4 \xe4\xbb\xa5\xe4\xb8\x8a\xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99"' | |||||
3175 | msgid "%s does not look like a Subversion repository to libsvn version %s" |
|
3282 | msgid "%s does not look like a Subversion repository to libsvn version %s" | |
3176 | msgstr "%s は subversion 形式ではないと思われます (libsvn バージョン %s)" |
|
3283 | msgstr "%s は subversion 形式ではないと思われます (libsvn バージョン %s)" | |
3177 |
|
3284 | |||
|
3285 | msgid "subversion source does not support specifying multiple revisions" | |||
|
3286 | msgstr "subversion 形式からの変換では、複数リビジョン指定は未サポートです" | |||
|
3287 | ||||
3178 | #, python-format |
|
3288 | #, python-format | |
3179 | msgid "svn: revision %s is not an integer" |
|
3289 | msgid "svn: revision %s is not an integer" | |
3180 | msgstr "svn: リビジョン %s が数字ではありません" |
|
3290 | msgstr "svn: リビジョン %s が数字ではありません" | |
@@ -3910,6 +4020,13 b' msgstr ""' | |||||
3910 | " 親リビジョンが null の場合は tip が対象になります。" |
|
4020 | " 親リビジョンが null の場合は tip が対象になります。" | |
3911 |
|
4021 | |||
3912 | msgid "" |
|
4022 | msgid "" | |
|
4023 | " The ``gpg.cmd`` config setting can be used to specify the command\n" | |||
|
4024 | " to run. A default key can be specified with ``gpg.key``." | |||
|
4025 | msgstr "" | |||
|
4026 | " ``gpg.cmd`` 設定により、 使用するコマンドを指定可能です。\n" | |||
|
4027 | " デフォルトの鍵は ``gpg.key`` で指定可能です。" | |||
|
4028 | ||||
|
4029 | msgid "" | |||
3913 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" |
|
4030 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
3914 | " " |
|
4031 | " " | |
3915 | msgstr "" |
|
4032 | msgstr "" | |
@@ -4139,10 +4256,10 b' msgstr ""' | |||||
4139 |
|
4256 | |||
4140 | msgid "" |
|
4257 | msgid "" | |
4141 | " [hgk]\n" |
|
4258 | " [hgk]\n" | |
4142 | " path=/location/of/hgk" |
|
4259 | " path = /location/of/hgk" | |
4143 | msgstr "" |
|
4260 | msgstr "" | |
4144 | " [hgk]\n" |
|
4261 | " [hgk]\n" | |
4145 | " path=/location/of/hgk" |
|
4262 | " path = /location/of/hgk" | |
4146 |
|
4263 | |||
4147 | msgid "" |
|
4264 | msgid "" | |
4148 | "hgk can make use of the extdiff extension to visualize revisions.\n" |
|
4265 | "hgk can make use of the extdiff extension to visualize revisions.\n" | |
@@ -4591,6 +4708,10 b' msgstr "\xe8\xa1\x9d\xe7\xaa\x81\xe8\xa7\xa3\xe6\xb6\x88\xe5\xbe\x8c\xe3\x81\xab \'hg histedit --continue\' \xe3\x82\x92\xe5\xae\x9f\xe8\xa1\x8c\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"' | |||||
4591 | msgid "%s: empty changeset\n" |
|
4708 | msgid "%s: empty changeset\n" | |
4592 | msgstr "%s: 空のリビジョン\n" |
|
4709 | msgstr "%s: 空のリビジョン\n" | |
4593 |
|
4710 | |||
|
4711 | #, python-format | |||
|
4712 | msgid "cannot fold into public change %s" | |||
|
4713 | msgstr "public フェーズのリビジョン %s への併合はできません" | |||
|
4714 | ||||
4594 | msgid "" |
|
4715 | msgid "" | |
4595 | "Make changes as needed, you may commit or record as needed now.\n" |
|
4716 | "Make changes as needed, you may commit or record as needed now.\n" | |
4596 | "When you are finished, run hg histedit --continue to resume." |
|
4717 | "When you are finished, run hg histedit --continue to resume." | |
@@ -4738,8 +4859,11 b' msgid "cannot edit history that contains' | |||||
4738 | msgstr "マージを含む履歴は histedit の対象に指定できません" |
|
4859 | msgstr "マージを含む履歴は histedit の対象に指定できません" | |
4739 |
|
4860 | |||
4740 | #, python-format |
|
4861 | #, python-format | |
4741 |
msgid "cannot edit |
|
4862 | msgid "cannot edit public changeset: %s" | |
4742 | msgstr "改変不能なリビジョンがあります: %s" |
|
4863 | msgstr "public フェーズのリビジョンは改変できません: %s" | |
|
4864 | ||||
|
4865 | msgid "see \"hg help phases\" for details" | |||
|
4866 | msgstr "詳細は \"hg help phases\" 参照" | |||
4743 |
|
4867 | |||
4744 | #, python-format |
|
4868 | #, python-format | |
4745 | msgid "malformed line \"%s\"" |
|
4869 | msgid "malformed line \"%s\"" | |
@@ -5457,9 +5581,12 b' msgid "converting revisions"' | |||||
5457 | msgstr "リビジョンの変換中" |
|
5581 | msgstr "リビジョンの変換中" | |
5458 |
|
5582 | |||
5459 | #, python-format |
|
5583 | #, python-format | |
5460 |
msgid "missing largefile '%s' |
|
5584 | msgid "missing largefile for '%s' in %s" | |
5461 | msgstr "大容量ファイル '%s' (リビジョン %s 由来) がありません" |
|
5585 | msgstr "大容量ファイル '%s' (リビジョン %s 由来) がありません" | |
5462 |
|
5586 | |||
|
5587 | msgid "all largefiles must be present locally" | |||
|
5588 | msgstr "全ての大容量ファイルがローカルリポジトリに存在している必要があります" | |||
|
5589 | ||||
5463 | #, python-format |
|
5590 | #, python-format | |
5464 | msgid "renamed/copied largefile %s becomes symlink" |
|
5591 | msgid "renamed/copied largefile %s becomes symlink" | |
5465 | msgstr "改名/複製対象の大容量ファイル %s がシンボリックリンク化されています" |
|
5592 | msgstr "改名/複製対象の大容量ファイル %s がシンボリックリンク化されています" | |
@@ -6058,8 +6185,8 b' msgid "patch name cannot begin with \\"%s' | |||||
6058 | msgstr "パッチ名の最初の文字に \"%s\" は使用できません" |
|
6185 | msgstr "パッチ名の最初の文字に \"%s\" は使用できません" | |
6059 |
|
6186 | |||
6060 | #, python-format |
|
6187 | #, python-format | |
6061 |
msgid " |
|
6188 | msgid "%r cannot be used in the name of a patch" | |
6062 |
msgstr " |
|
6189 | msgstr "%r を含む名前はパッチ名に使用できません" | |
6063 |
|
6190 | |||
6064 | #, python-format |
|
6191 | #, python-format | |
6065 | msgid "\"%s\" already exists as a directory" |
|
6192 | msgid "\"%s\" already exists as a directory" | |
@@ -6174,11 +6301,8 b' msgstr "\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %s \xe3\x81\x8c\xe8\xa7\xa3\xe9\x99\xa4\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xab\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"' | |||||
6174 | msgid "popping would remove a revision not managed by this patch queue" |
|
6301 | msgid "popping would remove a revision not managed by this patch queue" | |
6175 | msgstr "管理対象外のリビジョンが解除対象に指定されました" |
|
6302 | msgstr "管理対象外のリビジョンが解除対象に指定されました" | |
6176 |
|
6303 | |||
6177 |
msgid "popping would remove a |
|
6304 | msgid "popping would remove a public revision" | |
6178 |
msgstr "適用解除対象は |
|
6305 | msgstr "適用解除対象は public フェーズのリビジョンです" | |
6179 |
|
||||
6180 | msgid "see \"hg help phases\" for details" |
|
|||
6181 | msgstr "詳細は \"hg help phases\" 参照" |
|
|||
6182 |
|
6306 | |||
6183 | msgid "deletions found between repo revs" |
|
6307 | msgid "deletions found between repo revs" | |
6184 | msgstr "リビジョン間で削除が検出されました" |
|
6308 | msgstr "リビジョン間で削除が検出されました" | |
@@ -6193,8 +6317,8 b' msgstr "\xe5\x85\xa8\xe3\x81\xa6\xe3\x81\xae\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe3\x81\xae\xe9\x81\xa9\xe7\x94\xa8\xe3\x81\x8c\xe8\xa7\xa3\xe9\x99\xa4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f\\n"' | |||||
6193 | msgid "cannot refresh a revision with children" |
|
6317 | msgid "cannot refresh a revision with children" | |
6194 | msgstr "ヘッド以外は qrefresh の対象に指定できません" |
|
6318 | msgstr "ヘッド以外は qrefresh の対象に指定できません" | |
6195 |
|
6319 | |||
6196 |
msgid "cannot refresh |
|
6320 | msgid "cannot refresh public revision" | |
6197 |
msgstr " |
|
6321 | msgstr "public フェーズのリビジョンは qrefresh できません" | |
6198 |
|
6322 | |||
6199 | msgid "" |
|
6323 | msgid "" | |
6200 | "refresh interrupted while patch was popped! (revert --all, qpush to " |
|
6324 | "refresh interrupted while patch was popped! (revert --all, qpush to " | |
@@ -8161,96 +8285,17 b' msgstr "\xe9\x80\x81\xe4\xbf\xa1\xe4\xb8\xad"' | |||||
8161 | msgid "writing" |
|
8285 | msgid "writing" | |
8162 | msgstr "書き出し中" |
|
8286 | msgstr "書き出し中" | |
8163 |
|
8287 | |||
8164 | msgid "show progress bars for some actions" |
|
8288 | msgid "show progress bars for some actions (DEPRECATED)" | |
8165 | msgstr "処理における進捗率の表示" |
|
8289 | msgstr "処理における進捗率の表示 (非推奨)" | |
8166 |
|
8290 | |||
8167 | msgid "" |
|
8291 | msgid "" | |
8168 | "This extension uses the progress information logged by hg commands\n" |
|
8292 | "This extension has been merged into core, you can remove it from your " | |
8169 | "to draw progress bars that are as informative as possible. Some progress\n" |
|
8293 | "config.\n" | |
8170 | "bars only offer indeterminate information, while others have a definite\n" |
|
8294 | "See hg help config.progress for configuration options.\n" | |
8171 | "end point." |
|
8295 | msgstr "" | |
8172 | msgstr "" |
|
8296 | "本エクステンションは、 本体機能に取り込まれましたので、設定ファイルから\n" | |
8173 | "本エクステンションは、 hg コマンドからの進捗情報を元に、\n" |
|
8297 | "progress 有効化設定を削除可能です。 進捗表示の設定詳細に関しては\n" | |
8174 | "可能な限り有益な進捗率を表示します。 多くの処理での進捗率表示が、\n" |
|
8298 | "'hg help config.progress' を参照してください。\n" | |
8175 | "明確な処理総量に基づいている一方で、 いくつかの処理においては、\n" |
|
|||
8176 | "不確定な情報に基づいた進捗率を表示する場合もあります。" |
|
|||
8177 |
|
||||
8178 | msgid "The following settings are available::" |
|
|||
8179 | msgstr "指定可能な設定は以下の通りです::" |
|
|||
8180 |
|
||||
8181 | msgid "" |
|
|||
8182 | " [progress]\n" |
|
|||
8183 | " delay = 3 # number of seconds (float) before showing the progress bar\n" |
|
|||
8184 | " changedelay = 1 # changedelay: minimum delay before showing a new topic.\n" |
|
|||
8185 | " # If set to less than 3 * refresh, that value will\n" |
|
|||
8186 | " # be used instead.\n" |
|
|||
8187 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" |
|
|||
8188 | " format = topic bar number estimate # format of the progress bar\n" |
|
|||
8189 | " width = <none> # if set, the maximum width of the progress information\n" |
|
|||
8190 | " # (that is, min(width, term width) will be used)\n" |
|
|||
8191 | " clear-complete = True # clear the progress bar after it's done\n" |
|
|||
8192 | " disable = False # if true, don't show a progress bar\n" |
|
|||
8193 | " assume-tty = False # if true, ALWAYS show a progress bar, unless\n" |
|
|||
8194 | " # disable is given" |
|
|||
8195 | msgstr "" |
|
|||
8196 | " [progress]\n" |
|
|||
8197 | " delay = 3 # 進捗率表示までの猶予秒数 (浮動小数指定)\n" |
|
|||
8198 | " changedelay = 1 # 新規トピック表示までの最小猶予時間。\n" |
|
|||
8199 | " # 3 * refresh よりも小さい値の場合は、\n" |
|
|||
8200 | " # この設定は無視されます。\n" |
|
|||
8201 | " refresh = 0.1 # 進捗率表示更新間隔の秒数\n" |
|
|||
8202 | " format = topic bar number estimate # 進捗率表示の形式指定\n" |
|
|||
8203 | " width = <none> # 進捗率表示の最大カラム数\n" |
|
|||
8204 | " # (width 設定と画面幅の小さい方が有効になります)\n" |
|
|||
8205 | " clear-complete = True # 実行完了時の進捗率表示クリアの有無\n" |
|
|||
8206 | " disable = False # 真値が設定された場合、進捗率は表示されません\n" |
|
|||
8207 | " assume-tty = False # 真値が設定された場合、 disable が指定されない限り\n" |
|
|||
8208 | " # 常に進捗率が表示されます" |
|
|||
8209 |
|
||||
8210 | msgid "" |
|
|||
8211 | "Valid entries for the format field are topic, bar, number, unit,\n" |
|
|||
8212 | "estimate, speed, and item. item defaults to the last 20 characters of\n" |
|
|||
8213 | "the item, but this can be changed by adding either ``-<num>`` which\n" |
|
|||
8214 | "would take the last num characters, or ``+<num>`` for the first num\n" |
|
|||
8215 | "characters.\n" |
|
|||
8216 | msgstr "" |
|
|||
8217 | "format 指定で有効な要素は topic bar number unit estimate speed item\n" |
|
|||
8218 | "です。 デフォルトの item は末尾 20 文字ですが、 ``-<num>`` (末尾 num\n" |
|
|||
8219 | "文字) や ``+<num>`` (冒頭 num 文字) 指定の追加で変更可能です。\n" |
|
|||
8220 |
|
||||
8221 | #. i18n: format XX seconds as "XXs" |
|
|||
8222 | #, python-format |
|
|||
8223 | msgid "%02ds" |
|
|||
8224 | msgstr "%02d秒" |
|
|||
8225 |
|
||||
8226 | #. i18n: format X minutes and YY seconds as "XmYYs" |
|
|||
8227 | #, python-format |
|
|||
8228 | msgid "%dm%02ds" |
|
|||
8229 | msgstr "%d分%02d秒" |
|
|||
8230 |
|
||||
8231 | #. i18n: format X hours and YY minutes as "XhYYm" |
|
|||
8232 | #, python-format |
|
|||
8233 | msgid "%dh%02dm" |
|
|||
8234 | msgstr "%d時間%02d分" |
|
|||
8235 |
|
||||
8236 | #. i18n: format X days and YY hours as "XdYYh" |
|
|||
8237 | #, python-format |
|
|||
8238 | msgid "%dd%02dh" |
|
|||
8239 | msgstr "%d日%02d時間" |
|
|||
8240 |
|
||||
8241 | #. i18n: format X weeks and YY days as "XwYYd" |
|
|||
8242 | #, python-format |
|
|||
8243 | msgid "%dw%02dd" |
|
|||
8244 | msgstr "%d週%02d日" |
|
|||
8245 |
|
||||
8246 | #. i18n: format X years and YY weeks as "XyYYw" |
|
|||
8247 | #, python-format |
|
|||
8248 | msgid "%dy%02dw" |
|
|||
8249 | msgstr "%d年%02d週" |
|
|||
8250 |
|
||||
8251 | #, python-format |
|
|||
8252 | msgid "%d %s/sec" |
|
|||
8253 | msgstr "%d %s/秒" |
|
|||
8254 |
|
8299 | |||
8255 | msgid "command to delete untracked files from the working directory" |
|
8300 | msgid "command to delete untracked files from the working directory" | |
8256 | msgstr "作業領域中の未登録ファイルを削除するコマンド" |
|
8301 | msgstr "作業領域中の未登録ファイルを削除するコマンド" | |
@@ -8670,8 +8715,8 b' msgid "nothing to rebase\\n"' | |||||
8670 | msgstr "移動の必要はありません\n" |
|
8715 | msgstr "移動の必要はありません\n" | |
8671 |
|
8716 | |||
8672 | #, python-format |
|
8717 | #, python-format | |
8673 |
msgid "can't rebase |
|
8718 | msgid "can't rebase public changeset %s" | |
8674 |
msgstr " |
|
8719 | msgstr "public フェーズのリビジョン %s は移動できません" | |
8675 |
|
8720 | |||
8676 | #, python-format |
|
8721 | #, python-format | |
8677 | msgid "reopening closed branch head %s\n" |
|
8722 | msgid "reopening closed branch head %s\n" | |
@@ -8741,8 +8786,8 b' msgid "no rebase in progress"' | |||||
8741 | msgstr "実施中の rebase による移動はありません" |
|
8786 | msgstr "実施中の rebase による移動はありません" | |
8742 |
|
8787 | |||
8743 | #, python-format |
|
8788 | #, python-format | |
8744 |
msgid "warning: can't clean up |
|
8789 | msgid "warning: can't clean up public changesets %s\n" | |
8745 |
msgstr "警告: |
|
8790 | msgstr "警告: public フェーズのリビジョン %s は破棄できません\n" | |
8746 |
|
8791 | |||
8747 | msgid "warning: new changesets detected on target branch, can't strip\n" |
|
8792 | msgid "warning: new changesets detected on target branch, can't strip\n" | |
8748 | msgstr "警告: 想定外の新規リビジョン追加により、対象ブランチを破棄できません\n" |
|
8793 | msgstr "警告: 想定外の新規リビジョン追加により、対象ブランチを破棄できません\n" | |
@@ -8850,6 +8895,10 b' msgstr " ? - \xe3\x83\x98\xe3\x83\xab\xe3\x83\x97\xe8\xa1\xa8\xe7\xa4\xba(?)"' | |||||
8850 | msgid " This command is not available when committing a merge." |
|
8895 | msgid " This command is not available when committing a merge." | |
8851 | msgstr " 本コマンドをマージのコミットに使用することはできません。" |
|
8896 | msgstr " 本コマンドをマージのコミットに使用することはできません。" | |
8852 |
|
8897 | |||
|
8898 | #, python-format | |||
|
8899 | msgid "running non-interactively, use %s instead" | |||
|
8900 | msgstr "非対話的に実行する場合は、%s を使用してください" | |||
|
8901 | ||||
8853 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
8902 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." | |
8854 | msgstr "hg qrecord [OPTION]... PATCH [FILE]..." |
|
8903 | msgstr "hg qrecord [OPTION]... PATCH [FILE]..." | |
8855 |
|
8904 | |||
@@ -9056,6 +9105,77 b' msgstr "\xe7\x8b\xac\xe8\x87\xaa\xe3\x82\xb9\xe3\x82\xad\xe3\x83\xbc\xe3\x83\x9e %s:// \xe3\x81\xaf\xe3\x80\x81 \xe3\x83\x89\xe3\x83\xa9\xe3\x82\xa4\xe3\x83\x96\xe6\x96\x87\xe5\xad\x97 %s:\\\\ \xe3\x81\xa8\xe8\xa1\x9d\xe7\xaa\x81\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\\n"' | |||||
9056 | msgid "share a common history between several working directories" |
|
9105 | msgid "share a common history between several working directories" | |
9057 | msgstr "複数作業領域による履歴情報領域の共有" |
|
9106 | msgstr "複数作業領域による履歴情報領域の共有" | |
9058 |
|
9107 | |||
|
9108 | msgid "" | |||
|
9109 | "Automatic Pooled Storage for Clones\n" | |||
|
9110 | "-----------------------------------" | |||
|
9111 | msgstr "" | |||
|
9112 | "複製時の履歴管理情報の共有領域自動作成\n" | |||
|
9113 | "--------------------------------------" | |||
|
9114 | ||||
|
9115 | msgid "" | |||
|
9116 | "When this extension is active, :hg:`clone` can be configured to\n" | |||
|
9117 | "automatically share/pool storage across multiple clones. This\n" | |||
|
9118 | "mode effectively converts :hg:`clone` to :hg:`clone` + :hg:`share`.\n" | |||
|
9119 | "The benefit of using this mode is the automatic management of\n" | |||
|
9120 | "store paths and intelligent pooling of related repositories." | |||
|
9121 | msgstr "" | |||
|
9122 | "本エクステンションが有効な場合、 :hg:`clone` でのリポジトリ複製の際に、\n" | |||
|
9123 | "複数のローカルリポジトリ間で、 履歴情報を共有するための履歴共有領域が、\n" | |||
|
9124 | "自動的に作成できるようになります (※ 訳注: 実際の共有領域の作成の有無は、\n" | |||
|
9125 | "後述する ``share.pool`` 設定の有無に応じます)。 この場合、 :hg:`clone` は\n" | |||
|
9126 | ":hg:`clone` + :hg:`share` 相当を (効率的に) 実施します。 この機能により、\n" | |||
|
9127 | "由来の同じリポジトリの履歴管理情報が、 効率的に共有管理されます。" | |||
|
9128 | ||||
|
9129 | msgid "The following ``share.`` config options influence this feature:" | |||
|
9130 | msgstr "以下の ``share.`` セクション設定が、この機能を制御します:" | |||
|
9131 | ||||
|
9132 | msgid "" | |||
|
9133 | "``share.pool``\n" | |||
|
9134 | " Filesystem path where shared repository data will be stored. When\n" | |||
|
9135 | " defined, :hg:`clone` will automatically use shared repository\n" | |||
|
9136 | " storage instead of creating a store inside each clone." | |||
|
9137 | msgstr "" | |||
|
9138 | "``share.pool``\n" | |||
|
9139 | " 共有用履歴情報管理領域の作成先ディレクトリパス。 この値の設定時は、\n" | |||
|
9140 | " :hg:`clone` 時に、 各複製リポジトリ毎に履歴情報管理領域を作成せずに、\n" | |||
|
9141 | " このディレクトリ配下の履歴管理領域を、 共有するようになります\n" | |||
|
9142 | " (※ 訳注: 対応する管理領域が無い場合は、 この配下に作成した上で、\n" | |||
|
9143 | " clone 先リポジトリから、 その領域を共有するようにします)" | |||
|
9144 | ||||
|
9145 | msgid "" | |||
|
9146 | "``share.poolnaming``\n" | |||
|
9147 | " How directory names in ``share.pool`` are constructed." | |||
|
9148 | msgstr "" | |||
|
9149 | "``share.poolnaming``\n" | |||
|
9150 | " ``share.pool`` 配下での履歴管理領域の命名方式。" | |||
|
9151 | ||||
|
9152 | msgid "" | |||
|
9153 | " \"identity\" means the name is derived from the first changeset in the\n" | |||
|
9154 | " repository. In this mode, different remotes share storage if their\n" | |||
|
9155 | " root/initial changeset is identical. In this mode, the local shared\n" | |||
|
9156 | " repository is an aggregate of all encountered remote repositories." | |||
|
9157 | msgstr "" | |||
|
9158 | " \"identity\" が設定されている場合、 ``share.pool`` 配下において、\n" | |||
|
9159 | " 各履歴管理領域を作成/参照する際の、 識別用ディレクトリ名として、\n" | |||
|
9160 | " 履歴の最初のリビジョンのハッシュ値が使用されます。 この設定の場合、\n" | |||
|
9161 | " 最初のリビジョンが一致するなら、 異なるリモートリポジトリの複製でも、\n" | |||
|
9162 | " 同一管理領域を共有します。 共有管理領域には、 同一由来のリポジトリの、\n" | |||
|
9163 | " 履歴情報が集約されることになります。" | |||
|
9164 | ||||
|
9165 | msgid "" | |||
|
9166 | " \"remote\" means the name is derived from the source repository's\n" | |||
|
9167 | " path or URL. In this mode, storage is only shared if the path or URL\n" | |||
|
9168 | " requested in the :hg:`clone` command matches exactly to a repository\n" | |||
|
9169 | " that was cloned before." | |||
|
9170 | msgstr "" | |||
|
9171 | " \"remote\" が設定されている場合、 共有用履歴管理領域の作成/参照には、\n" | |||
|
9172 | " 複製元のパスや URL が使用されます (※ 訳注: 実際には、「複製元のパスや\n" | |||
|
9173 | " URL」から算出したハッシュ値)。 :hg:`clone` に指定した複製元のパスや\n" | |||
|
9174 | " URL が一致した場合のみ、 履歴管理領域が共有されます。" | |||
|
9175 | ||||
|
9176 | msgid " The default naming mode is \"identity.\"\n" | |||
|
9177 | msgstr " デフォルトの設定は \"identity.\" です。\n" | |||
|
9178 | ||||
9059 | msgid "do not create a working directory" |
|
9179 | msgid "do not create a working directory" | |
9060 | msgstr "作業領域へのファイルの取り出しを抑止します" |
|
9180 | msgstr "作業領域へのファイルの取り出しを抑止します" | |
9061 |
|
9181 | |||
@@ -9178,6 +9298,14 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe5\x86\x85\xe5\xae\xb9\xe3\x82\x92 %s \xe3\x81\xa8\xe3\x81\x84\xe3\x81\x86\xe5\x90\x8d\xe5\x89\x8d\xe3\x81\xa7\xe9\x80\x80\xe9\x81\xbf\\n"' | |||||
9178 | msgid "no shelved changes specified!" |
|
9298 | msgid "no shelved changes specified!" | |
9179 | msgstr "退避情報名が無指定です!" |
|
9299 | msgstr "退避情報名が無指定です!" | |
9180 |
|
9300 | |||
|
9301 | #, python-format | |||
|
9302 | msgid "--%s expects a single shelf" | |||
|
9303 | msgstr "--%s には単一退避情報のみが指定できます" | |||
|
9304 | ||||
|
9305 | #, python-format | |||
|
9306 | msgid "cannot find shelf %s" | |||
|
9307 | msgstr "退避情報 %s が見つかりません" | |||
|
9308 | ||||
9181 | msgid "working directory parents do not match unshelve state" |
|
9309 | msgid "working directory parents do not match unshelve state" | |
9182 | msgstr "作業領域の親リビジョンが、復旧開始時点と異なります" |
|
9310 | msgstr "作業領域の親リビジョンが、復旧開始時点と異なります" | |
9183 |
|
9311 | |||
@@ -9222,8 +9350,11 b' msgstr ""' | |||||
9222 |
|
9350 | |||
9223 | msgid "" |
|
9351 | msgid "" | |
9224 | " If a shelved change is applied successfully, the bundle that\n" |
|
9352 | " If a shelved change is applied successfully, the bundle that\n" | |
9225 |
" contains the shelved changes is |
|
9353 | " contains the shelved changes is moved to a backup location\n" | |
9226 | msgstr " 退避内容の復旧が完了したなら、 対応する退避情報は破棄されます。" |
|
9354 | " (.hg/shelve-backup)." | |
|
9355 | msgstr "" | |||
|
9356 | " 退避内容を復旧し終えた後、 退避情報はバックアップ領域に移動されます\n" | |||
|
9357 | " (.hg/shelve-backup)。" | |||
9227 |
|
9358 | |||
9228 | msgid "" |
|
9359 | msgid "" | |
9229 | " Since you can restore a shelved change on top of an arbitrary\n" |
|
9360 | " Since you can restore a shelved change on top of an arbitrary\n" | |
@@ -9231,23 +9362,43 b' msgid ""' | |||||
9231 | " between your changes and the commits you are unshelving onto. If\n" |
|
9362 | " between your changes and the commits you are unshelving onto. If\n" | |
9232 | " this occurs, you must resolve the conflict, then use\n" |
|
9363 | " this occurs, you must resolve the conflict, then use\n" | |
9233 | " ``--continue`` to complete the unshelve operation. (The bundle\n" |
|
9364 | " ``--continue`` to complete the unshelve operation. (The bundle\n" | |
9234 |
" will not be |
|
9365 | " will not be moved until you successfully complete the unshelve.)" | |
9235 | msgstr "" |
|
9366 | msgstr "" | |
9236 | " 任意の時点で退避内容を復旧できるため、 作業領域の親リビジョンと、\n" |
|
9367 | " 任意の時点で退避内容を復旧できるため、 作業領域の親リビジョンと、\n" | |
9237 | " 退避内容の組み合わせ次第では、 変更内容が衝突するかもしれません。\n" |
|
9368 | " 退避内容の組み合わせ次第では、 変更内容が衝突するかもしれません。\n" | |
9238 | " その場合は、 衝突解消後に :hg:`unshelve --continue` を実行して、\n" |
|
9369 | " その場合は、 衝突解消後に :hg:`unshelve --continue` を実行して、\n" | |
9239 | " 復旧処理を完了させてください。 (復旧処理が完了するまでは、\n" |
|
9370 | " 復旧処理を完了させてください。 (復旧処理が完了するまでは、\n" | |
9240 |
" 退避情報は |
|
9371 | " 退避情報はバックアップ領域に移動されません)" | |
9241 |
|
9372 | |||
9242 | msgid "" |
|
9373 | msgid "" | |
9243 | " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" |
|
9374 | " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" | |
9244 | " that causes a conflict. This reverts the unshelved changes, and\n" |
|
9375 | " that causes a conflict. This reverts the unshelved changes, and\n" | |
9245 |
" |
|
9376 | " leaves the bundle in place.)" | |
9246 | " " |
|
|||
9247 | msgstr "" |
|
9377 | msgstr "" | |
9248 | " (:hg:`unshelve --abort` 実行により、 衝突が発生した復旧処理を、\n" |
|
9378 | " (:hg:`unshelve --abort` 実行により、 衝突が発生した復旧処理を、\n" | |
9249 | " 中止することもできます。 その場合、 作業領域中の変更は破棄されますが、\n" |
|
9379 | " 中止することもできます。 その場合、 作業領域中の変更は破棄されますが、\n" | |
9250 |
" 退避情報は保持されます) |
|
9380 | " 退避情報は保持されます)" | |
|
9381 | ||||
|
9382 | msgid "" | |||
|
9383 | " After a successful unshelve, the shelved changes are stored in a\n" | |||
|
9384 | " backup directory. Only the N most recent backups are kept. N\n" | |||
|
9385 | " defaults to 10 but can be overridden using the ``shelve.maxbackups``\n" | |||
|
9386 | " configuration option." | |||
|
9387 | msgstr "" | |||
|
9388 | " 退避内容を復旧し終えた後、 退避情報はバックアップ領域で保持されます。\n" | |||
|
9389 | " バックアップ領域に保持される退避情報の最大数は ``shelve.maxbackups``\n" | |||
|
9390 | " 設定で指定できます(デフォルト値: 10)" | |||
|
9391 | ||||
|
9392 | msgid "" | |||
|
9393 | " Timestamp in seconds is used to decide order of backups. More\n" | |||
|
9394 | " than ``maxbackups`` backups are kept, if same timestamp\n" | |||
|
9395 | " prevents from deciding exact order of them, for safety.\n" | |||
|
9396 | " " | |||
|
9397 | msgstr "" | |||
|
9398 | " バックアップの順序は、 タイムスタンプ (単位:秒) で判定します。\n" | |||
|
9399 | " 複数の退避情報が、 同一のタイムスタンプを持つ場合は、\n" | |||
|
9400 | " 順序を確定できないため、 ``maxbackups`` よりも多くの退避情報が、\n" | |||
|
9401 | " バックアップ領域に保持される可能性もあります。\n" | |||
9251 | " " |
|
9402 | " " | |
9252 |
|
9403 | |||
9253 | msgid "cannot combine abort/continue with naming a shelved change" |
|
9404 | msgid "cannot combine abort/continue with naming a shelved change" | |
@@ -9302,8 +9453,8 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe5\x90\x8d\xe3\x82\x92\xe9\x80\x80\xe9\x81\xbf\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xab\xe8\xa8\x98\xe9\x8c\xb2"' | |||||
9302 | msgid "show patch" |
|
9453 | msgid "show patch" | |
9303 | msgstr "パッチ形式での表示" |
|
9454 | msgstr "パッチ形式での表示" | |
9304 |
|
9455 | |||
9305 |
msgid "interactive mode, only works while creating a shelve |
|
9456 | msgid "interactive mode, only works while creating a shelve" | |
9306 |
msgstr "対話的な退避対象の選択 (退避実施時のみ指定可能) |
|
9457 | msgstr "対話的な退避対象の選択 (退避実施時のみ指定可能)" | |
9307 |
|
9458 | |||
9308 | msgid "output diffstat-style summary of changes" |
|
9459 | msgid "output diffstat-style summary of changes" | |
9309 | msgstr "diffstat 形式の変更概要を出力" |
|
9460 | msgstr "diffstat 形式の変更概要を出力" | |
@@ -9375,10 +9526,6 b' msgstr "\xe3\x82\xaa\xe3\x83\x97\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3 \'--%s\' \xe3\x81\xa8 \'--%s\' \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
9375 | msgid "cannot specify names when using '--cleanup'" |
|
9526 | msgid "cannot specify names when using '--cleanup'" | |
9376 | msgstr "退避情報の名前指定は '--cleanup' と併用できません" |
|
9527 | msgstr "退避情報の名前指定は '--cleanup' と併用できません" | |
9377 |
|
9528 | |||
9378 | #, python-format |
|
|||
9379 | msgid "option '--%s' may not be used when shelving a change" |
|
|||
9380 | msgstr "オプション '--%s' は変更退避時には指定できません" |
|
|||
9381 |
|
||||
9382 | msgid "unshelve already in progress" |
|
9529 | msgid "unshelve already in progress" | |
9383 | msgstr "unshelve による退避情報復旧が未完了です" |
|
9530 | msgstr "unshelve による退避情報復旧が未完了です" | |
9384 |
|
9531 | |||
@@ -10028,10 +10175,6 b' msgid "malformed line in .hg/bookmarks: ' | |||||
10028 | msgstr "不正な .hg/bookmarks 記述行: %r\n" |
|
10175 | msgstr "不正な .hg/bookmarks 記述行: %r\n" | |
10029 |
|
10176 | |||
10030 | #, python-format |
|
10177 | #, python-format | |
10031 | msgid "branch %s not found" |
|
|||
10032 | msgstr "ブランチ %s が見つかりません" |
|
|||
10033 |
|
||||
10034 | #, python-format |
|
|||
10035 | msgid "updating to active bookmark %s\n" |
|
10178 | msgid "updating to active bookmark %s\n" | |
10036 | msgstr "アクティブなブックマーク %s への更新中\n" |
|
10179 | msgstr "アクティブなブックマーク %s への更新中\n" | |
10037 |
|
10180 | |||
@@ -10040,6 +10183,10 b' msgid "adding remote bookmark %s\\n"' | |||||
10040 | msgstr "連携先での新規ブックマーク %s を追加中\n" |
|
10183 | msgstr "連携先での新規ブックマーク %s を追加中\n" | |
10041 |
|
10184 | |||
10042 | #, python-format |
|
10185 | #, python-format | |
|
10186 | msgid "remote bookmark %s points to locally missing %s\n" | |||
|
10187 | msgstr "連携先のブックマーク %s はリポジトリに存在しない %s を参照\n" | |||
|
10188 | ||||
|
10189 | #, python-format | |||
10043 | msgid "importing bookmark %s\n" |
|
10190 | msgid "importing bookmark %s\n" | |
10044 | msgstr "ブックマーク %s の取り込み中\n" |
|
10191 | msgstr "ブックマーク %s の取り込み中\n" | |
10045 |
|
10192 | |||
@@ -10222,9 +10369,8 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe5\x90\x8d %s \xe3\x81\x8c\xe6\x94\xb9\xe8\xa1\x8c\xe3\x82\x92\xe5\x90\xab\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"' | |||||
10222 | msgid "the name '%s' is reserved" |
|
10369 | msgid "the name '%s' is reserved" | |
10223 | msgstr "タグ名 '%s' はシステムで予約されています" |
|
10370 | msgstr "タグ名 '%s' はシステムで予約されています" | |
10224 |
|
10371 | |||
10225 | #, python-format |
|
10372 | msgid "running non-interactively" | |
10226 | msgid "running non-interactively, use %s instead" |
|
10373 | msgstr "非対話的な実行中" | |
10227 | msgstr "非対話的に実行する場合は、%s を使用してください" |
|
|||
10228 |
|
10374 | |||
10229 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" |
|
10375 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
10230 | msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)" |
|
10376 | msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)" | |
@@ -10256,11 +10402,17 b' msgstr "\xe5\x87\xba\xe5\x8a\x9b\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe5\x90\x8d\xe3\x81\xab\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xbc\xe3\x83\x9e\xe3\x83\x83\xe3\x83\x88 \'%%%s\' \xe6\x8c\x87\xe5\xae\x9a"' | |||||
10256 | msgid "cannot specify --changelog and --manifest at the same time" |
|
10402 | msgid "cannot specify --changelog and --manifest at the same time" | |
10257 | msgstr "--changelog と --manifest は同時には指定できません" |
|
10403 | msgstr "--changelog と --manifest は同時には指定できません" | |
10258 |
|
10404 | |||
|
10405 | msgid "cannot specify --changelog and --dir at the same time" | |||
|
10406 | msgstr "--changelog と --dir は同時には指定できません" | |||
|
10407 | ||||
10259 | msgid "cannot specify filename with --changelog or --manifest" |
|
10408 | msgid "cannot specify filename with --changelog or --manifest" | |
10260 | msgstr "--changelog または --manifest とファイル名は同時に指定できません" |
|
10409 | msgstr "--changelog または --manifest とファイル名は同時に指定できません" | |
10261 |
|
10410 | |||
10262 | msgid "cannot specify --changelog or --manifest without a repository" |
|
10411 | msgid "cannot specify --changelog or --manifest or --dir without a repository" | |
10263 |
msgstr "--changelog |
|
10412 | msgstr "--changelog/--manifest/--dir 指定時はリポジトリ指定が必要です" | |
|
10413 | ||||
|
10414 | msgid "--dir can only be used on repos with treemanifest enabled" | |||
|
10415 | msgstr "--dir は treemanifest が有効なリポジトリでのみ使用可能です" | |||
10264 |
|
10416 | |||
10265 | msgid "invalid arguments" |
|
10417 | msgid "invalid arguments" | |
10266 | msgstr "引数が不正です" |
|
10418 | msgstr "引数が不正です" | |
@@ -10435,13 +10587,6 b' msgid "%s: no key named \'%s\'"' | |||||
10435 | msgstr "%s: '%s' というキーはありません" |
|
10587 | msgstr "%s: '%s' というキーはありません" | |
10436 |
|
10588 | |||
10437 | #, python-format |
|
10589 | #, python-format | |
10438 | msgid "available styles: %s\n" |
|
|||
10439 | msgstr "利用可能なスタイル: %s\n" |
|
|||
10440 |
|
||||
10441 | msgid "specify a template" |
|
|||
10442 | msgstr "テンプレートを指定してください" |
|
|||
10443 |
|
||||
10444 | #, python-format |
|
|||
10445 | msgid "found revision %s from %s\n" |
|
10590 | msgid "found revision %s from %s\n" | |
10446 | msgstr "リビジョン %s (%s) が指定日時に合致します\n" |
|
10591 | msgstr "リビジョン %s (%s) が指定日時に合致します\n" | |
10447 |
|
10592 | |||
@@ -10584,6 +10729,14 b' msgstr "\xe7\x9b\xb4\xe5\x89\x8d\xe3\x81\xae\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe6\x9b\xb4\xe6\x96\xb0\xe3\x81\xaf\xe4\xb8\xad\xe6\x96\xad\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"' | |||||
10584 | msgid "use 'hg update' to get a consistent checkout" |
|
10729 | msgid "use 'hg update' to get a consistent checkout" | |
10585 | msgstr "作業領域内容の整合性を取るには 'hg update' を実行してください" |
|
10730 | msgstr "作業領域内容の整合性を取るには 'hg update' を実行してください" | |
10586 |
|
10731 | |||
|
10732 | #, python-format | |||
|
10733 | msgid "can't close already inactivated backup: %s" | |||
|
10734 | msgstr "非活性化済みのバックアップは close できません: %s" | |||
|
10735 | ||||
|
10736 | #, python-format | |||
|
10737 | msgid "can't release already inactivated backup: %s" | |||
|
10738 | msgstr "非活性化済みのバックアップは release できません: %s" | |||
|
10739 | ||||
10587 | msgid "repository root directory or name of overlay bundle file" |
|
10740 | msgid "repository root directory or name of overlay bundle file" | |
10588 | msgstr "リポジトリのルート位置、 またはバンドルファイルのパス" |
|
10741 | msgstr "リポジトリのルート位置、 またはバンドルファイルのパス" | |
10589 |
|
10742 | |||
@@ -11512,11 +11665,14 b' msgstr ""' | |||||
11512 |
|
11665 | |||
11513 | msgid "" |
|
11666 | msgid "" | |
11514 | " Use the command :hg:`update` to switch to an existing branch. Use\n" |
|
11667 | " Use the command :hg:`update` to switch to an existing branch. Use\n" | |
11515 | " :hg:`commit --close-branch` to mark this branch as closed." |
|
11668 | " :hg:`commit --close-branch` to mark this branch head as closed.\n" | |
11516 | msgstr "" |
|
11669 | " When all heads of the branch are closed, the branch will be\n" | |
11517 | " 作業領域の内容を既存ブランチのもので更新する場合は :hg:`update` を\n" |
|
11670 | " considered closed." | |
11518 | " 使用してください。 現ブランチを閉鎖する場合は\n" |
|
11671 | msgstr "" | |
11519 | " :hg:`commit --close-branch` を使用してください。" |
|
11672 | " 作業領域の内容を既存ブランチの内容で更新する場合は :hg:`update`\n" | |
|
11673 | " を使用します。 現ブランチヘッドを閉鎖する場合は\n" | |||
|
11674 | " :hg:`commit --close-branch` を使用します。 当該ブランチにおける、\n" | |||
|
11675 | " 全ブランチヘッドの閉鎖をもって、 そのブランチの閉鎖とみなします。" | |||
11520 |
|
11676 | |||
11521 | #, python-format |
|
11677 | #, python-format | |
11522 | msgid "reset working directory to branch %s\n" |
|
11678 | msgid "reset working directory to branch %s\n" | |
@@ -11903,8 +12059,8 b' msgstr "--noupdate \xe3\x81\xa8 --updaterev \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
11903 | msgid "mark new/missing files as added/removed before committing" |
|
12059 | msgid "mark new/missing files as added/removed before committing" | |
11904 | msgstr "新規/不在ファイルを、コミット前に登録/除外対象化" |
|
12060 | msgstr "新規/不在ファイルを、コミット前に登録/除外対象化" | |
11905 |
|
12061 | |||
11906 |
msgid "mark a branch as closed |
|
12062 | msgid "mark a branch head as closed" | |
11907 |
msgstr "ブランチ |
|
12063 | msgstr "ブランチヘッドを閉鎖します" | |
11908 |
|
12064 | |||
11909 | msgid "amend the parent of the working directory" |
|
12065 | msgid "amend the parent of the working directory" | |
11910 | msgstr "作業領域の親リビジョンの改変" |
|
12066 | msgstr "作業領域の親リビジョンの改変" | |
@@ -11953,6 +12109,15 b' msgstr ""' | |||||
11953 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" |
|
12109 | " 入力したメッセージは ``.hg/last-message.txt`` に保存されます。" | |
11954 |
|
12110 | |||
11955 | msgid "" |
|
12111 | msgid "" | |
|
12112 | " The --close-branch flag can be used to mark the current branch\n" | |||
|
12113 | " head closed. When all heads of a branch are closed, the branch\n" | |||
|
12114 | " will be considered closed and no longer listed." | |||
|
12115 | msgstr "" | |||
|
12116 | " --close-branch 指定により、 現ブランチヘッドが閉鎖されます。\n" | |||
|
12117 | " 当該ブランチにおける、 全ブランチヘッドの閉鎖をもって、\n" | |||
|
12118 | " そのブランチの閉鎖とみなし、 以後は一覧に列挙されません。" | |||
|
12119 | ||||
|
12120 | msgid "" | |||
11956 | " The --amend flag can be used to amend the parent of the\n" |
|
12121 | " The --amend flag can be used to amend the parent of the\n" | |
11957 | " working directory with a new commit that contains the changes\n" |
|
12122 | " working directory with a new commit that contains the changes\n" | |
11958 | " in the parent in addition to those currently reported by :hg:`status`,\n" |
|
12123 | " in the parent in addition to those currently reported by :hg:`status`,\n" | |
@@ -12314,6 +12479,9 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe5\xb1\xa5\xe6\xad\xb4\xe3\x81\xae\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x81\xbf"' | |||||
12314 | msgid "open manifest" |
|
12479 | msgid "open manifest" | |
12315 | msgstr "マニフェストの読み込み" |
|
12480 | msgstr "マニフェストの読み込み" | |
12316 |
|
12481 | |||
|
12482 | msgid "open directory manifest" | |||
|
12483 | msgstr "ディレクトリマニフェストの読み込み" | |||
|
12484 | ||||
12317 | msgid "-c|-m|FILE REV" |
|
12485 | msgid "-c|-m|FILE REV" | |
12318 | msgstr "-c|-m|FILE REV" |
|
12486 | msgstr "-c|-m|FILE REV" | |
12319 |
|
12487 | |||
@@ -12664,6 +12832,9 b' msgstr ""' | |||||
12664 | " ファイル内容の確認を強制させることができます。\n" |
|
12832 | " ファイル内容の確認を強制させることができます。\n" | |
12665 | " " |
|
12833 | " " | |
12666 |
|
12834 | |||
|
12835 | msgid "rebuild the fncache file" | |||
|
12836 | msgstr "fncache ファイルの再構築" | |||
|
12837 | ||||
12667 | msgid "revision to debug" |
|
12838 | msgid "revision to debug" | |
12668 | msgstr "デバッグ対象リビジョン" |
|
12839 | msgstr "デバッグ対象リビジョン" | |
12669 |
|
12840 | |||
@@ -13113,6 +13284,9 b' msgstr ""' | |||||
13113 | " 本コマンドでの登録除外は、 現ブランチにおける登録除外のみを意味し、\n" |
|
13284 | " 本コマンドでの登録除外は、 現ブランチにおける登録除外のみを意味し、\n" | |
13114 | " 履歴そのものは保持され続けますし、 作業領域からも削除されません。" |
|
13285 | " 履歴そのものは保持され続けますし、 作業領域からも削除されません。" | |
13115 |
|
13286 | |||
|
13287 | msgid " To delete the file from the working directory, see :hg:`remove`." | |||
|
13288 | msgstr " 作業領域中のファイルを削除する場合は :hg:`remove` を使います。" | |||
|
13289 | ||||
13116 | msgid " To undo a forget before the next commit, see :hg:`add`." |
|
13290 | msgid " To undo a forget before the next commit, see :hg:`add`." | |
13117 | msgstr "" |
|
13291 | msgstr "" | |
13118 | " 登録除外操作のコミット前取り消しは、 :hg:`help add` を参照して\n" |
|
13292 | " 登録除外操作のコミット前取り消しは、 :hg:`help add` を参照して\n" | |
@@ -13671,6 +13845,18 b' msgstr ""' | |||||
13671 | " メタデータのみが記録された、 新規リビジョンを作成します。" |
|
13845 | " メタデータのみが記録された、 新規リビジョンを作成します。" | |
13672 |
|
13846 | |||
13673 | msgid "" |
|
13847 | msgid "" | |
|
13848 | " It is possible to use external patch programs to perform the patch\n" | |||
|
13849 | " by setting the ``ui.patch`` configuration option. For the default\n" | |||
|
13850 | " internal tool, the fuzz can also be configured via ``patch.fuzz``.\n" | |||
|
13851 | " See :hg:`help config` for more information about configuration\n" | |||
|
13852 | " files and how to use these options." | |||
|
13853 | msgstr "" | |||
|
13854 | " ``ui.patch`` 設定により、 外部プログラムでのパッチ適用も可能です。\n" | |||
|
13855 | " デフォルトのパッチ適用で使用される Mercurial の内部処理でも、\n" | |||
|
13856 | " ``patch.fuzz`` 設定により fuzz 挙動を制御可能です。 設定ファイルや、\n" | |||
|
13857 | " 上記設定項目の詳細に関しては :hg:`help config` を参照してください。" | |||
|
13858 | ||||
|
13859 | msgid "" | |||
13674 | " To read a patch from standard input, use \"-\" as the patch name. If\n" |
|
13860 | " To read a patch from standard input, use \"-\" as the patch name. If\n" | |
13675 | " a URL is specified, the patch will be downloaded from it.\n" |
|
13861 | " a URL is specified, the patch will be downloaded from it.\n" | |
13676 | " See :hg:`help dates` for a list of formats valid for -d/--date." |
|
13862 | " See :hg:`help dates` for a list of formats valid for -d/--date." | |
@@ -13707,6 +13893,22 b' msgid " hg import --exact propo' | |||||
13707 | msgstr " hg import --exact proposed-fix.patch" |
|
13893 | msgstr " hg import --exact proposed-fix.patch" | |
13708 |
|
13894 | |||
13709 | msgid "" |
|
13895 | msgid "" | |
|
13896 | " - use an external tool to apply a patch which is too fuzzy for\n" | |||
|
13897 | " the default internal tool." | |||
|
13898 | msgstr "" | |||
|
13899 | " - 内部パッチ適用ツールでは fuzz 要因で適用が難しいパッチを、 \n" | |||
|
13900 | " 外部パッチツールを使って適用" | |||
|
13901 | ||||
|
13902 | msgid " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" | |||
|
13903 | msgstr " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" | |||
|
13904 | ||||
|
13905 | msgid " - change the default fuzzing from 2 to a less strict 7" | |||
|
13906 | msgstr " - デフォルトの fuzz 許容量 2 から緩和して 7 に設定" | |||
|
13907 | ||||
|
13908 | msgid " hg import --config ui.fuzz=7 fuzz.patch" | |||
|
13909 | msgstr " hg import --config ui.fuzz=7 fuzz.patch" | |||
|
13910 | ||||
|
13911 | msgid "" | |||
13710 | " Returns 0 on success, 1 on partial success (see --partial).\n" |
|
13912 | " Returns 0 on success, 1 on partial success (see --partial).\n" | |
13711 | " " |
|
13913 | " " | |
13712 | msgstr "" |
|
13914 | msgstr "" | |
@@ -14322,9 +14524,6 b' msgid " See :hg:`summary` and :hg:`he' | |||||
14322 | msgstr "" |
|
14524 | msgstr "" | |
14323 | " 関連情報は :hg:`summary` や :hg:`help revsets` を参照してください。" |
|
14525 | " 関連情報は :hg:`summary` や :hg:`help revsets` を参照してください。" | |
14324 |
|
14526 | |||
14325 | msgid "can only specify an explicit filename" |
|
|||
14326 | msgstr "明示的なファイル名以外は指定できません" |
|
|||
14327 |
|
||||
14328 | #, python-format |
|
14527 | #, python-format | |
14329 | msgid "'%s' not found in manifest!" |
|
14528 | msgid "'%s' not found in manifest!" | |
14330 | msgstr "'%s' は管理対象ではありません" |
|
14529 | msgstr "'%s' は管理対象ではありません" | |
@@ -14403,14 +14602,14 b' msgstr "\xe3\x83\x95\xe3\x82\xa7\xe3\x83\xbc\xe3\x82\xba\xe5\xa2\x83\xe7\x95\x8c\xe3\x81\xae\xe7\xa7\xbb\xe5\x8b\x95\xe3\x82\x92\xe4\xbc\xb4\xe3\x81\x86\xe5\xbc\xb7\xe5\x88\xb6\xe5\xae\x9f\xe8\xa1\x8c"' | |||||
14403 | msgid "target revision" |
|
14602 | msgid "target revision" | |
14404 | msgstr "対象リビジョン" |
|
14603 | msgstr "対象リビジョン" | |
14405 |
|
14604 | |||
14406 | msgid "[-p|-d|-s] [-f] [-r] REV..." |
|
14605 | msgid "[-p|-d|-s] [-f] [-r] [REV...]" | |
14407 | msgstr "[-p|-d|-s] [-f] [-r] REV..." |
|
14606 | msgstr "[-p|-d|-s] [-f] [-r] [REV...]" | |
14408 |
|
14607 | |||
14409 | msgid "set or show the current phase name" |
|
14608 | msgid "set or show the current phase name" | |
14410 | msgstr "現行フェーズ状態の変更または表示" |
|
14609 | msgstr "現行フェーズ状態の変更または表示" | |
14411 |
|
14610 | |||
14412 |
msgid " With no argument, show the phase name of |
|
14611 | msgid " With no argument, show the phase name of the current revision(s)." | |
14413 |
msgstr " 引数無しの場合、 |
|
14612 | msgstr " 引数無しの場合、 作業領域の親リビジョンのフェーズ名を表示します。" | |
14414 |
|
14613 | |||
14415 | msgid "" |
|
14614 | msgid "" | |
14416 | " With one of -p/--public, -d/--draft or -s/--secret, change the\n" |
|
14615 | " With one of -p/--public, -d/--draft or -s/--secret, change the\n" | |
@@ -14431,11 +14630,16 b' msgstr " public < draft < secret"' | |||||
14431 |
|
14630 | |||
14432 | msgid "" |
|
14631 | msgid "" | |
14433 | " Returns 0 on success, 1 if no phases were changed or some could not\n" |
|
14632 | " Returns 0 on success, 1 if no phases were changed or some could not\n" | |
14434 |
" be changed. |
|
14633 | " be changed." | |
14435 | " " |
|
|||
14436 | msgstr "" |
|
14634 | msgstr "" | |
14437 | " 成功時のコマンドの終了値は 0、 フェーズ状態変更が無い、あるいは、\n" |
|
14635 | " 成功時のコマンドの終了値は 0、 フェーズ状態変更が無い、あるいは、\n" | |
14438 |
" 変更に失敗した場合は 1 です。 |
|
14636 | " 変更に失敗した場合は 1 です。" | |
|
14637 | ||||
|
14638 | msgid "" | |||
|
14639 | " (For more information about the phases concept, see :hg:`help phases`.)\n" | |||
|
14640 | " " | |||
|
14641 | msgstr "" | |||
|
14642 | " (フェーズに関する詳細は、 :hg:`help phases` を参照してください)\n" | |||
14439 | " " |
|
14643 | " " | |
14440 |
|
14644 | |||
14441 | msgid "only one phase can be specified" |
|
14645 | msgid "only one phase can be specified" | |
@@ -15298,10 +15502,10 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe7\x8a\xb6\xe6\x85\x8b\xe3\x81\xae\xe6\xa6\x82\xe8\xa6\x81\xe8\xa1\xa8\xe7\xa4\xba"' | |||||
15298 |
|
15502 | |||
15299 | msgid "" |
|
15503 | msgid "" | |
15300 | " This generates a brief summary of the working directory state,\n" |
|
15504 | " This generates a brief summary of the working directory state,\n" | |
15301 | " including parents, branch, commit status, and available updates." |
|
15505 | " including parents, branch, commit status, phase and available updates." | |
15302 | msgstr "" |
|
15506 | msgstr "" | |
15303 |
" 親リビジョン、 ブランチ、 想定コミット結果 |
|
15507 | " 親リビジョン、 ブランチ、 想定コミット結果、 フェーズ、 \n" | |
15304 | " 作業領域状態の概要を表示します。" |
|
15508 | " 作業領域更新候補等を含む、 作業領域状態の概要を表示します。" | |
15305 |
|
15509 | |||
15306 | msgid "" |
|
15510 | msgid "" | |
15307 | " With the --remote option, this will check the default paths for\n" |
|
15511 | " With the --remote option, this will check the default paths for\n" | |
@@ -15403,6 +15607,18 b' msgstr "update \xe5\x80\x99\xe8\xa3\x9c: %d \xe3\x81\xae\xe6\x96\xb0\xe8\xa6\x8f\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3(update)\\n"' | |||||
15403 | msgid "update: %d new changesets, %d branch heads (merge)\n" |
|
15607 | msgid "update: %d new changesets, %d branch heads (merge)\n" | |
15404 | msgstr "update 候補: %d 個の新規リビジョン、%d 個のブランチヘッド(merge)\n" |
|
15608 | msgstr "update 候補: %d 個の新規リビジョン、%d 個のブランチヘッド(merge)\n" | |
15405 |
|
15609 | |||
|
15610 | #, python-format | |||
|
15611 | msgid "%d draft" | |||
|
15612 | msgstr "%d draft リビジョン" | |||
|
15613 | ||||
|
15614 | #, python-format | |||
|
15615 | msgid "%d secret" | |||
|
15616 | msgstr "%d secret リビジョン" | |||
|
15617 | ||||
|
15618 | #, python-format | |||
|
15619 | msgid "phases: %s\n" | |||
|
15620 | msgstr "フェーズ: %s\n" | |||
|
15621 | ||||
15406 | msgid "1 or more incoming" |
|
15622 | msgid "1 or more incoming" | |
15407 | msgstr "取り込み候補リビジョンあり" |
|
15623 | msgstr "取り込み候補リビジョンあり" | |
15408 |
|
15624 | |||
@@ -15610,12 +15826,12 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe5\x86\x85\xe5\xae\xb9\xe6\x9b\xb4\xe6\x96\xb0(\xe3\x81\xbe\xe3\x81\x9f\xe3\x81\xaf\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe5\x88\x87\xe3\x82\x8a\xe6\x9b\xbf\xe3\x81\x88)"' | |||||
15610 | msgid "" |
|
15826 | msgid "" | |
15611 | " Update the repository's working directory to the specified\n" |
|
15827 | " Update the repository's working directory to the specified\n" | |
15612 | " changeset. If no changeset is specified, update to the tip of the\n" |
|
15828 | " changeset. If no changeset is specified, update to the tip of the\n" | |
15613 |
" current named branch and move the |
|
15829 | " current named branch and move the active bookmark (see :hg:`help\n" | |
15614 | " bookmarks`)." |
|
15830 | " bookmarks`)." | |
15615 | msgstr "" |
|
15831 | msgstr "" | |
15616 | " 指定されたリビジョン時点の内容で、 作業領域を更新します。\n" |
|
15832 | " 指定されたリビジョン時点の内容で、 作業領域を更新します。\n" | |
15617 | " 対象リビジョンが指定されない場合、 作業領域と同じ名前付きブランチの、\n" |
|
15833 | " 対象リビジョンが指定されない場合、 作業領域と同じ名前付きブランチの、\n" | |
15618 |
" 最新リビジョンで更新した上で、 ブックマーク |
|
15834 | " 最新リビジョンで更新した上で、 アクティブブックマークを更新します。\n" | |
15619 | " (詳細は :hg:`help bookmarks` 参照)" |
|
15835 | " (詳細は :hg:`help bookmarks` 参照)" | |
15620 |
|
15836 | |||
15621 | msgid "" |
|
15837 | msgid "" | |
@@ -15700,13 +15916,13 b' msgid "cannot specify both -c/--check an' | |||||
15700 | msgstr "-c/--check と -C/--clean は併用できません" |
|
15916 | msgstr "-c/--check と -C/--clean は併用できません" | |
15701 |
|
15917 | |||
15702 | #, python-format |
|
15918 | #, python-format | |
|
15919 | msgid "(leaving bookmark %s)\n" | |||
|
15920 | msgstr "(ブックマーク %s を非アクティブ化中)\n" | |||
|
15921 | ||||
|
15922 | #, python-format | |||
15703 | msgid "(activating bookmark %s)\n" |
|
15923 | msgid "(activating bookmark %s)\n" | |
15704 | msgstr "(ブックマーク %s をアクティブ化中)\n" |
|
15924 | msgstr "(ブックマーク %s をアクティブ化中)\n" | |
15705 |
|
15925 | |||
15706 | #, python-format |
|
|||
15707 | msgid "(leaving bookmark %s)\n" |
|
|||
15708 | msgstr "(ブックマーク %s を非アクティブ化中)\n" |
|
|||
15709 |
|
||||
15710 | msgid "verify the integrity of the repository" |
|
15926 | msgid "verify the integrity of the repository" | |
15711 | msgstr "リポジトリの整合性検証" |
|
15927 | msgstr "リポジトリの整合性検証" | |
15712 |
|
15928 | |||
@@ -15864,6 +16080,9 b' msgstr "\xe3\x82\xb3\xe3\x83\x94\xe3\x83\xbc\xe5\xa4\xb1\xe6\x95\x97: %s \xe3\x81\xaf\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x82\x82\xe3\x82\xb7\xe3\x83\xb3\xe3\x83\x9c\xe3\x83\xaa\xe3\x83\x83\xe3\x82\xaf\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe3\x81\xa7\xe3\x82\x82\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"' | |||||
15864 | msgid "the python curses/wcurses module is not available/installed" |
|
16080 | msgid "the python curses/wcurses module is not available/installed" | |
15865 | msgstr "Python の curses/wcurses モジュールが利用できません" |
|
16081 | msgstr "Python の curses/wcurses モジュールが利用できません" | |
15866 |
|
16082 | |||
|
16083 | msgid "confirm" | |||
|
16084 | msgstr "" | |||
|
16085 | ||||
15867 | msgid "starting interactive selection\n" |
|
16086 | msgid "starting interactive selection\n" | |
15868 | msgstr "対話的な選択の開始\n" |
|
16087 | msgstr "対話的な選択の開始\n" | |
15869 |
|
16088 | |||
@@ -15901,6 +16120,9 b' msgstr ""' | |||||
15901 | msgid "user quit" |
|
16120 | msgid "user quit" | |
15902 | msgstr "ユーザの指示により終了します" |
|
16121 | msgstr "ユーザの指示により終了します" | |
15903 |
|
16122 | |||
|
16123 | msgid "this diff is too large to be displayed" | |||
|
16124 | msgstr "差分量が多すぎて表示できません" | |||
|
16125 | ||||
15904 | #, python-format |
|
16126 | #, python-format | |
15905 | msgid "invalid character in dag description: %s..." |
|
16127 | msgid "invalid character in dag description: %s..." | |
15906 | msgstr "dag 記述に不正な文字が使われています: %s..." |
|
16128 | msgstr "dag 記述に不正な文字が使われています: %s..." | |
@@ -16070,6 +16292,9 b' msgstr "hg: %s\\n"' | |||||
16070 | msgid "abort: remote error:\n" |
|
16292 | msgid "abort: remote error:\n" | |
16071 | msgstr "中止: 連携エラー:\n" |
|
16293 | msgstr "中止: 連携エラー:\n" | |
16072 |
|
16294 | |||
|
16295 | msgid "abort: remote error\n" | |||
|
16296 | msgstr "中止: 連携エラー\n" | |||
|
16297 | ||||
16073 | #, python-format |
|
16298 | #, python-format | |
16074 | msgid "abort: %s!\n" |
|
16299 | msgid "abort: %s!\n" | |
16075 | msgstr "中止: %s!\n" |
|
16300 | msgstr "中止: %s!\n" | |
@@ -16233,6 +16458,13 b' msgstr ""' | |||||
16233 | "lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" |
|
16458 | "lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" | |
16234 | "lsprof/からインストールしてください" |
|
16459 | "lsprof/からインストールしてください" | |
16235 |
|
16460 | |||
|
16461 | msgid "" | |||
|
16462 | "flamegraph not available - install from https://github.com/evanhempel/python-" | |||
|
16463 | "flamegraph" | |||
|
16464 | msgstr "" | |||
|
16465 | "flamegraph が使用できません - https://github.com/evanhempel/python-" | |||
|
16466 | "flamegraph からインストールしてください" | |||
|
16467 | ||||
16236 | msgid "statprof not available - install using \"easy_install statprof\"" |
|
16468 | msgid "statprof not available - install using \"easy_install statprof\"" | |
16237 | msgstr "" |
|
16469 | msgstr "" | |
16238 | "statprof が利用できません - \"easy_install statprof\"でインストールしてくださ" |
|
16470 | "statprof が利用できません - \"easy_install statprof\"でインストールしてくださ" | |
@@ -16305,12 +16537,16 b' msgid "no common changegroup version"' | |||||
16305 | msgstr "利用可能な共通のバンドル形式バージョンがありません" |
|
16537 | msgstr "利用可能な共通のバンドル形式バージョンがありません" | |
16306 |
|
16538 | |||
16307 | #, python-format |
|
16539 | #, python-format | |
|
16540 | msgid "updating %s to public failed" | |||
|
16541 | msgstr "%s フェーズの public 化に失敗" | |||
|
16542 | ||||
|
16543 | #, python-format | |||
16308 | msgid "server ignored update of %s to public!\n" |
|
16544 | msgid "server ignored update of %s to public!\n" | |
16309 | msgstr "連携先で、%s の public 化が無視されました!\n" |
|
16545 | msgstr "連携先で、%s の public 化が無視されました!\n" | |
16310 |
|
16546 | |||
16311 | #, python-format |
|
16547 | #, python-format | |
16312 | msgid "updating %s to public failed!\n" |
|
16548 | msgid "updating %s to public failed!\n" | |
16313 |
msgstr "%s |
|
16549 | msgstr "%s フェーズの public 化に失敗!\n" | |
16314 |
|
16550 | |||
16315 | #, python-format |
|
16551 | #, python-format | |
16316 | msgid "server ignored bookmark %s update\n" |
|
16552 | msgid "server ignored bookmark %s update\n" | |
@@ -16338,6 +16574,23 b' msgstr "bundle10 \xe3\x81\xa7\xe3\x81\xae\xe8\xa6\x81\xe6\xb1\x82\xe3\x81\xab\xe3\x81\xaf\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99"' | |||||
16338 | msgid "unsupported getbundle arguments: %s" |
|
16574 | msgid "unsupported getbundle arguments: %s" | |
16339 | msgstr "getbundle プロトコルに未知の引数が指定されました: %s" |
|
16575 | msgstr "getbundle プロトコルに未知の引数が指定されました: %s" | |
16340 |
|
16576 | |||
|
16577 | msgid "streaming all changes\n" | |||
|
16578 | msgstr "全変更を転送中\n" | |||
|
16579 | ||||
|
16580 | msgid "unexpected response from remote server:" | |||
|
16581 | msgstr "連携先のサーバから予期しない返信:" | |||
|
16582 | ||||
|
16583 | #, python-format | |||
|
16584 | msgid "%d files to transfer, %s of data\n" | |||
|
16585 | msgstr "%d 個のファイル転送(データ量 %s)\n" | |||
|
16586 | ||||
|
16587 | msgid "clone" | |||
|
16588 | msgstr "複製" | |||
|
16589 | ||||
|
16590 | #, python-format | |||
|
16591 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |||
|
16592 | msgstr "%s を %.1f 秒で送信しました (%s/秒)\n" | |||
|
16593 | ||||
16341 | #, python-format |
|
16594 | #, python-format | |
16342 | msgid "*** failed to import extension %s from %s: %s\n" |
|
16595 | msgid "*** failed to import extension %s from %s: %s\n" | |
16343 | msgstr "*** %s のインポートに失敗 (%s): %s\n" |
|
16596 | msgstr "*** %s のインポートに失敗 (%s): %s\n" | |
@@ -16520,6 +16773,9 b' msgstr "\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\xe3\x81\x8c\xe7\xb5\x82\xe7\xab\xaf\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
16520 | msgid "syntax error" |
|
16773 | msgid "syntax error" | |
16521 | msgstr "文法エラー" |
|
16774 | msgstr "文法エラー" | |
16522 |
|
16775 | |||
|
16776 | msgid "invalid token" | |||
|
16777 | msgstr "不正な記述" | |||
|
16778 | ||||
16523 | msgid "missing argument" |
|
16779 | msgid "missing argument" | |
16524 | msgstr "引数がありません" |
|
16780 | msgstr "引数がありません" | |
16525 |
|
16781 | |||
@@ -16786,11 +17042,12 b' msgstr "subrepo \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf\xe6\x9c\x80\xe5\xa4\xa7\xef\xbc\x91\xe3\x81\xa4\xe3\x81\xa7\xe3\x81\x99"' | |||||
16786 | msgid "subrepo requires a pattern or no arguments" |
|
17042 | msgid "subrepo requires a pattern or no arguments" | |
16787 | msgstr "subrepo の引数は、パターン指定か、引数無しです" |
|
17043 | msgstr "subrepo の引数は、パターン指定か、引数無しです" | |
16788 |
|
17044 | |||
16789 | msgid "invalid token" |
|
17045 | #, python-format | |
16790 | msgstr "不正な記述" |
|
17046 | msgid "available styles: %s\n" | |
16791 |
|
17047 | msgstr "利用可能なスタイル: %s\n" | ||
16792 | msgid "custom templates not yet supported" |
|
17048 | ||
16793 | msgstr "現在カスタムテンプレートは未サポートです" |
|
17049 | msgid "specify a template" | |
|
17050 | msgstr "テンプレートを指定してください" | |||
16794 |
|
17051 | |||
16795 | msgid "starting revisions are not directly related" |
|
17052 | msgid "starting revisions are not directly related" | |
16796 | msgstr "開始リビジョンと直接の関連がありません" |
|
17053 | msgstr "開始リビジョンと直接の関連がありません" | |
@@ -17861,8 +18118,8 b' msgid ""' | |||||
17861 | " HG: --\n" |
|
18118 | " HG: --\n" | |
17862 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" |
|
18119 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
17863 | " \"HG: branch merge\\n\")\n" |
|
18120 | " \"HG: branch merge\\n\")\n" | |
17864 |
" }HG: branch '{branch}'\\n{if( |
|
18121 | " }HG: branch '{branch}'\\n{if(activebookmark,\n" | |
17865 |
" \"HG: bookmark '{ |
|
18122 | " \"HG: bookmark '{activebookmark}'\\n\") }{subrepos %\n" | |
17866 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" |
|
18123 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" | |
17867 | " \"HG: added {file}\\n\" }{file_mods %\n" |
|
18124 | " \"HG: added {file}\\n\" }{file_mods %\n" | |
17868 | " \"HG: changed {file}\\n\" }{file_dels %\n" |
|
18125 | " \"HG: changed {file}\\n\" }{file_dels %\n" | |
@@ -17876,8 +18133,8 b' msgstr ""' | |||||
17876 | " HG: --\n" |
|
18133 | " HG: --\n" | |
17877 | " HG: ユーザ: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" |
|
18134 | " HG: ユーザ: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
17878 | " \"HG: ブランチのマージ\\n\")\n" |
|
18135 | " \"HG: ブランチのマージ\\n\")\n" | |
17879 |
" }HG: ブランチ '{branch}'\\n{if( |
|
18136 | " }HG: ブランチ '{branch}'\\n{if(activebookmark,\n" | |
17880 |
" \"HG: ブックマーク '{ |
|
18137 | " \"HG: ブックマーク '{activebookmark}'\\n\") }{subrepos %\n" | |
17881 | " \"HG: サブリポジトリ {subrepo}\\n\" }{file_adds %\n" |
|
18138 | " \"HG: サブリポジトリ {subrepo}\\n\" }{file_adds %\n" | |
17882 | " \"HG: {file} を追加\\n\" }{file_mods %\n" |
|
18139 | " \"HG: {file} を追加\\n\" }{file_mods %\n" | |
17883 | " \"HG: {file} を変更\\n\" }{file_dels %\n" |
|
18140 | " \"HG: {file} を変更\\n\" }{file_dels %\n" | |
@@ -18411,14 +18668,14 b' msgstr "``~/.hgrc`` \xe8\xa8\x98\xe8\xbf\xb0\xe4\xbe\x8b\xe3\x82\x92\xe4\xbb\xa5\xe4\xb8\x8b\xe3\x81\xab\xe7\xa4\xba\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99::"' | |||||
18411 |
|
18668 | |||
18412 | msgid "" |
|
18669 | msgid "" | |
18413 | " [extensions]\n" |
|
18670 | " [extensions]\n" | |
18414 |
" # (the |
|
18671 | " # (the color extension will get loaded from Mercurial's path)\n" | |
18415 |
" |
|
18672 | " color =\n" | |
18416 | " # (this extension will get loaded from the file specified)\n" |
|
18673 | " # (this extension will get loaded from the file specified)\n" | |
18417 | " myfeature = ~/.hgext/myfeature.py" |
|
18674 | " myfeature = ~/.hgext/myfeature.py" | |
18418 | msgstr "" |
|
18675 | msgstr "" | |
18419 | " [extensions]\n" |
|
18676 | " [extensions]\n" | |
18420 |
" # ( |
|
18677 | " # (color エクステンションは Mercurial 同梱のものが読み込まれます)\n" | |
18421 |
" |
|
18678 | " color =\n" | |
18422 | " # (以下のエクステンションは指定のパスから読み込まれます)\n" |
|
18679 | " # (以下のエクステンションは指定のパスから読み込まれます)\n" | |
18423 | " myfeature = ~/.hgext/myfeature.py" |
|
18680 | " myfeature = ~/.hgext/myfeature.py" | |
18424 |
|
18681 | |||
@@ -19403,11 +19660,20 b' msgstr ""' | |||||
19403 | " デフォルト値: strict" |
|
19660 | " デフォルト値: strict" | |
19404 |
|
19661 | |||
19405 | msgid "" |
|
19662 | msgid "" | |
19406 | "\n" |
|
19663 | "``fuzz``\n" | |
|
19664 | " The number of lines of 'fuzz' to allow when applying patches. This\n" | |||
|
19665 | " controls how much context the patcher is allowed to ignore when\n" | |||
|
19666 | " trying to apply a patch.\n" | |||
|
19667 | " Default: 2" | |||
|
19668 | msgstr "" | |||
|
19669 | "``fuzz``\n" | |||
|
19670 | " パッチ適用での 'fuzz' における許容行数。 パッチ適用において、\n" | |||
|
19671 | " 無視可能なコンテキスト行数を制御できます。 デフォルト値: 2" | |||
|
19672 | ||||
|
19673 | msgid "" | |||
19407 | "``paths``\n" |
|
19674 | "``paths``\n" | |
19408 | "---------" |
|
19675 | "---------" | |
19409 | msgstr "" |
|
19676 | msgstr "" | |
19410 | "\n" |
|
|||
19411 | "``paths``\n" |
|
19677 | "``paths``\n" | |
19412 | "---------" |
|
19678 | "---------" | |
19413 |
|
19679 | |||
@@ -19665,6 +19931,102 b' msgstr ""' | |||||
19665 | " 詳細プロファイラ ``ls`` 固有の設定。 デフォルト値: 5" |
|
19931 | " 詳細プロファイラ ``ls`` 固有の設定。 デフォルト値: 5" | |
19666 |
|
19932 | |||
19667 | msgid "" |
|
19933 | msgid "" | |
|
19934 | "``progress``\n" | |||
|
19935 | "------------" | |||
|
19936 | msgstr "" | |||
|
19937 | "``progress``\n" | |||
|
19938 | "------------" | |||
|
19939 | ||||
|
19940 | msgid "" | |||
|
19941 | "Mercurial commands can draw progress bars that are as informative as\n" | |||
|
19942 | "possible. Some progress bars only offer indeterminate information, while " | |||
|
19943 | "others\n" | |||
|
19944 | "have a definite end point." | |||
|
19945 | msgstr "" | |||
|
19946 | "Mercurial コマンドは、 処理の進捗率を表示可能です。 多くの処理において、\n" | |||
|
19947 | "明確な処理総量に基づいて、 進捗表示が行われますが、 一部の処理では、\n" | |||
|
19948 | "不確定な情報に基づいた進捗率が表示される場合があります。" | |||
|
19949 | ||||
|
19950 | msgid "" | |||
|
19951 | "``delay``\n" | |||
|
19952 | " Number of seconds (float) before showing the progress bar. (default: 3)" | |||
|
19953 | msgstr "" | |||
|
19954 | "``delay``\n" | |||
|
19955 | " 進捗表示開始までの秒数(浮動小数点) (デフォルト値: 3.0)" | |||
|
19956 | ||||
|
19957 | msgid "" | |||
|
19958 | "``changedelay``\n" | |||
|
19959 | " Minimum delay before showing a new topic. When set to less than 3 * " | |||
|
19960 | "refresh,\n" | |||
|
19961 | " that value will be used instead. (default: 1)" | |||
|
19962 | msgstr "" | |||
|
19963 | "``changedelay``\n" | |||
|
19964 | " 次のトピック表示までの最小遅延。 refresh の3倍以上の値は無視されます。\n" | |||
|
19965 | " (デフォルト値: 1.0)" | |||
|
19966 | ||||
|
19967 | msgid "" | |||
|
19968 | "``refresh``\n" | |||
|
19969 | " Time in seconds between refreshes of the progress bar. (default: 0.1)" | |||
|
19970 | msgstr "" | |||
|
19971 | "``refresh``\n" | |||
|
19972 | " 進捗表示更新間隔の秒数 (デフォルト値: 0.1)" | |||
|
19973 | ||||
|
19974 | msgid "" | |||
|
19975 | "``format``\n" | |||
|
19976 | " Format of the progress bar." | |||
|
19977 | msgstr "" | |||
|
19978 | "``format``\n" | |||
|
19979 | " 進捗表示の形式指定。" | |||
|
19980 | ||||
|
19981 | msgid "" | |||
|
19982 | " Valid entries for the format field are ``topic``, ``bar``, ``number``,\n" | |||
|
19983 | " ``unit``, ``estimate``, speed, and item. item defaults to the last 20\n" | |||
|
19984 | " characters of the item, but this can be changed by adding either ``-" | |||
|
19985 | "<num>``\n" | |||
|
19986 | " which would take the last num characters, or ``+<num>`` for the first " | |||
|
19987 | "num\n" | |||
|
19988 | " characters." | |||
|
19989 | msgstr "" | |||
|
19990 | " format 指定で有効な要素は ``topic`` (現処理内容), ``bar`` (バー表示),\n" | |||
|
19991 | " ``number`` (終了数), ``unit`` (対象単位), ``estimate`` (残予想時間),\n" | |||
|
19992 | " ``speed`` (処理速度), ``item`` (現処理対象) です。 デフォルトの item\n" | |||
|
19993 | " は対象の末尾 20 文字ですが、 ``-<num>`` (末尾 num 文字) や ``+<num>``\n" | |||
|
19994 | " (冒頭 num 文字) 指定の追加で変更可能です。" | |||
|
19995 | ||||
|
19996 | msgid " (default: Topic bar number estimate)" | |||
|
19997 | msgstr " (デフォルト値: topic bar number estimate)" | |||
|
19998 | ||||
|
19999 | msgid "" | |||
|
20000 | "``width``\n" | |||
|
20001 | " If set, the maximum width of the progress information (that is, min" | |||
|
20002 | "(width,\n" | |||
|
20003 | " term width) will be used)" | |||
|
20004 | msgstr "" | |||
|
20005 | "``width``\n" | |||
|
20006 | " 進捗情報表示の最大幅 (画面幅と比較して、 小さい方の値を採用)" | |||
|
20007 | ||||
|
20008 | msgid "" | |||
|
20009 | "``clear-complete``\n" | |||
|
20010 | " clear the progress bar after it's done (default to True)" | |||
|
20011 | msgstr "" | |||
|
20012 | "``clear-complete``\n" | |||
|
20013 | " 処理終了後の進捗表示クリアの要否 (デフォルト値: True)" | |||
|
20014 | ||||
|
20015 | msgid "" | |||
|
20016 | "``disable``\n" | |||
|
20017 | " If true, don't show a progress bar" | |||
|
20018 | msgstr "" | |||
|
20019 | "``disable``\n" | |||
|
20020 | " true 設定時は、 進捗表示を抑止" | |||
|
20021 | ||||
|
20022 | msgid "" | |||
|
20023 | "``assume-tty``\n" | |||
|
20024 | " If true, ALWAYS show a progress bar, unless disable is given" | |||
|
20025 | msgstr "" | |||
|
20026 | "``assume-tty``\n" | |||
|
20027 | " true 設定時は、disable による禁止が無い限り、 常に進捗表示を実施" | |||
|
20028 | ||||
|
20029 | msgid "" | |||
19668 | "``revsetalias``\n" |
|
20030 | "``revsetalias``\n" | |
19669 | "---------------" |
|
20031 | "---------------" | |
19670 | msgstr "" |
|
20032 | msgstr "" | |
@@ -19732,6 +20094,15 b' msgstr ""' | |||||
19732 | " データの完全性を確認します。 デフォルト値: False" |
|
20094 | " データの完全性を確認します。 デフォルト値: False" | |
19733 |
|
20095 | |||
19734 | msgid "" |
|
20096 | msgid "" | |
|
20097 | "``maxhttpheaderlen``\n" | |||
|
20098 | " Instruct HTTP clients not to send request headers longer than this\n" | |||
|
20099 | " many bytes. Default is 1024." | |||
|
20100 | msgstr "" | |||
|
20101 | "``maxhttpheaderlen``\n" | |||
|
20102 | " HTTP クライアントに対して、 このサイズ以上のヘッダを送信しないように、\n" | |||
|
20103 | " 指示します (デフォルト値: 1024)" | |||
|
20104 | ||||
|
20105 | msgid "" | |||
19735 | "``smtp``\n" |
|
20106 | "``smtp``\n" | |
19736 | "--------" |
|
20107 | "--------" | |
19737 | msgstr "" |
|
20108 | msgstr "" | |
@@ -20091,6 +20462,32 b' msgstr ""' | |||||
20091 | " 文字コード混在による深刻な問題を生じます。" |
|
20462 | " 文字コード混在による深刻な問題を生じます。" | |
20092 |
|
20463 | |||
20093 | msgid "" |
|
20464 | msgid "" | |
|
20465 | "``patch``\n" | |||
|
20466 | " An optional external tool that ``hg import`` and some extensions\n" | |||
|
20467 | " will use for applying patches. By default Mercurial uses an\n" | |||
|
20468 | " internal patch utility. The external tool must work as the common\n" | |||
|
20469 | " Unix ``patch`` program. In particular, it must accept a ``-p``\n" | |||
|
20470 | " argument to strip patch headers, a ``-d`` argument to specify the\n" | |||
|
20471 | " current directory, a file name to patch, and a patch file to take\n" | |||
|
20472 | " from stdin." | |||
|
20473 | msgstr "" | |||
|
20474 | "``patch``\n" | |||
|
20475 | " :hg:`import` やエクステンションによるパッチ適用で使用する外部ツール。\n" | |||
|
20476 | " 通常のパッチ適用は Mercurial 内部で処理されます。 外部ツールは、\n" | |||
|
20477 | " Unix の ``patch`` コマンドと同等の挙動が要求されます。 最低限、\n" | |||
|
20478 | " パス指定の冒頭要素除去の ``-p`` 、起点ディレクトリ指定の ``-d``\n" | |||
|
20479 | " といったオプションの受理や、 標準入力からのパッチファイル入力が、\n" | |||
|
20480 | " 必要とされます。" | |||
|
20481 | ||||
|
20482 | msgid "" | |||
|
20483 | " It is possible to specify a patch tool together with extra\n" | |||
|
20484 | " arguments. For example, setting this option to ``patch --merge``\n" | |||
|
20485 | " will use the ``patch`` program with its 2-way merge option." | |||
|
20486 | msgstr "" | |||
|
20487 | " 外部ツールは固有引数と一緒に指定可能です。 例えば ``patch --merge``\n" | |||
|
20488 | " 指定により、 2-way マージオプション付きで ``patch`` が実行されます。" | |||
|
20489 | ||||
|
20490 | msgid "" | |||
20094 | "``portablefilenames``\n" |
|
20491 | "``portablefilenames``\n" | |
20095 | " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" |
|
20492 | " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" | |
20096 | " Default is ``warn``.\n" |
|
20493 | " Default is ``warn``.\n" | |
@@ -20134,15 +20531,6 b' msgstr ""' | |||||
20134 | " clone/push/pull 処理における遠隔実行コマンド。 デフォルト値: ``hg``" |
|
20531 | " clone/push/pull 処理における遠隔実行コマンド。 デフォルト値: ``hg``" | |
20135 |
|
20532 | |||
20136 | msgid "" |
|
20533 | msgid "" | |
20137 | "``reportoldssl``\n" |
|
|||
20138 | " Warn if an SSL certificate is unable to be used due to using Python\n" |
|
|||
20139 | " 2.5 or earlier. True or False. Default is True." |
|
|||
20140 | msgstr "" |
|
|||
20141 | "``reportoldssl``\n" |
|
|||
20142 | " Python 2.5 以前の使用により、 SSL 証明書の処理ができない場合の、\n" |
|
|||
20143 | " 警告表示の有無を指定する真偽値。 デフォルト値: True" |
|
|||
20144 |
|
||||
20145 | msgid "" |
|
|||
20146 | "``report_untrusted``\n" |
|
20534 | "``report_untrusted``\n" | |
20147 | " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" |
|
20535 | " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" | |
20148 | " trusted user or group. True or False. Default is True." |
|
20536 | " trusted user or group. True or False. Default is True." | |
@@ -20485,6 +20873,13 b' msgstr ""' | |||||
20485 | " hgweb におけるキャッシュ利用の可否。 デフォルト値: True" |
|
20873 | " hgweb におけるキャッシュ利用の可否。 デフォルト値: True" | |
20486 |
|
20874 | |||
20487 | msgid "" |
|
20875 | msgid "" | |
|
20876 | "``certificate``\n" | |||
|
20877 | " Certificate to use when running :hg:`serve`." | |||
|
20878 | msgstr "" | |||
|
20879 | "``certificate``\n" | |||
|
20880 | " :hg:`serve` 実行時に使用する証明書。" | |||
|
20881 | ||||
|
20882 | msgid "" | |||
20488 | "``collapse``\n" |
|
20883 | "``collapse``\n" | |
20489 | " With ``descend`` enabled, repositories in subdirectories are shown at\n" |
|
20884 | " With ``descend`` enabled, repositories in subdirectories are shown at\n" | |
20490 | " a single level alongside repositories in the current path. With\n" |
|
20885 | " a single level alongside repositories in the current path. With\n" | |
@@ -22809,6 +23204,16 b' msgstr ""' | |||||
22809 | "パターン記述を ``^`` で開始してください。" |
|
23204 | "パターン記述を ``^`` で開始してください。" | |
22810 |
|
23205 | |||
22811 | msgid "" |
|
23206 | msgid "" | |
|
23207 | "Subdirectories can have their own .hgignore settings by adding\n" | |||
|
23208 | "``subinclude:path/to/subdir/.hgignore`` to the root ``.hgignore``. See\n" | |||
|
23209 | ":hg:`help patterns` for details on ``subinclude:`` and ``include:``." | |||
|
23210 | msgstr "" | |||
|
23211 | "リポジトリルートの ``.hgignore`` に ``subinclude:path/to/subdir/.hgignore``\n" | |||
|
23212 | "記述を追加することで、 各サブディレクトリ固有の .hgignore 設定が可能です。\n" | |||
|
23213 | "``subinclude:`` と ``include:`` の詳細は :hg:`help patterns`\n" | |||
|
23214 | "を参照してください。" | |||
|
23215 | ||||
|
23216 | msgid "" | |||
22812 | " Patterns specified in other than ``.hgignore`` are always rooted.\n" |
|
23217 | " Patterns specified in other than ``.hgignore`` are always rooted.\n" | |
22813 | " Please see :hg:`help patterns` for details." |
|
23218 | " Please see :hg:`help patterns` for details." | |
22814 | msgstr "" |
|
23219 | msgstr "" | |
@@ -23424,6 +23829,21 b' msgstr ""' | |||||
23424 | "file パターンとして扱われます。" |
|
23829 | "file パターンとして扱われます。" | |
23425 |
|
23830 | |||
23426 | msgid "" |
|
23831 | msgid "" | |
|
23832 | "To read a set of patterns from a file, use ``include:`` or ``subinclude:``.\n" | |||
|
23833 | "``include:`` will use all the patterns from the given file and treat them as " | |||
|
23834 | "if\n" | |||
|
23835 | "they had been passed in manually. ``subinclude:`` will only apply the " | |||
|
23836 | "patterns\n" | |||
|
23837 | "against files that are under the subinclude file's directory. See :hg:`help\n" | |||
|
23838 | "hgignore` for details on the format of these files." | |||
|
23839 | msgstr "" | |||
|
23840 | "パターン指定をファイルから読み込む場合は、 ``include:`` や ``subinclude:``\n" | |||
|
23841 | "を使用します。 ``include:`` で読み込まれた内容は、 手動での直接指定と、\n" | |||
|
23842 | "同じ効果を持ちます。 ``subinclude:`` で読み込まれた内容は、\n" | |||
|
23843 | "読み込み対象ファイルのディレクトリと、 その配下にのみ適用されます。\n" | |||
|
23844 | "パターンファイルの形式詳細は :hg:`help hgignore` を参照してください。" | |||
|
23845 | ||||
|
23846 | msgid "" | |||
23427 | "All patterns, except for ``glob:`` specified in command line (not for\n" |
|
23847 | "All patterns, except for ``glob:`` specified in command line (not for\n" | |
23428 | "``-I`` or ``-X`` options), can match also against directories: files\n" |
|
23848 | "``-I`` or ``-X`` options), can match also against directories: files\n" | |
23429 | "under matched directories are treated as matched." |
|
23849 | "under matched directories are treated as matched." | |
@@ -23471,7 +23891,7 b' msgid " re:.*\\\\.c$ any name ending' | |||||
23471 | msgstr " re:.*\\.c$ 任意のディレクトリの、 名前が \".c\" で終わるもの" |
|
23891 | msgstr " re:.*\\.c$ 任意のディレクトリの、 名前が \".c\" で終わるもの" | |
23472 |
|
23892 | |||
23473 | msgid "File examples::" |
|
23893 | msgid "File examples::" | |
23474 |
msgstr " |
|
23894 | msgstr "一覧指定例::" | |
23475 |
|
23895 | |||
23476 | msgid "" |
|
23896 | msgid "" | |
23477 | " listfile:list.txt read list from list.txt with one file pattern per line\n" |
|
23897 | " listfile:list.txt read list from list.txt with one file pattern per line\n" | |
@@ -23480,8 +23900,22 b' msgstr ""' | |||||
23480 | " listfile:list.txt 1行 1 file パターンで list.txt から読み込み\n" |
|
23900 | " listfile:list.txt 1行 1 file パターンで list.txt から読み込み\n" | |
23481 | " listfile0:list.txt null 文字区切りで file パターンを読み込み" |
|
23901 | " listfile0:list.txt null 文字区切りで file パターンを読み込み" | |
23482 |
|
23902 | |||
23483 |
msgid "See also :hg:`help filesets`. |
|
23903 | msgid "See also :hg:`help filesets`." | |
23484 |
msgstr ":hg:`help filesets` も参照してください。 |
|
23904 | msgstr ":hg:`help filesets` も参照してください。" | |
|
23905 | ||||
|
23906 | msgid "Include examples::" | |||
|
23907 | msgstr "ファイル読み込み例::" | |||
|
23908 | ||||
|
23909 | msgid "" | |||
|
23910 | " include:path/to/mypatternfile reads patterns to be applied to all " | |||
|
23911 | "paths\n" | |||
|
23912 | " subinclude:path/to/subignorefile reads patterns specifically for paths in " | |||
|
23913 | "the\n" | |||
|
23914 | " subdirectory\n" | |||
|
23915 | msgstr "" | |||
|
23916 | " include:path/to/mypatternfile 読み込みパターンはリポジトリ全体に適用\n" | |||
|
23917 | " subinclude:path/to/subignorefile 読み込みパターンはサブディレクトリ\n" | |||
|
23918 | " 配下にのみ適用\n" | |||
23485 |
|
23919 | |||
23486 | msgid "" |
|
23920 | msgid "" | |
23487 | "What are phases?\n" |
|
23921 | "What are phases?\n" | |
@@ -24222,13 +24656,17 b' msgstr ""' | |||||
24222 |
|
24656 | |||
24223 | msgid "" |
|
24657 | msgid "" | |
24224 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" |
|
24658 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" | |
24225 | " specified. Git and Subversion subrepositories are currently\n" |
|
24659 | " specified. However, if you specify the full path of a file or\n" | |
24226 | " silently ignored." |
|
24660 | " directory in a subrepo, it will be displayed even without\n" | |
24227 | msgstr "" |
|
24661 | " -S/--subrepos being specified. Git and Subversion subrepositories\n" | |
24228 | ":files: -S/--subrepos 指定が無い限り、 ファイル一覧表示は、\n" |
|
24662 | " are currently silently ignored." | |
24229 | " 再帰的には実施されません。 なお、 サブリポジトリが Git または\n" |
|
24663 | msgstr "" | |
24230 | " Subversion 形式の場合、 現状では、 何の表示も無しに、\n" |
|
24664 | ":file: -S/--subrepos 指定が無い限り、 管理対象ファイルの一覧表示は、\n" | |
24231 | " 一覧表示要求を無視します。" |
|
24665 | " 再帰的には実施されません。 但し、 -S/--subrepos 指定が無くても、\n" | |
|
24666 | " サブリポジトリ中のファイルへのパスが、 直接指定された場合は、\n" | |||
|
24667 | " 管理対象一覧表示が実施されます。 なお、 サブリポジトリが\n" | |||
|
24668 | " Git/Subversion 形式の場合、 現状では、 何の表示も無しに、\n" | |||
|
24669 | " 表示要求を無視します。" | |||
24232 |
|
24670 | |||
24233 | msgid "" |
|
24671 | msgid "" | |
24234 | ":forget: forget currently only handles exact file matches in subrepos.\n" |
|
24672 | ":forget: forget currently only handles exact file matches in subrepos.\n" | |
@@ -24443,6 +24881,16 b' msgstr "\xe3\x81\xbe\xe3\x81\x9f\xe3\x80\x81 \xe5\x88\x97\xe6\x8c\x99\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe8\xbf\x94\xe3\x81\x99 expr \xe3\x81\xab\xe5\xaf\xbe\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 \xe4\xbb\xa5\xe4\xb8\x8b\xe3\x81\xae\xe6\xa7\x98\xe3\x81\xaa\xe8\xa8\x98\xe8\xbf\xb0\xe3\x81\x8c\xe5\x8f\xaf\xe8\x83\xbd\xe3\x81\xa7\xe3\x81\x99:"' | |||||
24443 | msgid "- expr % \"{template}\"" |
|
24881 | msgid "- expr % \"{template}\"" | |
24444 | msgstr "- expr % \"{template}\"" |
|
24882 | msgstr "- expr % \"{template}\"" | |
24445 |
|
24883 | |||
|
24884 | msgid "" | |||
|
24885 | "As seen in the above example, \"{template}\" is interpreted as a template.\n" | |||
|
24886 | "To prevent it from being interpreted, you can use an escape character " | |||
|
24887 | "\"\\{\"\n" | |||
|
24888 | "or a raw string prefix, \"r'...'\"." | |||
|
24889 | msgstr "" | |||
|
24890 | "上記例で見られるように、 \"{template}\" はテンプレートとして解釈されます。\n" | |||
|
24891 | "テンプレートとしての解釈を抑止する場合は、 \"\\{\" で開始するか、\n" | |||
|
24892 | "文字列指定の冒頭に ``r`` を付けて下さい (例: \"r'...'\")" | |||
|
24893 | ||||
24446 | msgid "Some sample command line templates:" |
|
24894 | msgid "Some sample command line templates:" | |
24447 | msgstr "コマンドラインでのテンプレート指定例:" |
|
24895 | msgstr "コマンドラインでのテンプレート指定例:" | |
24448 |
|
24896 | |||
@@ -24473,8 +24921,8 b' msgstr " $ hg log -r 0 --template \\"{d' | |||||
24473 | msgid "- Output the description set to a fill-width of 30::" |
|
24921 | msgid "- Output the description set to a fill-width of 30::" | |
24474 | msgstr "- コミットログの各行を30桁で揃えて出力::" |
|
24922 | msgstr "- コミットログの各行を30桁で揃えて出力::" | |
24475 |
|
24923 | |||
24476 |
msgid " $ hg log -r 0 --template \"{fill(desc, |
|
24924 | msgid " $ hg log -r 0 --template \"{fill(desc, 30)}\"" | |
24477 |
msgstr " $ hg log -r 0 --template \"{fill(desc, |
|
24925 | msgstr " $ hg log -r 0 --template \"{fill(desc, 30)}\"" | |
24478 |
|
24926 | |||
24479 | msgid "- Use a conditional to test for the default branch::" |
|
24927 | msgid "- Use a conditional to test for the default branch::" | |
24480 | msgstr "- default ブランチか否かで表示内容を切り替え::" |
|
24928 | msgstr "- default ブランチか否かで表示内容を切り替え::" | |
@@ -24514,15 +24962,15 b' msgstr "- \xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae \'extra\' \xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xae\xe5\x86\x85\xe5\xae\xb9\xe3\x82\x921\xe8\xa1\x8c1\xe3\x83\x87\xe3\x83\xbc\xe3\x82\xbf\xe3\x81\xa7\xe8\xa1\xa8\xe7\xa4\xba::"' | |||||
24514 | msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" |
|
24962 | msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" | |
24515 | msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" |
|
24963 | msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" | |
24516 |
|
24964 | |||
24517 |
msgid "- Mark the |
|
24965 | msgid "- Mark the active bookmark with '*'::" | |
24518 |
msgstr "- |
|
24966 | msgstr "- アクティブなブックマークに '*' を表示::" | |
24519 |
|
24967 | |||
24520 | msgid "" |
|
24968 | msgid "" | |
24521 |
" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, |
|
24969 | " $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " | |
24522 |
" |
|
24970 | "'*')} '}\\n\"" | |
24523 | msgstr "" |
|
24971 | msgstr "" | |
24524 |
" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, |
|
24972 | " $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " | |
24525 |
" |
|
24973 | "'*')} '}\\n\"" | |
24526 |
|
24974 | |||
24527 | msgid "- Mark the working copy parent with '@'::" |
|
24975 | msgid "- Mark the working copy parent with '@'::" | |
24528 | msgstr "- 作業領域の親リビジョンに '@' を表示::" |
|
24976 | msgstr "- 作業領域の親リビジョンに '@' を表示::" | |
@@ -24533,16 +24981,15 b' msgstr " $ hg log --template \\"{ifcont' | |||||
24533 | msgid "- Show only commit descriptions that start with \"template\"::" |
|
24981 | msgid "- Show only commit descriptions that start with \"template\"::" | |
24534 | msgstr "- \"template\" で始まるコミットログのみを表示::" |
|
24982 | msgstr "- \"template\" で始まるコミットログのみを表示::" | |
24535 |
|
24983 | |||
24536 | msgid "" |
|
24984 | msgid " $ hg log --template \"{startswith('template', firstline(desc))}\\n\"" | |
24537 | " $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" |
|
24985 | msgstr "" | |
24538 | msgstr "" |
|
24986 | " $ hg log --template \"{startswith('template', firstline(desc))}\\n\"" | |
24539 | " $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" |
|
|||
24540 |
|
24987 | |||
24541 | msgid "- Print the first word of each line of a commit message::" |
|
24988 | msgid "- Print the first word of each line of a commit message::" | |
24542 | msgstr "- コミットログの最初の語のみを表示::" |
|
24989 | msgstr "- コミットログの最初の語のみを表示::" | |
24543 |
|
24990 | |||
24544 |
msgid " $ hg log --template \"{word( |
|
24991 | msgid " $ hg log --template \"{word(0, desc)}\\n\"\n" | |
24545 |
msgstr " $ hg log --template \"{word( |
|
24992 | msgstr " $ hg log --template \"{word(0, desc)}\\n\"\n" | |
24546 |
|
24993 | |||
24547 | msgid "Valid URLs are of the form::" |
|
24994 | msgid "Valid URLs are of the form::" | |
24548 | msgstr "有効な URL 指定は以下の形式です::" |
|
24995 | msgstr "有効な URL 指定は以下の形式です::" | |
@@ -24713,6 +25160,19 b' msgstr "\xe8\xa4\x87\xe8\xa3\xbd\xe5\x85\x88\xe3\x81\xaf\xe6\x97\xa2\xe3\x81\xab\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
24713 | msgid "updating working directory\n" |
|
25160 | msgid "updating working directory\n" | |
24714 | msgstr "作業領域の更新中\n" |
|
25161 | msgstr "作業領域の更新中\n" | |
24715 |
|
25162 | |||
|
25163 | msgid "" | |||
|
25164 | "src repository does not support revision lookup and so doesn't support clone " | |||
|
25165 | "by revision" | |||
|
25166 | msgstr "指定の複製元は、 リビジョン指定付き複製が未サポートです" | |||
|
25167 | ||||
|
25168 | #, python-format | |||
|
25169 | msgid "(sharing from existing pooled repository %s)\n" | |||
|
25170 | msgstr "(既存の共有用履歴管理領域 %s を使用)\n" | |||
|
25171 | ||||
|
25172 | #, python-format | |||
|
25173 | msgid "(sharing from new pooled repository %s)\n" | |||
|
25174 | msgstr "(共有用履歴管理領域 %s を新規作成)\n" | |||
|
25175 | ||||
24716 | #, python-format |
|
25176 | #, python-format | |
24717 | msgid "destination directory: %s\n" |
|
25177 | msgid "destination directory: %s\n" | |
24718 | msgstr "複製先ディレクトリ: %s\n" |
|
25178 | msgstr "複製先ディレクトリ: %s\n" | |
@@ -24728,10 +25188,11 b' msgstr "\xe8\xa4\x87\xe8\xa3\xbd\xe5\x85\x88 \'%s\' \xe3\x81\xaf\xe6\x97\xa2\xe3\x81\xab\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
24728 | msgid "destination '%s' is not empty" |
|
25188 | msgid "destination '%s' is not empty" | |
24729 | msgstr "複製先 '%s' は空ではありません" |
|
25189 | msgstr "複製先 '%s' は空ではありません" | |
24730 |
|
25190 | |||
24731 | msgid "" |
|
25191 | msgid "(not using pooled storage: remote appears to be empty)\n" | |
24732 | "src repository does not support revision lookup and so doesn't support clone " |
|
25192 | msgstr "(共有用履歴管理領域は使用しません: 複製元の履歴が空です)\n" | |
24733 | "by revision" |
|
25193 | ||
24734 | msgstr "指定の複製元は、 リビジョン指定付き複製が未サポートです" |
|
25194 | msgid "(not using pooled storage: unable to resolve identity of remote)\n" | |
|
25195 | msgstr "(共有用履歴管理領域は使用しません: 複製元の履歴を参照できません)\n" | |||
24735 |
|
25196 | |||
24736 | msgid "clone from remote to remote not supported" |
|
25197 | msgid "clone from remote to remote not supported" | |
24737 | msgstr "リモートからリモートへの複製は未サポートです" |
|
25198 | msgstr "リモートからリモートへの複製は未サポートです" | |
@@ -24761,6 +25222,13 b' msgstr ""' | |||||
24761 | msgid "(branch merge, don't forget to commit)\n" |
|
25222 | msgid "(branch merge, don't forget to commit)\n" | |
24762 | msgstr "(マージ結果の commit を忘れずに)\n" |
|
25223 | msgstr "(マージ結果の commit を忘れずに)\n" | |
24763 |
|
25224 | |||
|
25225 | msgid "checking subrepo links\n" | |||
|
25226 | msgstr "サブリポジトリの確認中\n" | |||
|
25227 | ||||
|
25228 | #, python-format | |||
|
25229 | msgid ".hgsubstate is corrupt in revision %s\n" | |||
|
25230 | msgstr "リビジョン %s における .hgsubstate が不正です\n" | |||
|
25231 | ||||
24764 | #, python-format |
|
25232 | #, python-format | |
24765 | msgid "websub: invalid pattern for %s: %s\n" |
|
25233 | msgid "websub: invalid pattern for %s: %s\n" | |
24766 | msgstr "websub: %s のパターンが不正です: %s\n" |
|
25234 | msgstr "websub: %s のパターンが不正です: %s\n" | |
@@ -25379,14 +25847,6 b' msgid "cannot create new http repository' | |||||
25379 | msgstr "http リポジトリの新規作成はできません" |
|
25847 | msgstr "http リポジトリの新規作成はできません" | |
25380 |
|
25848 | |||
25381 | #, python-format |
|
25849 | #, python-format | |
25382 | msgid "ignoring invalid syntax '%s'" |
|
|||
25383 | msgstr "文法不正の '%s' を無視します" |
|
|||
25384 |
|
||||
25385 | #, python-format |
|
|||
25386 | msgid "skipping unreadable ignore file '%s': %s\n" |
|
|||
25387 | msgstr "読込不可の ignore ファイル '%s' をスキップします: %s\n" |
|
|||
25388 |
|
||||
25389 | #, python-format |
|
|||
25390 | msgid "repository %s not found" |
|
25850 | msgid "repository %s not found" | |
25391 | msgstr "リポジトリ '%s' が見つかりません" |
|
25851 | msgstr "リポジトリ '%s' が見つかりません" | |
25392 |
|
25852 | |||
@@ -25529,9 +25989,6 b' msgstr "\xe7\xae\xa1\xe7\x90\x86\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe4\xb8\x80\xe8\xa6\xa7\xe3\x81\xae\xe8\xa8\x98\xe9\x8c\xb2\xe4\xb8\xad\\n"' | |||||
25529 | msgid "committing changelog\n" |
|
25989 | msgid "committing changelog\n" | |
25530 | msgstr "変更履歴の記録中\n" |
|
25990 | msgstr "変更履歴の記録中\n" | |
25531 |
|
25991 | |||
25532 | msgid "unexpected response from remote server:" |
|
|||
25533 | msgstr "連携先のサーバから予期しない返信:" |
|
|||
25534 |
|
||||
25535 | msgid "operation forbidden by server" |
|
25992 | msgid "operation forbidden by server" | |
25536 | msgstr "その処理はサーバで禁止されています" |
|
25993 | msgstr "その処理はサーバで禁止されています" | |
25537 |
|
25994 | |||
@@ -25541,20 +25998,6 b' msgstr "\xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe3\x83\xad\xe3\x83\x83\xe3\x82\xaf\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97"' | |||||
25541 | msgid "the server sent an unknown error code" |
|
25998 | msgid "the server sent an unknown error code" | |
25542 | msgstr "サーバが未知のエラーコードを返却しました" |
|
25999 | msgstr "サーバが未知のエラーコードを返却しました" | |
25543 |
|
26000 | |||
25544 | msgid "streaming all changes\n" |
|
|||
25545 | msgstr "全変更を転送中\n" |
|
|||
25546 |
|
||||
25547 | #, python-format |
|
|||
25548 | msgid "%d files to transfer, %s of data\n" |
|
|||
25549 | msgstr "%d 個のファイル転送(データ量 %s)\n" |
|
|||
25550 |
|
||||
25551 | msgid "clone" |
|
|||
25552 | msgstr "複製" |
|
|||
25553 |
|
||||
25554 | #, python-format |
|
|||
25555 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
|||
25556 | msgstr "%s を %.1f 秒で送信しました (%s/秒)\n" |
|
|||
25557 |
|
||||
25558 | #, python-format |
|
26001 | #, python-format | |
25559 | msgid "pushkey-abort: %s\n" |
|
26002 | msgid "pushkey-abort: %s\n" | |
25560 | msgstr "pushkey 処理の中止: %s\n" |
|
26003 | msgstr "pushkey 処理の中止: %s\n" | |
@@ -25625,6 +26068,14 b' msgid "unable to read file list (%s)"' | |||||
25625 | msgstr "一覧ファイル(%s)が読み込めません" |
|
26068 | msgstr "一覧ファイル(%s)が読み込めません" | |
25626 |
|
26069 | |||
25627 | #, python-format |
|
26070 | #, python-format | |
|
26071 | msgid "skipping unreadable pattern file '%s': %s\n" | |||
|
26072 | msgstr "読込不可のパターンファイル '%s' をスキップします: %s\n" | |||
|
26073 | ||||
|
26074 | #, python-format | |||
|
26075 | msgid "%s: invalid pattern (%s): %s" | |||
|
26076 | msgstr "%s: 不正パターン (%s): %s" | |||
|
26077 | ||||
|
26078 | #, python-format | |||
25628 | msgid "invalid pattern (%s): %s" |
|
26079 | msgid "invalid pattern (%s): %s" | |
25629 | msgstr "不正パターン (%s): %s" |
|
26080 | msgstr "不正パターン (%s): %s" | |
25630 |
|
26081 | |||
@@ -25632,6 +26083,10 b' msgid "invalid pattern"' | |||||
25632 | msgstr "不正パターン" |
|
26083 | msgstr "不正パターン" | |
25633 |
|
26084 | |||
25634 | #, python-format |
|
26085 | #, python-format | |
|
26086 | msgid "%s: ignoring invalid syntax '%s'\n" | |||
|
26087 | msgstr "%s: 文法不正の '%s' を無視します\n" | |||
|
26088 | ||||
|
26089 | #, python-format | |||
25635 | msgid "diff context lines count must be an integer, not %r" |
|
26090 | msgid "diff context lines count must be an integer, not %r" | |
25636 | msgstr "差分コンテキストでの行数指定が不正です: %r" |
|
26091 | msgstr "差分コンテキストでの行数指定が不正です: %r" | |
25637 |
|
26092 | |||
@@ -25706,6 +26161,10 b' msgstr "\xe6\x9b\xb4\xe6\x96\xb0\xe4\xb8\xad"' | |||||
25706 | msgid "getting %s to %s\n" |
|
26161 | msgid "getting %s to %s\n" | |
25707 | msgstr "%s から %s に複製中\n" |
|
26162 | msgstr "%s から %s に複製中\n" | |
25708 |
|
26163 | |||
|
26164 | #, python-format | |||
|
26165 | msgid "branch %s not found" | |||
|
26166 | msgstr "ブランチ %s が見つかりません" | |||
|
26167 | ||||
25709 | msgid "merging with a working directory ancestor has no effect" |
|
26168 | msgid "merging with a working directory ancestor has no effect" | |
25710 | msgstr "作業領域の祖先とのマージは意味がありません" |
|
26169 | msgstr "作業領域の祖先とのマージは意味がありません" | |
25711 |
|
26170 | |||
@@ -25840,6 +26299,22 b' msgid "not an infix: %s"' | |||||
25840 | msgstr "不正な挿入辞: %s" |
|
26299 | msgstr "不正な挿入辞: %s" | |
25841 |
|
26300 | |||
25842 | #, python-format |
|
26301 | #, python-format | |
|
26302 | msgid "%(func)s takes at most %(nargs)d arguments" | |||
|
26303 | msgstr "%(func)s の引数は最大 %(nargs)d 個です" | |||
|
26304 | ||||
|
26305 | #, python-format | |||
|
26306 | msgid "%(func)s got an invalid argument" | |||
|
26307 | msgstr "%(func)s の引数が不正です" | |||
|
26308 | ||||
|
26309 | #, python-format | |||
|
26310 | msgid "%(func)s got an unexpected keyword argument '%(key)s'" | |||
|
26311 | msgstr "%(func)s に予期せぬキーワード引数 '%(key)s' が指定されました" | |||
|
26312 | ||||
|
26313 | #, python-format | |||
|
26314 | msgid "%(func)s got multiple values for keyword argument '%(key)s'" | |||
|
26315 | msgstr "%(func)s のキーワード引数 '%(key)s' が複数の値を持ちます" | |||
|
26316 | ||||
|
26317 | #, python-format | |||
25843 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" |
|
26318 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" | |
25844 | msgstr "%d 個の差分(総数 %d)が適用失敗 -- 却下差分は %s に保存\n" |
|
26319 | msgstr "%d 個の差分(総数 %d)が適用失敗 -- 却下差分は %s に保存\n" | |
25845 |
|
26320 | |||
@@ -25889,6 +26364,9 b' msgstr "\xe3\x81\x93\xe3\x82\x8c\xe3\x81\xaf\xe3\x83\x90\xe3\x82\xa4\xe3\x83\x8a\xe3\x83\xaa\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\x99\\n"' | |||||
25889 | msgid "%d hunks, %d lines changed\n" |
|
26364 | msgid "%d hunks, %d lines changed\n" | |
25890 | msgstr "%d 個の差分、 %d 行の変更\n" |
|
26365 | msgstr "%d 個の差分、 %d 行の変更\n" | |
25891 |
|
26366 | |||
|
26367 | msgid "record" | |||
|
26368 | msgstr "" | |||
|
26369 | ||||
25892 | msgid "" |
|
26370 | msgid "" | |
25893 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " |
|
26371 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " | |
25894 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " |
|
26372 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " | |
@@ -25925,6 +26403,10 b' msgstr ""' | |||||
25925 | "編集作業は中止され、差分はそのまま維持されます。\n" |
|
26403 | "編集作業は中止され、差分はそのまま維持されます。\n" | |
25926 |
|
26404 | |||
25927 | #, python-format |
|
26405 | #, python-format | |
|
26406 | msgid "editor exited with exit code %d\n" | |||
|
26407 | msgstr "エディタが終了コード %d で終了しました\n" | |||
|
26408 | ||||
|
26409 | #, python-format | |||
25928 | msgid "examine changes to %s?" |
|
26410 | msgid "examine changes to %s?" | |
25929 | msgstr "%s の変更点を調べますか?" |
|
26411 | msgstr "%s の変更点を調べますか?" | |
25930 |
|
26412 | |||
@@ -26006,6 +26488,10 b' msgid "path %r traverses symbolic link %' | |||||
26006 | msgstr "パス %r はシンボリックリンク '%r' が含まれています" |
|
26488 | msgstr "パス %r はシンボリックリンク '%r' が含まれています" | |
26007 |
|
26489 | |||
26008 | #, python-format |
|
26490 | #, python-format | |
|
26491 | msgid "consider using '--cwd %s'" | |||
|
26492 | msgstr "'--cwd %s' を使ってみては?" | |||
|
26493 | ||||
|
26494 | #, python-format | |||
26009 | msgid "%s not under root '%s'" |
|
26495 | msgid "%s not under root '%s'" | |
26010 | msgstr "%s はルートディレクトリ '%s' の配下にはありません" |
|
26496 | msgstr "%s はルートディレクトリ '%s' の配下にはありません" | |
26011 |
|
26497 | |||
@@ -26039,6 +26525,40 b' msgstr "\xe7\xb5\x82\xe4\xba\x86\xe3\x82\xb3\xe3\x83\xbc\xe3\x83\x89 %d \xe3\x81\xa7\xe7\xb5\x82\xe4\xba\x86\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"' | |||||
26039 | msgid "killed by signal %d" |
|
26525 | msgid "killed by signal %d" | |
26040 | msgstr "シグナル %d で強制終了されました" |
|
26526 | msgstr "シグナル %d で強制終了されました" | |
26041 |
|
26527 | |||
|
26528 | #. i18n: format XX seconds as "XXs" | |||
|
26529 | #, python-format | |||
|
26530 | msgid "%02ds" | |||
|
26531 | msgstr "%02d秒" | |||
|
26532 | ||||
|
26533 | #. i18n: format X minutes and YY seconds as "XmYYs" | |||
|
26534 | #, python-format | |||
|
26535 | msgid "%dm%02ds" | |||
|
26536 | msgstr "%d分%02d秒" | |||
|
26537 | ||||
|
26538 | #. i18n: format X hours and YY minutes as "XhYYm" | |||
|
26539 | #, python-format | |||
|
26540 | msgid "%dh%02dm" | |||
|
26541 | msgstr "%d時間%02d分" | |||
|
26542 | ||||
|
26543 | #. i18n: format X days and YY hours as "XdYYh" | |||
|
26544 | #, python-format | |||
|
26545 | msgid "%dd%02dh" | |||
|
26546 | msgstr "%d日%02d時間" | |||
|
26547 | ||||
|
26548 | #. i18n: format X weeks and YY days as "XwYYd" | |||
|
26549 | #, python-format | |||
|
26550 | msgid "%dw%02dd" | |||
|
26551 | msgstr "%d週%02d日" | |||
|
26552 | ||||
|
26553 | #. i18n: format X years and YY weeks as "XyYYw" | |||
|
26554 | #, python-format | |||
|
26555 | msgid "%dy%02dw" | |||
|
26556 | msgstr "%d年%02d週" | |||
|
26557 | ||||
|
26558 | #, python-format | |||
|
26559 | msgid "%d %s/sec" | |||
|
26560 | msgstr "%d %s/秒" | |||
|
26561 | ||||
26042 | #, python-format |
|
26562 | #, python-format | |
26043 | msgid "unknown strip-bundle2-version value %r; should be one of %r\n" |
|
26563 | msgid "unknown strip-bundle2-version value %r; should be one of %r\n" | |
26044 | msgstr "strip-bundle2-version 値 %r は未知の値です; 使用可能候補は %r\n" |
|
26564 | msgstr "strip-bundle2-version 値 %r は未知の値です; 使用可能候補は %r\n" | |
@@ -26047,6 +26567,12 b' msgstr "strip-bundle2-version \xe5\x80\xa4 %r \xe3\x81\xaf\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe5\x80\xa4\xe3\x81\xa7\xe3\x81\x99; \xe4\xbd\xbf\xe7\x94\xa8\xe5\x8f\xaf\xe8\x83\xbd\xe5\x80\x99\xe8\xa3\x9c\xe3\x81\xaf %r\\n"' | |||||
26047 | msgid "saved backup bundle to %s\n" |
|
26567 | msgid "saved backup bundle to %s\n" | |
26048 | msgstr "バックアップのバンドルを %s に保存\n" |
|
26568 | msgstr "バックアップのバンドルを %s に保存\n" | |
26049 |
|
26569 | |||
|
26570 | msgid "programming error: cannot strip from inside a transaction" | |||
|
26571 | msgstr "内部エラー: トランザクション内では strip 処理を実施できません" | |||
|
26572 | ||||
|
26573 | msgid "contact your extension maintainer" | |||
|
26574 | msgstr "原因と思われるエクステンションの管理者に相談してください" | |||
|
26575 | ||||
26050 | msgid "adding branch\n" |
|
26576 | msgid "adding branch\n" | |
26051 | msgstr "ブランチを追加中\n" |
|
26577 | msgstr "ブランチを追加中\n" | |
26052 |
|
26578 | |||
@@ -26062,6 +26588,19 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe9\x99\xa4\xe5\xa4\x96\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97: \xe5\xae\x8c\xe5\x85\xa8\xe3\x81\xaa\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe3\x82\x92 \'%s\' \xe3\x81\xab\xe4\xbf\x9d\xe5\xad\x98\\n"' | |||||
26062 | msgid "strip failed, partial bundle stored in '%s'\n" |
|
26588 | msgid "strip failed, partial bundle stored in '%s'\n" | |
26063 | msgstr "リビジョンの除外に失敗: 部分的なバンドルを '%s' に保存\n" |
|
26589 | msgstr "リビジョンの除外に失敗: 部分的なバンドルを '%s' に保存\n" | |
26064 |
|
26590 | |||
|
26591 | msgid "(not rebuilding fncache because repository does not support fncache)\n" | |||
|
26592 | msgstr "(fncache 未サポートのリポジトリのため、fncache の再構築は省略)\n" | |||
|
26593 | ||||
|
26594 | msgid "changeset" | |||
|
26595 | msgstr "リビジョン" | |||
|
26596 | ||||
|
26597 | #, python-format | |||
|
26598 | msgid "%d items added, %d removed from fncache\n" | |||
|
26599 | msgstr "fncache に %d 要素を追加、 %d 要素を削除\n" | |||
|
26600 | ||||
|
26601 | msgid "fncache already up to date\n" | |||
|
26602 | msgstr "fncache は最新の状態です\n" | |||
|
26603 | ||||
26065 | #, python-format |
|
26604 | #, python-format | |
26066 | msgid "revlog decompress error: %s" |
|
26605 | msgid "revlog decompress error: %s" | |
26067 | msgstr "revlog 圧縮の展開エラー: %s" |
|
26606 | msgstr "revlog 圧縮の展開エラー: %s" | |
@@ -26123,6 +26662,10 b' msgid "attempted to add linkrev -1 to %s' | |||||
26123 | msgstr "linkrev -1 なリビジョンを %s に追加しようとしています" |
|
26662 | msgstr "linkrev -1 なリビジョンを %s に追加しようとしています" | |
26124 |
|
26663 | |||
26125 | #, python-format |
|
26664 | #, python-format | |
|
26665 | msgid "%s: size of %d bytes exceeds maximum revlog storage of 2GiB" | |||
|
26666 | msgstr "%s: 更新後のサイズ %d バイトは履歴ファイルの最大容量 2GiB を超過します" | |||
|
26667 | ||||
|
26668 | #, python-format | |||
26126 | msgid "node %s is not censored" |
|
26669 | msgid "node %s is not censored" | |
26127 | msgstr "ノード %s は検閲対象ではありません" |
|
26670 | msgstr "ノード %s は検閲対象ではありません" | |
26128 |
|
26671 | |||
@@ -26134,9 +26677,8 b' msgstr "revset \xe8\xa8\x98\xe8\xbf\xb0 \'%s\' \xe3\x81\xa7\xe3\x81\xae\xe6\x96\x87\xe6\xb3\x95\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc"' | |||||
26134 | msgid "at %s: %s" |
|
26677 | msgid "at %s: %s" | |
26135 | msgstr "文字位置: %s: %s" |
|
26678 | msgstr "文字位置: %s: %s" | |
26136 |
|
26679 | |||
26137 | #, python-format |
|
26680 | msgid "can't use a key-value pair in this context" | |
26138 | msgid "can't use %s here" |
|
26681 | msgstr "ここでは key-value ペアを使用できません" | |
26139 | msgstr "ここでは %s を使用できません" |
|
|||
26140 |
|
26682 | |||
26141 | msgid "" |
|
26683 | msgid "" | |
26142 | "``adds(pattern)``\n" |
|
26684 | "``adds(pattern)``\n" | |
@@ -26412,17 +26954,6 b' msgid "divergent takes no arguments"' | |||||
26412 | msgstr "divergent には引数が指定できません" |
|
26954 | msgstr "divergent には引数が指定できません" | |
26413 |
|
26955 | |||
26414 | msgid "" |
|
26956 | msgid "" | |
26415 | "``draft()``\n" |
|
|||
26416 | " Changeset in draft phase." |
|
|||
26417 | msgstr "" |
|
|||
26418 | "``draft()``\n" |
|
|||
26419 | " フェーズが draft なリビジョン群。" |
|
|||
26420 |
|
||||
26421 | #. i18n: "draft" is a keyword |
|
|||
26422 | msgid "draft takes no arguments" |
|
|||
26423 | msgstr "draft には引数が指定できません" |
|
|||
26424 |
|
||||
26425 | msgid "" |
|
|||
26426 | "``extinct()``\n" |
|
26957 | "``extinct()``\n" | |
26427 | " Obsolete changesets with obsolete descendants only." |
|
26958 | " Obsolete changesets with obsolete descendants only." | |
26428 | msgstr "" |
|
26959 | msgstr "" | |
@@ -26452,8 +26983,8 b' msgstr ""' | |||||
26452 | " 付きで指定してください。" |
|
26983 | " 付きで指定してください。" | |
26453 |
|
26984 | |||
26454 | #. i18n: "extra" is a keyword |
|
26985 | #. i18n: "extra" is a keyword | |
26455 |
msgid "extra takes at least 1 a |
|
26986 | msgid "extra takes at least 1 argument" | |
26456 |
msgstr "extra |
|
26987 | msgstr "extra には最低1つの引数が必要です" | |
26457 |
|
26988 | |||
26458 | #. i18n: "extra" is a keyword |
|
26989 | #. i18n: "extra" is a keyword | |
26459 | msgid "first argument to extra must be a string" |
|
26990 | msgid "first argument to extra must be a string" | |
@@ -26855,6 +27386,28 b' msgstr ""' | |||||
26855 | "``parents([set])``\n" |
|
27386 | "``parents([set])``\n" | |
26856 | " 指定リビジョン群または作業領域の、 全親リビジョン群。" |
|
27387 | " 指定リビジョン群または作業領域の、 全親リビジョン群。" | |
26857 |
|
27388 | |||
|
27389 | msgid "" | |||
|
27390 | "``draft()``\n" | |||
|
27391 | " Changeset in draft phase." | |||
|
27392 | msgstr "" | |||
|
27393 | "``draft()``\n" | |||
|
27394 | " フェーズが draft なリビジョン群。" | |||
|
27395 | ||||
|
27396 | #. i18n: "draft" is a keyword | |||
|
27397 | msgid "draft takes no arguments" | |||
|
27398 | msgstr "draft には引数が指定できません" | |||
|
27399 | ||||
|
27400 | msgid "" | |||
|
27401 | "``secret()``\n" | |||
|
27402 | " Changeset in secret phase." | |||
|
27403 | msgstr "" | |||
|
27404 | "``secret()``\n" | |||
|
27405 | " フェーズが secret なリビジョン群。" | |||
|
27406 | ||||
|
27407 | #. i18n: "secret" is a keyword | |||
|
27408 | msgid "secret takes no arguments" | |||
|
27409 | msgstr "secret には引数が指定できません" | |||
|
27410 | ||||
26858 | msgid "^ expects a number 0, 1, or 2" |
|
27411 | msgid "^ expects a number 0, 1, or 2" | |
26859 | msgstr "^ には 0、 1 または 2 を指定してください" |
|
27412 | msgstr "^ には 0、 1 または 2 を指定してください" | |
26860 |
|
27413 | |||
@@ -27021,17 +27574,6 b' msgstr ""' | |||||
27021 | " 全リビジョン。" |
|
27574 | " 全リビジョン。" | |
27022 |
|
27575 | |||
27023 | msgid "" |
|
27576 | msgid "" | |
27024 | "``secret()``\n" |
|
|||
27025 | " Changeset in secret phase." |
|
|||
27026 | msgstr "" |
|
|||
27027 | "``secret()``\n" |
|
|||
27028 | " フェーズが secret なリビジョン群。" |
|
|||
27029 |
|
||||
27030 | #. i18n: "secret" is a keyword |
|
|||
27031 | msgid "secret takes no arguments" |
|
|||
27032 | msgstr "secret には引数が指定できません" |
|
|||
27033 |
|
||||
27034 | msgid "" |
|
|||
27035 | "``sort(set[, [-]key...])``\n" |
|
27577 | "``sort(set[, [-]key...])``\n" | |
27036 | " Sort set by keys. The default sort order is ascending, specify a key\n" |
|
27578 | " Sort set by keys. The default sort order is ascending, specify a key\n" | |
27037 | " as ``-key`` to sort in descending order." |
|
27579 | " as ``-key`` to sort in descending order." | |
@@ -27278,19 +27820,20 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xa8\xe3\x81\xae\xe9\x80\xa3\xe6\x90\xba\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97"' | |||||
27278 | msgid "no suitable response from remote hg" |
|
27820 | msgid "no suitable response from remote hg" | |
27279 | msgstr "指定リポジトリからの応答が不適切" |
|
27821 | msgstr "指定リポジトリからの応答が不適切" | |
27280 |
|
27822 | |||
|
27823 | msgid "check previous remote output" | |||
|
27824 | msgstr "連携先からの直前の出力を確認してください" | |||
|
27825 | ||||
27281 | #, python-format |
|
27826 | #, python-format | |
27282 | msgid "push refused: %s" |
|
27827 | msgid "push refused: %s" | |
27283 | msgstr "履歴反映が拒否されました: %s" |
|
27828 | msgstr "履歴反映が拒否されました: %s" | |
27284 |
|
27829 | |||
|
27830 | #, python-format | |||
|
27831 | msgid "passphrase for %s: " | |||
|
27832 | msgstr "%s のパスフレーズ: " | |||
|
27833 | ||||
27285 | msgid "ssl connection failed" |
|
27834 | msgid "ssl connection failed" | |
27286 | msgstr "ssl 接続に失敗" |
|
27835 | msgstr "ssl 接続に失敗" | |
27287 |
|
27836 | |||
27288 | msgid "Python SSL support not found" |
|
|||
27289 | msgstr "Python の SSL サポート機能が使用できません" |
|
|||
27290 |
|
||||
27291 | msgid "certificate checking requires Python 2.6" |
|
|||
27292 | msgstr "証明書検証には Python 2.6 が必要です" |
|
|||
27293 |
|
||||
27294 | msgid "no certificate received" |
|
27837 | msgid "no certificate received" | |
27295 | msgstr "証明書が指定されていません" |
|
27838 | msgstr "証明書が指定されていません" | |
27296 |
|
27839 | |||
@@ -27309,18 +27852,6 b' msgid "could not find web.cacerts: %s"' | |||||
27309 | msgstr "web.cacerts が見つかりません: %s" |
|
27852 | msgstr "web.cacerts が見つかりません: %s" | |
27310 |
|
27853 | |||
27311 | #, python-format |
|
27854 | #, python-format | |
27312 | msgid "host fingerprint for %s can't be verified (Python too old)" |
|
|||
27313 | msgstr "ホスト %s のフィンガープリントが検証できません (Python が古いため)" |
|
|||
27314 |
|
||||
27315 | #, python-format |
|
|||
27316 | msgid "certificate for %s can't be verified (Python too old)" |
|
|||
27317 | msgstr "%s の証明書は検証できません (Python が古いため)" |
|
|||
27318 |
|
||||
27319 | #, python-format |
|
|||
27320 | msgid "warning: certificate for %s can't be verified (Python too old)\n" |
|
|||
27321 | msgstr "警告: %s の証明書は検証できません (Python が古いため)\n" |
|
|||
27322 |
|
||||
27323 | #, python-format |
|
|||
27324 | msgid "%s ssl connection error" |
|
27855 | msgid "%s ssl connection error" | |
27325 | msgstr "%s への ssl 接続に失敗" |
|
27856 | msgstr "%s への ssl 接続に失敗" | |
27326 |
|
27857 | |||
@@ -27509,6 +28040,14 b' msgid "reverting subrepo %s\\n"' | |||||
27509 | msgstr "サブリポジトリ %s の変更取り消し中\n" |
|
28040 | msgstr "サブリポジトリ %s の変更取り消し中\n" | |
27510 |
|
28041 | |||
27511 | #, python-format |
|
28042 | #, python-format | |
|
28043 | msgid "subrepo '%s' is hidden in revision %s\n" | |||
|
28044 | msgstr "サブリポジトリ '%s' の参照先はリビジョン %s 時点で不可視です\n" | |||
|
28045 | ||||
|
28046 | #, python-format | |||
|
28047 | msgid "subrepo '%s' not found in revision %s\n" | |||
|
28048 | msgstr "サブリポジトリ '%s' はリビジョン %s 時点で不在です\n" | |||
|
28049 | ||||
|
28050 | #, python-format | |||
27512 | msgid "'svn' executable not found for subrepo '%s'" |
|
28051 | msgid "'svn' executable not found for subrepo '%s'" | |
27513 | msgstr "サブリポジトリ '%s' に使用する 'svn' コマンドが見つかりません" |
|
28052 | msgstr "サブリポジトリ '%s' に使用する 'svn' コマンドが見つかりません" | |
27514 |
|
28053 | |||
@@ -27739,6 +28278,18 b' msgstr ""' | |||||
27739 | " 'Foo Bar'" |
|
28278 | " 'Foo Bar'" | |
27740 |
|
28279 | |||
27741 | msgid "" |
|
28280 | msgid "" | |
|
28281 | ":revescape: Any text. Escapes all \"special\" characters, except @.\n" | |||
|
28282 | " Forward slashes are escaped twice to prevent web servers from " | |||
|
28283 | "prematurely\n" | |||
|
28284 | " unescaping them. For example, \"@foo bar/baz\" becomes \"@foo%20bar" | |||
|
28285 | "%252Fbaz\"." | |||
|
28286 | msgstr "" | |||
|
28287 | ":revescape: 文字列。 @ 以外の全ての「特殊」文字を変換します。\n" | |||
|
28288 | " ウェブサービスによる早期の復号を防ぐため、 スラッシュ (\"/\") は二重に" | |||
|
28289 | "変換されます。 例えば \"@foo bar/baz\" は\n" | |||
|
28290 | " \"@foo%20bar%252Fbaz\" となります。" | |||
|
28291 | ||||
|
28292 | msgid "" | |||
27742 | ":rfc3339date: Date. Returns a date using the Internet date format\n" |
|
28293 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
27743 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
|
28294 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." | |
27744 | msgstr "" |
|
28295 | msgstr "" | |
@@ -27828,18 +28379,26 b' msgstr ":branch: \xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\xe3\x80\x82 \xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe5\xb1\x9e\xe3\x81\x99\xe3\x82\x8b\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe5\x90\x8d\xe3\x80\x82"' | |||||
27828 |
|
28379 | |||
27829 | msgid "" |
|
28380 | msgid "" | |
27830 | ":bookmarks: List of strings. Any bookmarks associated with the\n" |
|
28381 | ":bookmarks: List of strings. Any bookmarks associated with the\n" | |
27831 | " changeset." |
|
28382 | " changeset. Also sets 'active', the name of the active bookmark." | |
27832 | msgstr "" |
|
28383 | msgstr "" | |
27833 | ":bookmarks: 文字列列挙。 当該リビジョンに付与されたブックマークの一覧。" |
|
28384 | ":bookmarks: 文字列列挙。 当該リビジョンに付与されたブックマークの一覧。\n" | |
|
28385 | " アクティブブックマークが存在する場合は 'active' が設定されます。" | |||
27834 |
|
28386 | |||
27835 | msgid ":children: List of strings. The children of the changeset." |
|
28387 | msgid ":children: List of strings. The children of the changeset." | |
27836 | msgstr ":children: 文字列列挙。 リビジョンの子供。" |
|
28388 | msgstr ":children: 文字列列挙。 リビジョンの子供。" | |
27837 |
|
28389 | |||
27838 | msgid "" |
|
28390 | msgid "" | |
27839 | ":currentbookmark: String. The active bookmark, if it is\n" |
|
28391 | ":currentbookmark: String. The active bookmark, if it is\n" | |
27840 | " associated with the changeset" |
|
28392 | " associated with the changeset (DEPRECATED)" | |
27841 | msgstr "" |
|
28393 | msgstr "" | |
27842 | ":currentbookmark: 文字列. アクティブブックマーク (対象リビジョンに対して、\n" |
|
28394 | ":currentbookmark: 文字列. アクティブブックマーク (対象リビジョンに対して、\n" | |
|
28395 | " 関連付けられている場合のみ) (非推奨)" | |||
|
28396 | ||||
|
28397 | msgid "" | |||
|
28398 | ":activebookmark: String. The active bookmark, if it is\n" | |||
|
28399 | " associated with the changeset" | |||
|
28400 | msgstr "" | |||
|
28401 | ":activebookmark: 文字列. アクティブブックマーク (対象リビジョンに対して、\n" | |||
27843 | " 関連付けられている場合のみ)" |
|
28402 | " 関連付けられている場合のみ)" | |
27844 |
|
28403 | |||
27845 | msgid ":date: Date information. The date when the changeset was committed." |
|
28404 | msgid ":date: Date information. The date when the changeset was committed." | |
@@ -27891,14 +28450,20 b' msgstr ""' | |||||
27891 | " 登録除外ファイルの一覧。" |
|
28450 | " 登録除外ファイルの一覧。" | |
27892 |
|
28451 | |||
27893 | msgid "" |
|
28452 | msgid "" | |
27894 | ":latesttag: String. Most recent global tag in the ancestors of this\n" |
|
28453 | ":latesttag: List of strings. The global tags on the most recent globally\n" | |
27895 | " changeset." |
|
28454 | " tagged ancestor of this changeset." | |
27896 | msgstr "" |
|
28455 | msgstr "" | |
27897 |
":latesttag: 文字列。 当該リビジョンの祖先に対して |
|
28456 | ":latesttag: 文字列列挙。 当該リビジョンの祖先に対して、\n" | |
|
28457 | " 最も最近に付与されたグローバルタグの一覧" | |||
27898 |
|
28458 | |||
27899 | msgid ":latesttagdistance: Integer. Longest path to the latest tag." |
|
28459 | msgid ":latesttagdistance: Integer. Longest path to the latest tag." | |
27900 | msgstr ":latesttagdistance: 整数。 最新タグへの最長パス" |
|
28460 | msgstr ":latesttagdistance: 整数。 最新タグへの最長パス" | |
27901 |
|
28461 | |||
|
28462 | msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag." | |||
|
28463 | msgstr "" | |||
|
28464 | ":changessincelatesttag: 数値。 最新タグ以降の全祖先リビジョン数。\n" | |||
|
28465 | " (※ 訳注: 履歴中に分岐がない場合は latesttagdistance と等価です)" | |||
|
28466 | ||||
27902 | msgid "" |
|
28467 | msgid "" | |
27903 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" |
|
28468 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" | |
27904 | " digit string." |
|
28469 | " digit string." | |
@@ -27959,6 +28524,12 b' msgstr ""' | |||||
27959 | ":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n" |
|
28524 | ":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n" | |
27960 | " 親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。" |
|
28525 | " 親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。" | |
27961 |
|
28526 | |||
|
28527 | msgid "integer literal without digits" | |||
|
28528 | msgstr "数値の指定がありません" | |||
|
28529 | ||||
|
28530 | msgid "unterminated template expansion" | |||
|
28531 | msgstr "テンプレート定義が終端していません" | |||
|
28532 | ||||
27962 | #, python-format |
|
28533 | #, python-format | |
27963 | msgid "unknown method '%s'" |
|
28534 | msgid "unknown method '%s'" | |
27964 | msgstr "未知の処理 '%s' が指定されました" |
|
28535 | msgstr "未知の処理 '%s' が指定されました" | |
@@ -28035,6 +28606,20 b' msgid "pad() expects two to four argumen' | |||||
28035 | msgstr "pad() の引数は2つから4つの間です" |
|
28606 | msgstr "pad() の引数は2つから4つの間です" | |
28036 |
|
28607 | |||
28037 | msgid "" |
|
28608 | msgid "" | |
|
28609 | ":indent(text, indentchars[, firstline]): Indents all non-empty lines\n" | |||
|
28610 | " with the characters given in the indentchars string. An optional\n" | |||
|
28611 | " third parameter will override the indent for the first line only\n" | |||
|
28612 | " if present." | |||
|
28613 | msgstr "" | |||
|
28614 | ":indent(text, indentchars[, firstline]): 空白行以外を indentchars\n" | |||
|
28615 | " を使って字下げします。 firstline が指定された場合、 最初の行は、\n" | |||
|
28616 | " firstline を使って字下げされます。" | |||
|
28617 | ||||
|
28618 | #. i18n: "indent" is a keyword | |||
|
28619 | msgid "indent() expects two or three arguments" | |||
|
28620 | msgstr "indent() は2または3の引数が必要です" | |||
|
28621 | ||||
|
28622 | msgid "" | |||
28038 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" |
|
28623 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" | |
28039 | " are complex types. This function allows you to obtain the value of an\n" |
|
28624 | " are complex types. This function allows you to obtain the value of an\n" | |
28040 | " attribute on these type." |
|
28625 | " attribute on these type." | |
@@ -28165,8 +28750,9 b' msgstr ""' | |||||
28165 | msgid "word expects two or three arguments, got %d" |
|
28750 | msgid "word expects two or three arguments, got %d" | |
28166 | msgstr "word は2または3の引数が必要です (実際の引数は %d 個)" |
|
28751 | msgstr "word は2または3の引数が必要です (実際の引数は %d 個)" | |
28167 |
|
28752 | |||
28168 | msgid "Use strings like '3' for numbers passed to word function" |
|
28753 | #. i18n: "word" is a keyword | |
28169 | msgstr "word 関数には '3' のような文字列形式で数値を指定してください" |
|
28754 | msgid "word expects an integer index" | |
|
28755 | msgstr "word にはインデックス値を数値で指定してください" | |||
28170 |
|
28756 | |||
28171 | msgid "unmatched quotes" |
|
28757 | msgid "unmatched quotes" | |
28172 | msgstr "引用符の対応関係が不正です" |
|
28758 | msgstr "引用符の対応関係が不正です" | |
@@ -28601,8 +29187,9 b' msgstr "\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe5\x90\x8d \'%s\' \xe3\x81\xae\xe3\x83\x87\xe3\x82\xb3\xe3\x83\xbc\xe3\x83\x89\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97"' | |||||
28601 | msgid "broken revlog! (%s)" |
|
29187 | msgid "broken revlog! (%s)" | |
28602 | msgstr "不正な revlog! (%s)" |
|
29188 | msgstr "不正な revlog! (%s)" | |
28603 |
|
29189 | |||
28604 | msgid "missing revlog!" |
|
29190 | #, python-format | |
28605 | msgstr "revlog が見つかりません!" |
|
29191 | msgid " warning: revlog '%s' not in fncache!" | |
|
29192 | msgstr " 警告: 履歴ファイル '%s' は fncache に含まれていません!" | |||
28606 |
|
29193 | |||
28607 | #, python-format |
|
29194 | #, python-format | |
28608 | msgid "%s not in manifests" |
|
29195 | msgid "%s not in manifests" | |
@@ -28651,6 +29238,10 b' msgstr "%d \xe5\x80\x8b\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x80\x81 %d \xe4\xbb\xb6\xe3\x81\xae\xe5\xb7\xae\xe5\x88\x86\xe6\x83\x85\xe5\xa0\xb1\xe3\x80\x81 \xe5\x90\x88\xe8\xa8\x88 %d \xe4\xbb\xb6\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\\n"' | |||||
28651 | msgid "%d warnings encountered!\n" |
|
29238 | msgid "%d warnings encountered!\n" | |
28652 | msgstr "警告が %d 件あります!\n" |
|
29239 | msgstr "警告が %d 件あります!\n" | |
28653 |
|
29240 | |||
|
29241 | msgid "hint: run \"hg debugrebuildfncache\" to recover from corrupt fncache\n" | |||
|
29242 | msgstr "" | |||
|
29243 | "ヒント: fncache の修復には \"hg debugrebuildfncache\" を実施してください\n" | |||
|
29244 | ||||
28654 | #, python-format |
|
29245 | #, python-format | |
28655 | msgid "%d integrity errors encountered!\n" |
|
29246 | msgid "%d integrity errors encountered!\n" | |
28656 | msgstr "不整合が %d 件あります!\n" |
|
29247 | msgstr "不整合が %d 件あります!\n" |
This diff has been collapsed as it changes many lines, (1336 lines changed) Show them Hide them | |||||
@@ -1310,6 +1310,9 b' msgstr "deve ser especificado um caminho' | |||||
1310 | msgid "must specify revision to censor" |
|
1310 | msgid "must specify revision to censor" | |
1311 | msgstr "deve ser especificada uma revisão a ser censurada" |
|
1311 | msgstr "deve ser especificada uma revisão a ser censurada" | |
1312 |
|
1312 | |||
|
1313 | msgid "can only specify an explicit filename" | |||
|
1314 | msgstr "só é possível especificar um nome de arquivo explícito" | |||
|
1315 | ||||
1313 | msgid "cannot censor file with no history" |
|
1316 | msgid "cannot censor file with no history" | |
1314 | msgstr "não é possível censurar um arquivo sem histórico" |
|
1317 | msgstr "não é possível censurar um arquivo sem histórico" | |
1315 |
|
1318 | |||
@@ -1681,8 +1684,8 b' msgstr ""' | |||||
1681 | " resolve.unresolved = red bold\n" |
|
1684 | " resolve.unresolved = red bold\n" | |
1682 | " resolve.resolved = green bold" |
|
1685 | " resolve.resolved = green bold" | |
1683 |
|
1686 | |||
1684 |
msgid " bookmarks. |
|
1687 | msgid " bookmarks.active = green" | |
1685 |
msgstr " bookmarks. |
|
1688 | msgstr " bookmarks.active = green" | |
1686 |
|
1689 | |||
1687 | msgid "" |
|
1690 | msgid "" | |
1688 | " branches.active = none\n" |
|
1691 | " branches.active = none\n" | |
@@ -2465,6 +2468,15 b' msgstr ""' | |||||
2465 | " for maior do que 0. O padrão é False." |
|
2468 | " for maior do que 0. O padrão é False." | |
2466 |
|
2469 | |||
2467 | msgid "" |
|
2470 | msgid "" | |
|
2471 | " :convert.git.remoteprefix: remote refs are converted as bookmarks with\n" | |||
|
2472 | " ``convert.git.remoteprefix`` as a prefix followed by a /. The default\n" | |||
|
2473 | " is 'remote'." | |||
|
2474 | msgstr "" | |||
|
2475 | " :convert.git.remoteprefix: refs remotas são convertidas para marcadores\n" | |||
|
2476 | " usando como prefixo ``convert.git.remoteprefix`` seguido de /. O\n" | |||
|
2477 | " padrão é 'remote'." | |||
|
2478 | ||||
|
2479 | msgid "" | |||
2468 | " Perforce Source\n" |
|
2480 | " Perforce Source\n" | |
2469 | " ###############" |
|
2481 | " ###############" | |
2470 | msgstr "" |
|
2482 | msgstr "" | |
@@ -2508,6 +2520,43 b' msgstr ""' | |||||
2508 | " Destino Mercurial\n" |
|
2520 | " Destino Mercurial\n" | |
2509 | " #################" |
|
2521 | " #################" | |
2510 |
|
2522 | |||
|
2523 | msgid "" | |||
|
2524 | " The Mercurial destination will recognize Mercurial subrepositories in the\n" | |||
|
2525 | " destination directory, and update the .hgsubstate file automatically if the\n" | |||
|
2526 | " destination subrepositories contain the <dest>/<sub>/.hg/shamap file.\n" | |||
|
2527 | " Converting a repository with subrepositories requires converting a single\n" | |||
|
2528 | " repository at a time, from the bottom up." | |||
|
2529 | msgstr "" | |||
|
2530 | " O destino Mercurial reconhecerá sub-repositórios do Mercurial\n" | |||
|
2531 | " no diretório de destino, e atualizará o arquivo .hgsubstate\n" | |||
|
2532 | " automaticamente se os sub-repositórios de destino contiverem\n" | |||
|
2533 | " o arquivo <dest>/<sub>/.hg/shamap.\n" | |||
|
2534 | " A conversão de um repositório com sub-repositórios deve ser\n" | |||
|
2535 | " realizada um repositório de cada vez, dos níveis de baixo\n" | |||
|
2536 | " para cima." | |||
|
2537 | ||||
|
2538 | msgid "" | |||
|
2539 | " An example showing how to convert a repository with subrepositories::" | |||
|
2540 | msgstr "" | |||
|
2541 | " Um exemplo que mostra como converter um repositório com sub-" | |||
|
2542 | "repositórios::" | |||
|
2543 | ||||
|
2544 | msgid "" | |||
|
2545 | " # so convert knows the type when it sees a non empty destination\n" | |||
|
2546 | " $ hg init converted" | |||
|
2547 | msgstr "" | |||
|
2548 | " # para que convert saiba o tipo do destino\n" | |||
|
2549 | " $ hg init converted" | |||
|
2550 | ||||
|
2551 | msgid "" | |||
|
2552 | " $ hg convert orig/sub1 converted/sub1\n" | |||
|
2553 | " $ hg convert orig/sub2 converted/sub2\n" | |||
|
2554 | " $ hg convert orig converted" | |||
|
2555 | msgstr "" | |||
|
2556 | " $ hg convert orig/sub1 converted/sub1\n" | |||
|
2557 | " $ hg convert orig/sub2 converted/sub2\n" | |||
|
2558 | " $ hg convert orig converted" | |||
|
2559 | ||||
2511 | msgid " The following options are supported:" |
|
2560 | msgid " The following options are supported:" | |
2512 | msgstr " As seguintes opções são suportadas:" |
|
2561 | msgstr " As seguintes opções são suportadas:" | |
2513 |
|
2562 | |||
@@ -2527,11 +2576,36 b' msgstr ""' | |||||
2527 |
|
2576 | |||
2528 | msgid "" |
|
2577 | msgid "" | |
2529 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" |
|
2578 | " :convert.hg.usebranchnames: preserve branch names. The default is\n" | |
2530 |
" True. |
|
2579 | " True." | |
2531 | " " |
|
|||
2532 | msgstr "" |
|
2580 | msgstr "" | |
2533 | " :convert.hg.usebranchnames: preserva nomes de ramo. O valor\n" |
|
2581 | " :convert.hg.usebranchnames: preserva nomes de ramo. O valor\n" | |
2534 |
" padrão é True. |
|
2582 | " padrão é True." | |
|
2583 | ||||
|
2584 | msgid "" | |||
|
2585 | " :convert.hg.sourcename: records the given string as a 'convert_source' extra\n" | |||
|
2586 | " value on each commit made in the target repository. The default is None." | |||
|
2587 | msgstr "" | |||
|
2588 | " :convert.hg.sourcename: grava a string pedida em um valor extra\n" | |||
|
2589 | " 'convert_source' em cada revisão criada no repositório de\n" | |||
|
2590 | " destino. O padrão é None." | |||
|
2591 | ||||
|
2592 | msgid "" | |||
|
2593 | " All Destinations\n" | |||
|
2594 | " ################" | |||
|
2595 | msgstr "" | |||
|
2596 | " Todos os Destinos\n" | |||
|
2597 | " #################" | |||
|
2598 | ||||
|
2599 | msgid " All destination types accept the following options:" | |||
|
2600 | msgstr " Todos os tipos de destino aceitam as seguintes opções:" | |||
|
2601 | ||||
|
2602 | msgid "" | |||
|
2603 | " :convert.skiptags: does not convert tags from the source repo to the target\n" | |||
|
2604 | " repo. The default is False.\n" | |||
|
2605 | " " | |||
|
2606 | msgstr "" | |||
|
2607 | " :convert.skiptags: não converte etiquetas da origem para o repositório\n" | |||
|
2608 | " de destino. O padrão é False.\n" | |||
2535 | " " |
|
2609 | " " | |
2536 |
|
2610 | |||
2537 | msgid "only return changes on specified branches" |
|
2611 | msgid "only return changes on specified branches" | |
@@ -2758,6 +2832,9 b' msgstr "--closesort n\xc3\xa3o \xc3\xa9 suportado para esta origem de dados"' | |||||
2758 | msgid "%s does not look like a CVS checkout" |
|
2832 | msgid "%s does not look like a CVS checkout" | |
2759 | msgstr "%s não parece ser uma cópia de trabalho do CVS" |
|
2833 | msgstr "%s não parece ser uma cópia de trabalho do CVS" | |
2760 |
|
2834 | |||
|
2835 | msgid "cvs source does not support specifying multiple revs" | |||
|
2836 | msgstr "a origem cvs não suporta a especificação de múltiplas revisões" | |||
|
2837 | ||||
2761 | #, python-format |
|
2838 | #, python-format | |
2762 | msgid "revision %s is not a patchset number" |
|
2839 | msgid "revision %s is not a patchset number" | |
2763 | msgstr "revisão %s não é um número de patchset" |
|
2840 | msgstr "revisão %s não é um número de patchset" | |
@@ -2925,6 +3002,10 b' msgid "cannot retrieve git heads"' | |||||
2925 | msgstr "não é possível recuperar cabeças do git" |
|
3002 | msgstr "não é possível recuperar cabeças do git" | |
2926 |
|
3003 | |||
2927 | #, python-format |
|
3004 | #, python-format | |
|
3005 | msgid "cannot retrieve git head \"%s\"" | |||
|
3006 | msgstr "não é possível recuperar a cabeça do git \"%s\"" | |||
|
3007 | ||||
|
3008 | #, python-format | |||
2928 | msgid "cannot read %r object at %s" |
|
3009 | msgid "cannot read %r object at %s" | |
2929 | msgstr "não é possível ler objeto %r em %s" |
|
3010 | msgstr "não é possível ler objeto %r em %s" | |
2930 |
|
3011 | |||
@@ -2933,8 +3014,12 b' msgid "cannot read %r object at %s: unex' | |||||
2933 | msgstr "não é possível ler objeto %r em %s: tamanho inesperado" |
|
3014 | msgstr "não é possível ler objeto %r em %s: tamanho inesperado" | |
2934 |
|
3015 | |||
2935 | #, python-format |
|
3016 | #, python-format | |
2936 | msgid "cannot read submodules config file in %s" |
|
3017 | msgid "warning: cannot read submodules config file in %s\n" | |
2937 | msgstr "não é possível ler arquivo de configuração de submódulos em %s" |
|
3018 | msgstr "aviso: não é possível ler arquivo de configuração de submódulos em %s\n" | |
|
3019 | ||||
|
3020 | #, python-format | |||
|
3021 | msgid "warning: unable to parse .gitmodules in %s\n" | |||
|
3022 | msgstr "aviso: incapaz de decodificar .gitmodules em %s\n" | |||
2938 |
|
3023 | |||
2939 | msgid "convert from git do not support --full" |
|
3024 | msgid "convert from git do not support --full" | |
2940 | msgstr "a conversão a partir do git não suporta --full" |
|
3025 | msgstr "a conversão a partir do git não suporta --full" | |
@@ -2988,6 +3073,14 b' msgstr "n\xc3\xa3o foi poss\xc3\xadvel criar reposit\xc3\xb3rio hg %s como destino"' | |||||
2988 | msgid "pulling from %s into %s\n" |
|
3073 | msgid "pulling from %s into %s\n" | |
2989 | msgstr "trazendo de %s para %s\n" |
|
3074 | msgstr "trazendo de %s para %s\n" | |
2990 |
|
3075 | |||
|
3076 | #, python-format | |||
|
3077 | msgid "no \".hgsubstate\" updates will be made for \"%s\"\n" | |||
|
3078 | msgstr "nenhuma atualização de \".hgsubstate\" será feita para \"%s\"\n" | |||
|
3079 | ||||
|
3080 | #, python-format | |||
|
3081 | msgid "%s is missing from %s/.hg/shamap\n" | |||
|
3082 | msgstr "%s está faltando em %s/.hg/shamap\n" | |||
|
3083 | ||||
2991 | msgid "filtering out empty revision\n" |
|
3084 | msgid "filtering out empty revision\n" | |
2992 | msgstr "filtrando revisão vazia\n" |
|
3085 | msgstr "filtrando revisão vazia\n" | |
2993 |
|
3086 | |||
@@ -3005,6 +3098,9 b' msgstr ""' | |||||
3005 | "revisão %s não encontrada no repositório de destino (buscas com " |
|
3098 | "revisão %s não encontrada no repositório de destino (buscas com " | |
3006 | "clonebranches=true não foram implementadas)" |
|
3099 | "clonebranches=true não foram implementadas)" | |
3007 |
|
3100 | |||
|
3101 | msgid "mercurial source does not support specifying multiple revisions" | |||
|
3102 | msgstr "a origem mercurial não suporta a especificação de múltiplas revisões" | |||
|
3103 | ||||
3008 | #, python-format |
|
3104 | #, python-format | |
3009 | msgid "%s is not a valid start revision" |
|
3105 | msgid "%s is not a valid start revision" | |
3010 | msgstr "%s não é uma revisão inicial válida" |
|
3106 | msgstr "%s não é uma revisão inicial válida" | |
@@ -3016,6 +3112,9 b' msgstr "hg.revs n\xc3\xa3o pode ser combinado com hg.startrev ou --rev"' | |||||
3016 | msgid "ignoring: %s\n" |
|
3112 | msgid "ignoring: %s\n" | |
3017 | msgstr "ignorando: %s\n" |
|
3113 | msgstr "ignorando: %s\n" | |
3018 |
|
3114 | |||
|
3115 | msgid "monotone source does not support specifying multiple revs" | |||
|
3116 | msgstr "a origem monotone não suporta a especificação de múltiplas revisões" | |||
|
3117 | ||||
3019 | #, python-format |
|
3118 | #, python-format | |
3020 | msgid "%s does not look like a monotone repository" |
|
3119 | msgid "%s does not look like a monotone repository" | |
3021 | msgstr "%s não parece ser um repositório do Monotone" |
|
3120 | msgstr "%s não parece ser um repositório do Monotone" | |
@@ -3066,12 +3165,19 b' msgstr "fim de cabe\xc3\xa7alhos stdio do mtn automate n\xc3\xa3o atingido"' | |||||
3066 | msgid "%s does not look like a P4 repository" |
|
3165 | msgid "%s does not look like a P4 repository" | |
3067 | msgstr "%s não parece ser um repositório do P4" |
|
3166 | msgstr "%s não parece ser um repositório do P4" | |
3068 |
|
3167 | |||
|
3168 | msgid "p4 source does not support specifying multiple revisions" | |||
|
3169 | msgstr "a origem p4 não suporta a especificação de múltiplas revisões" | |||
|
3170 | ||||
3069 | msgid "reading p4 views\n" |
|
3171 | msgid "reading p4 views\n" | |
3070 | msgstr "lendo 'p4 views'\n" |
|
3172 | msgstr "lendo 'p4 views'\n" | |
3071 |
|
3173 | |||
3072 | msgid "collecting p4 changelists\n" |
|
3174 | msgid "collecting p4 changelists\n" | |
3073 | msgstr "coletando changelists do p4\n" |
|
3175 | msgstr "coletando changelists do p4\n" | |
3074 |
|
3176 | |||
|
3177 | #, python-format | |||
|
3178 | msgid "cannot find source for copied file: %s@%s\n" | |||
|
3179 | msgstr "não é possível localizar a origem do arquivo copiado: %s@%s\n" | |||
|
3180 | ||||
3075 | msgid "convert from p4 do not support --full" |
|
3181 | msgid "convert from p4 do not support --full" | |
3076 | msgstr "a conversão a partir do p4 não suporta --full" |
|
3182 | msgstr "a conversão a partir do p4 não suporta --full" | |
3077 |
|
3183 | |||
@@ -3118,6 +3224,9 b' msgid "%s does not look like a Subversio' | |||||
3118 | msgstr "" |
|
3224 | msgstr "" | |
3119 | "%s não parece ser um repositório do Subversion para a libsvn versão %s" |
|
3225 | "%s não parece ser um repositório do Subversion para a libsvn versão %s" | |
3120 |
|
3226 | |||
|
3227 | msgid "subversion source does not support specifying multiple revisions" | |||
|
3228 | msgstr "a origem subversion não suporta a especificação de múltiplas revisões" | |||
|
3229 | ||||
3121 | #, python-format |
|
3230 | #, python-format | |
3122 | msgid "svn: revision %s is not an integer" |
|
3231 | msgid "svn: revision %s is not an integer" | |
3123 | msgstr "svn: revisão %s não é um inteiro" |
|
3232 | msgstr "svn: revisão %s não é um inteiro" | |
@@ -3877,6 +3986,14 b' msgstr ""' | |||||
3877 | " nenhuma revisão." |
|
3986 | " nenhuma revisão." | |
3878 |
|
3987 | |||
3879 | msgid "" |
|
3988 | msgid "" | |
|
3989 | " The ``gpg.cmd`` config setting can be used to specify the command\n" | |||
|
3990 | " to run. A default key can be specified with ``gpg.key``." | |||
|
3991 | msgstr "" | |||
|
3992 | " A opção de configuração ``gpg.cmd`` pode ser usada para especificar\n" | |||
|
3993 | " o comando a ser executado. Uma chave padrão pode ser especificada em\n" | |||
|
3994 | " ``gpg.key``." | |||
|
3995 | ||||
|
3996 | msgid "" | |||
3880 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" |
|
3997 | " See :hg:`help dates` for a list of formats valid for -d/--date.\n" | |
3881 | " " |
|
3998 | " " | |
3882 | msgstr "" |
|
3999 | msgstr "" | |
@@ -4114,10 +4231,10 b' msgstr ""' | |||||
4114 |
|
4231 | |||
4115 | msgid "" |
|
4232 | msgid "" | |
4116 | " [hgk]\n" |
|
4233 | " [hgk]\n" | |
4117 | " path=/location/of/hgk" |
|
4234 | " path = /location/of/hgk" | |
4118 | msgstr "" |
|
4235 | msgstr "" | |
4119 | " [hgk]\n" |
|
4236 | " [hgk]\n" | |
4120 | " path=/localização/do/hgk" |
|
4237 | " path = /localização/do/hgk" | |
4121 |
|
4238 | |||
4122 | msgid "" |
|
4239 | msgid "" | |
4123 | "hgk can make use of the extdiff extension to visualize revisions.\n" |
|
4240 | "hgk can make use of the extdiff extension to visualize revisions.\n" | |
@@ -4565,6 +4682,10 b' msgstr "Conserte a mudan\xc3\xa7a e execute hg histedit --continue"' | |||||
4565 | msgid "%s: empty changeset\n" |
|
4682 | msgid "%s: empty changeset\n" | |
4566 | msgstr "%s: revisão vazia\n" |
|
4683 | msgstr "%s: revisão vazia\n" | |
4567 |
|
4684 | |||
|
4685 | #, python-format | |||
|
4686 | msgid "cannot fold into public change %s" | |||
|
4687 | msgstr "não é possível combinar com a revisão pública %s" | |||
|
4688 | ||||
4568 | msgid "" |
|
4689 | msgid "" | |
4569 | "Make changes as needed, you may commit or record as needed now.\n" |
|
4690 | "Make changes as needed, you may commit or record as needed now.\n" | |
4570 | "When you are finished, run hg histedit --continue to resume." |
|
4691 | "When you are finished, run hg histedit --continue to resume." | |
@@ -4715,8 +4836,11 b' msgid "cannot edit history that contains' | |||||
4715 | msgstr "não é possível editar histórico que contenha mesclagens" |
|
4836 | msgstr "não é possível editar histórico que contenha mesclagens" | |
4716 |
|
4837 | |||
4717 | #, python-format |
|
4838 | #, python-format | |
4718 |
msgid "cannot edit |
|
4839 | msgid "cannot edit public changeset: %s" | |
4719 |
msgstr "não é possível editar uma revisão |
|
4840 | msgstr "não é possível editar uma revisão pública: %s" | |
|
4841 | ||||
|
4842 | msgid "see \"hg help phases\" for details" | |||
|
4843 | msgstr "veja \"hg help phases\" para mais detalhes" | |||
4720 |
|
4844 | |||
4721 | #, python-format |
|
4845 | #, python-format | |
4722 | msgid "malformed line \"%s\"" |
|
4846 | msgid "malformed line \"%s\"" | |
@@ -5455,8 +5579,11 b' msgid "converting revisions"' | |||||
5455 | msgstr "convertendo revisões" |
|
5579 | msgstr "convertendo revisões" | |
5456 |
|
5580 | |||
5457 | #, python-format |
|
5581 | #, python-format | |
5458 |
msgid "missing largefile '%s' |
|
5582 | msgid "missing largefile for '%s' in %s" | |
5459 |
msgstr "largefile |
|
5583 | msgstr "largefile para '%s' faltando em %s" | |
|
5584 | ||||
|
5585 | msgid "all largefiles must be present locally" | |||
|
5586 | msgstr "todos os largefiles devem estar presentes localmente" | |||
5460 |
|
5587 | |||
5461 | #, python-format |
|
5588 | #, python-format | |
5462 | msgid "renamed/copied largefile %s becomes symlink" |
|
5589 | msgid "renamed/copied largefile %s becomes symlink" | |
@@ -6064,8 +6191,8 b' msgid "patch name cannot begin with \\"%s' | |||||
6064 | msgstr "o nome do patch não pode começar com \"%s\"" |
|
6191 | msgstr "o nome do patch não pode começar com \"%s\"" | |
6065 |
|
6192 | |||
6066 | #, python-format |
|
6193 | #, python-format | |
6067 |
msgid " |
|
6194 | msgid "%r cannot be used in the name of a patch" | |
6068 |
msgstr " |
|
6195 | msgstr "%r não pode ser usado em um nome de patch" | |
6069 |
|
6196 | |||
6070 | #, python-format |
|
6197 | #, python-format | |
6071 | msgid "\"%s\" already exists as a directory" |
|
6198 | msgid "\"%s\" already exists as a directory" | |
@@ -6181,11 +6308,8 b' msgid "popping would remove a revision n' | |||||
6181 | msgstr "" |
|
6308 | msgstr "" | |
6182 | "desempilhar removeria uma revisão não gerenciada por esta fila de patches" |
|
6309 | "desempilhar removeria uma revisão não gerenciada por esta fila de patches" | |
6183 |
|
6310 | |||
6184 |
msgid "popping would remove a |
|
6311 | msgid "popping would remove a public revision" | |
6185 |
msgstr " |
|
6312 | msgstr "desempilhar removeria uma revisão pública" | |
6186 |
|
||||
6187 | msgid "see \"hg help phases\" for details" |
|
|||
6188 | msgstr "veja \"hg help phases\" para mais detalhes" |
|
|||
6189 |
|
6313 | |||
6190 | msgid "deletions found between repo revs" |
|
6314 | msgid "deletions found between repo revs" | |
6191 | msgstr "remoções encontradas entre revisões do repositório" |
|
6315 | msgstr "remoções encontradas entre revisões do repositório" | |
@@ -6200,8 +6324,8 b' msgstr "a fila de patches agora est\xc3\xa1 vazia\\n"' | |||||
6200 | msgid "cannot refresh a revision with children" |
|
6324 | msgid "cannot refresh a revision with children" | |
6201 | msgstr "não se pode renovar uma revisão com filhos" |
|
6325 | msgstr "não se pode renovar uma revisão com filhos" | |
6202 |
|
6326 | |||
6203 |
msgid "cannot refresh |
|
6327 | msgid "cannot refresh public revision" | |
6204 |
msgstr "não se pode renovar uma revisão |
|
6328 | msgstr "não se pode renovar uma revisão pública" | |
6205 |
|
6329 | |||
6206 | msgid "" |
|
6330 | msgid "" | |
6207 | "refresh interrupted while patch was popped! (revert --all, qpush to " |
|
6331 | "refresh interrupted while patch was popped! (revert --all, qpush to " | |
@@ -8206,102 +8330,16 b' msgstr "enviando"' | |||||
8206 | msgid "writing" |
|
8330 | msgid "writing" | |
8207 | msgstr "escrevendo" |
|
8331 | msgstr "escrevendo" | |
8208 |
|
8332 | |||
8209 | msgid "show progress bars for some actions" |
|
8333 | msgid "show progress bars for some actions (DEPRECATED)" | |
8210 | msgstr "mostra barras de progresso para algumas ações" |
|
8334 | msgstr "mostra barras de progresso para algumas ações (OBSOLETA)" | |
8211 |
|
8335 | |||
8212 | msgid "" |
|
8336 | msgid "" | |
8213 | "This extension uses the progress information logged by hg commands\n" |
|
8337 | "This extension has been merged into core, you can remove it from your config.\n" | |
8214 | "to draw progress bars that are as informative as possible. Some progress\n" |
|
8338 | "See hg help config.progress for configuration options.\n" | |
8215 | "bars only offer indeterminate information, while others have a definite\n" |
|
8339 | msgstr "" | |
8216 | "end point." |
|
8340 | "Esta extensão foi integrada ao Mercurial, você pode removê-la de sua\n" | |
8217 | msgstr "" |
|
8341 | "configuração.\n" | |
8218 | "Esta extensão usa a informação de progresso fornecida por comandos do\n" |
|
8342 | "Veja hg help config.progress para opções de configuração.\n" | |
8219 | "Mercurial para desenhar barras de progresso que sejam tão informativas\n" |
|
|||
8220 | "quanto possível. Algumas barras de progresso fornecem apenas informação\n" |
|
|||
8221 | "indeterminada, enquanto outras possuem um ponto de encerramento definido." |
|
|||
8222 |
|
||||
8223 | msgid "The following settings are available::" |
|
|||
8224 | msgstr "As seguintes opções estão disponíveis::" |
|
|||
8225 |
|
||||
8226 | msgid "" |
|
|||
8227 | " [progress]\n" |
|
|||
8228 | " delay = 3 # number of seconds (float) before showing the progress bar\n" |
|
|||
8229 | " changedelay = 1 # changedelay: minimum delay before showing a new topic.\n" |
|
|||
8230 | " # If set to less than 3 * refresh, that value will\n" |
|
|||
8231 | " # be used instead.\n" |
|
|||
8232 | " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" |
|
|||
8233 | " format = topic bar number estimate # format of the progress bar\n" |
|
|||
8234 | " width = <none> # if set, the maximum width of the progress information\n" |
|
|||
8235 | " # (that is, min(width, term width) will be used)\n" |
|
|||
8236 | " clear-complete = True # clear the progress bar after it's done\n" |
|
|||
8237 | " disable = False # if true, don't show a progress bar\n" |
|
|||
8238 | " assume-tty = False # if true, ALWAYS show a progress bar, unless\n" |
|
|||
8239 | " # disable is given" |
|
|||
8240 | msgstr "" |
|
|||
8241 | " [progress]\n" |
|
|||
8242 | " delay = 3 # número de segundos (float) antes que a barra seja mostrada\n" |
|
|||
8243 | " changedelay = 1 # changedelay: atraso mínimo antes que um novo tópico\n" |
|
|||
8244 | " # seja mostrado. Se for definido para menos de\n" |
|
|||
8245 | " # 3 * refresh, tal valor será usado em seu lugar.\n" |
|
|||
8246 | " refresh = 0.1 # tempo em segundos entre atualizações da\n" |
|
|||
8247 | " # barra de progresso\n" |
|
|||
8248 | " format = topic bar number estimate # formato da barra de progresso\n" |
|
|||
8249 | " width = <none> # se definido, será a largura máxima da informação de\n" |
|
|||
8250 | " # progresso (isto é, min(largura, largura do terminal)\n" |
|
|||
8251 | " # será usada)\n" |
|
|||
8252 | " clear-complete = True # limpa a barra de progresso após terminar\n" |
|
|||
8253 | " disable = False # se 'true', não exibe uma barra de progresso\n" |
|
|||
8254 | " assume-tty = False # se 'true', SEMPRE exibe uma barra de progressos,\n" |
|
|||
8255 | " # a não ser que 'disable' seja 'true'" |
|
|||
8256 |
|
||||
8257 | msgid "" |
|
|||
8258 | "Valid entries for the format field are topic, bar, number, unit,\n" |
|
|||
8259 | "estimate, speed, and item. item defaults to the last 20 characters of\n" |
|
|||
8260 | "the item, but this can be changed by adding either ``-<num>`` which\n" |
|
|||
8261 | "would take the last num characters, or ``+<num>`` for the first num\n" |
|
|||
8262 | "characters.\n" |
|
|||
8263 | msgstr "" |
|
|||
8264 | "Entradas válidas para o campo format são topic (tópico), bar (barra),\n" |
|
|||
8265 | "number (número), unit (unidade), estimate (estimativa), speed (velocidade)\n" |
|
|||
8266 | "e item (item).\n" |
|
|||
8267 | "item por padrão são os\n" |
|
|||
8268 | "últimos caracteres do item, mas isto pode ser modificado adicionando ou\n" |
|
|||
8269 | "``-<num>``, que consideraria os últimos num caracteres, ou ``+<num>``\n" |
|
|||
8270 | "para os primeiros num caracteres.\n" |
|
|||
8271 |
|
||||
8272 | #. i18n: format XX seconds as "XXs" |
|
|||
8273 | #, python-format |
|
|||
8274 | msgid "%02ds" |
|
|||
8275 | msgstr "%02ds" |
|
|||
8276 |
|
||||
8277 | #. i18n: format X minutes and YY seconds as "XmYYs" |
|
|||
8278 | #, python-format |
|
|||
8279 | msgid "%dm%02ds" |
|
|||
8280 | msgstr "%dm%02ds" |
|
|||
8281 |
|
||||
8282 | #. i18n: format X hours and YY minutes as "XhYYm" |
|
|||
8283 | #, python-format |
|
|||
8284 | msgid "%dh%02dm" |
|
|||
8285 | msgstr "%dh%02dm" |
|
|||
8286 |
|
||||
8287 | #. i18n: format X days and YY hours as "XdYYh" |
|
|||
8288 | #, python-format |
|
|||
8289 | msgid "%dd%02dh" |
|
|||
8290 | msgstr "%dd%02dh" |
|
|||
8291 |
|
||||
8292 | #. i18n: format X weeks and YY days as "XwYYd" |
|
|||
8293 | #, python-format |
|
|||
8294 | msgid "%dw%02dd" |
|
|||
8295 | msgstr "%dw%02dd" |
|
|||
8296 |
|
||||
8297 | #. i18n: format X years and YY weeks as "XyYYw" |
|
|||
8298 | #, python-format |
|
|||
8299 | msgid "%dy%02dw" |
|
|||
8300 | msgstr "%dy%02dw" |
|
|||
8301 |
|
||||
8302 | #, python-format |
|
|||
8303 | msgid "%d %s/sec" |
|
|||
8304 | msgstr "%d %s/seg" |
|
|||
8305 |
|
8343 | |||
8306 | msgid "command to delete untracked files from the working directory" |
|
8344 | msgid "command to delete untracked files from the working directory" | |
8307 | msgstr "comando para apagar do diretório de trabalho arquivos não rastreados" |
|
8345 | msgstr "comando para apagar do diretório de trabalho arquivos não rastreados" | |
@@ -8739,8 +8777,8 b' msgid "nothing to rebase\\n"' | |||||
8739 | msgstr "nada para rebasear\n" |
|
8777 | msgstr "nada para rebasear\n" | |
8740 |
|
8778 | |||
8741 | #, python-format |
|
8779 | #, python-format | |
8742 |
msgid "can't rebase |
|
8780 | msgid "can't rebase public changeset %s" | |
8743 |
msgstr "não é possível rebasear a revisão |
|
8781 | msgstr "não é possível rebasear a revisão pública %s" | |
8744 |
|
8782 | |||
8745 | #, python-format |
|
8783 | #, python-format | |
8746 | msgid "reopening closed branch head %s\n" |
|
8784 | msgid "reopening closed branch head %s\n" | |
@@ -8809,8 +8847,8 b' msgid "no rebase in progress"' | |||||
8809 | msgstr "nenhum rebaseamento em andamento" |
|
8847 | msgstr "nenhum rebaseamento em andamento" | |
8810 |
|
8848 | |||
8811 | #, python-format |
|
8849 | #, python-format | |
8812 |
msgid "warning: can't clean up |
|
8850 | msgid "warning: can't clean up public changesets %s\n" | |
8813 |
msgstr "aviso: não é possível limpar as revisões |
|
8851 | msgstr "aviso: não é possível limpar as revisões públicas %s\n" | |
8814 |
|
8852 | |||
8815 | msgid "warning: new changesets detected on target branch, can't strip\n" |
|
8853 | msgid "warning: new changesets detected on target branch, can't strip\n" | |
8816 | msgstr "" |
|
8854 | msgstr "" | |
@@ -8925,6 +8963,10 b' msgid " This command is not available' | |||||
8925 | msgstr "" |
|
8963 | msgstr "" | |
8926 | " Este comando não está disponível para a consolidação de uma mesclagem." |
|
8964 | " Este comando não está disponível para a consolidação de uma mesclagem." | |
8927 |
|
8965 | |||
|
8966 | #, python-format | |||
|
8967 | msgid "running non-interactively, use %s instead" | |||
|
8968 | msgstr "não está executando interativamente, use %s" | |||
|
8969 | ||||
8928 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." |
|
8970 | msgid "hg qrecord [OPTION]... PATCH [FILE]..." | |
8929 | msgstr "hg qrecord [OPÇÃO]... PATCH [ARQUIVO]..." |
|
8971 | msgstr "hg qrecord [OPÇÃO]... PATCH [ARQUIVO]..." | |
8930 |
|
8972 | |||
@@ -9135,6 +9177,78 b' msgstr "esquema personalizado %s:// conf' | |||||
9135 | msgid "share a common history between several working directories" |
|
9177 | msgid "share a common history between several working directories" | |
9136 | msgstr "compartilha histórico comum entre vários diretórios de trabalho" |
|
9178 | msgstr "compartilha histórico comum entre vários diretórios de trabalho" | |
9137 |
|
9179 | |||
|
9180 | msgid "" | |||
|
9181 | "Automatic Pooled Storage for Clones\n" | |||
|
9182 | "-----------------------------------" | |||
|
9183 | msgstr "" | |||
|
9184 | "Armazenamento Compartilhado Automático para Clones\n" | |||
|
9185 | "--------------------------------------------------" | |||
|
9186 | ||||
|
9187 | msgid "" | |||
|
9188 | "When this extension is active, :hg:`clone` can be configured to\n" | |||
|
9189 | "automatically share/pool storage across multiple clones. This\n" | |||
|
9190 | "mode effectively converts :hg:`clone` to :hg:`clone` + :hg:`share`.\n" | |||
|
9191 | "The benefit of using this mode is the automatic management of\n" | |||
|
9192 | "store paths and intelligent pooling of related repositories." | |||
|
9193 | msgstr "" | |||
|
9194 | "Ao ativar esta extensão, :hg:`clone` pode ser configurado\n" | |||
|
9195 | "para compartilhar armazenamento entre múltiplos clones.\n" | |||
|
9196 | "Este modo efetivamente converte :hg:`clone` em :hg:`clone`\n" | |||
|
9197 | "+ :hg:`share`.\n" | |||
|
9198 | "Os benefícios do uso desse modo são o gerenciamento automático\n" | |||
|
9199 | "de caminhos de armazenamento e o agrupamento inteligente de\n" | |||
|
9200 | "repositórios relacionados." | |||
|
9201 | ||||
|
9202 | msgid "The following ``share.`` config options influence this feature:" | |||
|
9203 | msgstr "" | |||
|
9204 | "As seguintes opções de configuração ``share.`` influenciam essa " | |||
|
9205 | "funcionalidade:" | |||
|
9206 | ||||
|
9207 | msgid "" | |||
|
9208 | "``share.pool``\n" | |||
|
9209 | " Filesystem path where shared repository data will be stored. When\n" | |||
|
9210 | " defined, :hg:`clone` will automatically use shared repository\n" | |||
|
9211 | " storage instead of creating a store inside each clone." | |||
|
9212 | msgstr "" | |||
|
9213 | "``share.pool``\n" | |||
|
9214 | " Caminho do sistema de arquivos onde dados compartilhados dos\n" | |||
|
9215 | " repositórios serão armazenados. Se definido, :hg:`clone`\n" | |||
|
9216 | " automaticamente usará repositórios compartilhados ao invés\n" | |||
|
9217 | " de manter armazenamento separado dentro de cada clone." | |||
|
9218 | ||||
|
9219 | msgid "" | |||
|
9220 | "``share.poolnaming``\n" | |||
|
9221 | " How directory names in ``share.pool`` are constructed." | |||
|
9222 | msgstr "" | |||
|
9223 | "``share.poolnaming``\n" | |||
|
9224 | " Como nomes de diretório em ``share.pool`` são construídos." | |||
|
9225 | ||||
|
9226 | msgid "" | |||
|
9227 | " \"identity\" means the name is derived from the first changeset in the\n" | |||
|
9228 | " repository. In this mode, different remotes share storage if their\n" | |||
|
9229 | " root/initial changeset is identical. In this mode, the local shared\n" | |||
|
9230 | " repository is an aggregate of all encountered remote repositories." | |||
|
9231 | msgstr "" | |||
|
9232 | " \"identity\" gera o nome a partir da primeira revisão do repositório.\n" | |||
|
9233 | " Neste modo, diferentes repositórios remotos compartilharão o\n" | |||
|
9234 | " armazenamento se suas revisões iniciais forem idênticas. O\n" | |||
|
9235 | " repositório local compartilhado será um agregado de todos os\n" | |||
|
9236 | " repositórios remotos encontrados." | |||
|
9237 | ||||
|
9238 | msgid "" | |||
|
9239 | " \"remote\" means the name is derived from the source repository's\n" | |||
|
9240 | " path or URL. In this mode, storage is only shared if the path or URL\n" | |||
|
9241 | " requested in the :hg:`clone` command matches exactly to a repository\n" | |||
|
9242 | " that was cloned before." | |||
|
9243 | msgstr "" | |||
|
9244 | " \"remote\" gera o nome a partir da URL ou caminho do repositório de\n" | |||
|
9245 | " origem. Neste modo, o armazenamento será compartilhado apenas se o\n" | |||
|
9246 | " caminho ou URL pedida em :hg:`clone` for idêntico a um repositório\n" | |||
|
9247 | " que tenha sido clonado anteriormente." | |||
|
9248 | ||||
|
9249 | msgid " The default naming mode is \"identity.\"\n" | |||
|
9250 | msgstr " O modo de nomeação padrão é \"identity\".\n" | |||
|
9251 | ||||
9138 | msgid "do not create a working directory" |
|
9252 | msgid "do not create a working directory" | |
9139 | msgstr "não cria um diretório de trabalho" |
|
9253 | msgstr "não cria um diretório de trabalho" | |
9140 |
|
9254 | |||
@@ -9265,6 +9379,14 b' msgstr "engavetada como %s\\n"' | |||||
9265 | msgid "no shelved changes specified!" |
|
9379 | msgid "no shelved changes specified!" | |
9266 | msgstr "nenhuma mudança engavetada foi especificada!" |
|
9380 | msgstr "nenhuma mudança engavetada foi especificada!" | |
9267 |
|
9381 | |||
|
9382 | #, python-format | |||
|
9383 | msgid "--%s expects a single shelf" | |||
|
9384 | msgstr "--%s espera uma única \"gaveta\"" | |||
|
9385 | ||||
|
9386 | #, python-format | |||
|
9387 | msgid "cannot find shelf %s" | |||
|
9388 | msgstr "não é possível localizar \"gaveta\" %s" | |||
|
9389 | ||||
9268 | msgid "working directory parents do not match unshelve state" |
|
9390 | msgid "working directory parents do not match unshelve state" | |
9269 | msgstr "" |
|
9391 | msgstr "" | |
9270 | "os pais do diretório de trabalho não combinam com o estado do unshelve" |
|
9392 | "os pais do diretório de trabalho não combinam com o estado do unshelve" | |
@@ -9311,10 +9433,12 b' msgstr ""' | |||||
9311 |
|
9433 | |||
9312 | msgid "" |
|
9434 | msgid "" | |
9313 | " If a shelved change is applied successfully, the bundle that\n" |
|
9435 | " If a shelved change is applied successfully, the bundle that\n" | |
9314 |
" contains the shelved changes is |
|
9436 | " contains the shelved changes is moved to a backup location\n" | |
|
9437 | " (.hg/shelve-backup)." | |||
9315 | msgstr "" |
|
9438 | msgstr "" | |
9316 | " Se uma mudança engavetada for restaurada com sucesso, o arquivo\n" |
|
9439 | " Se uma mudança engavetada for restaurada com sucesso, o arquivo\n" | |
9317 |
" bundle que contém essa mudança será |
|
9440 | " bundle que contém essa mudança será movido para uma cópia de\n" | |
|
9441 | " segurança (.hg/shelve-backup)." | |||
9318 |
|
9442 | |||
9319 | msgid "" |
|
9443 | msgid "" | |
9320 | " Since you can restore a shelved change on top of an arbitrary\n" |
|
9444 | " Since you can restore a shelved change on top of an arbitrary\n" | |
@@ -9322,25 +9446,48 b' msgid ""' | |||||
9322 | " between your changes and the commits you are unshelving onto. If\n" |
|
9446 | " between your changes and the commits you are unshelving onto. If\n" | |
9323 | " this occurs, you must resolve the conflict, then use\n" |
|
9447 | " this occurs, you must resolve the conflict, then use\n" | |
9324 | " ``--continue`` to complete the unshelve operation. (The bundle\n" |
|
9448 | " ``--continue`` to complete the unshelve operation. (The bundle\n" | |
9325 |
" will not be |
|
9449 | " will not be moved until you successfully complete the unshelve.)" | |
9326 | msgstr "" |
|
9450 | msgstr "" | |
9327 | " Por ser possível restaurar uma mudança engavetada sobre uma\n" |
|
9451 | " Por ser possível restaurar uma mudança engavetada sobre uma\n" | |
9328 | " revisão qualquer, uma operação unshelve pode resultar em um\n" |
|
9452 | " revisão qualquer, uma operação unshelve pode resultar em um\n" | |
9329 | " conflito entre as mudanças restauradas e as revisões de\n" |
|
9453 | " conflito entre as mudanças restauradas e as revisões de\n" | |
9330 | " destino. Se isso ocorrer, você deve resolver os conflitos,\n" |
|
9454 | " destino. Se isso ocorrer, você deve resolver os conflitos,\n" | |
9331 | " e em seguida usar ``--continue`` para completar a operação\n" |
|
9455 | " e em seguida usar ``--continue`` para completar a operação\n" | |
9332 |
" unshelve. (O bundle não será |
|
9456 | " unshelve. (O bundle não será movido até que você complete\n" | |
9333 | " a operação unshelve com sucesso.)" |
|
9457 | " a operação unshelve com sucesso.)" | |
9334 |
|
9458 | |||
9335 | msgid "" |
|
9459 | msgid "" | |
9336 | " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" |
|
9460 | " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" | |
9337 | " that causes a conflict. This reverts the unshelved changes, and\n" |
|
9461 | " that causes a conflict. This reverts the unshelved changes, and\n" | |
9338 |
" |
|
9462 | " leaves the bundle in place.)" | |
9339 | " " |
|
|||
9340 | msgstr "" |
|
9463 | msgstr "" | |
9341 | " (Alternativamente, vocẽ pode usar ``--abort`` para abandonar\n" |
|
9464 | " (Alternativamente, vocẽ pode usar ``--abort`` para abandonar\n" | |
9342 | " uma operação unshelve que causou um conflito. Isto reverte\n" |
|
9465 | " uma operação unshelve que causou um conflito. Isto reverte\n" | |
9343 |
" as mudanças engavetadas sem |
|
9466 | " as mudanças engavetadas sem mover o bundle.)\n" | |
|
9467 | " " | |||
|
9468 | ||||
|
9469 | msgid "" | |||
|
9470 | " After a successful unshelve, the shelved changes are stored in a\n" | |||
|
9471 | " backup directory. Only the N most recent backups are kept. N\n" | |||
|
9472 | " defaults to 10 but can be overridden using the ``shelve.maxbackups``\n" | |||
|
9473 | " configuration option." | |||
|
9474 | msgstr "" | |||
|
9475 | " Após uma operação unshelve realizada com sucesso, as mudanças\n" | |||
|
9476 | " \"engavetadas\" são preservadas em uma cópia de segurança.\n" | |||
|
9477 | " Apenas as últimas N cópias são mantidas.\n" | |||
|
9478 | " O valor padrão de N é 10, e pode ser alterado usando a opção\n" | |||
|
9479 | " de configuração``shelve.maxbackups``." | |||
|
9480 | ||||
|
9481 | msgid "" | |||
|
9482 | " Timestamp in seconds is used to decide order of backups. More\n" | |||
|
9483 | " than ``maxbackups`` backups are kept, if same timestamp\n" | |||
|
9484 | " prevents from deciding exact order of them, for safety.\n" | |||
|
9485 | " " | |||
|
9486 | msgstr "" | |||
|
9487 | " O timestamp dos arquivos em segundos é usado para decidir a\n" | |||
|
9488 | " ordem das cópias de segurança. Por segurança, um número maior\n" | |||
|
9489 | " de cópias do que ``maxbackups`` será preservado, caso um mesmo\n" | |||
|
9490 | " timestamp impedir que a ordem exata seja determinada.\n" | |||
9344 | " " |
|
9491 | " " | |
9345 |
|
9492 | |||
9346 | msgid "cannot combine abort/continue with naming a shelved change" |
|
9493 | msgid "cannot combine abort/continue with naming a shelved change" | |
@@ -9401,8 +9548,8 b' msgstr "usa o nome fornecido para a revis\xc3\xa3o da shelve"' | |||||
9401 | msgid "show patch" |
|
9548 | msgid "show patch" | |
9402 | msgstr "mostra o patch" |
|
9549 | msgstr "mostra o patch" | |
9403 |
|
9550 | |||
9404 |
msgid "interactive mode, only works while creating a shelve |
|
9551 | msgid "interactive mode, only works while creating a shelve" | |
9405 |
msgstr "modo interativo, funciona apenas ao criar uma shelve |
|
9552 | msgstr "modo interativo, funciona apenas ao criar uma shelve" | |
9406 |
|
9553 | |||
9407 | msgid "output diffstat-style summary of changes" |
|
9554 | msgid "output diffstat-style summary of changes" | |
9408 | msgstr "imprime sumário de mudanças no estilo diffstat" |
|
9555 | msgstr "imprime sumário de mudanças no estilo diffstat" | |
@@ -9478,10 +9625,6 b' msgstr "as op\xc3\xa7\xc3\xb5es \'--%s\' e \'--%s\' n\xc3\xa3o podem ser usadas ao mesmo tempo"' | |||||
9478 | msgid "cannot specify names when using '--cleanup'" |
|
9625 | msgid "cannot specify names when using '--cleanup'" | |
9479 | msgstr "não se pode especificar nomes ao usar --cleanup" |
|
9626 | msgstr "não se pode especificar nomes ao usar --cleanup" | |
9480 |
|
9627 | |||
9481 | #, python-format |
|
|||
9482 | msgid "option '--%s' may not be used when shelving a change" |
|
|||
9483 | msgstr "a opção '--%s' não pode ser usada ao engavetar uma mudança" |
|
|||
9484 |
|
||||
9485 | msgid "unshelve already in progress" |
|
9628 | msgid "unshelve already in progress" | |
9486 | msgstr "unshelve já está em andamento" |
|
9629 | msgstr "unshelve já está em andamento" | |
9487 |
|
9630 | |||
@@ -10153,10 +10296,6 b' msgid "malformed line in .hg/bookmarks: ' | |||||
10153 | msgstr "linha malformada em .hg/bookmarks: %r\n" |
|
10296 | msgstr "linha malformada em .hg/bookmarks: %r\n" | |
10154 |
|
10297 | |||
10155 | #, python-format |
|
10298 | #, python-format | |
10156 | msgid "branch %s not found" |
|
|||
10157 | msgstr "ramo %s não encontrado" |
|
|||
10158 |
|
||||
10159 | #, python-format |
|
|||
10160 | msgid "updating to active bookmark %s\n" |
|
10299 | msgid "updating to active bookmark %s\n" | |
10161 | msgstr "atualizando para o marcador ativo %s\n" |
|
10300 | msgstr "atualizando para o marcador ativo %s\n" | |
10162 |
|
10301 | |||
@@ -10165,6 +10304,10 b' msgid "adding remote bookmark %s\\n"' | |||||
10165 | msgstr "adicionando marcador remoto %s\n" |
|
10304 | msgstr "adicionando marcador remoto %s\n" | |
10166 |
|
10305 | |||
10167 | #, python-format |
|
10306 | #, python-format | |
|
10307 | msgid "remote bookmark %s points to locally missing %s\n" | |||
|
10308 | msgstr "o marcador remoto %s aponta para uma revisão %s faltando no local\n" | |||
|
10309 | ||||
|
10310 | #, python-format | |||
10168 | msgid "importing bookmark %s\n" |
|
10311 | msgid "importing bookmark %s\n" | |
10169 | msgstr "importando marcador %s\n" |
|
10312 | msgstr "importando marcador %s\n" | |
10170 |
|
10313 | |||
@@ -10348,9 +10491,8 b' msgstr "nome de usu\xc3\xa1rio %s cont\xc3\xa9m uma quebra de linha"' | |||||
10348 | msgid "the name '%s' is reserved" |
|
10491 | msgid "the name '%s' is reserved" | |
10349 | msgstr "o nome '%s' é reservado" |
|
10492 | msgstr "o nome '%s' é reservado" | |
10350 |
|
10493 | |||
10351 | #, python-format |
|
10494 | msgid "running non-interactively" | |
10352 | msgid "running non-interactively, use %s instead" |
|
10495 | msgstr "executando de forma não interativa" | |
10353 | msgstr "não está executando interativamente, use %s" |
|
|||
10354 |
|
10496 | |||
10355 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" |
|
10497 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |
10356 | msgstr "não é possível consolidar parcialmente uma mesclagem (use \"hg commit\")" |
|
10498 | msgstr "não é possível consolidar parcialmente uma mesclagem (use \"hg commit\")" | |
@@ -10382,13 +10524,20 b' msgstr "especificador inv\xc3\xa1lido de formato \'%%%s\' no nome de arquivo de sa\xc3\xadda"' | |||||
10382 | msgid "cannot specify --changelog and --manifest at the same time" |
|
10524 | msgid "cannot specify --changelog and --manifest at the same time" | |
10383 | msgstr "não é possível especificar simultaneamente --changelog e --manifest" |
|
10525 | msgstr "não é possível especificar simultaneamente --changelog e --manifest" | |
10384 |
|
10526 | |||
|
10527 | msgid "cannot specify --changelog and --dir at the same time" | |||
|
10528 | msgstr "não é possível especificar simultaneamente --changelog e --dir" | |||
|
10529 | ||||
10385 | msgid "cannot specify filename with --changelog or --manifest" |
|
10530 | msgid "cannot specify filename with --changelog or --manifest" | |
10386 | msgstr "" |
|
10531 | msgstr "" | |
10387 | "não é possível especificar um nome de arquivo com --changelog ou --manifest" |
|
10532 | "não é possível especificar um nome de arquivo com --changelog ou --manifest" | |
10388 |
|
10533 | |||
10389 | msgid "cannot specify --changelog or --manifest without a repository" |
|
10534 | msgid "cannot specify --changelog or --manifest or --dir without a repository" | |
10390 | msgstr "" |
|
10535 | msgstr "" | |
10391 |
"não é possível especificar --changelog |
|
10536 | "não é possível especificar --changelog, --manifest ou --dir sem um " | |
|
10537 | "repositório" | |||
|
10538 | ||||
|
10539 | msgid "--dir can only be used on repos with treemanifest enabled" | |||
|
10540 | msgstr "--dir só pode ser usada em repositórios com treemanifest habilitada" | |||
10392 |
|
10541 | |||
10393 | msgid "invalid arguments" |
|
10542 | msgid "invalid arguments" | |
10394 | msgstr "argumentos inválidos" |
|
10543 | msgstr "argumentos inválidos" | |
@@ -10563,13 +10712,6 b' msgid "%s: no key named \'%s\'"' | |||||
10563 | msgstr "%s: nenhuma chave nomeada '%s'" |
|
10712 | msgstr "%s: nenhuma chave nomeada '%s'" | |
10564 |
|
10713 | |||
10565 | #, python-format |
|
10714 | #, python-format | |
10566 | msgid "available styles: %s\n" |
|
|||
10567 | msgstr "estilos disponíveis: %s\n" |
|
|||
10568 |
|
||||
10569 | msgid "specify a template" |
|
|||
10570 | msgstr "especifique um modelo" |
|
|||
10571 |
|
||||
10572 | #, python-format |
|
|||
10573 | msgid "found revision %s from %s\n" |
|
10715 | msgid "found revision %s from %s\n" | |
10574 | msgstr "encontrada revisão %s de %s\n" |
|
10716 | msgstr "encontrada revisão %s de %s\n" | |
10575 |
|
10717 | |||
@@ -10717,6 +10859,14 b' msgstr "o \xc3\xbaltimo update foi interrompido"' | |||||
10717 | msgid "use 'hg update' to get a consistent checkout" |
|
10859 | msgid "use 'hg update' to get a consistent checkout" | |
10718 | msgstr "use 'hg update' para obter uma cópia de trabalho consistente" |
|
10860 | msgstr "use 'hg update' para obter uma cópia de trabalho consistente" | |
10719 |
|
10861 | |||
|
10862 | #, python-format | |||
|
10863 | msgid "can't close already inactivated backup: %s" | |||
|
10864 | msgstr "não é possível fechar um backup já desativado: %s" | |||
|
10865 | ||||
|
10866 | #, python-format | |||
|
10867 | msgid "can't release already inactivated backup: %s" | |||
|
10868 | msgstr "não é possível liberar um backup já desativado: %s" | |||
|
10869 | ||||
10720 | msgid "repository root directory or name of overlay bundle file" |
|
10870 | msgid "repository root directory or name of overlay bundle file" | |
10721 | msgstr "" |
|
10871 | msgstr "" | |
10722 | "diretório raiz do repositório ou nome de arquivo de bundle para sobreposição" |
|
10872 | "diretório raiz do repositório ou nome de arquivo de bundle para sobreposição" | |
@@ -11681,12 +11831,15 b' msgstr ""' | |||||
11681 |
|
11831 | |||
11682 | msgid "" |
|
11832 | msgid "" | |
11683 | " Use the command :hg:`update` to switch to an existing branch. Use\n" |
|
11833 | " Use the command :hg:`update` to switch to an existing branch. Use\n" | |
11684 | " :hg:`commit --close-branch` to mark this branch as closed." |
|
11834 | " :hg:`commit --close-branch` to mark this branch head as closed.\n" | |
|
11835 | " When all heads of the branch are closed, the branch will be\n" | |||
|
11836 | " considered closed." | |||
11685 | msgstr "" |
|
11837 | msgstr "" | |
11686 | " Use o comando :hg:`update` para alternar para um ramo existente.\n" |
|
11838 | " Use o comando :hg:`update` para alternar para um ramo existente.\n" | |
11687 | " Use :hg:`commit --close-branch` para marcar este ramo como\n" |
|
11839 | " Use :hg:`commit --close-branch` para marcar esta cabeça de ramo como\n" | |
11688 |
" fechad |
|
11840 | " fechada.\n" | |
11689 | " " |
|
11841 | " O ramo será considerado fechado se todas as suas cabeças estiverem\n" | |
|
11842 | " fechadas." | |||
11690 |
|
11843 | |||
11691 | #, python-format |
|
11844 | #, python-format | |
11692 | msgid "reset working directory to branch %s\n" |
|
11845 | msgid "reset working directory to branch %s\n" | |
@@ -12092,8 +12245,8 b' msgstr ""' | |||||
12092 | "marca arquivos novos/ausentes como adicionados/removidos antes da " |
|
12245 | "marca arquivos novos/ausentes como adicionados/removidos antes da " | |
12093 | "consolidação" |
|
12246 | "consolidação" | |
12094 |
|
12247 | |||
12095 |
msgid "mark a branch as closed |
|
12248 | msgid "mark a branch head as closed" | |
12096 |
msgstr "marca um ramo como fechad |
|
12249 | msgstr "marca uma cabeça de ramo como fechada" | |
12097 |
|
12250 | |||
12098 | msgid "amend the parent of the working directory" |
|
12251 | msgid "amend the parent of the working directory" | |
12099 | msgstr "emenda o pai do diretório de trabalho" |
|
12252 | msgstr "emenda o pai do diretório de trabalho" | |
@@ -12143,6 +12296,16 b' msgstr ""' | |||||
12143 | " dessa mensagem em ``.hg/last-message.txt``." |
|
12296 | " dessa mensagem em ``.hg/last-message.txt``." | |
12144 |
|
12297 | |||
12145 | msgid "" |
|
12298 | msgid "" | |
|
12299 | " The --close-branch flag can be used to mark the current branch\n" | |||
|
12300 | " head closed. When all heads of a branch are closed, the branch\n" | |||
|
12301 | " will be considered closed and no longer listed." | |||
|
12302 | msgstr "" | |||
|
12303 | " A opção --close-branch pode ser usada para marcar a cabeça de\n" | |||
|
12304 | " ramo atual como fechada.\n" | |||
|
12305 | " Quando todas as cabeças de um ramo estiverem fechadas, o ramo\n" | |||
|
12306 | " será considerado fechado e não será mais listado." | |||
|
12307 | ||||
|
12308 | msgid "" | |||
12146 | " The --amend flag can be used to amend the parent of the\n" |
|
12309 | " The --amend flag can be used to amend the parent of the\n" | |
12147 | " working directory with a new commit that contains the changes\n" |
|
12310 | " working directory with a new commit that contains the changes\n" | |
12148 | " in the parent in addition to those currently reported by :hg:`status`,\n" |
|
12311 | " in the parent in addition to those currently reported by :hg:`status`,\n" | |
@@ -12504,6 +12667,9 b' msgstr "abre o changelog"' | |||||
12504 | msgid "open manifest" |
|
12667 | msgid "open manifest" | |
12505 | msgstr "abre o manifesto" |
|
12668 | msgstr "abre o manifesto" | |
12506 |
|
12669 | |||
|
12670 | msgid "open directory manifest" | |||
|
12671 | msgstr "abre o manifesto do diretório" | |||
|
12672 | ||||
12507 | msgid "-c|-m|FILE REV" |
|
12673 | msgid "-c|-m|FILE REV" | |
12508 | msgstr "-c|-m|ARQUIVO REV" |
|
12674 | msgstr "-c|-m|ARQUIVO REV" | |
12509 |
|
12675 | |||
@@ -12868,6 +13034,9 b' msgstr ""' | |||||
12868 | " de :hg:`status` verifique o conteúdo real dos arquivos.\n" |
|
13034 | " de :hg:`status` verifique o conteúdo real dos arquivos.\n" | |
12869 | " " |
|
13035 | " " | |
12870 |
|
13036 | |||
|
13037 | msgid "rebuild the fncache file" | |||
|
13038 | msgstr "reconstrói o arquivo fncache" | |||
|
13039 | ||||
12871 | msgid "revision to debug" |
|
13040 | msgid "revision to debug" | |
12872 | msgstr "revisão a ser depurada" |
|
13041 | msgstr "revisão a ser depurada" | |
12873 |
|
13042 | |||
@@ -13337,6 +13506,10 b' msgstr ""' | |||||
13337 | " Isto remove arquivos apenas do ramo atual,e não de todo o\n" |
|
13506 | " Isto remove arquivos apenas do ramo atual,e não de todo o\n" | |
13338 | " histórico do projeto, nem os apaga do diretório de trabalho." |
|
13507 | " histórico do projeto, nem os apaga do diretório de trabalho." | |
13339 |
|
13508 | |||
|
13509 | msgid " To delete the file from the working directory, see :hg:`remove`." | |||
|
13510 | msgstr "" | |||
|
13511 | " Para apagar o arquivo do diretório de trabalho, veja :hg:`remove`." | |||
|
13512 | ||||
13340 | msgid " To undo a forget before the next commit, see :hg:`add`." |
|
13513 | msgid " To undo a forget before the next commit, see :hg:`add`." | |
13341 | msgstr "" |
|
13514 | msgstr "" | |
13342 | " Para desfazer um forget antes da próxima consolidação, veja :hg:`add`." |
|
13515 | " Para desfazer um forget antes da próxima consolidação, veja :hg:`add`." | |
@@ -13918,6 +14091,20 b' msgstr ""' | |||||
13918 | " importando apenas os metadados do patch." |
|
14091 | " importando apenas os metadados do patch." | |
13919 |
|
14092 | |||
13920 | msgid "" |
|
14093 | msgid "" | |
|
14094 | " It is possible to use external patch programs to perform the patch\n" | |||
|
14095 | " by setting the ``ui.patch`` configuration option. For the default\n" | |||
|
14096 | " internal tool, the fuzz can also be configured via ``patch.fuzz``.\n" | |||
|
14097 | " See :hg:`help config` for more information about configuration\n" | |||
|
14098 | " files and how to use these options." | |||
|
14099 | msgstr "" | |||
|
14100 | " É possível usar programas externos para aplicar o patch\n" | |||
|
14101 | " definindo a opção de configuração ``ui.patch``. Para a\n" | |||
|
14102 | " ferramenta interna usada por padrão, o nível de fuzz pode\n" | |||
|
14103 | " ser configurado usando a opção ``patch.fuzz``.\n" | |||
|
14104 | " Veja :hg:`help config` para mais informações sobre arquivos\n" | |||
|
14105 | " de configuração e como usar essas opções." | |||
|
14106 | ||||
|
14107 | msgid "" | |||
13921 | " To read a patch from standard input, use \"-\" as the patch name. If\n" |
|
14108 | " To read a patch from standard input, use \"-\" as the patch name. If\n" | |
13922 | " a URL is specified, the patch will be downloaded from it.\n" |
|
14109 | " a URL is specified, the patch will be downloaded from it.\n" | |
13923 | " See :hg:`help dates` for a list of formats valid for -d/--date." |
|
14110 | " See :hg:`help dates` for a list of formats valid for -d/--date." | |
@@ -13959,6 +14146,22 b' msgid " hg import --exact propo' | |||||
13959 | msgstr " hg import --exact proposed-fix.patch" |
|
14146 | msgstr " hg import --exact proposed-fix.patch" | |
13960 |
|
14147 | |||
13961 | msgid "" |
|
14148 | msgid "" | |
|
14149 | " - use an external tool to apply a patch which is too fuzzy for\n" | |||
|
14150 | " the default internal tool." | |||
|
14151 | msgstr "" | |||
|
14152 | " - usa um programa externo para aplicar um patch com contextos\n" | |||
|
14153 | " excessivamente diferentes para a ferramenta interna." | |||
|
14154 | ||||
|
14155 | msgid " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" | |||
|
14156 | msgstr " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" | |||
|
14157 | ||||
|
14158 | msgid " - change the default fuzzing from 2 to a less strict 7" | |||
|
14159 | msgstr " - muda o nível de fuzz de 2 para 7" | |||
|
14160 | ||||
|
14161 | msgid " hg import --config ui.fuzz=7 fuzz.patch" | |||
|
14162 | msgstr " hg import --config ui.fuzz=7 fuzz.patch" | |||
|
14163 | ||||
|
14164 | msgid "" | |||
13962 | " Returns 0 on success, 1 on partial success (see --partial).\n" |
|
14165 | " Returns 0 on success, 1 on partial success (see --partial).\n" | |
13963 | " " |
|
14166 | " " | |
13964 | msgstr "" |
|
14167 | msgstr "" | |
@@ -14599,9 +14802,6 b' msgid " See :hg:`summary` and :hg:`he' | |||||
14599 | msgstr "" |
|
14802 | msgstr "" | |
14600 | " Veja :hg:`summary` e :hg:`help revsets` para informações relacionadas." |
|
14803 | " Veja :hg:`summary` e :hg:`help revsets` para informações relacionadas." | |
14601 |
|
14804 | |||
14602 | msgid "can only specify an explicit filename" |
|
|||
14603 | msgstr "só é possível especificar um nome de arquivo explícito" |
|
|||
14604 |
|
||||
14605 | #, python-format |
|
14805 | #, python-format | |
14606 | msgid "'%s' not found in manifest!" |
|
14806 | msgid "'%s' not found in manifest!" | |
14607 | msgstr "'%s' não encontrado no manifesto!" |
|
14807 | msgstr "'%s' não encontrado no manifesto!" | |
@@ -14679,14 +14879,14 b' msgstr "permite que o limite seja movido para tr\xc3\xa1s"' | |||||
14679 | msgid "target revision" |
|
14879 | msgid "target revision" | |
14680 | msgstr "revisão alvo" |
|
14880 | msgstr "revisão alvo" | |
14681 |
|
14881 | |||
14682 | msgid "[-p|-d|-s] [-f] [-r] REV..." |
|
14882 | msgid "[-p|-d|-s] [-f] [-r] [REV...]" | |
14683 | msgstr "[-p|-d|-s] [-f] [-r] REV..." |
|
14883 | msgstr "[-p|-d|-s] [-f] [-r] [REV...]" | |
14684 |
|
14884 | |||
14685 | msgid "set or show the current phase name" |
|
14885 | msgid "set or show the current phase name" | |
14686 | msgstr "define ou mostra o nome da fase atual" |
|
14886 | msgstr "define ou mostra o nome da fase atual" | |
14687 |
|
14887 | |||
14688 |
msgid " With no argument, show the phase name of |
|
14888 | msgid " With no argument, show the phase name of the current revision(s)." | |
14689 |
msgstr " Sem parâmetros, mostra o nome da fase das revisões |
|
14889 | msgstr " Sem parâmetros, mostra os nomes das fases das revisões atuais." | |
14690 |
|
14890 | |||
14691 | msgid "" |
|
14891 | msgid "" | |
14692 | " With one of -p/--public, -d/--draft or -s/--secret, change the\n" |
|
14892 | " With one of -p/--public, -d/--draft or -s/--secret, change the\n" | |
@@ -14709,11 +14909,16 b' msgstr " p\xc3\xbablica < rascunho < secreta"' | |||||
14709 |
|
14909 | |||
14710 | msgid "" |
|
14910 | msgid "" | |
14711 | " Returns 0 on success, 1 if no phases were changed or some could not\n" |
|
14911 | " Returns 0 on success, 1 if no phases were changed or some could not\n" | |
14712 |
" be changed. |
|
14912 | " be changed." | |
14713 | " " |
|
|||
14714 | msgstr "" |
|
14913 | msgstr "" | |
14715 | " Devolve 0 para indicar sucesso, 1 se não houver mudanças de fase\n" |
|
14914 | " Devolve 0 para indicar sucesso, 1 se não houver mudanças de fase\n" | |
14716 |
" ou se algumas não puderam ser mudadas. |
|
14915 | " ou se algumas não puderam ser mudadas." | |
|
14916 | ||||
|
14917 | msgid "" | |||
|
14918 | " (For more information about the phases concept, see :hg:`help phases`.)\n" | |||
|
14919 | " " | |||
|
14920 | msgstr "" | |||
|
14921 | " (Para mais informações sobre o conceito de fases, veja :hg:`help phases`.)\n" | |||
14717 | " " |
|
14922 | " " | |
14718 |
|
14923 | |||
14719 | msgid "only one phase can be specified" |
|
14924 | msgid "only one phase can be specified" | |
@@ -15606,10 +15811,10 b' msgstr "sumariza o estado do diret\xc3\xb3rio de trabalho"' | |||||
15606 |
|
15811 | |||
15607 | msgid "" |
|
15812 | msgid "" | |
15608 | " This generates a brief summary of the working directory state,\n" |
|
15813 | " This generates a brief summary of the working directory state,\n" | |
15609 | " including parents, branch, commit status, and available updates." |
|
15814 | " including parents, branch, commit status, phase and available updates." | |
15610 | msgstr "" |
|
15815 | msgstr "" | |
15611 | " Isto gera um breve sumário do estado do diretório de trabalho,\n" |
|
15816 | " Isto gera um breve sumário do estado do diretório de trabalho,\n" | |
15612 | " incluindo pais, ramo, status de consolidação e atualizações\n" |
|
15817 | " incluindo pais, ramo, status de consolidação, fase e atualizações\n" | |
15613 | " disponíveis." |
|
15818 | " disponíveis." | |
15614 |
|
15819 | |||
15615 | msgid "" |
|
15820 | msgid "" | |
@@ -15712,6 +15917,18 b' msgstr "atualiza\xc3\xa7\xc3\xb5es: %d novas revis\xc3\xb5es (update)\\n"' | |||||
15712 | msgid "update: %d new changesets, %d branch heads (merge)\n" |
|
15917 | msgid "update: %d new changesets, %d branch heads (merge)\n" | |
15713 | msgstr "atualizações: %d novas revisões, %d cabeças de ramo (merge)\n" |
|
15918 | msgstr "atualizações: %d novas revisões, %d cabeças de ramo (merge)\n" | |
15714 |
|
15919 | |||
|
15920 | #, python-format | |||
|
15921 | msgid "%d draft" | |||
|
15922 | msgstr "%d em fase draft" | |||
|
15923 | ||||
|
15924 | #, python-format | |||
|
15925 | msgid "%d secret" | |||
|
15926 | msgstr "%d em fase secret" | |||
|
15927 | ||||
|
15928 | #, python-format | |||
|
15929 | msgid "phases: %s\n" | |||
|
15930 | msgstr "fases: %s\n" | |||
|
15931 | ||||
15715 | msgid "1 or more incoming" |
|
15932 | msgid "1 or more incoming" | |
15716 | msgstr "1 ou mais a serem recebidas" |
|
15933 | msgstr "1 ou mais a serem recebidas" | |
15717 |
|
15934 | |||
@@ -15927,12 +16144,12 b' msgstr "atualiza o diret\xc3\xb3rio de trabalho (ou muda para outra revis\xc3\xa3o)"' | |||||
15927 | msgid "" |
|
16144 | msgid "" | |
15928 | " Update the repository's working directory to the specified\n" |
|
16145 | " Update the repository's working directory to the specified\n" | |
15929 | " changeset. If no changeset is specified, update to the tip of the\n" |
|
16146 | " changeset. If no changeset is specified, update to the tip of the\n" | |
15930 |
" current named branch and move the |
|
16147 | " current named branch and move the active bookmark (see :hg:`help\n" | |
15931 | " bookmarks`)." |
|
16148 | " bookmarks`)." | |
15932 | msgstr "" |
|
16149 | msgstr "" | |
15933 | " Atualiza o diretório de trabalho do repositório para a revisão\n" |
|
16150 | " Atualiza o diretório de trabalho do repositório para a revisão\n" | |
15934 | " pedida. Se não for especificada uma revisão, atualiza para a\n" |
|
16151 | " pedida. Se não for especificada uma revisão, atualiza para a\n" | |
15935 |
" última revisão do ramo nomeado atual e move o marcador at |
|
16152 | " última revisão do ramo nomeado atual e move o marcador ativo\n" | |
15936 | " (veja :hg:`help bookmarks`)." |
|
16153 | " (veja :hg:`help bookmarks`)." | |
15937 |
|
16154 | |||
15938 | msgid "" |
|
16155 | msgid "" | |
@@ -16021,13 +16238,13 b' msgid "cannot specify both -c/--check an' | |||||
16021 | msgstr "não se pode especificar ao mesmo tempo -c/--check e -C/--clean" |
|
16238 | msgstr "não se pode especificar ao mesmo tempo -c/--check e -C/--clean" | |
16022 |
|
16239 | |||
16023 | #, python-format |
|
16240 | #, python-format | |
|
16241 | msgid "(leaving bookmark %s)\n" | |||
|
16242 | msgstr "(mantendo marcador %s)\n" | |||
|
16243 | ||||
|
16244 | #, python-format | |||
16024 | msgid "(activating bookmark %s)\n" |
|
16245 | msgid "(activating bookmark %s)\n" | |
16025 | msgstr "(ativando marcador %s)\n" |
|
16246 | msgstr "(ativando marcador %s)\n" | |
16026 |
|
16247 | |||
16027 | #, python-format |
|
|||
16028 | msgid "(leaving bookmark %s)\n" |
|
|||
16029 | msgstr "(mantendo marcador %s)\n" |
|
|||
16030 |
|
||||
16031 | msgid "verify the integrity of the repository" |
|
16248 | msgid "verify the integrity of the repository" | |
16032 | msgstr "verifica a integridade do repositório" |
|
16249 | msgstr "verifica a integridade do repositório" | |
16033 |
|
16250 | |||
@@ -16187,6 +16404,9 b' msgstr "c\xc3\xb3pia falhou: %s n\xc3\xa3o \xc3\xa9 um arquivo ou um link simb\xc3\xb3lico\\n"' | |||||
16187 | msgid "the python curses/wcurses module is not available/installed" |
|
16404 | msgid "the python curses/wcurses module is not available/installed" | |
16188 | msgstr "o módulo curses/wcurses do Python não está disponível" |
|
16405 | msgstr "o módulo curses/wcurses do Python não está disponível" | |
16189 |
|
16406 | |||
|
16407 | msgid "confirm" | |||
|
16408 | msgstr "" | |||
|
16409 | ||||
16190 | msgid "starting interactive selection\n" |
|
16410 | msgid "starting interactive selection\n" | |
16191 | msgstr "iniciando seleção interativa\n" |
|
16411 | msgstr "iniciando seleção interativa\n" | |
16192 |
|
16412 | |||
@@ -16225,6 +16445,9 b' msgstr ""' | |||||
16225 | msgid "user quit" |
|
16445 | msgid "user quit" | |
16226 | msgstr "usuário encerrou" |
|
16446 | msgstr "usuário encerrou" | |
16227 |
|
16447 | |||
|
16448 | msgid "this diff is too large to be displayed" | |||
|
16449 | msgstr "o diff é grande demais para ser mostrado" | |||
|
16450 | ||||
16228 | #, python-format |
|
16451 | #, python-format | |
16229 | msgid "invalid character in dag description: %s..." |
|
16452 | msgid "invalid character in dag description: %s..." | |
16230 | msgstr "caractere inválido na descrição do dag: %s..." |
|
16453 | msgstr "caractere inválido na descrição do dag: %s..." | |
@@ -16402,6 +16625,9 b' msgstr "hg: %s\\n"' | |||||
16402 | msgid "abort: remote error:\n" |
|
16625 | msgid "abort: remote error:\n" | |
16403 | msgstr "abortado: erro remoto:\n" |
|
16626 | msgstr "abortado: erro remoto:\n" | |
16404 |
|
16627 | |||
|
16628 | msgid "abort: remote error\n" | |||
|
16629 | msgstr "abortado: erro remoto\n" | |||
|
16630 | ||||
16405 | #, python-format |
|
16631 | #, python-format | |
16406 | msgid "abort: %s!\n" |
|
16632 | msgid "abort: %s!\n" | |
16407 | msgstr "abortado: %s!\n" |
|
16633 | msgstr "abortado: %s!\n" | |
@@ -16570,6 +16796,13 b' msgstr ""' | |||||
16570 | "lsprof não disponível - instale de " |
|
16796 | "lsprof não disponível - instale de " | |
16571 | "http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" |
|
16797 | "http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" | |
16572 |
|
16798 | |||
|
16799 | msgid "" | |||
|
16800 | "flamegraph not available - install from https://github.com/evanhempel" | |||
|
16801 | "/python-flamegraph" | |||
|
16802 | msgstr "" | |||
|
16803 | "flamegraph indisponível - instale de https://github.com/evanhempel/python-" | |||
|
16804 | "flamegraph" | |||
|
16805 | ||||
16573 | msgid "statprof not available - install using \"easy_install statprof\"" |
|
16806 | msgid "statprof not available - install using \"easy_install statprof\"" | |
16574 | msgstr "statprof não está disponível - instale usando \"easy_install statprof\"" |
|
16807 | msgstr "statprof não está disponível - instale usando \"easy_install statprof\"" | |
16575 |
|
16808 | |||
@@ -16640,6 +16873,10 b' msgid "no common changegroup version"' | |||||
16640 | msgstr "nenhuma versão de changegroup em comum" |
|
16873 | msgstr "nenhuma versão de changegroup em comum" | |
16641 |
|
16874 | |||
16642 | #, python-format |
|
16875 | #, python-format | |
|
16876 | msgid "updating %s to public failed" | |||
|
16877 | msgstr "a atualização da fase de %s para pública falhou" | |||
|
16878 | ||||
|
16879 | #, python-format | |||
16643 | msgid "server ignored update of %s to public!\n" |
|
16880 | msgid "server ignored update of %s to public!\n" | |
16644 | msgstr "o servidor ignorou a atualização de %s para a fase 'public'!\n" |
|
16881 | msgstr "o servidor ignorou a atualização de %s para a fase 'public'!\n" | |
16645 |
|
16882 | |||
@@ -16677,6 +16914,23 b' msgstr "o pedido por bundle10 deve inclu' | |||||
16677 | msgid "unsupported getbundle arguments: %s" |
|
16914 | msgid "unsupported getbundle arguments: %s" | |
16678 | msgstr "argumentos de getbundle não suportados: %s" |
|
16915 | msgstr "argumentos de getbundle não suportados: %s" | |
16679 |
|
16916 | |||
|
16917 | msgid "streaming all changes\n" | |||
|
16918 | msgstr "encadeando todas as mudanças\n" | |||
|
16919 | ||||
|
16920 | msgid "unexpected response from remote server:" | |||
|
16921 | msgstr "resposta inesperada do servidor remoto:" | |||
|
16922 | ||||
|
16923 | #, python-format | |||
|
16924 | msgid "%d files to transfer, %s of data\n" | |||
|
16925 | msgstr "%d arquivos para transferir, %s de dados\n" | |||
|
16926 | ||||
|
16927 | msgid "clone" | |||
|
16928 | msgstr "clone" | |||
|
16929 | ||||
|
16930 | #, python-format | |||
|
16931 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |||
|
16932 | msgstr "transferidos %s em %.1f segundos (%s/s)\n" | |||
|
16933 | ||||
16680 | #, python-format |
|
16934 | #, python-format | |
16681 | msgid "*** failed to import extension %s from %s: %s\n" |
|
16935 | msgid "*** failed to import extension %s from %s: %s\n" | |
16682 | msgstr "*** falha ao importar a extensão %s de %s: %s\n" |
|
16936 | msgstr "*** falha ao importar a extensão %s de %s: %s\n" | |
@@ -16857,6 +17111,9 b' msgstr "string n\xc3\xa3o terminada"' | |||||
16857 | msgid "syntax error" |
|
17111 | msgid "syntax error" | |
16858 | msgstr "erro de sintaxe" |
|
17112 | msgstr "erro de sintaxe" | |
16859 |
|
17113 | |||
|
17114 | msgid "invalid token" | |||
|
17115 | msgstr "token inválido" | |||
|
17116 | ||||
16860 | msgid "missing argument" |
|
17117 | msgid "missing argument" | |
16861 | msgstr "argumento faltando" |
|
17118 | msgstr "argumento faltando" | |
16862 |
|
17119 | |||
@@ -17123,11 +17380,12 b' msgstr "subrepo recebe um ou nenhum argu' | |||||
17123 | msgid "subrepo requires a pattern or no arguments" |
|
17380 | msgid "subrepo requires a pattern or no arguments" | |
17124 | msgstr "subrepo requer um padrão ou nenhum argumento" |
|
17381 | msgstr "subrepo requer um padrão ou nenhum argumento" | |
17125 |
|
17382 | |||
17126 | msgid "invalid token" |
|
17383 | #, python-format | |
17127 | msgstr "token inválido" |
|
17384 | msgid "available styles: %s\n" | |
17128 |
|
17385 | msgstr "estilos disponíveis: %s\n" | ||
17129 | msgid "custom templates not yet supported" |
|
17386 | ||
17130 | msgstr "modelos personalizados ainda não são suportados" |
|
17387 | msgid "specify a template" | |
|
17388 | msgstr "especifique um modelo" | |||
17131 |
|
17389 | |||
17132 | msgid "starting revisions are not directly related" |
|
17390 | msgid "starting revisions are not directly related" | |
17133 | msgstr "as revisões iniciais não são diretamente relacionadas" |
|
17391 | msgstr "as revisões iniciais não são diretamente relacionadas" | |
@@ -18217,8 +18475,8 b' msgid ""' | |||||
18217 | " HG: --\n" |
|
18475 | " HG: --\n" | |
18218 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" |
|
18476 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
18219 | " \"HG: branch merge\\n\")\n" |
|
18477 | " \"HG: branch merge\\n\")\n" | |
18220 |
" }HG: branch '{branch}'\\n{if( |
|
18478 | " }HG: branch '{branch}'\\n{if(activebookmark,\n" | |
18221 |
" \"HG: bookmark '{ |
|
18479 | " \"HG: bookmark '{activebookmark}'\\n\") }{subrepos %\n" | |
18222 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" |
|
18480 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" | |
18223 | " \"HG: added {file}\\n\" }{file_mods %\n" |
|
18481 | " \"HG: added {file}\\n\" }{file_mods %\n" | |
18224 | " \"HG: changed {file}\\n\" }{file_dels %\n" |
|
18482 | " \"HG: changed {file}\\n\" }{file_dels %\n" | |
@@ -18232,8 +18490,8 b' msgstr ""' | |||||
18232 | " HG: --\n" |
|
18490 | " HG: --\n" | |
18233 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" |
|
18491 | " HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" | |
18234 | " \"HG: branch merge\\n\")\n" |
|
18492 | " \"HG: branch merge\\n\")\n" | |
18235 |
" }HG: branch '{branch}'\\n{if( |
|
18493 | " }HG: branch '{branch}'\\n{if(activebookmark,\n" | |
18236 |
" \"HG: bookmark '{ |
|
18494 | " \"HG: bookmark '{activebookmark}'\\n\") }{subrepos %\n" | |
18237 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" |
|
18495 | " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" | |
18238 | " \"HG: added {file}\\n\" }{file_mods %\n" |
|
18496 | " \"HG: added {file}\\n\" }{file_mods %\n" | |
18239 | " \"HG: changed {file}\\n\" }{file_dels %\n" |
|
18497 | " \"HG: changed {file}\\n\" }{file_dels %\n" | |
@@ -18787,14 +19045,14 b' msgstr "Exemplo para ``~/.hgrc``::"' | |||||
18787 |
|
19045 | |||
18788 | msgid "" |
|
19046 | msgid "" | |
18789 | " [extensions]\n" |
|
19047 | " [extensions]\n" | |
18790 |
" # (the |
|
19048 | " # (the color extension will get loaded from Mercurial's path)\n" | |
18791 |
" |
|
19049 | " color =\n" | |
18792 | " # (this extension will get loaded from the file specified)\n" |
|
19050 | " # (this extension will get loaded from the file specified)\n" | |
18793 | " myfeature = ~/.hgext/myfeature.py" |
|
19051 | " myfeature = ~/.hgext/myfeature.py" | |
18794 | msgstr "" |
|
19052 | msgstr "" | |
18795 | " [extensions]\n" |
|
19053 | " [extensions]\n" | |
18796 |
" # (a extensão |
|
19054 | " # (a extensão color será carregada a partir do caminho do Mercurial)\n" | |
18797 |
" |
|
19055 | " color =\n" | |
18798 | " # (esta extensão será carregada do arquivo especificado)\n" |
|
19056 | " # (esta extensão será carregada do arquivo especificado)\n" | |
18799 | " myfeature = ~/.hgext/myfeature.py" |
|
19057 | " myfeature = ~/.hgext/myfeature.py" | |
18800 |
|
19058 | |||
@@ -19786,11 +20044,22 b' msgstr ""' | |||||
19786 | " Padrão: strict." |
|
20044 | " Padrão: strict." | |
19787 |
|
20045 | |||
19788 | msgid "" |
|
20046 | msgid "" | |
19789 | "\n" |
|
20047 | "``fuzz``\n" | |
|
20048 | " The number of lines of 'fuzz' to allow when applying patches. This\n" | |||
|
20049 | " controls how much context the patcher is allowed to ignore when\n" | |||
|
20050 | " trying to apply a patch.\n" | |||
|
20051 | " Default: 2" | |||
|
20052 | msgstr "" | |||
|
20053 | "``fuzz``\n" | |||
|
20054 | " O número de linhas de 'fuzz' permitidas ao aplicar patches. Isto\n" | |||
|
20055 | " controla quanto contexto a aplicação do patch pode ignorar na\n" | |||
|
20056 | " tentativa de aplicar um patch.\n" | |||
|
20057 | " Padrão: 2" | |||
|
20058 | ||||
|
20059 | msgid "" | |||
19790 | "``paths``\n" |
|
20060 | "``paths``\n" | |
19791 | "---------" |
|
20061 | "---------" | |
19792 | msgstr "" |
|
20062 | msgstr "" | |
19793 | "\n" |
|
|||
19794 | "``paths``\n" |
|
20063 | "``paths``\n" | |
19795 | "---------" |
|
20064 | "---------" | |
19796 |
|
20065 | |||
@@ -20057,6 +20326,105 b' msgstr ""' | |||||
20057 | " Padrão: 5." |
|
20326 | " Padrão: 5." | |
20058 |
|
20327 | |||
20059 | msgid "" |
|
20328 | msgid "" | |
|
20329 | "``progress``\n" | |||
|
20330 | "------------" | |||
|
20331 | msgstr "" | |||
|
20332 | "``progress``\n" | |||
|
20333 | "------------" | |||
|
20334 | ||||
|
20335 | msgid "" | |||
|
20336 | "Mercurial commands can draw progress bars that are as informative as\n" | |||
|
20337 | "possible. Some progress bars only offer indeterminate information, while others\n" | |||
|
20338 | "have a definite end point." | |||
|
20339 | msgstr "" | |||
|
20340 | "Comandos do Mercurial podem desenhar barras de progresso tão\n" | |||
|
20341 | "informativas quanto possível. Algumas barras de progresso\n" | |||
|
20342 | "fornecem apenas informação indeterminada, enquanto outras\n" | |||
|
20343 | "possuem um ponto de encerramento definido." | |||
|
20344 | ||||
|
20345 | msgid "" | |||
|
20346 | "``delay``\n" | |||
|
20347 | " Number of seconds (float) before showing the progress bar. (default: 3)" | |||
|
20348 | msgstr "" | |||
|
20349 | "``delay``\n" | |||
|
20350 | " Número de segundos (float) antes que a barra seja mostrada.\n" | |||
|
20351 | " (padrão: 3)" | |||
|
20352 | ||||
|
20353 | msgid "" | |||
|
20354 | "``changedelay``\n" | |||
|
20355 | " Minimum delay before showing a new topic. When set to less than 3 * refresh,\n" | |||
|
20356 | " that value will be used instead. (default: 1)" | |||
|
20357 | msgstr "" | |||
|
20358 | "``changedelay``\n" | |||
|
20359 | " Atraso mínimo antes de mostrar um novo tópico. Se for definido\n" | |||
|
20360 | " para menos de 3 * refresh, tal valor será usado em seu lugar.\n" | |||
|
20361 | " (padrão: 1)" | |||
|
20362 | ||||
|
20363 | msgid "" | |||
|
20364 | "``refresh``\n" | |||
|
20365 | " Time in seconds between refreshes of the progress bar. (default: 0.1)" | |||
|
20366 | msgstr "" | |||
|
20367 | "``refresh``\n" | |||
|
20368 | " tempo em segundos entre atualizações da barra de progresso.\n" | |||
|
20369 | " (padrão: 0.1)" | |||
|
20370 | ||||
|
20371 | msgid "" | |||
|
20372 | "``format``\n" | |||
|
20373 | " Format of the progress bar." | |||
|
20374 | msgstr "" | |||
|
20375 | "``format``\n" | |||
|
20376 | " Formato da barra de progresso." | |||
|
20377 | ||||
|
20378 | msgid "" | |||
|
20379 | " Valid entries for the format field are ``topic``, ``bar``, ``number``,\n" | |||
|
20380 | " ``unit``, ``estimate``, speed, and item. item defaults to the last 20\n" | |||
|
20381 | " characters of the item, but this can be changed by adding either ``-<num>``\n" | |||
|
20382 | " which would take the last num characters, or ``+<num>`` for the first num\n" | |||
|
20383 | " characters." | |||
|
20384 | msgstr "" | |||
|
20385 | " Entradas válidas para o campo format são topic (tópico),\n" | |||
|
20386 | " bar (barra), number (número), unit (unidade), estimate\n" | |||
|
20387 | " (estimativa), speed (velocidade) e item (item).\n" | |||
|
20388 | " Por padrão, item são os últimos 20 caracteres do item,\n" | |||
|
20389 | " mas isto pode ser modificado adicionando ``-<num>``, que\n" | |||
|
20390 | " consideraria os últimos num caracteres, ou ``+<num>``\n" | |||
|
20391 | " para os primeiros num caracteres." | |||
|
20392 | ||||
|
20393 | msgid " (default: Topic bar number estimate)" | |||
|
20394 | msgstr " (padrão: Topic bar number estimate)" | |||
|
20395 | ||||
|
20396 | msgid "" | |||
|
20397 | "``width``\n" | |||
|
20398 | " If set, the maximum width of the progress information (that is, min(width,\n" | |||
|
20399 | " term width) will be used)" | |||
|
20400 | msgstr "" | |||
|
20401 | "``width``\n" | |||
|
20402 | " Se definido, será a largura máxima da informação de progresso\n" | |||
|
20403 | " (isto é, min(largura, largura do terminal) será usada)" | |||
|
20404 | ||||
|
20405 | msgid "" | |||
|
20406 | "``clear-complete``\n" | |||
|
20407 | " clear the progress bar after it's done (default to True)" | |||
|
20408 | msgstr "" | |||
|
20409 | "``clear-complete``\n" | |||
|
20410 | " limpa a barra de progresso após terminar (o padrão é True)" | |||
|
20411 | ||||
|
20412 | msgid "" | |||
|
20413 | "``disable``\n" | |||
|
20414 | " If true, don't show a progress bar" | |||
|
20415 | msgstr "" | |||
|
20416 | "``disable``\n" | |||
|
20417 | " Se 'true', não exibe uma barra de progresso" | |||
|
20418 | ||||
|
20419 | msgid "" | |||
|
20420 | "``assume-tty``\n" | |||
|
20421 | " If true, ALWAYS show a progress bar, unless disable is given" | |||
|
20422 | msgstr "" | |||
|
20423 | "``assume-tty``\n" | |||
|
20424 | " Se 'true', SEMPRE exibe uma barra de progressos, a não ser\n" | |||
|
20425 | " que 'disable' seja 'true'" | |||
|
20426 | ||||
|
20427 | msgid "" | |||
20060 | "``revsetalias``\n" |
|
20428 | "``revsetalias``\n" | |
20061 | "---------------" |
|
20429 | "---------------" | |
20062 | msgstr "" |
|
20430 | msgstr "" | |
@@ -20127,6 +20495,15 b' msgstr ""' | |||||
20127 | " estão presentes. O padrão é False." |
|
20495 | " estão presentes. O padrão é False." | |
20128 |
|
20496 | |||
20129 | msgid "" |
|
20497 | msgid "" | |
|
20498 | "``maxhttpheaderlen``\n" | |||
|
20499 | " Instruct HTTP clients not to send request headers longer than this\n" | |||
|
20500 | " many bytes. Default is 1024." | |||
|
20501 | msgstr "" | |||
|
20502 | "``maxhttpheaderlen``\n" | |||
|
20503 | " Instrui clientes HTTP a não enviares cabeçalhos de pedido\n" | |||
|
20504 | " contendo mais bytes do que este valor. O padrão é 1024." | |||
|
20505 | ||||
|
20506 | msgid "" | |||
20130 | "``smtp``\n" |
|
20507 | "``smtp``\n" | |
20131 | "--------" |
|
20508 | "--------" | |
20132 | msgstr "" |
|
20509 | msgstr "" | |
@@ -20485,6 +20862,36 b' msgstr ""' | |||||
20485 | " de conflitos podem causar problemas sérios." |
|
20862 | " de conflitos podem causar problemas sérios." | |
20486 |
|
20863 | |||
20487 | msgid "" |
|
20864 | msgid "" | |
|
20865 | "``patch``\n" | |||
|
20866 | " An optional external tool that ``hg import`` and some extensions\n" | |||
|
20867 | " will use for applying patches. By default Mercurial uses an\n" | |||
|
20868 | " internal patch utility. The external tool must work as the common\n" | |||
|
20869 | " Unix ``patch`` program. In particular, it must accept a ``-p``\n" | |||
|
20870 | " argument to strip patch headers, a ``-d`` argument to specify the\n" | |||
|
20871 | " current directory, a file name to patch, and a patch file to take\n" | |||
|
20872 | " from stdin." | |||
|
20873 | msgstr "" | |||
|
20874 | "``patch``\n" | |||
|
20875 | " Um utilitário externo opcional que ``hg import`` e algumas\n" | |||
|
20876 | " extensões usarão para aplicar patches.\n" | |||
|
20877 | " Por padrão, o Mercurial usa uma ferramenta interna.\n" | |||
|
20878 | " A ferramenta externa deve funcionar da mesma maneira que\n" | |||
|
20879 | " o programa Unix ``patch``.\n" | |||
|
20880 | " Em particular, deve aceitar um argumento ``-p`` para remover\n" | |||
|
20881 | " cabeçalhos do patch, um argumento ``-d`` para especificar o\n" | |||
|
20882 | " diretório atual, um nome de arquivo no qual aplicar o patch,\n" | |||
|
20883 | " e ler um arquivo de patch a partir da entrada padrão." | |||
|
20884 | ||||
|
20885 | msgid "" | |||
|
20886 | " It is possible to specify a patch tool together with extra\n" | |||
|
20887 | " arguments. For example, setting this option to ``patch --merge``\n" | |||
|
20888 | " will use the ``patch`` program with its 2-way merge option." | |||
|
20889 | msgstr "" | |||
|
20890 | " É possível especificar parâmetros extras para a ferramenta de patch.\n" | |||
|
20891 | " Por exemplo, definir essa opção como ``patch --merge`` usará o\n" | |||
|
20892 | " programa ``patch`` com sua opção de mesclagem de duas vias." | |||
|
20893 | ||||
|
20894 | msgid "" | |||
20488 | "``portablefilenames``\n" |
|
20895 | "``portablefilenames``\n" | |
20489 | " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" |
|
20896 | " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" | |
20490 | " Default is ``warn``.\n" |
|
20897 | " Default is ``warn``.\n" | |
@@ -20528,16 +20935,6 b' msgstr ""' | |||||
20528 | " O padrão é ``hg``." |
|
20935 | " O padrão é ``hg``." | |
20529 |
|
20936 | |||
20530 | msgid "" |
|
20937 | msgid "" | |
20531 | "``reportoldssl``\n" |
|
|||
20532 | " Warn if an SSL certificate is unable to be used due to using Python\n" |
|
|||
20533 | " 2.5 or earlier. True or False. Default is True." |
|
|||
20534 | msgstr "" |
|
|||
20535 | "``reportoldssl``\n" |
|
|||
20536 | " Avisa se um certificado SSL não puder ser usado por falta de\n" |
|
|||
20537 | " suporte nas versões do Pyton 2.5 ou anteriores. True ou False.\n" |
|
|||
20538 | " O padrão é True." |
|
|||
20539 |
|
||||
20540 | msgid "" |
|
|||
20541 | "``report_untrusted``\n" |
|
20938 | "``report_untrusted``\n" | |
20542 | " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" |
|
20939 | " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" | |
20543 | " trusted user or group. True or False. Default is True." |
|
20940 | " trusted user or group. True or False. Default is True." | |
@@ -20895,6 +21292,13 b' msgstr ""' | |||||
20895 | " Habilita suporte a cache na interface hgweb. O padrão é True." |
|
21292 | " Habilita suporte a cache na interface hgweb. O padrão é True." | |
20896 |
|
21293 | |||
20897 | msgid "" |
|
21294 | msgid "" | |
|
21295 | "``certificate``\n" | |||
|
21296 | " Certificate to use when running :hg:`serve`." | |||
|
21297 | msgstr "" | |||
|
21298 | "``certificate``\n" | |||
|
21299 | " Certificado a ser usado ao executar :hg:`serve`." | |||
|
21300 | ||||
|
21301 | msgid "" | |||
20898 | "``collapse``\n" |
|
21302 | "``collapse``\n" | |
20899 | " With ``descend`` enabled, repositories in subdirectories are shown at\n" |
|
21303 | " With ``descend`` enabled, repositories in subdirectories are shown at\n" | |
20900 | " a single level alongside repositories in the current path. With\n" |
|
21304 | " a single level alongside repositories in the current path. With\n" | |
@@ -23293,6 +23697,17 b' msgstr ""' | |||||
23293 | "partir da raiz, comece-o por ``^``." |
|
23697 | "partir da raiz, comece-o por ``^``." | |
23294 |
|
23698 | |||
23295 | msgid "" |
|
23699 | msgid "" | |
|
23700 | "Subdirectories can have their own .hgignore settings by adding\n" | |||
|
23701 | "``subinclude:path/to/subdir/.hgignore`` to the root ``.hgignore``. See\n" | |||
|
23702 | ":hg:`help patterns` for details on ``subinclude:`` and ``include:``." | |||
|
23703 | msgstr "" | |||
|
23704 | "Subdiretórios podem ter suas próprias configurações .hgignore\n" | |||
|
23705 | "adicionando ``subinclude:caminho/para/subdir/.hgignore`` ao\n" | |||
|
23706 | "``.hgignore`` raiz.\n" | |||
|
23707 | "Veja :hg:`help patterns` para detalhes sobre ``subinclude:``\n" | |||
|
23708 | "e ``include:``." | |||
|
23709 | ||||
|
23710 | msgid "" | |||
23296 | " Patterns specified in other than ``.hgignore`` are always rooted.\n" |
|
23711 | " Patterns specified in other than ``.hgignore`` are always rooted.\n" | |
23297 | " Please see :hg:`help patterns` for details." |
|
23712 | " Please see :hg:`help patterns` for details." | |
23298 | msgstr "" |
|
23713 | msgstr "" | |
@@ -23912,6 +24327,21 b' msgstr ""' | |||||
23912 | "arquivo também é tratada como um padrão de arquivos." |
|
24327 | "arquivo também é tratada como um padrão de arquivos." | |
23913 |
|
24328 | |||
23914 | msgid "" |
|
24329 | msgid "" | |
|
24330 | "To read a set of patterns from a file, use ``include:`` or ``subinclude:``.\n" | |||
|
24331 | "``include:`` will use all the patterns from the given file and treat them as if\n" | |||
|
24332 | "they had been passed in manually. ``subinclude:`` will only apply the patterns\n" | |||
|
24333 | "against files that are under the subinclude file's directory. See :hg:`help\n" | |||
|
24334 | "hgignore` for details on the format of these files." | |||
|
24335 | msgstr "" | |||
|
24336 | "Para ler um conjunto de padrões de um arquivo, use ``include:``\n" | |||
|
24337 | "ou ``subinclude:``.\n" | |||
|
24338 | "``include:`` usará todos os padrões de um arquivo dado, tratando-os\n" | |||
|
24339 | "como se fossem especificados manualmente.\n" | |||
|
24340 | "``subinclude:`` aplicará os padrões apenas a arquivos sob o diretório\n" | |||
|
24341 | "que contém o arquivo incluído.\n" | |||
|
24342 | "Veja :hg:`help hgignore` para detalhes do formato desses arquivos." | |||
|
24343 | ||||
|
24344 | msgid "" | |||
23915 | "All patterns, except for ``glob:`` specified in command line (not for\n" |
|
24345 | "All patterns, except for ``glob:`` specified in command line (not for\n" | |
23916 | "``-I`` or ``-X`` options), can match also against directories: files\n" |
|
24346 | "``-I`` or ``-X`` options), can match also against directories: files\n" | |
23917 | "under matched directories are treated as matched." |
|
24347 | "under matched directories are treated as matched." | |
@@ -23974,8 +24404,21 b' msgstr ""' | |||||
23974 | " listfile:list.txt lê a lista de list.txt com um padrão por linha\n" |
|
24404 | " listfile:list.txt lê a lista de list.txt com um padrão por linha\n" | |
23975 | " listfile0:list.txt lê a lista de list.txt delimitados por bytes null" |
|
24405 | " listfile0:list.txt lê a lista de list.txt delimitados por bytes null" | |
23976 |
|
24406 | |||
23977 |
msgid "See also :hg:`help filesets`. |
|
24407 | msgid "See also :hg:`help filesets`." | |
23978 |
msgstr "Veja também :hg:`help filesets`. |
|
24408 | msgstr "Veja também :hg:`help filesets`." | |
|
24409 | ||||
|
24410 | msgid "Include examples::" | |||
|
24411 | msgstr "Exemplos de padrões de inclusão::" | |||
|
24412 | ||||
|
24413 | msgid "" | |||
|
24414 | " include:path/to/mypatternfile reads patterns to be applied to all paths\n" | |||
|
24415 | " subinclude:path/to/subignorefile reads patterns specifically for paths in the\n" | |||
|
24416 | " subdirectory\n" | |||
|
24417 | msgstr "" | |||
|
24418 | " include:caminho/para/arquivo lê padrões a serem aplicados a todos\n" | |||
|
24419 | " os caminhos\n" | |||
|
24420 | " subinclude:caminho/para/arquivo lê padrões específicos para caminhos\n" | |||
|
24421 | " no subdiretório\n" | |||
23979 |
|
24422 | |||
23980 | msgid "" |
|
24423 | msgid "" | |
23981 | "What are phases?\n" |
|
24424 | "What are phases?\n" | |
@@ -24758,13 +25201,16 b' msgstr ""' | |||||
24758 |
|
25201 | |||
24759 | msgid "" |
|
25202 | msgid "" | |
24760 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" |
|
25203 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" | |
24761 | " specified. Git and Subversion subrepositories are currently\n" |
|
25204 | " specified. However, if you specify the full path of a file or\n" | |
24762 | " silently ignored." |
|
25205 | " directory in a subrepo, it will be displayed even without\n" | |
24763 | msgstr "" |
|
25206 | " -S/--subrepos being specified. Git and Subversion subrepositories\n" | |
24764 | ":files: files não é executado recursivamente em\n" |
|
25207 | " are currently silently ignored." | |
24765 | " sub-repositórios, a não ser que -S/--subrepos seja\n" |
|
25208 | msgstr "" | |
24766 | " especificado.\n" |
|
25209 | ":files: files não é executado recursivamente em sub-repositórios, a não\n" | |
24767 | " Sub-repositórios do Subversion e do Git são no momento\n" |
|
25210 | " ser que -S/--subrepos seja especificado. No entanto, se for\n" | |
|
25211 | " especificado o caminho completo de um arquivo em um sub-repositório,\n" | |||
|
25212 | " ele será mostrado mesmo que -S/--subrepos não seja passado.\n" | |||
|
25213 | " Sub-repositórios do Subversion e do git são no momento\n" | |||
24768 | " silenciosamente ignorados." |
|
25214 | " silenciosamente ignorados." | |
24769 |
|
25215 | |||
24770 | msgid "" |
|
25216 | msgid "" | |
@@ -24996,6 +25442,15 b' msgstr ""' | |||||
24996 | msgid "- expr % \"{template}\"" |
|
25442 | msgid "- expr % \"{template}\"" | |
24997 | msgstr "- expr % \"{modelo}\"" |
|
25443 | msgstr "- expr % \"{modelo}\"" | |
24998 |
|
25444 | |||
|
25445 | msgid "" | |||
|
25446 | "As seen in the above example, \"{template}\" is interpreted as a template.\n" | |||
|
25447 | "To prevent it from being interpreted, you can use an escape character \"\\{\"\n" | |||
|
25448 | "or a raw string prefix, \"r'...'\"." | |||
|
25449 | msgstr "" | |||
|
25450 | "Como visto no exemplo acima, \"{modelo}\" é interpretado como um modelo.\n" | |||
|
25451 | "Para impedir que seja interpretado, você pode usar um caractere de\n" | |||
|
25452 | "escape \"\\{\" ou um prefixo de string literal \"r'...'\"." | |||
|
25453 | ||||
24999 | msgid "Some sample command line templates:" |
|
25454 | msgid "Some sample command line templates:" | |
25000 | msgstr "Alguns exemplos de modelos de linha de comando:" |
|
25455 | msgstr "Alguns exemplos de modelos de linha de comando:" | |
25001 |
|
25456 | |||
@@ -25026,8 +25481,8 b' msgstr " $ hg log -r 0 --template \\"{d' | |||||
25026 | msgid "- Output the description set to a fill-width of 30::" |
|
25481 | msgid "- Output the description set to a fill-width of 30::" | |
25027 | msgstr "- Informar as descrições em um campo de largura 30::" |
|
25482 | msgstr "- Informar as descrições em um campo de largura 30::" | |
25028 |
|
25483 | |||
25029 |
msgid " $ hg log -r 0 --template \"{fill(desc, |
|
25484 | msgid " $ hg log -r 0 --template \"{fill(desc, 30)}\"" | |
25030 |
msgstr " $ hg log -r 0 --template \"{fill(desc, |
|
25485 | msgstr " $ hg log -r 0 --template \"{fill(desc, 30)}\"" | |
25031 |
|
25486 | |||
25032 | msgid "- Use a conditional to test for the default branch::" |
|
25487 | msgid "- Use a conditional to test for the default branch::" | |
25033 | msgstr "- Usar uma conditional para testar pelo ramo default::" |
|
25488 | msgstr "- Usar uma conditional para testar pelo ramo default::" | |
@@ -25063,15 +25518,15 b' msgstr "- Exibe o conte\xc3\xbado do campo \'extra\', um em cada linha::"' | |||||
25063 | msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" |
|
25518 | msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" | |
25064 | msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" |
|
25519 | msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" | |
25065 |
|
25520 | |||
25066 |
msgid "- Mark the |
|
25521 | msgid "- Mark the active bookmark with '*'::" | |
25067 |
msgstr "- Indica o marcador at |
|
25522 | msgstr "- Indica o marcador ativo com '*'::" | |
25068 |
|
25523 | |||
25069 | msgid "" |
|
25524 | msgid "" | |
25070 |
" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, |
|
25525 | " $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " | |
25071 |
" |
|
25526 | "'*')} '}\\n\"" | |
25072 | msgstr "" |
|
25527 | msgstr "" | |
25073 |
" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, |
|
25528 | " $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " | |
25074 |
" |
|
25529 | "'*')} '}\\n\"" | |
25075 |
|
25530 | |||
25076 | msgid "- Mark the working copy parent with '@'::" |
|
25531 | msgid "- Mark the working copy parent with '@'::" | |
25077 | msgstr "- Indica o pai do diretório de trabalho com '@'::" |
|
25532 | msgstr "- Indica o pai do diretório de trabalho com '@'::" | |
@@ -25082,15 +25537,15 b' msgstr " $ hg log --template \\"{ifcont' | |||||
25082 | msgid "- Show only commit descriptions that start with \"template\"::" |
|
25537 | msgid "- Show only commit descriptions that start with \"template\"::" | |
25083 | msgstr "- Mostra apenas descrições de revisão que comecem com \"template\"::" |
|
25538 | msgstr "- Mostra apenas descrições de revisão que comecem com \"template\"::" | |
25084 |
|
25539 | |||
25085 |
msgid " $ hg log --template \"{startswith( |
|
25540 | msgid " $ hg log --template \"{startswith('template', firstline(desc))}\\n\"" | |
25086 |
msgstr " $ hg log --template \"{startswith( |
|
25541 | msgstr " $ hg log --template \"{startswith('template', firstline(desc))}\\n\"" | |
25087 |
|
25542 | |||
25088 | msgid "- Print the first word of each line of a commit message::" |
|
25543 | msgid "- Print the first word of each line of a commit message::" | |
25089 | msgstr "" |
|
25544 | msgstr "" | |
25090 | "- Imprime a primeira palavra de cada linha de uma mensagem de consolidação::" |
|
25545 | "- Imprime a primeira palavra de cada linha de uma mensagem de consolidação::" | |
25091 |
|
25546 | |||
25092 |
msgid " $ hg log --template \"{word( |
|
25547 | msgid " $ hg log --template \"{word(0, desc)}\\n\"\n" | |
25093 |
msgstr " $ hg log --template \"{word( |
|
25548 | msgstr " $ hg log --template \"{word(0, desc)}\\n\"\n" | |
25094 |
|
25549 | |||
25095 | msgid "Valid URLs are of the form::" |
|
25550 | msgid "Valid URLs are of the form::" | |
25096 | msgstr "URLs válidas são da forma::" |
|
25551 | msgstr "URLs válidas são da forma::" | |
@@ -25261,6 +25716,21 b' msgstr "o destino j\xc3\xa1 existe"' | |||||
25261 | msgid "updating working directory\n" |
|
25716 | msgid "updating working directory\n" | |
25262 | msgstr "atualizando diretório de trabalho\n" |
|
25717 | msgstr "atualizando diretório de trabalho\n" | |
25263 |
|
25718 | |||
|
25719 | msgid "" | |||
|
25720 | "src repository does not support revision lookup and so doesn't support clone" | |||
|
25721 | " by revision" | |||
|
25722 | msgstr "" | |||
|
25723 | "repositório de origem não suporta busca de revisões, portanto não suporta " | |||
|
25724 | "clonar por revisão" | |||
|
25725 | ||||
|
25726 | #, python-format | |||
|
25727 | msgid "(sharing from existing pooled repository %s)\n" | |||
|
25728 | msgstr "(compartilhando repositório existente %s)\n" | |||
|
25729 | ||||
|
25730 | #, python-format | |||
|
25731 | msgid "(sharing from new pooled repository %s)\n" | |||
|
25732 | msgstr "(compartilhando novo repositório agrupado %s)\n" | |||
|
25733 | ||||
25264 | #, python-format |
|
25734 | #, python-format | |
25265 | msgid "destination directory: %s\n" |
|
25735 | msgid "destination directory: %s\n" | |
25266 | msgstr "diretório de destino: %s\n" |
|
25736 | msgstr "diretório de destino: %s\n" | |
@@ -25276,12 +25746,14 b' msgstr "o destino \'%s\' j\xc3\xa1 existe"' | |||||
25276 | msgid "destination '%s' is not empty" |
|
25746 | msgid "destination '%s' is not empty" | |
25277 | msgstr "o destino '%s' não está vazio" |
|
25747 | msgstr "o destino '%s' não está vazio" | |
25278 |
|
25748 | |||
25279 | msgid "" |
|
25749 | msgid "(not using pooled storage: remote appears to be empty)\n" | |
25280 | "src repository does not support revision lookup and so doesn't support clone" |
|
25750 | msgstr "" | |
25281 | " by revision" |
|
25751 | "(desativando armazenamento compartilhado: o remoto parece estar vazio)\n" | |
25282 | msgstr "" |
|
25752 | ||
25283 | "repositório de origem não suporta busca de revisões, portanto não suporta " |
|
25753 | msgid "(not using pooled storage: unable to resolve identity of remote)\n" | |
25284 | "clonar por revisão" |
|
25754 | msgstr "" | |
|
25755 | "(desativando armazenamento compartilhado: incapaz de determinar identidade " | |||
|
25756 | "do remoto)\n" | |||
25285 |
|
25757 | |||
25286 | msgid "clone from remote to remote not supported" |
|
25758 | msgid "clone from remote to remote not supported" | |
25287 | msgstr "clone de origem remota para destino remoto não suportado" |
|
25759 | msgstr "clone de origem remota para destino remoto não suportado" | |
@@ -25314,6 +25786,13 b' msgstr ""' | |||||
25314 | msgid "(branch merge, don't forget to commit)\n" |
|
25786 | msgid "(branch merge, don't forget to commit)\n" | |
25315 | msgstr "(mesclagem de ramo, não esqueça de consolidar)\n" |
|
25787 | msgstr "(mesclagem de ramo, não esqueça de consolidar)\n" | |
25316 |
|
25788 | |||
|
25789 | msgid "checking subrepo links\n" | |||
|
25790 | msgstr "checando links para sub-repositórios\n" | |||
|
25791 | ||||
|
25792 | #, python-format | |||
|
25793 | msgid ".hgsubstate is corrupt in revision %s\n" | |||
|
25794 | msgstr ".hgsubstate está corrompido na revisão %s\n" | |||
|
25795 | ||||
25317 | #, python-format |
|
25796 | #, python-format | |
25318 | msgid "websub: invalid pattern for %s: %s\n" |
|
25797 | msgid "websub: invalid pattern for %s: %s\n" | |
25319 | msgstr "websub: padrão inválido para %s: %s\n" |
|
25798 | msgstr "websub: padrão inválido para %s: %s\n" | |
@@ -25949,14 +26428,6 b' msgid "cannot create new http repository' | |||||
25949 | msgstr "impossível criar novo repositório http" |
|
26428 | msgstr "impossível criar novo repositório http" | |
25950 |
|
26429 | |||
25951 | #, python-format |
|
26430 | #, python-format | |
25952 | msgid "ignoring invalid syntax '%s'" |
|
|||
25953 | msgstr "ignorando sintaxe inválida '%s'" |
|
|||
25954 |
|
||||
25955 | #, python-format |
|
|||
25956 | msgid "skipping unreadable ignore file '%s': %s\n" |
|
|||
25957 | msgstr "desconsiderando arquivo ignore ilegível '%s': %s\n" |
|
|||
25958 |
|
||||
25959 | #, python-format |
|
|||
25960 | msgid "repository %s not found" |
|
26431 | msgid "repository %s not found" | |
25961 | msgstr "repositório %s não encontrado" |
|
26432 | msgstr "repositório %s não encontrado" | |
25962 |
|
26433 | |||
@@ -26110,9 +26581,6 b' msgstr "consolidando manifesto\\n"' | |||||
26110 | msgid "committing changelog\n" |
|
26581 | msgid "committing changelog\n" | |
26111 | msgstr "consolidando changelog\n" |
|
26582 | msgstr "consolidando changelog\n" | |
26112 |
|
26583 | |||
26113 | msgid "unexpected response from remote server:" |
|
|||
26114 | msgstr "resposta inesperada do servidor remoto:" |
|
|||
26115 |
|
||||
26116 | msgid "operation forbidden by server" |
|
26584 | msgid "operation forbidden by server" | |
26117 | msgstr "operação não permitida pelo servidor" |
|
26585 | msgstr "operação não permitida pelo servidor" | |
26118 |
|
26586 | |||
@@ -26122,20 +26590,6 b' msgstr "o bloqueio do reposit\xc3\xb3rio remoto falhou"' | |||||
26122 | msgid "the server sent an unknown error code" |
|
26590 | msgid "the server sent an unknown error code" | |
26123 | msgstr "o servidor enviou um código de erro desconhecido" |
|
26591 | msgstr "o servidor enviou um código de erro desconhecido" | |
26124 |
|
26592 | |||
26125 | msgid "streaming all changes\n" |
|
|||
26126 | msgstr "encadeando todas as mudanças\n" |
|
|||
26127 |
|
||||
26128 | #, python-format |
|
|||
26129 | msgid "%d files to transfer, %s of data\n" |
|
|||
26130 | msgstr "%d arquivos para transferir, %s de dados\n" |
|
|||
26131 |
|
||||
26132 | msgid "clone" |
|
|||
26133 | msgstr "clone" |
|
|||
26134 |
|
||||
26135 | #, python-format |
|
|||
26136 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
|||
26137 | msgstr "transferidos %s em %.1f segundos (%s/s)\n" |
|
|||
26138 |
|
||||
26139 | #, python-format |
|
26593 | #, python-format | |
26140 | msgid "pushkey-abort: %s\n" |
|
26594 | msgid "pushkey-abort: %s\n" | |
26141 | msgstr "pushkey-abortado: %s\n" |
|
26595 | msgstr "pushkey-abortado: %s\n" | |
@@ -26209,6 +26663,14 b' msgid "unable to read file list (%s)"' | |||||
26209 | msgstr "incapaz de ler lista de arquivos (%s)" |
|
26663 | msgstr "incapaz de ler lista de arquivos (%s)" | |
26210 |
|
26664 | |||
26211 | #, python-format |
|
26665 | #, python-format | |
|
26666 | msgid "skipping unreadable pattern file '%s': %s\n" | |||
|
26667 | msgstr "desconsiderando arquivo de padrões ilegível '%s': %s\n" | |||
|
26668 | ||||
|
26669 | #, python-format | |||
|
26670 | msgid "%s: invalid pattern (%s): %s" | |||
|
26671 | msgstr "%s: padrão inválido (%s): %s" | |||
|
26672 | ||||
|
26673 | #, python-format | |||
26212 | msgid "invalid pattern (%s): %s" |
|
26674 | msgid "invalid pattern (%s): %s" | |
26213 | msgstr "padrão inválido (%s): %s" |
|
26675 | msgstr "padrão inválido (%s): %s" | |
26214 |
|
26676 | |||
@@ -26216,6 +26678,10 b' msgid "invalid pattern"' | |||||
26216 | msgstr "padrão inválido" |
|
26678 | msgstr "padrão inválido" | |
26217 |
|
26679 | |||
26218 | #, python-format |
|
26680 | #, python-format | |
|
26681 | msgid "%s: ignoring invalid syntax '%s'\n" | |||
|
26682 | msgstr "%s: ignorando sintaxe inválida '%s'\n" | |||
|
26683 | ||||
|
26684 | #, python-format | |||
26219 | msgid "diff context lines count must be an integer, not %r" |
|
26685 | msgid "diff context lines count must be an integer, not %r" | |
26220 | msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r" |
|
26686 | msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r" | |
26221 |
|
26687 | |||
@@ -26292,6 +26758,10 b' msgstr "atualizando"' | |||||
26292 | msgid "getting %s to %s\n" |
|
26758 | msgid "getting %s to %s\n" | |
26293 | msgstr "obtendo %s para %s\n" |
|
26759 | msgstr "obtendo %s para %s\n" | |
26294 |
|
26760 | |||
|
26761 | #, python-format | |||
|
26762 | msgid "branch %s not found" | |||
|
26763 | msgstr "ramo %s não encontrado" | |||
|
26764 | ||||
26295 | msgid "merging with a working directory ancestor has no effect" |
|
26765 | msgid "merging with a working directory ancestor has no effect" | |
26296 | msgstr "" |
|
26766 | msgstr "" | |
26297 | "mesclar com um ancestral do diretório de trabalho não tem nenhum efeito" |
|
26767 | "mesclar com um ancestral do diretório de trabalho não tem nenhum efeito" | |
@@ -26429,6 +26899,24 b' msgid "not an infix: %s"' | |||||
26429 | msgstr "não é um infixo: %s" |
|
26899 | msgstr "não é um infixo: %s" | |
26430 |
|
26900 | |||
26431 | #, python-format |
|
26901 | #, python-format | |
|
26902 | msgid "%(func)s takes at most %(nargs)d arguments" | |||
|
26903 | msgstr "a função %(func)s recebe no máximo %(nargs)d argumentos" | |||
|
26904 | ||||
|
26905 | #, python-format | |||
|
26906 | msgid "%(func)s got an invalid argument" | |||
|
26907 | msgstr "a função %(func)s recebeu um argumento inválido" | |||
|
26908 | ||||
|
26909 | #, python-format | |||
|
26910 | msgid "%(func)s got an unexpected keyword argument '%(key)s'" | |||
|
26911 | msgstr "a função %(func)s recebeu um argumento nomeado inesperado '%(key)s'" | |||
|
26912 | ||||
|
26913 | #, python-format | |||
|
26914 | msgid "%(func)s got multiple values for keyword argument '%(key)s'" | |||
|
26915 | msgstr "" | |||
|
26916 | "a função %(func)s recebeu múltiplos valores para o argumento nomeado " | |||
|
26917 | "'%(key)s'" | |||
|
26918 | ||||
|
26919 | #, python-format | |||
26432 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" |
|
26920 | msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" | |
26433 | msgstr "%d de %d trechos FALHARAM -- gravando rejeitados no arquivo %s\n" |
|
26921 | msgstr "%d de %d trechos FALHARAM -- gravando rejeitados no arquivo %s\n" | |
26434 |
|
26922 | |||
@@ -26480,6 +26968,9 b' msgstr "este \xc3\xa9 um arquivo bin\xc3\xa1rio\\n"' | |||||
26480 | msgid "%d hunks, %d lines changed\n" |
|
26968 | msgid "%d hunks, %d lines changed\n" | |
26481 | msgstr "%d trechos, %d linhas modificadas\n" |
|
26969 | msgstr "%d trechos, %d linhas modificadas\n" | |
26482 |
|
26970 | |||
|
26971 | msgid "record" | |||
|
26972 | msgstr "" | |||
|
26973 | ||||
26483 | msgid "" |
|
26974 | msgid "" | |
26484 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " |
|
26975 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " | |
26485 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " |
|
26976 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " | |
@@ -26519,6 +27010,10 b' msgstr ""' | |||||
26519 | "removidas, a edição será abortada e o trecho não será modificado.\n" |
|
27010 | "removidas, a edição será abortada e o trecho não será modificado.\n" | |
26520 |
|
27011 | |||
26521 | #, python-format |
|
27012 | #, python-format | |
|
27013 | msgid "editor exited with exit code %d\n" | |||
|
27014 | msgstr "o editor terminou com o código de saída %d\n" | |||
|
27015 | ||||
|
27016 | #, python-format | |||
26522 | msgid "examine changes to %s?" |
|
27017 | msgid "examine changes to %s?" | |
26523 | msgstr "examinar mudanças em %s?" |
|
27018 | msgstr "examinar mudanças em %s?" | |
26524 |
|
27019 | |||
@@ -26600,6 +27095,10 b' msgid "path %r traverses symbolic link %' | |||||
26600 | msgstr "o caminho %r percorre o link simbólico %r" |
|
27095 | msgstr "o caminho %r percorre o link simbólico %r" | |
26601 |
|
27096 | |||
26602 | #, python-format |
|
27097 | #, python-format | |
|
27098 | msgid "consider using '--cwd %s'" | |||
|
27099 | msgstr "considere usar '--cwd %s'" | |||
|
27100 | ||||
|
27101 | #, python-format | |||
26603 | msgid "%s not under root '%s'" |
|
27102 | msgid "%s not under root '%s'" | |
26604 | msgstr "%s não está sob a raiz '%s'" |
|
27103 | msgstr "%s não está sob a raiz '%s'" | |
26605 |
|
27104 | |||
@@ -26633,6 +27132,40 b' msgstr "terminou com o c\xc3\xb3digo %d"' | |||||
26633 | msgid "killed by signal %d" |
|
27132 | msgid "killed by signal %d" | |
26634 | msgstr "morto pelo sinal %d" |
|
27133 | msgstr "morto pelo sinal %d" | |
26635 |
|
27134 | |||
|
27135 | #. i18n: format XX seconds as "XXs" | |||
|
27136 | #, python-format | |||
|
27137 | msgid "%02ds" | |||
|
27138 | msgstr "%02ds" | |||
|
27139 | ||||
|
27140 | #. i18n: format X minutes and YY seconds as "XmYYs" | |||
|
27141 | #, python-format | |||
|
27142 | msgid "%dm%02ds" | |||
|
27143 | msgstr "%dm%02ds" | |||
|
27144 | ||||
|
27145 | #. i18n: format X hours and YY minutes as "XhYYm" | |||
|
27146 | #, python-format | |||
|
27147 | msgid "%dh%02dm" | |||
|
27148 | msgstr "%dh%02dm" | |||
|
27149 | ||||
|
27150 | #. i18n: format X days and YY hours as "XdYYh" | |||
|
27151 | #, python-format | |||
|
27152 | msgid "%dd%02dh" | |||
|
27153 | msgstr "%dd%02dh" | |||
|
27154 | ||||
|
27155 | #. i18n: format X weeks and YY days as "XwYYd" | |||
|
27156 | #, python-format | |||
|
27157 | msgid "%dw%02dd" | |||
|
27158 | msgstr "%dw%02dd" | |||
|
27159 | ||||
|
27160 | #. i18n: format X years and YY weeks as "XyYYw" | |||
|
27161 | #, python-format | |||
|
27162 | msgid "%dy%02dw" | |||
|
27163 | msgstr "%dy%02dw" | |||
|
27164 | ||||
|
27165 | #, python-format | |||
|
27166 | msgid "%d %s/sec" | |||
|
27167 | msgstr "%d %s/seg" | |||
|
27168 | ||||
26636 | #, python-format |
|
27169 | #, python-format | |
26637 | msgid "unknown strip-bundle2-version value %r; should be one of %r\n" |
|
27170 | msgid "unknown strip-bundle2-version value %r; should be one of %r\n" | |
26638 | msgstr "" |
|
27171 | msgstr "" | |
@@ -26642,6 +27175,13 b' msgstr ""' | |||||
26642 | msgid "saved backup bundle to %s\n" |
|
27175 | msgid "saved backup bundle to %s\n" | |
26643 | msgstr "salvando bundle de segurança em %s\n" |
|
27176 | msgstr "salvando bundle de segurança em %s\n" | |
26644 |
|
27177 | |||
|
27178 | msgid "programming error: cannot strip from inside a transaction" | |||
|
27179 | msgstr "" | |||
|
27180 | "erro de programação: não é possível executar strip dentro de uma transação" | |||
|
27181 | ||||
|
27182 | msgid "contact your extension maintainer" | |||
|
27183 | msgstr "contate o mantenedor da extensão" | |||
|
27184 | ||||
26645 | msgid "adding branch\n" |
|
27185 | msgid "adding branch\n" | |
26646 | msgstr "adicionando ramo\n" |
|
27186 | msgstr "adicionando ramo\n" | |
26647 |
|
27187 | |||
@@ -26657,6 +27197,19 b' msgstr "strip falhou, bundle completo ar' | |||||
26657 | msgid "strip failed, partial bundle stored in '%s'\n" |
|
27197 | msgid "strip failed, partial bundle stored in '%s'\n" | |
26658 | msgstr "strip falhou, bundle parcial armazenado em '%s'\n" |
|
27198 | msgstr "strip falhou, bundle parcial armazenado em '%s'\n" | |
26659 |
|
27199 | |||
|
27200 | msgid "(not rebuilding fncache because repository does not support fncache)\n" | |||
|
27201 | msgstr "(fncache não reparado porque o repositório não suporta fncache)\n" | |||
|
27202 | ||||
|
27203 | msgid "changeset" | |||
|
27204 | msgstr "revisão" | |||
|
27205 | ||||
|
27206 | #, python-format | |||
|
27207 | msgid "%d items added, %d removed from fncache\n" | |||
|
27208 | msgstr "%d itens adicionados, %d removidos do fncache\n" | |||
|
27209 | ||||
|
27210 | msgid "fncache already up to date\n" | |||
|
27211 | msgstr "fncache já está atualizado\n" | |||
|
27212 | ||||
26660 | #, python-format |
|
27213 | #, python-format | |
26661 | msgid "revlog decompress error: %s" |
|
27214 | msgid "revlog decompress error: %s" | |
26662 | msgstr "erro de descompressão do revlog: %s" |
|
27215 | msgstr "erro de descompressão do revlog: %s" | |
@@ -26718,6 +27271,11 b' msgid "attempted to add linkrev -1 to %s' | |||||
26718 | msgstr "tentativa de adicionar linkrev -1 a %s" |
|
27271 | msgstr "tentativa de adicionar linkrev -1 a %s" | |
26719 |
|
27272 | |||
26720 | #, python-format |
|
27273 | #, python-format | |
|
27274 | msgid "%s: size of %d bytes exceeds maximum revlog storage of 2GiB" | |||
|
27275 | msgstr "" | |||
|
27276 | "%s: o tamanho %d bytes excede o armazenamento máximo do revlog de 2GiB" | |||
|
27277 | ||||
|
27278 | #, python-format | |||
26721 | msgid "node %s is not censored" |
|
27279 | msgid "node %s is not censored" | |
26722 | msgstr "o nó %s não é censurado" |
|
27280 | msgstr "o nó %s não é censurado" | |
26723 |
|
27281 | |||
@@ -26729,9 +27287,8 b' msgstr "erro de sintaxe no revset \'%s\'"' | |||||
26729 | msgid "at %s: %s" |
|
27287 | msgid "at %s: %s" | |
26730 | msgstr "em %s: %s" |
|
27288 | msgstr "em %s: %s" | |
26731 |
|
27289 | |||
26732 | #, python-format |
|
27290 | msgid "can't use a key-value pair in this context" | |
26733 | msgid "can't use %s here" |
|
27291 | msgstr "não se pode usar um par chave-valor nesse contexto" | |
26734 | msgstr "não se pode usar %s aqui" |
|
|||
26735 |
|
27292 | |||
26736 | msgid "" |
|
27293 | msgid "" | |
26737 | "``adds(pattern)``\n" |
|
27294 | "``adds(pattern)``\n" | |
@@ -27004,17 +27561,6 b' msgid "divergent takes no arguments"' | |||||
27004 | msgstr "divergent não tem argumentos" |
|
27561 | msgstr "divergent não tem argumentos" | |
27005 |
|
27562 | |||
27006 | msgid "" |
|
27563 | msgid "" | |
27007 | "``draft()``\n" |
|
|||
27008 | " Changeset in draft phase." |
|
|||
27009 | msgstr "" |
|
|||
27010 | "``draft()``\n" |
|
|||
27011 | " Revisões na fase \"draft\" (rascunho)." |
|
|||
27012 |
|
||||
27013 | #. i18n: "draft" is a keyword |
|
|||
27014 | msgid "draft takes no arguments" |
|
|||
27015 | msgstr "draft não tem argumentos" |
|
|||
27016 |
|
||||
27017 | msgid "" |
|
|||
27018 | "``extinct()``\n" |
|
27564 | "``extinct()``\n" | |
27019 | " Obsolete changesets with obsolete descendants only." |
|
27565 | " Obsolete changesets with obsolete descendants only." | |
27020 | msgstr "" |
|
27566 | msgstr "" | |
@@ -27045,8 +27591,8 b' msgstr ""' | |||||
27045 | " com `re:` literalmente, use o prefixo `literal:`." |
|
27591 | " com `re:` literalmente, use o prefixo `literal:`." | |
27046 |
|
27592 | |||
27047 | #. i18n: "extra" is a keyword |
|
27593 | #. i18n: "extra" is a keyword | |
27048 |
msgid "extra takes at least 1 a |
|
27594 | msgid "extra takes at least 1 argument" | |
27049 |
msgstr "extra recebe |
|
27595 | msgstr "extra recebe pelo menos um argumento" | |
27050 |
|
27596 | |||
27051 | #. i18n: "extra" is a keyword |
|
27597 | #. i18n: "extra" is a keyword | |
27052 | msgid "first argument to extra must be a string" |
|
27598 | msgid "first argument to extra must be a string" | |
@@ -27443,6 +27989,28 b' msgstr ""' | |||||
27443 | " O conjunto de todos os pais de todas as revisões no conjunto pedido,\n" |
|
27989 | " O conjunto de todos os pais de todas as revisões no conjunto pedido,\n" | |
27444 | " ou os pais do diretório de trabalho." |
|
27990 | " ou os pais do diretório de trabalho." | |
27445 |
|
27991 | |||
|
27992 | msgid "" | |||
|
27993 | "``draft()``\n" | |||
|
27994 | " Changeset in draft phase." | |||
|
27995 | msgstr "" | |||
|
27996 | "``draft()``\n" | |||
|
27997 | " Revisões na fase \"draft\" (rascunho)." | |||
|
27998 | ||||
|
27999 | #. i18n: "draft" is a keyword | |||
|
28000 | msgid "draft takes no arguments" | |||
|
28001 | msgstr "draft não tem argumentos" | |||
|
28002 | ||||
|
28003 | msgid "" | |||
|
28004 | "``secret()``\n" | |||
|
28005 | " Changeset in secret phase." | |||
|
28006 | msgstr "" | |||
|
28007 | "``secret()``\n" | |||
|
28008 | " A revisão está na fase \"secret\" (secreta)." | |||
|
28009 | ||||
|
28010 | #. i18n: "secret" is a keyword | |||
|
28011 | msgid "secret takes no arguments" | |||
|
28012 | msgstr "secret não tem argumentos" | |||
|
28013 | ||||
27446 | msgid "^ expects a number 0, 1, or 2" |
|
28014 | msgid "^ expects a number 0, 1, or 2" | |
27447 | msgstr "^ espera o número 0, 1 ou 2" |
|
28015 | msgstr "^ espera o número 0, 1 ou 2" | |
27448 |
|
28016 | |||
@@ -27612,17 +28180,6 b' msgstr ""' | |||||
27612 | " Revisões no conjunto sem revisões pais no conjunto." |
|
28180 | " Revisões no conjunto sem revisões pais no conjunto." | |
27613 |
|
28181 | |||
27614 | msgid "" |
|
28182 | msgid "" | |
27615 | "``secret()``\n" |
|
|||
27616 | " Changeset in secret phase." |
|
|||
27617 | msgstr "" |
|
|||
27618 | "``secret()``\n" |
|
|||
27619 | " A revisão está na fase \"secret\" (secreta)." |
|
|||
27620 |
|
||||
27621 | #. i18n: "secret" is a keyword |
|
|||
27622 | msgid "secret takes no arguments" |
|
|||
27623 | msgstr "secret não tem argumentos" |
|
|||
27624 |
|
||||
27625 | msgid "" |
|
|||
27626 | "``sort(set[, [-]key...])``\n" |
|
28183 | "``sort(set[, [-]key...])``\n" | |
27627 | " Sort set by keys. The default sort order is ascending, specify a key\n" |
|
28184 | " Sort set by keys. The default sort order is ascending, specify a key\n" | |
27628 | " as ``-key`` to sort in descending order." |
|
28185 | " as ``-key`` to sort in descending order." | |
@@ -27877,19 +28434,20 b' msgstr "n\xc3\xa3o foi poss\xc3\xadvel criar reposit\xc3\xb3rio remoto"' | |||||
27877 | msgid "no suitable response from remote hg" |
|
28434 | msgid "no suitable response from remote hg" | |
27878 | msgstr "nenhuma resposta adequada do hg remoto" |
|
28435 | msgstr "nenhuma resposta adequada do hg remoto" | |
27879 |
|
28436 | |||
|
28437 | msgid "check previous remote output" | |||
|
28438 | msgstr "verifique a saída remota anterior" | |||
|
28439 | ||||
27880 | #, python-format |
|
28440 | #, python-format | |
27881 | msgid "push refused: %s" |
|
28441 | msgid "push refused: %s" | |
27882 | msgstr "envio recusado: %s" |
|
28442 | msgstr "envio recusado: %s" | |
27883 |
|
28443 | |||
|
28444 | #, python-format | |||
|
28445 | msgid "passphrase for %s: " | |||
|
28446 | msgstr "senha para %s: " | |||
|
28447 | ||||
27884 | msgid "ssl connection failed" |
|
28448 | msgid "ssl connection failed" | |
27885 | msgstr "a conexão ssl falhou" |
|
28449 | msgstr "a conexão ssl falhou" | |
27886 |
|
28450 | |||
27887 | msgid "Python SSL support not found" |
|
|||
27888 | msgstr "suporte do Python a SSL não instalado" |
|
|||
27889 |
|
||||
27890 | msgid "certificate checking requires Python 2.6" |
|
|||
27891 | msgstr "verificação de certificado exige Python 2.6" |
|
|||
27892 |
|
||||
27893 | msgid "no certificate received" |
|
28451 | msgid "no certificate received" | |
27894 | msgstr "nenhum certificado recebido" |
|
28452 | msgstr "nenhum certificado recebido" | |
27895 |
|
28453 | |||
@@ -27908,23 +28466,6 b' msgid "could not find web.cacerts: %s"' | |||||
27908 | msgstr "não foi possível encontrar web.cacerts: %s" |
|
28466 | msgstr "não foi possível encontrar web.cacerts: %s" | |
27909 |
|
28467 | |||
27910 | #, python-format |
|
28468 | #, python-format | |
27911 | msgid "host fingerprint for %s can't be verified (Python too old)" |
|
|||
27912 | msgstr "" |
|
|||
27913 | "a impressão digital do host para %s não pode ser verificada (versão do " |
|
|||
27914 | "Python muito antiga)" |
|
|||
27915 |
|
||||
27916 | #, python-format |
|
|||
27917 | msgid "certificate for %s can't be verified (Python too old)" |
|
|||
27918 | msgstr "" |
|
|||
27919 | "o certificado %s não pode ser verificado (versão do Python muito antiga)" |
|
|||
27920 |
|
||||
27921 | #, python-format |
|
|||
27922 | msgid "warning: certificate for %s can't be verified (Python too old)\n" |
|
|||
27923 | msgstr "" |
|
|||
27924 | "aviso: certificado %s não pode ser verificado (versão do Python muito " |
|
|||
27925 | "antiga)\n" |
|
|||
27926 |
|
||||
27927 | #, python-format |
|
|||
27928 | msgid "%s ssl connection error" |
|
28469 | msgid "%s ssl connection error" | |
27929 | msgstr "erro de conexão ssl com %s" |
|
28470 | msgstr "erro de conexão ssl com %s" | |
27930 |
|
28471 | |||
@@ -28113,6 +28654,14 b' msgid "reverting subrepo %s\\n"' | |||||
28113 | msgstr "revertendo sub-repositório %s\n" |
|
28654 | msgstr "revertendo sub-repositório %s\n" | |
28114 |
|
28655 | |||
28115 | #, python-format |
|
28656 | #, python-format | |
|
28657 | msgid "subrepo '%s' is hidden in revision %s\n" | |||
|
28658 | msgstr "sub-repositório '%s' oculto na revisão %s\n" | |||
|
28659 | ||||
|
28660 | #, python-format | |||
|
28661 | msgid "subrepo '%s' not found in revision %s\n" | |||
|
28662 | msgstr "sub-repositório '%s' não encontrado na revisão %s\n" | |||
|
28663 | ||||
|
28664 | #, python-format | |||
28116 | msgid "'svn' executable not found for subrepo '%s'" |
|
28665 | msgid "'svn' executable not found for subrepo '%s'" | |
28117 | msgstr "executável 'svn' não encontrado para o sub-repositório '%s'" |
|
28666 | msgstr "executável 'svn' não encontrado para o sub-repositório '%s'" | |
28118 |
|
28667 | |||
@@ -28356,6 +28905,16 b' msgstr ""' | |||||
28356 | " 'Foo Bar'" |
|
28905 | " 'Foo Bar'" | |
28357 |
|
28906 | |||
28358 | msgid "" |
|
28907 | msgid "" | |
|
28908 | ":revescape: Any text. Escapes all \"special\" characters, except @.\n" | |||
|
28909 | " Forward slashes are escaped twice to prevent web servers from prematurely\n" | |||
|
28910 | " unescaping them. For example, \"@foo bar/baz\" becomes \"@foo%20bar%252Fbaz\"." | |||
|
28911 | msgstr "" | |||
|
28912 | ":revescape: Qualquer texto. Codifica todos os caracteres\n" | |||
|
28913 | " \"especiais\", exceto @. Barras '/' recebem escapes duplos para\n" | |||
|
28914 | " impedir que servidores web retirem os escapes prematuramente.\n" | |||
|
28915 | " Por exemplo, \"@foo bar/baz\" se torna \"@foo%20bar%252Fbaz\"." | |||
|
28916 | ||||
|
28917 | msgid "" | |||
28359 | ":rfc3339date: Date. Returns a date using the Internet date format\n" |
|
28918 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |
28360 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." |
|
28919 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." | |
28361 | msgstr "" |
|
28920 | msgstr "" | |
@@ -28459,18 +29018,26 b' msgstr ":branch: String. O nome do ramo no qual a revis\xc3\xa3o foi consolidada."' | |||||
28459 |
|
29018 | |||
28460 | msgid "" |
|
29019 | msgid "" | |
28461 | ":bookmarks: List of strings. Any bookmarks associated with the\n" |
|
29020 | ":bookmarks: List of strings. Any bookmarks associated with the\n" | |
28462 | " changeset." |
|
29021 | " changeset. Also sets 'active', the name of the active bookmark." | |
28463 | msgstr "" |
|
29022 | msgstr "" | |
28464 | ":bookmarks: Lista de strings. Quaisquer marcadores associados à revisão." |
|
29023 | ":bookmarks: Lista de strings. Quaisquer marcadores associados à revisão.\n" | |
|
29024 | " Também define 'active', o nome do marcador ativo." | |||
28465 |
|
29025 | |||
28466 | msgid ":children: List of strings. The children of the changeset." |
|
29026 | msgid ":children: List of strings. The children of the changeset." | |
28467 | msgstr ":children: Lista de strings. As revisões filhas da revisão." |
|
29027 | msgstr ":children: Lista de strings. As revisões filhas da revisão." | |
28468 |
|
29028 | |||
28469 | msgid "" |
|
29029 | msgid "" | |
28470 | ":currentbookmark: String. The active bookmark, if it is\n" |
|
29030 | ":currentbookmark: String. The active bookmark, if it is\n" | |
28471 | " associated with the changeset" |
|
29031 | " associated with the changeset (DEPRECATED)" | |
28472 | msgstr "" |
|
29032 | msgstr "" | |
28473 | ":currentbookmark: String. O marcador ativo, se estiver\n" |
|
29033 | ":currentbookmark: String. O marcador ativo, se estiver\n" | |
|
29034 | " associado à revisão (OBSOLETO)" | |||
|
29035 | ||||
|
29036 | msgid "" | |||
|
29037 | ":activebookmark: String. The active bookmark, if it is\n" | |||
|
29038 | " associated with the changeset" | |||
|
29039 | msgstr "" | |||
|
29040 | ":activebookmark: String. O marcador ativo, se estiver\n" | |||
28474 | " associado à revisão" |
|
29041 | " associado à revisão" | |
28475 |
|
29042 | |||
28476 | msgid ":date: Date information. The date when the changeset was committed." |
|
29043 | msgid ":date: Date information. The date when the changeset was committed." | |
@@ -28524,15 +29091,20 b' msgstr ""' | |||||
28524 | " adicionados ou removidos por esta revisão." |
|
29091 | " adicionados ou removidos por esta revisão." | |
28525 |
|
29092 | |||
28526 | msgid "" |
|
29093 | msgid "" | |
28527 | ":latesttag: String. Most recent global tag in the ancestors of this\n" |
|
29094 | ":latesttag: List of strings. The global tags on the most recent globally\n" | |
28528 | " changeset." |
|
29095 | " tagged ancestor of this changeset." | |
28529 | msgstr "" |
|
29096 | msgstr "" | |
28530 |
":latesttag: |
|
29097 | ":latesttag: Lista de strings. As etiquetas globais no ancestral mais\n" | |
28531 | " revisão." |
|
29098 | " recente desta revisão que possuir etiquetas globais." | |
28532 |
|
29099 | |||
28533 | msgid ":latesttagdistance: Integer. Longest path to the latest tag." |
|
29100 | msgid ":latesttagdistance: Integer. Longest path to the latest tag." | |
28534 | msgstr ":latesttagdistance: Inteiro. O caminho mais longo para a latesttag." |
|
29101 | msgstr ":latesttagdistance: Inteiro. O caminho mais longo para a latesttag." | |
28535 |
|
29102 | |||
|
29103 | msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag." | |||
|
29104 | msgstr "" | |||
|
29105 | ":changessincelatesttag: Inteiro. Todos os ancestrais que não estão na\n" | |||
|
29106 | " etiqueta mais recente." | |||
|
29107 | ||||
28536 | msgid "" |
|
29108 | msgid "" | |
28537 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" |
|
29109 | ":node: String. The changeset identification hash, as a 40 hexadecimal\n" | |
28538 | " digit string." |
|
29110 | " digit string." | |
@@ -28596,6 +29168,12 b' msgstr ""' | |||||
28596 | " Se a revisão só tiver um pai \"natural\" (a revisão predecessora),\n" |
|
29168 | " Se a revisão só tiver um pai \"natural\" (a revisão predecessora),\n" | |
28597 | " nada é exibido." |
|
29169 | " nada é exibido." | |
28598 |
|
29170 | |||
|
29171 | msgid "integer literal without digits" | |||
|
29172 | msgstr "inteiro literal sem dígitos" | |||
|
29173 | ||||
|
29174 | msgid "unterminated template expansion" | |||
|
29175 | msgstr "expansão de modelo não terminada" | |||
|
29176 | ||||
28599 | #, python-format |
|
29177 | #, python-format | |
28600 | msgid "unknown method '%s'" |
|
29178 | msgid "unknown method '%s'" | |
28601 | msgstr "método desconhecido '%s'" |
|
29179 | msgstr "método desconhecido '%s'" | |
@@ -28674,6 +29252,20 b' msgid "pad() expects two to four argumen' | |||||
28674 | msgstr "pad() espera de dois a quatro argumentos" |
|
29252 | msgstr "pad() espera de dois a quatro argumentos" | |
28675 |
|
29253 | |||
28676 | msgid "" |
|
29254 | msgid "" | |
|
29255 | ":indent(text, indentchars[, firstline]): Indents all non-empty lines\n" | |||
|
29256 | " with the characters given in the indentchars string. An optional\n" | |||
|
29257 | " third parameter will override the indent for the first line only\n" | |||
|
29258 | " if present." | |||
|
29259 | msgstr "" | |||
|
29260 | ":indent(texto, caracteres[, primeiralinha]): Indenta todas as linhas\n" | |||
|
29261 | " não vazias com os caracteres pedidos. Se presente, um terceiro\n" | |||
|
29262 | " parâmetro opcional sobrepõe a indentação para a primeira linha." | |||
|
29263 | ||||
|
29264 | #. i18n: "indent" is a keyword | |||
|
29265 | msgid "indent() expects two or three arguments" | |||
|
29266 | msgstr "indent() espera dois ou três argumentos" | |||
|
29267 | ||||
|
29268 | msgid "" | |||
28677 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" |
|
29269 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" | |
28678 | " are complex types. This function allows you to obtain the value of an\n" |
|
29270 | " are complex types. This function allows you to obtain the value of an\n" | |
28679 | " attribute on these type." |
|
29271 | " attribute on these type." | |
@@ -28806,8 +29398,9 b' msgstr ""' | |||||
28806 | msgid "word expects two or three arguments, got %d" |
|
29398 | msgid "word expects two or three arguments, got %d" | |
28807 | msgstr "word espera dois ou três argumentos, %d recebidos" |
|
29399 | msgstr "word espera dois ou três argumentos, %d recebidos" | |
28808 |
|
29400 | |||
28809 | msgid "Use strings like '3' for numbers passed to word function" |
|
29401 | #. i18n: "word" is a keyword | |
28810 | msgstr "Use aspas como em '3' para números passados para a função word" |
|
29402 | msgid "word expects an integer index" | |
|
29403 | msgstr "word espera um índice inteiro" | |||
28811 |
|
29404 | |||
28812 | msgid "unmatched quotes" |
|
29405 | msgid "unmatched quotes" | |
28813 | msgstr "aspas não combinam" |
|
29406 | msgstr "aspas não combinam" | |
@@ -29243,8 +29836,9 b' msgstr "imposs\xc3\xadvel decodificar nome de arquivo \'%s\'"' | |||||
29243 | msgid "broken revlog! (%s)" |
|
29836 | msgid "broken revlog! (%s)" | |
29244 | msgstr "revlog quebrado! (%s)" |
|
29837 | msgstr "revlog quebrado! (%s)" | |
29245 |
|
29838 | |||
29246 | msgid "missing revlog!" |
|
29839 | #, python-format | |
29247 | msgstr "revlog faltando!" |
|
29840 | msgid " warning: revlog '%s' not in fncache!" | |
|
29841 | msgstr " warning: o revlog '%s' não está no fncache!" | |||
29248 |
|
29842 | |||
29249 | #, python-format |
|
29843 | #, python-format | |
29250 | msgid "%s not in manifests" |
|
29844 | msgid "%s not in manifests" | |
@@ -29293,6 +29887,11 b' msgstr "%d arquivos, %d revis\xc3\xb5es, %d mudan\xc3\xa7as em arquivos\\n"' | |||||
29293 | msgid "%d warnings encountered!\n" |
|
29887 | msgid "%d warnings encountered!\n" | |
29294 | msgstr "%d avisos encontrados!\n" |
|
29888 | msgstr "%d avisos encontrados!\n" | |
29295 |
|
29889 | |||
|
29890 | msgid "hint: run \"hg debugrebuildfncache\" to recover from corrupt fncache\n" | |||
|
29891 | msgstr "" | |||
|
29892 | "dica: execute \"hg debugrebuildfncache\" para recuperar o fncache " | |||
|
29893 | "corrompido\n" | |||
|
29894 | ||||
29296 | #, python-format |
|
29895 | #, python-format | |
29297 | msgid "%d integrity errors encountered!\n" |
|
29896 | msgid "%d integrity errors encountered!\n" | |
29298 | msgstr "%d erros de integridade encontrados!\n" |
|
29897 | msgstr "%d erros de integridade encontrados!\n" | |
@@ -29313,6 +29912,102 b' msgstr "procurar mudan\xc3\xa7as remotas"' | |||||
29313 | msgid "number of cpus must be an integer" |
|
29912 | msgid "number of cpus must be an integer" | |
29314 | msgstr "o número de cpus deve ser um inteiro" |
|
29913 | msgstr "o número de cpus deve ser um inteiro" | |
29315 |
|
29914 | |||
|
29915 | #~ msgid "cannot edit immutable changeset: %s" | |||
|
29916 | #~ msgstr "não é possível editar uma revisão imutável: %s" | |||
|
29917 | ||||
|
29918 | #~ msgid "The following settings are available::" | |||
|
29919 | #~ msgstr "As seguintes opções estão disponíveis::" | |||
|
29920 | ||||
|
29921 | #~ msgid "" | |||
|
29922 | #~ " [progress]\n" | |||
|
29923 | #~ " delay = 3 # number of seconds (float) before showing the progress bar\n" | |||
|
29924 | #~ " changedelay = 1 # changedelay: minimum delay before showing a new topic.\n" | |||
|
29925 | #~ " # If set to less than 3 * refresh, that value will\n" | |||
|
29926 | #~ " # be used instead.\n" | |||
|
29927 | #~ " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" | |||
|
29928 | #~ " format = topic bar number estimate # format of the progress bar\n" | |||
|
29929 | #~ " width = <none> # if set, the maximum width of the progress information\n" | |||
|
29930 | #~ " # (that is, min(width, term width) will be used)\n" | |||
|
29931 | #~ " clear-complete = True # clear the progress bar after it's done\n" | |||
|
29932 | #~ " disable = False # if true, don't show a progress bar\n" | |||
|
29933 | #~ " assume-tty = False # if true, ALWAYS show a progress bar, unless\n" | |||
|
29934 | #~ " # disable is given" | |||
|
29935 | #~ msgstr "" | |||
|
29936 | #~ " [progress]\n" | |||
|
29937 | #~ " delay = 3 # número de segundos (float) antes que a barra seja mostrada\n" | |||
|
29938 | #~ " changedelay = 1 # changedelay: atraso mínimo antes que um novo tópico\n" | |||
|
29939 | #~ " # seja mostrado. Se for definido para menos de\n" | |||
|
29940 | #~ " # 3 * refresh, tal valor será usado em seu lugar.\n" | |||
|
29941 | #~ " refresh = 0.1 # tempo em segundos entre atualizações da\n" | |||
|
29942 | #~ " # barra de progresso\n" | |||
|
29943 | #~ " format = topic bar number estimate # formato da barra de progresso\n" | |||
|
29944 | #~ " width = <none> # se definido, será a largura máxima da informação de\n" | |||
|
29945 | #~ " # progresso (isto é, min(largura, largura do terminal)\n" | |||
|
29946 | #~ " # será usada)\n" | |||
|
29947 | #~ " clear-complete = True # limpa a barra de progresso após terminar\n" | |||
|
29948 | #~ " disable = False # se 'true', não exibe uma barra de progresso\n" | |||
|
29949 | #~ " assume-tty = False # se 'true', SEMPRE exibe uma barra de progressos,\n" | |||
|
29950 | #~ " # a não ser que 'disable' seja 'true'" | |||
|
29951 | ||||
|
29952 | #~ msgid "option '--%s' may not be used when shelving a change" | |||
|
29953 | #~ msgstr "a opção '--%s' não pode ser usada ao engavetar uma mudança" | |||
|
29954 | ||||
|
29955 | #~ msgid "mark a branch as closed, hiding it from the branch list" | |||
|
29956 | #~ msgstr "marca um ramo como fechado, escondendo-o da lista de ramos" | |||
|
29957 | ||||
|
29958 | #~ msgid "custom templates not yet supported" | |||
|
29959 | #~ msgstr "modelos personalizados ainda não são suportados" | |||
|
29960 | ||||
|
29961 | #~ msgid "" | |||
|
29962 | #~ "``reportoldssl``\n" | |||
|
29963 | #~ " Warn if an SSL certificate is unable to be used due to using Python\n" | |||
|
29964 | #~ " 2.5 or earlier. True or False. Default is True." | |||
|
29965 | #~ msgstr "" | |||
|
29966 | #~ "``reportoldssl``\n" | |||
|
29967 | #~ " Avisa se um certificado SSL não puder ser usado por falta de\n" | |||
|
29968 | #~ " suporte nas versões do Pyton 2.5 ou anteriores. True ou False.\n" | |||
|
29969 | #~ " O padrão é True." | |||
|
29970 | ||||
|
29971 | #~ msgid "" | |||
|
29972 | #~ ":files: files does not recurse into subrepos unless -S/--subrepos is\n" | |||
|
29973 | #~ " specified. Git and Subversion subrepositories are currently\n" | |||
|
29974 | #~ " silently ignored." | |||
|
29975 | #~ msgstr "" | |||
|
29976 | #~ ":files: files não é executado recursivamente em\n" | |||
|
29977 | #~ " sub-repositórios, a não ser que -S/--subrepos seja\n" | |||
|
29978 | #~ " especificado.\n" | |||
|
29979 | #~ " Sub-repositórios do Subversion e do Git são no momento\n" | |||
|
29980 | #~ " silenciosamente ignorados." | |||
|
29981 | ||||
|
29982 | #~ msgid "can't use %s here" | |||
|
29983 | #~ msgstr "não se pode usar %s aqui" | |||
|
29984 | ||||
|
29985 | #~ msgid "Python SSL support not found" | |||
|
29986 | #~ msgstr "suporte do Python a SSL não instalado" | |||
|
29987 | ||||
|
29988 | #~ msgid "certificate checking requires Python 2.6" | |||
|
29989 | #~ msgstr "verificação de certificado exige Python 2.6" | |||
|
29990 | ||||
|
29991 | #~ msgid "host fingerprint for %s can't be verified (Python too old)" | |||
|
29992 | #~ msgstr "" | |||
|
29993 | #~ "a impressão digital do host para %s não pode ser verificada (versão do " | |||
|
29994 | #~ "Python muito antiga)" | |||
|
29995 | ||||
|
29996 | #~ msgid "certificate for %s can't be verified (Python too old)" | |||
|
29997 | #~ msgstr "" | |||
|
29998 | #~ "o certificado %s não pode ser verificado (versão do Python muito antiga)" | |||
|
29999 | ||||
|
30000 | #~ msgid "warning: certificate for %s can't be verified (Python too old)\n" | |||
|
30001 | #~ msgstr "" | |||
|
30002 | #~ "aviso: certificado %s não pode ser verificado (versão do Python muito " | |||
|
30003 | #~ "antiga)\n" | |||
|
30004 | ||||
|
30005 | #~ msgid "Use strings like '3' for numbers passed to word function" | |||
|
30006 | #~ msgstr "Use aspas como em '3' para números passados para a função word" | |||
|
30007 | ||||
|
30008 | #~ msgid "missing revlog!" | |||
|
30009 | #~ msgstr "revlog faltando!" | |||
|
30010 | ||||
29316 | #~ msgid "hg debug-merge-base REV REV" |
|
30011 | #~ msgid "hg debug-merge-base REV REV" | |
29317 | #~ msgstr "hg debug-merge-base REV REV" |
|
30012 | #~ msgstr "hg debug-merge-base REV REV" | |
29318 |
|
30013 | |||
@@ -29443,8 +30138,5 b' msgstr "o n\xc3\xbamero de cpus deve ser um inteiro"' | |||||
29443 | #~ " Se -a/--active for especificado, mostra apenas ramos ativos. Um\n" |
|
30138 | #~ " Se -a/--active for especificado, mostra apenas ramos ativos. Um\n" | |
29444 | #~ " ramo é considerado ativo se contém cabeças de repositório." |
|
30139 | #~ " ramo é considerado ativo se contém cabeças de repositório." | |
29445 |
|
30140 | |||
29446 | #~ msgid "grafting revision %s\n" |
|
|||
29447 | #~ msgstr "enxertando revisão %s\n" |
|
|||
29448 |
|
||||
29449 | #~ msgid "graft for revision %s is empty\n" |
|
30141 | #~ msgid "graft for revision %s is empty\n" | |
29450 | #~ msgstr "o enxerto para a revisão %s é vazio\n" |
|
30142 | #~ msgstr "o enxerto para a revisão %s é vazio\n" |
@@ -730,6 +730,34 b' class dirstate(object):' | |||||
730 | else: |
|
730 | else: | |
731 | badfn(ff, inst.strerror) |
|
731 | badfn(ff, inst.strerror) | |
732 |
|
732 | |||
|
733 | # Case insensitive filesystems cannot rely on lstat() failing to detect | |||
|
734 | # a case-only rename. Prune the stat object for any file that does not | |||
|
735 | # match the case in the filesystem, if there are multiple files that | |||
|
736 | # normalize to the same path. | |||
|
737 | if match.isexact() and self._checkcase: | |||
|
738 | normed = {} | |||
|
739 | ||||
|
740 | for f, st in results.iteritems(): | |||
|
741 | if st is None: | |||
|
742 | continue | |||
|
743 | ||||
|
744 | nc = util.normcase(f) | |||
|
745 | paths = normed.get(nc) | |||
|
746 | ||||
|
747 | if paths is None: | |||
|
748 | paths = set() | |||
|
749 | normed[nc] = paths | |||
|
750 | ||||
|
751 | paths.add(f) | |||
|
752 | ||||
|
753 | for norm, paths in normed.iteritems(): | |||
|
754 | if len(paths) > 1: | |||
|
755 | for path in paths: | |||
|
756 | folded = self._discoverpath(path, norm, True, None, | |||
|
757 | self._dirfoldmap) | |||
|
758 | if path != folded: | |||
|
759 | results[path] = None | |||
|
760 | ||||
733 | return results, dirsfound, dirsnotfound |
|
761 | return results, dirsfound, dirsnotfound | |
734 |
|
762 | |||
735 | def walk(self, match, subrepos, unknown, ignored, full=True): |
|
763 | def walk(self, match, subrepos, unknown, ignored, full=True): |
@@ -166,6 +166,8 b' helptable = sorted([' | |||||
166 | (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"), |
|
166 | (["hgignore", "ignore"], _("Syntax for Mercurial Ignore Files"), | |
167 | loaddoc('hgignore')), |
|
167 | loaddoc('hgignore')), | |
168 | (["phases"], _("Working with Phases"), loaddoc('phases')), |
|
168 | (["phases"], _("Working with Phases"), loaddoc('phases')), | |
|
169 | (['scripting'], _('Using Mercurial from scripts and automation'), | |||
|
170 | loaddoc('scripting')), | |||
169 | ]) |
|
171 | ]) | |
170 |
|
172 | |||
171 | # Map topics to lists of callable taking the current topic help and |
|
173 | # Map topics to lists of callable taking the current topic help and |
@@ -968,6 +968,9 b' class localrepository(object):' | |||||
968 | _("abandoned transaction found"), |
|
968 | _("abandoned transaction found"), | |
969 | hint=_("run 'hg recover' to clean up transaction")) |
|
969 | hint=_("run 'hg recover' to clean up transaction")) | |
970 |
|
970 | |||
|
971 | # make journal.dirstate contain in-memory changes at this point | |||
|
972 | self.dirstate.write() | |||
|
973 | ||||
971 | idbase = "%.40f#%f" % (random.random(), time.time()) |
|
974 | idbase = "%.40f#%f" % (random.random(), time.time()) | |
972 | txnid = 'TXN:' + util.sha1(idbase).hexdigest() |
|
975 | txnid = 'TXN:' + util.sha1(idbase).hexdigest() | |
973 | self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid) |
|
976 | self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid) |
@@ -5,7 +5,7 b'' | |||||
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | import copy, re |
|
8 | import copy, os, re | |
9 | import util, pathutil |
|
9 | import util, pathutil | |
10 | from i18n import _ |
|
10 | from i18n import _ | |
11 |
|
11 | |||
@@ -289,7 +289,8 b' class match(object):' | |||||
289 | continue |
|
289 | continue | |
290 | elif kind == 'include': |
|
290 | elif kind == 'include': | |
291 | try: |
|
291 | try: | |
292 | includepats = readpatternfile(pat, self._warn) |
|
292 | fullpath = os.path.join(root, util.localpath(pat)) | |
|
293 | includepats = readpatternfile(fullpath, self._warn) | |||
293 | for k, p, source in self._normalize(includepats, default, |
|
294 | for k, p, source in self._normalize(includepats, default, | |
294 | root, cwd, auditor): |
|
295 | root, cwd, auditor): | |
295 | kindpats.append((k, p, source or pat)) |
|
296 | kindpats.append((k, p, source or pat)) |
@@ -1156,7 +1156,8 b' static PyObject *compute_phases_map_sets' | |||||
1156 | if (minrevallphases != -1) { |
|
1156 | if (minrevallphases != -1) { | |
1157 | int parents[2]; |
|
1157 | int parents[2]; | |
1158 | for (i = minrevallphases; i < len; i++) { |
|
1158 | for (i = minrevallphases; i < len; i++) { | |
1159 |
if (index_get_parents(self, i, parents, |
|
1159 | if (index_get_parents(self, i, parents, | |
|
1160 | (int)len - 1) < 0) | |||
1160 | goto release_phasesetlist; |
|
1161 | goto release_phasesetlist; | |
1161 | set_phase_from_parents(phases, parents[0], parents[1], i); |
|
1162 | set_phase_from_parents(phases, parents[0], parents[1], i); | |
1162 | } |
|
1163 | } | |
@@ -1256,7 +1257,7 b' static PyObject *index_headrevs(indexObj' | |||||
1256 | continue; |
|
1257 | continue; | |
1257 | } |
|
1258 | } | |
1258 |
|
1259 | |||
1259 | if (index_get_parents(self, i, parents, len - 1) < 0) |
|
1260 | if (index_get_parents(self, i, parents, (int)len - 1) < 0) | |
1260 | goto bail; |
|
1261 | goto bail; | |
1261 | for (j = 0; j < 2; j++) { |
|
1262 | for (j = 0; j < 2; j++) { | |
1262 | if (parents[j] >= 0) |
|
1263 | if (parents[j] >= 0) |
@@ -237,7 +237,7 b' def rebuildfncache(ui, repo):' | |||||
237 |
|
237 | |||
238 | if 'fncache' not in repo.requirements: |
|
238 | if 'fncache' not in repo.requirements: | |
239 | ui.warn(_('(not rebuilding fncache because repository does not ' |
|
239 | ui.warn(_('(not rebuilding fncache because repository does not ' | |
240 | 'support fncache\n')) |
|
240 | 'support fncache)\n')) | |
241 | return |
|
241 | return | |
242 |
|
242 | |||
243 | lock = repo.lock() |
|
243 | lock = repo.lock() |
@@ -22,5 +22,6 b'' | |||||
22 | <div class="page_footer"> |
|
22 | <div class="page_footer"> | |
23 | {motd} |
|
23 | {motd} | |
24 | </div> |
|
24 | </div> | |
|
25 | <script type="text/javascript">process_dates()</script> | |||
25 | </body> |
|
26 | </body> | |
26 | </html> |
|
27 | </html> |
@@ -24,7 +24,7 b'' | |||||
24 | <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li> |
|
24 | <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li> | |
25 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> |
|
25 | <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li> | |
26 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> |
|
26 | <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> | |
27 |
<li><a href="{url|urlescape} |
|
27 | <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li> | |
28 | <li><a href="{url|urlescape}file{sessionvars%urlparameter}">files</a></li> |
|
28 | <li><a href="{url|urlescape}file{sessionvars%urlparameter}">files</a></li> | |
29 | <li class="current">help</li> |
|
29 | <li class="current">help</li> | |
30 | </ul> |
|
30 | </ul> |
@@ -35,5 +35,6 b'' | |||||
35 | <div id="corner-bottom-right"></div> |
|
35 | <div id="corner-bottom-right"></div> | |
36 |
|
36 | |||
37 | </div> |
|
37 | </div> | |
|
38 | <script type="text/javascript">process_dates()</script> | |||
38 | </body> |
|
39 | </body> | |
39 | </html> |
|
40 | </html> |
@@ -181,7 +181,7 b" tagentry = '" | |||||
181 | bookmarks = bookmarks.tmpl |
|
181 | bookmarks = bookmarks.tmpl | |
182 | bookmarkentry = ' |
|
182 | bookmarkentry = ' | |
183 | <tr class="parity{parity}"> |
|
183 | <tr class="parity{parity}"> | |
184 |
<td class="nowrap |
|
184 | <td class="nowrap age">{date|rfc822date}</td> | |
185 | <td><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></td> |
|
185 | <td><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></td> | |
186 | <td class="nowrap"> |
|
186 | <td class="nowrap"> | |
187 | <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | |
|
187 | <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | |
@@ -66,11 +66,11 b'' | |||||
66 | </tr> |
|
66 | </tr> | |
67 | </table> |
|
67 | </table> | |
68 |
|
68 | |||
69 | <h2 class="no-link">Branches</h2> |
|
69 | <h2><a href="{url|urlescape}branches{sessionvars%urlparameter}">Branches</a></h2> | |
70 | <table> |
|
70 | <table> | |
71 | {branches%branchentry} |
|
71 | {branches%branchentry} | |
72 | <tr class="light"> |
|
72 | <tr class="light"> | |
73 |
<td colspan="4"><a class="list" |
|
73 | <td colspan="4"><a class="list" href="{url|urlescape}branches{sessionvars%urlparameter}">...</a></td> | |
74 | </tr> |
|
74 | </tr> | |
75 | </table> |
|
75 | </table> | |
76 | {footer} |
|
76 | {footer} |
@@ -376,3 +376,7 b' def has_absimport():' | |||||
376 | @check("py3k", "running with Python 3.x") |
|
376 | @check("py3k", "running with Python 3.x") | |
377 | def has_py3k(): |
|
377 | def has_py3k(): | |
378 | return 3 == sys.version_info[0] |
|
378 | return 3 == sys.version_info[0] | |
|
379 | ||||
|
380 | @check("pure", "running with pure Python code") | |||
|
381 | def has_pure(): | |||
|
382 | return os.environ.get("HGTEST_RUN_TESTS_PURE") == "--pure" |
@@ -130,6 +130,34 b' backout of backout is as if nothing happ' | |||||
130 | update: (current) |
|
130 | update: (current) | |
131 | phases: 4 draft |
|
131 | phases: 4 draft | |
132 |
|
132 | |||
|
133 | Test that 'hg rollback' restores dirstate just before opening | |||
|
134 | transaction: in-memory dirstate changes should be written into | |||
|
135 | '.hg/journal.dirstate' as expected. | |||
|
136 | ||||
|
137 | $ echo 'removed soon' > b | |||
|
138 | $ hg commit -A -d '4 0' -m 'prepare for subsequent removing' | |||
|
139 | adding b | |||
|
140 | $ echo 'newly added' > c | |||
|
141 | $ hg add c | |||
|
142 | $ hg remove b | |||
|
143 | $ hg commit -d '5 0' -m 'prepare for subsequent backout' | |||
|
144 | $ touch -t 200001010000 c | |||
|
145 | $ hg status -A | |||
|
146 | C c | |||
|
147 | $ hg debugstate --nodates | |||
|
148 | n 644 12 set c | |||
|
149 | $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r . | |||
|
150 | adding b | |||
|
151 | removing c | |||
|
152 | changeset 6:4bfec048029d backs out changeset 5:fac0b729a654 | |||
|
153 | $ hg rollback -q | |||
|
154 | $ hg status -A | |||
|
155 | A b | |||
|
156 | R c | |||
|
157 | $ hg debugstate --nodates | |||
|
158 | a 0 -1 unset b | |||
|
159 | r 0 0 set c | |||
|
160 | ||||
133 | across branch |
|
161 | across branch | |
134 |
|
162 | |||
135 | $ cd .. |
|
163 | $ cd .. |
@@ -143,6 +143,24 b' unlinked by largefiles extension.' | |||||
143 | $ hg update -q -C 3 |
|
143 | $ hg update -q -C 3 | |
144 | $ hg update -q 0 |
|
144 | $ hg update -q 0 | |
145 |
|
145 | |||
|
146 | $ hg up -C -r 2 | |||
|
147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
148 | $ hg mv A a | |||
|
149 | $ hg diff -g > rename.diff | |||
|
150 | $ hg ci -m 'A -> a' | |||
|
151 | $ hg up -q '.^' | |||
|
152 | $ hg import rename.diff -m "import rename A -> a" | |||
|
153 | applying rename.diff | |||
|
154 | $ hg st | |||
|
155 | ? rename.diff | |||
|
156 | $ hg files | |||
|
157 | a | |||
|
158 | $ find * | sort | |||
|
159 | a | |||
|
160 | rename.diff | |||
|
161 | ||||
|
162 | $ rm rename.diff | |||
|
163 | ||||
146 |
$ |
|
164 | $ cd .. | |
147 |
|
165 | |||
148 | issue 3342: file in nested directory causes unexpected abort |
|
166 | issue 3342: file in nested directory causes unexpected abort |
@@ -4,7 +4,7 b'' | |||||
4 |
|
4 | |||
5 | New errors are not allowed. Warnings are strongly discouraged. |
|
5 | New errors are not allowed. Warnings are strongly discouraged. | |
6 |
|
6 | |||
7 | $ hg files "set:(**.py or **.txt) - tests/**" | |
|
7 | $ hg files "set:(**.py or **.txt) - tests/**" | sed 's|\\|/|g' | | |
8 | > xargs python contrib/check-config.py |
|
8 | > xargs python contrib/check-config.py | |
9 | undocumented: convert.cvsps.cache (bool) [True] |
|
9 | undocumented: convert.cvsps.cache (bool) [True] | |
10 | undocumented: convert.cvsps.fuzz (str) [60] |
|
10 | undocumented: convert.cvsps.fuzz (str) [60] |
@@ -788,7 +788,7 b' The shared repo should have been created' | |||||
788 | The destination should point to it |
|
788 | The destination should point to it | |
789 |
|
789 | |||
790 | $ cat share-dest1a/.hg/sharedpath; echo |
|
790 | $ cat share-dest1a/.hg/sharedpath; echo | |
791 | $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg |
|
791 | $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg (glob) | |
792 |
|
792 | |||
793 | The destination should have bookmarks |
|
793 | The destination should have bookmarks | |
794 |
|
794 | |||
@@ -798,7 +798,7 b' The destination should have bookmarks' | |||||
798 | The default path should be the remote, not the share |
|
798 | The default path should be the remote, not the share | |
799 |
|
799 | |||
800 | $ hg -R share-dest1a config paths.default |
|
800 | $ hg -R share-dest1a config paths.default | |
801 | $TESTTMP/source1a |
|
801 | $TESTTMP/source1a (glob) | |
802 |
|
802 | |||
803 | Clone with existing share dir should result in pull + share |
|
803 | Clone with existing share dir should result in pull + share | |
804 |
|
804 | |||
@@ -818,7 +818,7 b' Clone with existing share dir should res' | |||||
818 | b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1 |
|
818 | b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1 | |
819 |
|
819 | |||
820 | $ cat share-dest1b/.hg/sharedpath; echo |
|
820 | $ cat share-dest1b/.hg/sharedpath; echo | |
821 | $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg |
|
821 | $TESTTMP/share/b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1/.hg (glob) | |
822 |
|
822 | |||
823 | We only get bookmarks from the remote, not everything in the share |
|
823 | We only get bookmarks from the remote, not everything in the share | |
824 |
|
824 | |||
@@ -829,7 +829,7 b' We only get bookmarks from the remote, n' | |||||
829 | Default path should be source, not share. |
|
829 | Default path should be source, not share. | |
830 |
|
830 | |||
831 | $ hg -R share-dest1b config paths.default |
|
831 | $ hg -R share-dest1b config paths.default | |
832 | $TESTTMP/source1a |
|
832 | $TESTTMP/source1a (glob) | |
833 |
|
833 | |||
834 | Clone from unrelated repo should result in new share |
|
834 | Clone from unrelated repo should result in new share | |
835 |
|
835 |
@@ -120,52 +120,32 b' as default style, except for extra phase' | |||||
120 | $ hg log --style default > style.out |
|
120 | $ hg log --style default > style.out | |
121 | $ cmp log.out style.out || diff -u log.out style.out |
|
121 | $ cmp log.out style.out || diff -u log.out style.out | |
122 | $ hg log -T phases > phases.out |
|
122 | $ hg log -T phases > phases.out | |
123 |
$ diff -U 0 log.out phases.out | grep -v '^---\ |
|
123 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
124 | @@ -2,0 +3 @@ |
|
|||
125 | +phase: draft |
|
124 | +phase: draft | |
126 | @@ -6,0 +8 @@ |
|
|||
127 | +phase: draft |
|
125 | +phase: draft | |
128 | @@ -11,0 +14 @@ |
|
|||
129 | +phase: draft |
|
126 | +phase: draft | |
130 | @@ -17,0 +21 @@ |
|
|||
131 | +phase: draft |
|
127 | +phase: draft | |
132 | @@ -24,0 +29 @@ |
|
|||
133 | +phase: draft |
|
128 | +phase: draft | |
134 | @@ -31,0 +37 @@ |
|
|||
135 | +phase: draft |
|
129 | +phase: draft | |
136 | @@ -36,0 +43 @@ |
|
|||
137 | +phase: draft |
|
130 | +phase: draft | |
138 | @@ -41,0 +49 @@ |
|
|||
139 | +phase: draft |
|
131 | +phase: draft | |
140 | @@ -46,0 +55 @@ |
|
|||
141 | +phase: draft |
|
132 | +phase: draft | |
142 | @@ -51,0 +61 @@ |
|
|||
143 | +phase: draft |
|
133 | +phase: draft | |
144 |
|
134 | |||
145 | $ hg log -v > log.out |
|
135 | $ hg log -v > log.out | |
146 | $ hg log -v --style default > style.out |
|
136 | $ hg log -v --style default > style.out | |
147 | $ cmp log.out style.out || diff -u log.out style.out |
|
137 | $ cmp log.out style.out || diff -u log.out style.out | |
148 | $ hg log -v -T phases > phases.out |
|
138 | $ hg log -v -T phases > phases.out | |
149 |
$ diff -U 0 log.out phases.out | grep -v '^---\ |
|
139 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
150 | @@ -2,0 +3 @@ |
|
|||
151 | +phase: draft |
|
140 | +phase: draft | |
152 | @@ -7,0 +9 @@ |
|
|||
153 | +phase: draft |
|
141 | +phase: draft | |
154 | @@ -15,0 +18 @@ |
|
|||
155 | +phase: draft |
|
142 | +phase: draft | |
156 | @@ -24,0 +28 @@ |
|
|||
157 | +phase: draft |
|
143 | +phase: draft | |
158 | @@ -33,0 +38 @@ |
|
|||
159 | +phase: draft |
|
144 | +phase: draft | |
160 | @@ -43,0 +49 @@ |
|
|||
161 | +phase: draft |
|
145 | +phase: draft | |
162 | @@ -50,0 +57 @@ |
|
|||
163 | +phase: draft |
|
146 | +phase: draft | |
164 | @@ -58,0 +66 @@ |
|
|||
165 | +phase: draft |
|
147 | +phase: draft | |
166 | @@ -66,0 +75 @@ |
|
|||
167 | +phase: draft |
|
148 | +phase: draft | |
168 | @@ -77,0 +87 @@ |
|
|||
169 | +phase: draft |
|
149 | +phase: draft | |
170 |
|
150 | |||
171 | $ hg log -q > log.out |
|
151 | $ hg log -q > log.out | |
@@ -212,52 +192,32 b' Default style should also preserve color' | |||||
212 | $ hg --color=debug log --style default > style.out |
|
192 | $ hg --color=debug log --style default > style.out | |
213 | $ cmp log.out style.out || diff -u log.out style.out |
|
193 | $ cmp log.out style.out || diff -u log.out style.out | |
214 | $ hg --color=debug log -T phases > phases.out |
|
194 | $ hg --color=debug log -T phases > phases.out | |
215 |
$ diff -U 0 log.out phases.out | grep -v '^---\ |
|
195 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
216 | @@ -2,0 +3 @@ |
|
|||
217 | +[log.phase|phase: draft] |
|
196 | +[log.phase|phase: draft] | |
218 | @@ -6,0 +8 @@ |
|
|||
219 | +[log.phase|phase: draft] |
|
197 | +[log.phase|phase: draft] | |
220 | @@ -11,0 +14 @@ |
|
|||
221 | +[log.phase|phase: draft] |
|
198 | +[log.phase|phase: draft] | |
222 | @@ -17,0 +21 @@ |
|
|||
223 | +[log.phase|phase: draft] |
|
199 | +[log.phase|phase: draft] | |
224 | @@ -24,0 +29 @@ |
|
|||
225 | +[log.phase|phase: draft] |
|
200 | +[log.phase|phase: draft] | |
226 | @@ -31,0 +37 @@ |
|
|||
227 | +[log.phase|phase: draft] |
|
201 | +[log.phase|phase: draft] | |
228 | @@ -36,0 +43 @@ |
|
|||
229 | +[log.phase|phase: draft] |
|
202 | +[log.phase|phase: draft] | |
230 | @@ -41,0 +49 @@ |
|
|||
231 | +[log.phase|phase: draft] |
|
203 | +[log.phase|phase: draft] | |
232 | @@ -46,0 +55 @@ |
|
|||
233 | +[log.phase|phase: draft] |
|
204 | +[log.phase|phase: draft] | |
234 | @@ -51,0 +61 @@ |
|
|||
235 | +[log.phase|phase: draft] |
|
205 | +[log.phase|phase: draft] | |
236 |
|
206 | |||
237 | $ hg --color=debug -v log > log.out |
|
207 | $ hg --color=debug -v log > log.out | |
238 | $ hg --color=debug -v log --style default > style.out |
|
208 | $ hg --color=debug -v log --style default > style.out | |
239 | $ cmp log.out style.out || diff -u log.out style.out |
|
209 | $ cmp log.out style.out || diff -u log.out style.out | |
240 | $ hg --color=debug -v log -T phases > phases.out |
|
210 | $ hg --color=debug -v log -T phases > phases.out | |
241 |
$ diff -U 0 log.out phases.out | grep -v '^---\ |
|
211 | $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@' | |
242 | @@ -2,0 +3 @@ |
|
|||
243 | +[log.phase|phase: draft] |
|
212 | +[log.phase|phase: draft] | |
244 | @@ -7,0 +9 @@ |
|
|||
245 | +[log.phase|phase: draft] |
|
213 | +[log.phase|phase: draft] | |
246 | @@ -15,0 +18 @@ |
|
|||
247 | +[log.phase|phase: draft] |
|
214 | +[log.phase|phase: draft] | |
248 | @@ -24,0 +28 @@ |
|
|||
249 | +[log.phase|phase: draft] |
|
215 | +[log.phase|phase: draft] | |
250 | @@ -33,0 +38 @@ |
|
|||
251 | +[log.phase|phase: draft] |
|
216 | +[log.phase|phase: draft] | |
252 | @@ -43,0 +49 @@ |
|
|||
253 | +[log.phase|phase: draft] |
|
217 | +[log.phase|phase: draft] | |
254 | @@ -50,0 +57 @@ |
|
|||
255 | +[log.phase|phase: draft] |
|
218 | +[log.phase|phase: draft] | |
256 | @@ -58,0 +66 @@ |
|
|||
257 | +[log.phase|phase: draft] |
|
219 | +[log.phase|phase: draft] | |
258 | @@ -66,0 +75 @@ |
|
|||
259 | +[log.phase|phase: draft] |
|
220 | +[log.phase|phase: draft] | |
260 | @@ -77,0 +87 @@ |
|
|||
261 | +[log.phase|phase: draft] |
|
221 | +[log.phase|phase: draft] | |
262 |
|
222 | |||
263 | $ hg --color=debug -q log > log.out |
|
223 | $ hg --color=debug -q log > log.out |
@@ -143,6 +143,8 b'' | |||||
143 | store original revision ID in changeset (forces target IDs |
|
143 | store original revision ID in changeset (forces target IDs | |
144 | to change). It takes a boolean argument and defaults to |
|
144 | to change). It takes a boolean argument and defaults to | |
145 | False. |
|
145 | False. | |
|
146 | convert.hg.startrev | |||
|
147 | specify the initial Mercurial revision. The default is 0. | |||
146 | convert.hg.revs |
|
148 | convert.hg.revs | |
147 | revset specifying the source revisions to convert. |
|
149 | revset specifying the source revisions to convert. | |
148 |
|
150 | |||
@@ -273,9 +275,12 b'' | |||||
273 | that when a depot path is given you then usually should specify a target |
|
275 | that when a depot path is given you then usually should specify a target | |
274 | directory, because otherwise the target may be named "...-hg". |
|
276 | directory, because otherwise the target may be named "...-hg". | |
275 |
|
277 | |||
276 | It is possible to limit the amount of source history to be converted by |
|
278 | The following options can be set with "--config": | |
277 | specifying an initial Perforce revision: |
|
|||
278 |
|
279 | |||
|
280 | convert.p4.encoding | |||
|
281 | specify the encoding to use when decoding standard output of | |||
|
282 | the Perforce command line tool. The default is default | |||
|
283 | system encoding. | |||
279 | convert.p4.startrev |
|
284 | convert.p4.startrev | |
280 | specify initial Perforce revision (a Perforce changelist |
|
285 | specify initial Perforce revision (a Perforce changelist | |
281 | number). |
|
286 | number). |
@@ -308,7 +308,7 b' debugrebuildfncache does nothing unless ' | |||||
308 | $ hg --config format.usefncache=false init nofncache |
|
308 | $ hg --config format.usefncache=false init nofncache | |
309 | $ cd nofncache |
|
309 | $ cd nofncache | |
310 | $ hg debugrebuildfncache |
|
310 | $ hg debugrebuildfncache | |
311 | (not rebuilding fncache because repository does not support fncache |
|
311 | (not rebuilding fncache because repository does not support fncache) | |
312 |
|
312 | |||
313 | $ cd .. |
|
313 | $ cd .. | |
314 |
|
314 |
@@ -355,6 +355,7 b' Testing -h/--help:' | |||||
355 | phases Working with Phases |
|
355 | phases Working with Phases | |
356 | revisions Specifying Single Revisions |
|
356 | revisions Specifying Single Revisions | |
357 | revsets Specifying Revision Sets |
|
357 | revsets Specifying Revision Sets | |
|
358 | scripting Using Mercurial from scripts and automation | |||
358 | subrepos Subrepositories |
|
359 | subrepos Subrepositories | |
359 | templating Template Usage |
|
360 | templating Template Usage | |
360 | urls URL Paths |
|
361 | urls URL Paths | |
@@ -436,6 +437,7 b' Testing -h/--help:' | |||||
436 | phases Working with Phases |
|
437 | phases Working with Phases | |
437 | revisions Specifying Single Revisions |
|
438 | revisions Specifying Single Revisions | |
438 | revsets Specifying Revision Sets |
|
439 | revsets Specifying Revision Sets | |
|
440 | scripting Using Mercurial from scripts and automation | |||
439 | subrepos Subrepositories |
|
441 | subrepos Subrepositories | |
440 | templating Template Usage |
|
442 | templating Template Usage | |
441 | urls URL Paths |
|
443 | urls URL Paths |
@@ -117,6 +117,7 b' Short help:' | |||||
117 | phases Working with Phases |
|
117 | phases Working with Phases | |
118 | revisions Specifying Single Revisions |
|
118 | revisions Specifying Single Revisions | |
119 | revsets Specifying Revision Sets |
|
119 | revsets Specifying Revision Sets | |
|
120 | scripting Using Mercurial from scripts and automation | |||
120 | subrepos Subrepositories |
|
121 | subrepos Subrepositories | |
121 | templating Template Usage |
|
122 | templating Template Usage | |
122 | urls URL Paths |
|
123 | urls URL Paths | |
@@ -192,6 +193,7 b' Short help:' | |||||
192 | phases Working with Phases |
|
193 | phases Working with Phases | |
193 | revisions Specifying Single Revisions |
|
194 | revisions Specifying Single Revisions | |
194 | revsets Specifying Revision Sets |
|
195 | revsets Specifying Revision Sets | |
|
196 | scripting Using Mercurial from scripts and automation | |||
195 | subrepos Subrepositories |
|
197 | subrepos Subrepositories | |
196 | templating Template Usage |
|
198 | templating Template Usage | |
197 | urls URL Paths |
|
199 | urls URL Paths | |
@@ -740,6 +742,7 b' Test that default list of commands omits' | |||||
740 | phases Working with Phases |
|
742 | phases Working with Phases | |
741 | revisions Specifying Single Revisions |
|
743 | revisions Specifying Single Revisions | |
742 | revsets Specifying Revision Sets |
|
744 | revsets Specifying Revision Sets | |
|
745 | scripting Using Mercurial from scripts and automation | |||
743 | subrepos Subrepositories |
|
746 | subrepos Subrepositories | |
744 | templating Template Usage |
|
747 | templating Template Usage | |
745 | urls URL Paths |
|
748 | urls URL Paths | |
@@ -1406,6 +1409,13 b' Dish up an empty repo; serve it cold.' | |||||
1406 | Specifying Revision Sets |
|
1409 | Specifying Revision Sets | |
1407 | </td></tr> |
|
1410 | </td></tr> | |
1408 | <tr><td> |
|
1411 | <tr><td> | |
|
1412 | <a href="/help/scripting"> | |||
|
1413 | scripting | |||
|
1414 | </a> | |||
|
1415 | </td><td> | |||
|
1416 | Using Mercurial from scripts and automation | |||
|
1417 | </td></tr> | |||
|
1418 | <tr><td> | |||
1409 | <a href="/help/subrepos"> |
|
1419 | <a href="/help/subrepos"> | |
1410 | subrepos |
|
1420 | subrepos | |
1411 | </a> |
|
1421 | </a> |
@@ -1,4 +1,5 b'' | |||||
1 | $ hg init |
|
1 | $ hg init ignorerepo | |
|
2 | $ cd ignorerepo | |||
2 |
|
3 | |||
3 | Issue562: .hgignore requires newline at end: |
|
4 | Issue562: .hgignore requires newline at end: | |
4 |
|
5 | |||
@@ -44,7 +45,7 b' Should display baz only:' | |||||
44 |
|
45 | |||
45 | $ echo "*.o" > .hgignore |
|
46 | $ echo "*.o" > .hgignore | |
46 | $ hg status |
|
47 | $ hg status | |
47 | abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob) |
|
48 | abort: $TESTTMP/ignorerepo/.hgignore: invalid pattern (relre): *.o (glob) | |
48 | [255] |
|
49 | [255] | |
49 |
|
50 | |||
50 | $ echo ".*\.o" > .hgignore |
|
51 | $ echo ".*\.o" > .hgignore | |
@@ -69,7 +70,7 b' Test that patterns from ui.ignore option' | |||||
69 | $ echo > .hgignore |
|
70 | $ echo > .hgignore | |
70 | $ cat >> $HGRCPATH << EOF |
|
71 | $ cat >> $HGRCPATH << EOF | |
71 | > [ui] |
|
72 | > [ui] | |
72 | > ignore.other = $TESTTMP/.hg/testhgignore |
|
73 | > ignore.other = $TESTTMP/ignorerepo/.hg/testhgignore | |
73 | > EOF |
|
74 | > EOF | |
74 | $ echo "glob:**.o" > .hg/testhgignore |
|
75 | $ echo "glob:**.o" > .hg/testhgignore | |
75 | $ hg status |
|
76 | $ hg status | |
@@ -107,7 +108,7 b' Test relative ignore path (issue4473):' | |||||
107 |
|
108 | |||
108 | $ echo "syntax: invalid" > .hgignore |
|
109 | $ echo "syntax: invalid" > .hgignore | |
109 | $ hg status |
|
110 | $ hg status | |
110 | $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob) |
|
111 | $TESTTMP/ignorerepo/.hgignore: ignoring invalid syntax 'invalid' (glob) | |
111 | A dir/b.o |
|
112 | A dir/b.o | |
112 | ? .hgignore |
|
113 | ? .hgignore | |
113 | ? a.c |
|
114 | ? a.c | |
@@ -185,8 +186,9 b" Check using 'include:' in ignore file" | |||||
185 |
|
186 | |||
186 | Check recursive uses of 'include:' |
|
187 | Check recursive uses of 'include:' | |
187 |
|
188 | |||
188 | $ echo "include:nestedignore" >> otherignore |
|
189 | $ echo "include:nested/ignore" >> otherignore | |
189 | $ echo "glob:*ignore" > nestedignore |
|
190 | $ mkdir nested | |
|
191 | $ echo "glob:*ignore" > nested/ignore | |||
190 |
$ |
|
192 | $ hg status | |
191 | A dir/b.o |
|
193 | A dir/b.o | |
192 |
|
194 | |||
@@ -198,6 +200,13 b" Check recursive uses of 'include:'" | |||||
198 |
|
200 | |||
199 | $ mv goodignore otherignore |
|
201 | $ mv goodignore otherignore | |
200 |
|
202 | |||
|
203 | Check using 'include:' while in a non-root directory | |||
|
204 | ||||
|
205 | $ cd .. | |||
|
206 | $ hg -R ignorerepo status | |||
|
207 | A dir/b.o | |||
|
208 | $ cd ignorerepo | |||
|
209 | ||||
201 | Check including subincludes |
|
210 | Check including subincludes | |
202 |
|
211 | |||
203 | $ hg revert -q --all |
|
212 | $ hg revert -q --all |
@@ -1086,6 +1086,10 b' help/ shows help topics' | |||||
1086 | "topic": "revsets" |
|
1086 | "topic": "revsets" | |
1087 | }, |
|
1087 | }, | |
1088 | { |
|
1088 | { | |
|
1089 | "summary": "Using Mercurial from scripts and automation", | |||
|
1090 | "topic": "scripting" | |||
|
1091 | }, | |||
|
1092 | { | |||
1089 | "summary": "Subrepositories", |
|
1093 | "summary": "Subrepositories", | |
1090 | "topic": "subrepos" |
|
1094 | "topic": "subrepos" | |
1091 | }, |
|
1095 | }, |
@@ -45,6 +45,7 b' create random Python file to exercise Py' | |||||
45 | > p = primes() |
|
45 | > p = primes() | |
46 | > print "The first %d primes: %s" % (n, list(islice(p, n))) |
|
46 | > print "The first %d primes: %s" % (n, list(islice(p, n))) | |
47 | > EOF |
|
47 | > EOF | |
|
48 | $ echo >> primes.py # to test html markup with an empty line just before EOF | |||
48 |
$ |
|
49 | $ hg ci -Ama | |
49 | adding primes.py |
|
50 | adding primes.py | |
50 |
|
51 | |||
@@ -68,7 +69,7 b' hgweb filerevision, html' | |||||
68 | <script type="text/javascript" src="/static/mercurial.js"></script> |
|
69 | <script type="text/javascript" src="/static/mercurial.js"></script> | |
69 |
|
70 | |||
70 | <link rel="stylesheet" href="/highlightcss" type="text/css" /> |
|
71 | <link rel="stylesheet" href="/highlightcss" type="text/css" /> | |
71 |
<title>test: |
|
72 | <title>test: 06824edf55d0 primes.py</title> | |
72 | </head> |
|
73 | </head> | |
73 | <body> |
|
74 | <body> | |
74 |
|
75 | |||
@@ -106,7 +107,7 b' hgweb filerevision, html' | |||||
106 | <div class="main"> |
|
107 | <div class="main"> | |
107 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> |
|
108 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |
108 | <h3> |
|
109 | <h3> | |
109 |
view primes.py @ 0:<a href="/rev/ |
|
110 | view primes.py @ 0:<a href="/rev/06824edf55d0">06824edf55d0</a> | |
110 | <span class="tag">tip</span> |
|
111 | <span class="tag">tip</span> | |
111 | </h3> |
|
112 | </h3> | |
112 |
|
113 | |||
@@ -173,7 +174,8 b' hgweb filerevision, html' | |||||
173 | <span id="l29"> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></span><a href="#l29"></a> |
|
174 | <span id="l29"> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></span><a href="#l29"></a> | |
174 | <span id="l30"> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></span><a href="#l30"></a> |
|
175 | <span id="l30"> <span class="n">n</span> <span class="o">=</span> <span class="mi">10</span></span><a href="#l30"></a> | |
175 | <span id="l31"> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></span><a href="#l31"></a> |
|
176 | <span id="l31"> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></span><a href="#l31"></a> | |
176 |
<span id="l32"> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></span><a href="#l32"></a> |
|
177 | <span id="l32"> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></span><a href="#l32"></a> | |
|
178 | <span id="l33"></span><a href="#l33"></a></pre> | |||
177 | <div class="sourcelast"></div> |
|
179 | <div class="sourcelast"></div> | |
178 | </div> |
|
180 | </div> | |
179 | </div> |
|
181 | </div> | |
@@ -240,7 +242,7 b' hgweb fileannotate, html' | |||||
240 | <div class="main"> |
|
242 | <div class="main"> | |
241 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> |
|
243 | <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> | |
242 | <h3> |
|
244 | <h3> | |
243 |
annotate primes.py @ 0:<a href="/rev/ |
|
245 | annotate primes.py @ 0:<a href="/rev/06824edf55d0">06824edf55d0</a> | |
244 | <span class="tag">tip</span> |
|
246 | <span class="tag">tip</span> | |
245 | </h3> |
|
247 | </h3> | |
246 |
|
248 | |||
@@ -284,228 +286,235 b' hgweb fileannotate, html' | |||||
284 |
|
286 | |||
285 | <tr id="l1"> |
|
287 | <tr id="l1"> | |
286 | <td class="annotate"> |
|
288 | <td class="annotate"> | |
287 |
<a href="/annotate/ |
|
289 | <a href="/annotate/06824edf55d0/primes.py#l1" | |
288 |
title=" |
|
290 | title="06824edf55d0: a">test@0</a> | |
289 | </td> |
|
291 | </td> | |
290 | <td class="source"><a href="#l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td> |
|
292 | <td class="source"><a href="#l1"> 1</a> <span class="c">#!/usr/bin/env python</span></td> | |
291 | </tr> |
|
293 | </tr> | |
292 | <tr id="l2"> |
|
294 | <tr id="l2"> | |
293 | <td class="annotate"> |
|
295 | <td class="annotate"> | |
294 |
<a href="/annotate/ |
|
296 | <a href="/annotate/06824edf55d0/primes.py#l2" | |
295 |
title=" |
|
297 | title="06824edf55d0: a">test@0</a> | |
296 | </td> |
|
298 | </td> | |
297 | <td class="source"><a href="#l2"> 2</a> </td> |
|
299 | <td class="source"><a href="#l2"> 2</a> </td> | |
298 | </tr> |
|
300 | </tr> | |
299 | <tr id="l3"> |
|
301 | <tr id="l3"> | |
300 | <td class="annotate"> |
|
302 | <td class="annotate"> | |
301 |
<a href="/annotate/ |
|
303 | <a href="/annotate/06824edf55d0/primes.py#l3" | |
302 |
title=" |
|
304 | title="06824edf55d0: a">test@0</a> | |
303 | </td> |
|
305 | </td> | |
304 | <td class="source"><a href="#l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> |
|
306 | <td class="source"><a href="#l3"> 3</a> <span class="sd">"""Fun with generators. Corresponding Haskell implementation:</span></td> | |
305 | </tr> |
|
307 | </tr> | |
306 | <tr id="l4"> |
|
308 | <tr id="l4"> | |
307 | <td class="annotate"> |
|
309 | <td class="annotate"> | |
308 |
<a href="/annotate/ |
|
310 | <a href="/annotate/06824edf55d0/primes.py#l4" | |
309 |
title=" |
|
311 | title="06824edf55d0: a">test@0</a> | |
310 | </td> |
|
312 | </td> | |
311 | <td class="source"><a href="#l4"> 4</a> </td> |
|
313 | <td class="source"><a href="#l4"> 4</a> </td> | |
312 | </tr> |
|
314 | </tr> | |
313 | <tr id="l5"> |
|
315 | <tr id="l5"> | |
314 | <td class="annotate"> |
|
316 | <td class="annotate"> | |
315 |
<a href="/annotate/ |
|
317 | <a href="/annotate/06824edf55d0/primes.py#l5" | |
316 |
title=" |
|
318 | title="06824edf55d0: a">test@0</a> | |
317 | </td> |
|
319 | </td> | |
318 | <td class="source"><a href="#l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> |
|
320 | <td class="source"><a href="#l5"> 5</a> <span class="sd">primes = 2 : sieve [3, 5..]</span></td> | |
319 | </tr> |
|
321 | </tr> | |
320 | <tr id="l6"> |
|
322 | <tr id="l6"> | |
321 | <td class="annotate"> |
|
323 | <td class="annotate"> | |
322 |
<a href="/annotate/ |
|
324 | <a href="/annotate/06824edf55d0/primes.py#l6" | |
323 |
title=" |
|
325 | title="06824edf55d0: a">test@0</a> | |
324 | </td> |
|
326 | </td> | |
325 | <td class="source"><a href="#l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> |
|
327 | <td class="source"><a href="#l6"> 6</a> <span class="sd"> where sieve (p:ns) = p : sieve [n | n <- ns, mod n p /= 0]</span></td> | |
326 | </tr> |
|
328 | </tr> | |
327 | <tr id="l7"> |
|
329 | <tr id="l7"> | |
328 | <td class="annotate"> |
|
330 | <td class="annotate"> | |
329 |
<a href="/annotate/ |
|
331 | <a href="/annotate/06824edf55d0/primes.py#l7" | |
330 |
title=" |
|
332 | title="06824edf55d0: a">test@0</a> | |
331 | </td> |
|
333 | </td> | |
332 | <td class="source"><a href="#l7"> 7</a> <span class="sd">"""</span></td> |
|
334 | <td class="source"><a href="#l7"> 7</a> <span class="sd">"""</span></td> | |
333 | </tr> |
|
335 | </tr> | |
334 | <tr id="l8"> |
|
336 | <tr id="l8"> | |
335 | <td class="annotate"> |
|
337 | <td class="annotate"> | |
336 |
<a href="/annotate/ |
|
338 | <a href="/annotate/06824edf55d0/primes.py#l8" | |
337 |
title=" |
|
339 | title="06824edf55d0: a">test@0</a> | |
338 | </td> |
|
340 | </td> | |
339 | <td class="source"><a href="#l8"> 8</a> </td> |
|
341 | <td class="source"><a href="#l8"> 8</a> </td> | |
340 | </tr> |
|
342 | </tr> | |
341 | <tr id="l9"> |
|
343 | <tr id="l9"> | |
342 | <td class="annotate"> |
|
344 | <td class="annotate"> | |
343 |
<a href="/annotate/ |
|
345 | <a href="/annotate/06824edf55d0/primes.py#l9" | |
344 |
title=" |
|
346 | title="06824edf55d0: a">test@0</a> | |
345 | </td> |
|
347 | </td> | |
346 | <td class="source"><a href="#l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> |
|
348 | <td class="source"><a href="#l9"> 9</a> <span class="kn">from</span> <span class="nn">itertools</span> <span class="kn">import</span> <span class="n">dropwhile</span><span class="p">,</span> <span class="n">ifilter</span><span class="p">,</span> <span class="n">islice</span><span class="p">,</span> <span class="n">count</span><span class="p">,</span> <span class="n">chain</span></td> | |
347 | </tr> |
|
349 | </tr> | |
348 | <tr id="l10"> |
|
350 | <tr id="l10"> | |
349 | <td class="annotate"> |
|
351 | <td class="annotate"> | |
350 |
<a href="/annotate/ |
|
352 | <a href="/annotate/06824edf55d0/primes.py#l10" | |
351 |
title=" |
|
353 | title="06824edf55d0: a">test@0</a> | |
352 | </td> |
|
354 | </td> | |
353 | <td class="source"><a href="#l10"> 10</a> </td> |
|
355 | <td class="source"><a href="#l10"> 10</a> </td> | |
354 | </tr> |
|
356 | </tr> | |
355 | <tr id="l11"> |
|
357 | <tr id="l11"> | |
356 | <td class="annotate"> |
|
358 | <td class="annotate"> | |
357 |
<a href="/annotate/ |
|
359 | <a href="/annotate/06824edf55d0/primes.py#l11" | |
358 |
title=" |
|
360 | title="06824edf55d0: a">test@0</a> | |
359 | </td> |
|
361 | </td> | |
360 | <td class="source"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> |
|
362 | <td class="source"><a href="#l11"> 11</a> <span class="kn">def</span> <span class="nf">primes</span><span class="p">():</span></td> | |
361 | </tr> |
|
363 | </tr> | |
362 | <tr id="l12"> |
|
364 | <tr id="l12"> | |
363 | <td class="annotate"> |
|
365 | <td class="annotate"> | |
364 |
<a href="/annotate/ |
|
366 | <a href="/annotate/06824edf55d0/primes.py#l12" | |
365 |
title=" |
|
367 | title="06824edf55d0: a">test@0</a> | |
366 | </td> |
|
368 | </td> | |
367 | <td class="source"><a href="#l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td> |
|
369 | <td class="source"><a href="#l12"> 12</a> <span class="sd">"""Generate all primes."""</span></td> | |
368 | </tr> |
|
370 | </tr> | |
369 | <tr id="l13"> |
|
371 | <tr id="l13"> | |
370 | <td class="annotate"> |
|
372 | <td class="annotate"> | |
371 |
<a href="/annotate/ |
|
373 | <a href="/annotate/06824edf55d0/primes.py#l13" | |
372 |
title=" |
|
374 | title="06824edf55d0: a">test@0</a> | |
373 | </td> |
|
375 | </td> | |
374 | <td class="source"><a href="#l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> |
|
376 | <td class="source"><a href="#l13"> 13</a> <span class="kn">def</span> <span class="nf">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> | |
375 | </tr> |
|
377 | </tr> | |
376 | <tr id="l14"> |
|
378 | <tr id="l14"> | |
377 | <td class="annotate"> |
|
379 | <td class="annotate"> | |
378 |
<a href="/annotate/ |
|
380 | <a href="/annotate/06824edf55d0/primes.py#l14" | |
379 |
title=" |
|
381 | title="06824edf55d0: a">test@0</a> | |
380 | </td> |
|
382 | </td> | |
381 | <td class="source"><a href="#l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> |
|
383 | <td class="source"><a href="#l14"> 14</a> <span class="n">p</span> <span class="o">=</span> <span class="n">ns</span><span class="o">.</span><span class="n">next</span><span class="p">()</span></td> | |
382 | </tr> |
|
384 | </tr> | |
383 | <tr id="l15"> |
|
385 | <tr id="l15"> | |
384 | <td class="annotate"> |
|
386 | <td class="annotate"> | |
385 |
<a href="/annotate/ |
|
387 | <a href="/annotate/06824edf55d0/primes.py#l15" | |
386 |
title=" |
|
388 | title="06824edf55d0: a">test@0</a> | |
387 | </td> |
|
389 | </td> | |
388 | <td class="source"><a href="#l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> |
|
390 | <td class="source"><a href="#l15"> 15</a> <span class="c"># It is important to yield *here* in order to stop the</span></td> | |
389 | </tr> |
|
391 | </tr> | |
390 | <tr id="l16"> |
|
392 | <tr id="l16"> | |
391 | <td class="annotate"> |
|
393 | <td class="annotate"> | |
392 |
<a href="/annotate/ |
|
394 | <a href="/annotate/06824edf55d0/primes.py#l16" | |
393 |
title=" |
|
395 | title="06824edf55d0: a">test@0</a> | |
394 | </td> |
|
396 | </td> | |
395 | <td class="source"><a href="#l16"> 16</a> <span class="c"># infinite recursion.</span></td> |
|
397 | <td class="source"><a href="#l16"> 16</a> <span class="c"># infinite recursion.</span></td> | |
396 | </tr> |
|
398 | </tr> | |
397 | <tr id="l17"> |
|
399 | <tr id="l17"> | |
398 | <td class="annotate"> |
|
400 | <td class="annotate"> | |
399 |
<a href="/annotate/ |
|
401 | <a href="/annotate/06824edf55d0/primes.py#l17" | |
400 |
title=" |
|
402 | title="06824edf55d0: a">test@0</a> | |
401 | </td> |
|
403 | </td> | |
402 | <td class="source"><a href="#l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td> |
|
404 | <td class="source"><a href="#l17"> 17</a> <span class="kn">yield</span> <span class="n">p</span></td> | |
403 | </tr> |
|
405 | </tr> | |
404 | <tr id="l18"> |
|
406 | <tr id="l18"> | |
405 | <td class="annotate"> |
|
407 | <td class="annotate"> | |
406 |
<a href="/annotate/ |
|
408 | <a href="/annotate/06824edf55d0/primes.py#l18" | |
407 |
title=" |
|
409 | title="06824edf55d0: a">test@0</a> | |
408 | </td> |
|
410 | </td> | |
409 | <td class="source"><a href="#l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> |
|
411 | <td class="source"><a href="#l18"> 18</a> <span class="n">ns</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o">%</span> <span class="n">p</span> <span class="o">!=</span> <span class="mf">0</span><span class="p">,</span> <span class="n">ns</span><span class="p">)</span></td> | |
410 | </tr> |
|
412 | </tr> | |
411 | <tr id="l19"> |
|
413 | <tr id="l19"> | |
412 | <td class="annotate"> |
|
414 | <td class="annotate"> | |
413 |
<a href="/annotate/ |
|
415 | <a href="/annotate/06824edf55d0/primes.py#l19" | |
414 |
title=" |
|
416 | title="06824edf55d0: a">test@0</a> | |
415 | </td> |
|
417 | </td> | |
416 | <td class="source"><a href="#l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> |
|
418 | <td class="source"><a href="#l19"> 19</a> <span class="kn">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">sieve</span><span class="p">(</span><span class="n">ns</span><span class="p">):</span></td> | |
417 | </tr> |
|
419 | </tr> | |
418 | <tr id="l20"> |
|
420 | <tr id="l20"> | |
419 | <td class="annotate"> |
|
421 | <td class="annotate"> | |
420 |
<a href="/annotate/ |
|
422 | <a href="/annotate/06824edf55d0/primes.py#l20" | |
421 |
title=" |
|
423 | title="06824edf55d0: a">test@0</a> | |
422 | </td> |
|
424 | </td> | |
423 | <td class="source"><a href="#l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td> |
|
425 | <td class="source"><a href="#l20"> 20</a> <span class="kn">yield</span> <span class="n">n</span></td> | |
424 | </tr> |
|
426 | </tr> | |
425 | <tr id="l21"> |
|
427 | <tr id="l21"> | |
426 | <td class="annotate"> |
|
428 | <td class="annotate"> | |
427 |
<a href="/annotate/ |
|
429 | <a href="/annotate/06824edf55d0/primes.py#l21" | |
428 |
title=" |
|
430 | title="06824edf55d0: a">test@0</a> | |
429 | </td> |
|
431 | </td> | |
430 | <td class="source"><a href="#l21"> 21</a> </td> |
|
432 | <td class="source"><a href="#l21"> 21</a> </td> | |
431 | </tr> |
|
433 | </tr> | |
432 | <tr id="l22"> |
|
434 | <tr id="l22"> | |
433 | <td class="annotate"> |
|
435 | <td class="annotate"> | |
434 |
<a href="/annotate/ |
|
436 | <a href="/annotate/06824edf55d0/primes.py#l22" | |
435 |
title=" |
|
437 | title="06824edf55d0: a">test@0</a> | |
436 | </td> |
|
438 | </td> | |
437 | <td class="source"><a href="#l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> |
|
439 | <td class="source"><a href="#l22"> 22</a> <span class="n">odds</span> <span class="o">=</span> <span class="n">ifilter</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">i</span><span class="p">:</span> <span class="n">i</span> <span class="o">%</span> <span class="mf">2</span> <span class="o">==</span> <span class="mf">1</span><span class="p">,</span> <span class="n">count</span><span class="p">())</span></td> | |
438 | </tr> |
|
440 | </tr> | |
439 | <tr id="l23"> |
|
441 | <tr id="l23"> | |
440 | <td class="annotate"> |
|
442 | <td class="annotate"> | |
441 |
<a href="/annotate/ |
|
443 | <a href="/annotate/06824edf55d0/primes.py#l23" | |
442 |
title=" |
|
444 | title="06824edf55d0: a">test@0</a> | |
443 | </td> |
|
445 | </td> | |
444 | <td class="source"><a href="#l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> |
|
446 | <td class="source"><a href="#l23"> 23</a> <span class="kn">return</span> <span class="n">chain</span><span class="p">([</span><span class="mf">2</span><span class="p">],</span> <span class="n">sieve</span><span class="p">(</span><span class="n">dropwhile</span><span class="p">(</span><span class="kn">lambda</span> <span class="n">n</span><span class="p">:</span> <span class="n">n</span> <span class="o"><</span> <span class="mf">3</span><span class="p">,</span> <span class="n">odds</span><span class="p">)))</span></td> | |
445 | </tr> |
|
447 | </tr> | |
446 | <tr id="l24"> |
|
448 | <tr id="l24"> | |
447 | <td class="annotate"> |
|
449 | <td class="annotate"> | |
448 |
<a href="/annotate/ |
|
450 | <a href="/annotate/06824edf55d0/primes.py#l24" | |
449 |
title=" |
|
451 | title="06824edf55d0: a">test@0</a> | |
450 | </td> |
|
452 | </td> | |
451 | <td class="source"><a href="#l24"> 24</a> </td> |
|
453 | <td class="source"><a href="#l24"> 24</a> </td> | |
452 | </tr> |
|
454 | </tr> | |
453 | <tr id="l25"> |
|
455 | <tr id="l25"> | |
454 | <td class="annotate"> |
|
456 | <td class="annotate"> | |
455 |
<a href="/annotate/ |
|
457 | <a href="/annotate/06824edf55d0/primes.py#l25" | |
456 |
title=" |
|
458 | title="06824edf55d0: a">test@0</a> | |
457 | </td> |
|
459 | </td> | |
458 | <td class="source"><a href="#l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> |
|
460 | <td class="source"><a href="#l25"> 25</a> <span class="kn">if</span> <span class="n">__name__</span> <span class="o">==</span> <span class="s">"__main__"</span><span class="p">:</span></td> | |
459 | </tr> |
|
461 | </tr> | |
460 | <tr id="l26"> |
|
462 | <tr id="l26"> | |
461 | <td class="annotate"> |
|
463 | <td class="annotate"> | |
462 |
<a href="/annotate/ |
|
464 | <a href="/annotate/06824edf55d0/primes.py#l26" | |
463 |
title=" |
|
465 | title="06824edf55d0: a">test@0</a> | |
464 | </td> |
|
466 | </td> | |
465 | <td class="source"><a href="#l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td> |
|
467 | <td class="source"><a href="#l26"> 26</a> <span class="kn">import</span> <span class="nn">sys</span></td> | |
466 | </tr> |
|
468 | </tr> | |
467 | <tr id="l27"> |
|
469 | <tr id="l27"> | |
468 | <td class="annotate"> |
|
470 | <td class="annotate"> | |
469 |
<a href="/annotate/ |
|
471 | <a href="/annotate/06824edf55d0/primes.py#l27" | |
470 |
title=" |
|
472 | title="06824edf55d0: a">test@0</a> | |
471 | </td> |
|
473 | </td> | |
472 | <td class="source"><a href="#l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td> |
|
474 | <td class="source"><a href="#l27"> 27</a> <span class="kn">try</span><span class="p">:</span></td> | |
473 | </tr> |
|
475 | </tr> | |
474 | <tr id="l28"> |
|
476 | <tr id="l28"> | |
475 | <td class="annotate"> |
|
477 | <td class="annotate"> | |
476 |
<a href="/annotate/ |
|
478 | <a href="/annotate/06824edf55d0/primes.py#l28" | |
477 |
title=" |
|
479 | title="06824edf55d0: a">test@0</a> | |
478 | </td> |
|
480 | </td> | |
479 | <td class="source"><a href="#l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td> |
|
481 | <td class="source"><a href="#l28"> 28</a> <span class="n">n</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">sys</span><span class="o">.</span><span class="n">argv</span><span class="p">[</span><span class="mf">1</span><span class="p">])</span></td> | |
480 | </tr> |
|
482 | </tr> | |
481 | <tr id="l29"> |
|
483 | <tr id="l29"> | |
482 | <td class="annotate"> |
|
484 | <td class="annotate"> | |
483 |
<a href="/annotate/ |
|
485 | <a href="/annotate/06824edf55d0/primes.py#l29" | |
484 |
title=" |
|
486 | title="06824edf55d0: a">test@0</a> | |
485 | </td> |
|
487 | </td> | |
486 | <td class="source"><a href="#l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> |
|
488 | <td class="source"><a href="#l29"> 29</a> <span class="kn">except</span> <span class="p">(</span><span class="ne">ValueError</span><span class="p">,</span> <span class="ne">IndexError</span><span class="p">):</span></td> | |
487 | </tr> |
|
489 | </tr> | |
488 | <tr id="l30"> |
|
490 | <tr id="l30"> | |
489 | <td class="annotate"> |
|
491 | <td class="annotate"> | |
490 |
<a href="/annotate/ |
|
492 | <a href="/annotate/06824edf55d0/primes.py#l30" | |
491 |
title=" |
|
493 | title="06824edf55d0: a">test@0</a> | |
492 | </td> |
|
494 | </td> | |
493 | <td class="source"><a href="#l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td> |
|
495 | <td class="source"><a href="#l30"> 30</a> <span class="n">n</span> <span class="o">=</span> <span class="mf">10</span></td> | |
494 | </tr> |
|
496 | </tr> | |
495 | <tr id="l31"> |
|
497 | <tr id="l31"> | |
496 | <td class="annotate"> |
|
498 | <td class="annotate"> | |
497 |
<a href="/annotate/ |
|
499 | <a href="/annotate/06824edf55d0/primes.py#l31" | |
498 |
title=" |
|
500 | title="06824edf55d0: a">test@0</a> | |
499 | </td> |
|
501 | </td> | |
500 | <td class="source"><a href="#l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> |
|
502 | <td class="source"><a href="#l31"> 31</a> <span class="n">p</span> <span class="o">=</span> <span class="n">primes</span><span class="p">()</span></td> | |
501 | </tr> |
|
503 | </tr> | |
502 | <tr id="l32"> |
|
504 | <tr id="l32"> | |
503 | <td class="annotate"> |
|
505 | <td class="annotate"> | |
504 |
<a href="/annotate/ |
|
506 | <a href="/annotate/06824edf55d0/primes.py#l32" | |
505 |
title=" |
|
507 | title="06824edf55d0: a">test@0</a> | |
506 | </td> |
|
508 | </td> | |
507 | <td class="source"><a href="#l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> |
|
509 | <td class="source"><a href="#l32"> 32</a> <span class="kn">print</span> <span class="s">"The first </span><span class="si">%d</span><span class="s"> primes: </span><span class="si">%s</span><span class="s">"</span> <span class="o">%</span> <span class="p">(</span><span class="n">n</span><span class="p">,</span> <span class="nb">list</span><span class="p">(</span><span class="n">islice</span><span class="p">(</span><span class="n">p</span><span class="p">,</span> <span class="n">n</span><span class="p">)))</span></td> | |
508 | </tr> |
|
510 | </tr> | |
|
511 | <tr id="l33"> | |||
|
512 | <td class="annotate"> | |||
|
513 | <a href="/annotate/06824edf55d0/primes.py#l33" | |||
|
514 | title="06824edf55d0: a">test@0</a> | |||
|
515 | </td> | |||
|
516 | <td class="source"><a href="#l33"> 33</a> </td> | |||
|
517 | </tr> | |||
509 | </tbody> |
|
518 | </tbody> | |
510 | </table> |
|
519 | </table> | |
511 | </div> |
|
520 | </div> |
@@ -62,6 +62,8 b' We approximate that by reducing the read' | |||||
62 |
|
62 | |||
63 | Test corrupted p1/p2 fields that could cause SEGV at parsers.c: |
|
63 | Test corrupted p1/p2 fields that could cause SEGV at parsers.c: | |
64 |
|
64 | |||
|
65 | #if no-pure | |||
|
66 | ||||
65 | $ mkdir invalidparent |
|
67 | $ mkdir invalidparent | |
66 | $ cd invalidparent |
|
68 | $ cd invalidparent | |
67 |
|
69 | |||
@@ -118,3 +120,5 b' Test corrupted p1/p2 fields that could c' | |||||
118 | find_deepest: parent out of range |
|
120 | find_deepest: parent out of range | |
119 |
|
121 | |||
120 | $ cd .. |
|
122 | $ cd .. | |
|
123 | ||||
|
124 | #endif |
@@ -143,7 +143,7 b' Check that deep archiving works' | |||||
143 | $ hg remove sub1/.hgsubstate |
|
143 | $ hg remove sub1/.hgsubstate | |
144 | $ mv sub1/.hgsub sub1/x.hgsub |
|
144 | $ mv sub1/.hgsub sub1/x.hgsub | |
145 | $ hg status -S |
|
145 | $ hg status -S | |
146 |
warning: subrepo spec file 'sub1/.hgsub' not found |
|
146 | warning: subrepo spec file 'sub1/.hgsub' not found | |
147 | R sub1/.hgsubstate |
|
147 | R sub1/.hgsubstate | |
148 | R sub1/sub2/folder/test.txt |
|
148 | R sub1/sub2/folder/test.txt | |
149 | ! sub1/.hgsub |
|
149 | ! sub1/.hgsub | |
@@ -172,7 +172,7 b' Test relative path printing + subrepos' | |||||
172 | Archive wdir() with subrepos |
|
172 | Archive wdir() with subrepos | |
173 | $ hg rm main |
|
173 | $ hg rm main | |
174 | $ hg archive -S -r 'wdir()' ../wdir |
|
174 | $ hg archive -S -r 'wdir()' ../wdir | |
175 | $ diff -r . ../wdir | grep -v '\.hg$' |
|
175 | $ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:' | |
176 | Only in ../wdir: .hg_archival.txt |
|
176 | Only in ../wdir: .hg_archival.txt | |
177 |
|
177 | |||
178 | $ find ../wdir -type f | sort |
|
178 | $ find ../wdir -type f | sort | |
@@ -524,7 +524,7 b' largefile and a normal file. Then a lar' | |||||
524 | $ hg add sub1/sub2 |
|
524 | $ hg add sub1/sub2 | |
525 |
|
525 | |||
526 | $ hg archive -S -r 'wdir()' ../wdir2 |
|
526 | $ hg archive -S -r 'wdir()' ../wdir2 | |
527 | $ diff -r . ../wdir2 | grep -v '\.hg$' |
|
527 | $ diff -r . ../wdir2 | egrep -v '\.hg$|^Common subdirectories:' | |
528 | Only in ../wdir2: .hg_archival.txt |
|
528 | Only in ../wdir2: .hg_archival.txt | |
529 | Only in .: .hglf |
|
529 | Only in .: .hglf | |
530 | Only in .: foo |
|
530 | Only in .: foo | |
@@ -563,7 +563,7 b" Test 'wdir()' modified file archiving wi" | |||||
563 | $ echo 'mod' > large.bin |
|
563 | $ echo 'mod' > large.bin | |
564 | $ echo 'mod' > sub1/sub2/large.dat |
|
564 | $ echo 'mod' > sub1/sub2/large.dat | |
565 | $ hg archive -S -r 'wdir()' ../wdir3 |
|
565 | $ hg archive -S -r 'wdir()' ../wdir3 | |
566 | $ diff -r . ../wdir3 | grep -v '\.hg$' |
|
566 | $ diff -r . ../wdir3 | egrep -v '\.hg$|^Common subdirectories' | |
567 | Only in ../wdir3: .hg_archival.txt |
|
567 | Only in ../wdir3: .hg_archival.txt | |
568 | Only in .: .hglf |
|
568 | Only in .: .hglf | |
569 | Only in .: foo |
|
569 | Only in .: foo |
@@ -24,7 +24,7 b' abort more gracefully on .hgsubstate par' | |||||
24 | $ cp .hgsubstate .hgsubstate.old |
|
24 | $ cp .hgsubstate .hgsubstate.old | |
25 | >>> file('.hgsubstate', 'wb').write('\ninvalid') |
|
25 | >>> file('.hgsubstate', 'wb').write('\ninvalid') | |
26 | $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo |
|
26 | $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo | |
27 |
abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2 |
|
27 | abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2 | |
28 | [255] |
|
28 | [255] | |
29 | $ mv .hgsubstate.old .hgsubstate |
|
29 | $ mv .hgsubstate.old .hgsubstate | |
30 |
|
30 | |||
@@ -45,8 +45,8 b' delete .hgsub and update' | |||||
45 |
|
45 | |||
46 | $ rm .hgsub |
|
46 | $ rm .hgsub | |
47 | $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo |
|
47 | $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo | |
48 |
warning: subrepo spec file 'repo/.hgsub' not found |
|
48 | warning: subrepo spec file 'repo/.hgsub' not found | |
49 |
warning: subrepo spec file 'repo/.hgsub' not found |
|
49 | warning: subrepo spec file 'repo/.hgsub' not found | |
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | $ hg st |
|
51 | $ hg st | |
52 | warning: subrepo spec file '.hgsub' not found |
|
52 | warning: subrepo spec file '.hgsub' not found |
@@ -867,6 +867,7 b" timestamp of them isn't changed on the f" | |||||
867 | > [hooks] |
|
867 | > [hooks] | |
868 | > fakedirstatewritetime = ! |
|
868 | > fakedirstatewritetime = ! | |
869 | > fakepatchtime = ! |
|
869 | > fakepatchtime = ! | |
|
870 | > [extensions] | |||
870 | > abort = ! |
|
871 | > abort = ! | |
871 | > EOF |
|
872 | > EOF | |
872 |
|
873 | |||
@@ -877,4 +878,41 b" timestamp of them isn't changed on the f" | |||||
877 | $ hg status -A r1 |
|
878 | $ hg status -A r1 | |
878 | M r1 |
|
879 | M r1 | |
879 |
|
880 | |||
|
881 | Test that rollback by unexpected failure after transplanting the first | |||
|
882 | revision restores dirstate correctly. | |||
|
883 | ||||
|
884 | $ hg rollback -q | |||
|
885 | $ rm -f abort | |||
|
886 | $ hg update -q -C d11e3596cc1a | |||
|
887 | $ hg parents -T "{node|short}\n" | |||
|
888 | d11e3596cc1a | |||
|
889 | $ hg status -A | |||
|
890 | C r1 | |||
|
891 | C r2 | |||
|
892 | ||||
|
893 | $ cat >> .hg/hgrc <<EOF | |||
|
894 | > [hooks] | |||
|
895 | > # emulate failure at transplanting the 2nd revision | |||
|
896 | > pretxncommit.abort = test ! -f abort | |||
|
897 | > EOF | |||
|
898 | $ hg transplant "22c515968f13::" | |||
|
899 | applying 22c515968f13 | |||
|
900 | 22c515968f13 transplanted to * (glob) | |||
|
901 | applying e38700ba9dd3 | |||
|
902 | transaction abort! | |||
|
903 | rollback completed | |||
|
904 | abort: pretxncommit.abort hook exited with status 1 | |||
|
905 | [255] | |||
|
906 | $ cat >> .hg/hgrc <<EOF | |||
|
907 | > [hooks] | |||
|
908 | > pretxncommit.abort = ! | |||
|
909 | > EOF | |||
|
910 | ||||
|
911 | $ hg parents -T "{node|short}\n" | |||
|
912 | d11e3596cc1a | |||
|
913 | $ hg status -A | |||
|
914 | M r1 | |||
|
915 | ? abort | |||
|
916 | C r2 | |||
|
917 | ||||
880 | $ cd .. |
|
918 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now