Show More
@@ -105,3 +105,5 b' fbdd5195528fae4f41feebc1838215c110b25d6a' | |||||
105 | 5b4ed033390bf6e2879c8f5c28c84e1ee3b87231 0 iQIVAwUAVPQL9CBXgaxoKi1yAQJIXxAAtD2hWhaKa+lABmCOYG92FE/WdqY/91Xv5atTL8Xeko/MkirIKZiOuxNWX+J34TVevINZSWmMfDSc5TkGxktL9jW/pDB/CXn+CVZpxRabPYFH9HM2K3g8VaTV1MFtV2+feOMDIPCmq5ogMF9/kXjmifiEBrJcFsE82fdexJ3OHoOY4iHFxEhh3GzvNqEQygk4VeU6VYziNvSQj9G//PsK3Bmk7zm5ScsZcMVML3SIYFuej1b1PI1v0N8mmCRooVNBGhD/eA0iLtdh/hSb9s/8UgJ4f9HOcx9zqs8V4i14lpd/fo0+yvFuVrVbWGzrDrk5EKLENhVPwvc1KA32PTQ4Z9u7VQIBIxq3K5lL2VlCMIYc1BSaSQBjuiLm8VdN6iDuf5poNZhk1rvtpQgpxJzh362dlGtR/iTJuLCeW7gCqWUAorLTeHy0bLQ/jSOeTAGys8bUHtlRL4QbnhLbUmJmRYVvCJ+Yt1aTgTSNcoFjoLJarR1169BXgdCA38BgReUL6kB224UJSTzB1hJUyB2LvCWrXZMipZmR99Iwdq7MePD3+AoSIXQNUMY9blxuuF5x7W2ikNXmVWuab4Z8rQRtmGqEuIMBSunxAnZSn+i8057dFKlq+/yGy+WW3RQg+RnLnwZs1zCDTfu98/GT5k5hFpjXZeUWWiOVwQJ5HrqncCw= |
|
105 | 5b4ed033390bf6e2879c8f5c28c84e1ee3b87231 0 iQIVAwUAVPQL9CBXgaxoKi1yAQJIXxAAtD2hWhaKa+lABmCOYG92FE/WdqY/91Xv5atTL8Xeko/MkirIKZiOuxNWX+J34TVevINZSWmMfDSc5TkGxktL9jW/pDB/CXn+CVZpxRabPYFH9HM2K3g8VaTV1MFtV2+feOMDIPCmq5ogMF9/kXjmifiEBrJcFsE82fdexJ3OHoOY4iHFxEhh3GzvNqEQygk4VeU6VYziNvSQj9G//PsK3Bmk7zm5ScsZcMVML3SIYFuej1b1PI1v0N8mmCRooVNBGhD/eA0iLtdh/hSb9s/8UgJ4f9HOcx9zqs8V4i14lpd/fo0+yvFuVrVbWGzrDrk5EKLENhVPwvc1KA32PTQ4Z9u7VQIBIxq3K5lL2VlCMIYc1BSaSQBjuiLm8VdN6iDuf5poNZhk1rvtpQgpxJzh362dlGtR/iTJuLCeW7gCqWUAorLTeHy0bLQ/jSOeTAGys8bUHtlRL4QbnhLbUmJmRYVvCJ+Yt1aTgTSNcoFjoLJarR1169BXgdCA38BgReUL6kB224UJSTzB1hJUyB2LvCWrXZMipZmR99Iwdq7MePD3+AoSIXQNUMY9blxuuF5x7W2ikNXmVWuab4Z8rQRtmGqEuIMBSunxAnZSn+i8057dFKlq+/yGy+WW3RQg+RnLnwZs1zCDTfu98/GT5k5hFpjXZeUWWiOVwQJ5HrqncCw= | |
106 | 07a92bbd02e5e3a625e0820389b47786b02b2cea 0 iQIVAwUAVPSP9SBXgaxoKi1yAQLkBQ//dRQExJHFepJfZ0gvGnUoYI4APsLmne5XtfeXJ8OtUyC4a6RylxA5BavDWgXwUh9BGhOX2cBSz1fyvzohrPrvNnlBrYKAvOIJGEAiBTXHYTxHINEKPtDF92Uz23T0Rn/wnSvvlbWF7Pvd+0DMJpFDEyr9n6jvVLR7mgxMaCqZbVaB1W/wTwDjni780WgVx8OPUXkLx3/DyarMcIiPeI5UN+FeHDovTsBWFC95msFLm80PMRPuHOejWp65yyEemGujZEPO2D5VVah7fshM2HTz63+bkEBYoqrftuv3vXKBRG78MIrUrKpqxmnCKNKDUUWJ4yk3+NwuOiHlKdly5kZ7MNFaL73XKo8HH287lDWz0lIazs91dQA9a9JOyTsp8YqGtIJGGCbhrUDtiQJ199oBU84mw3VH/EEzm4mPv4sW5fm7BnnoH/a+9vXySc+498rkdLlzFwxrQkWyJ/pFOx4UA3mCtGQK+OSwLPc+X4SRqA4fiyqKxVAL1kpLTSDL3QA82I7GzBaXsxUXzS4nmteMhUyzTdwAhKVydL0gC3d7NmkAFSyRjdGzutUUXshYxg0ywRgYebe8uzJcTj4nNRgaalYLdg3guuDulD+dJmILsrcLmA6KD/pvfDn8PYt+4ZjNIvN2E9GF6uXDu4Ux+AlOTLk9BChxUF8uBX9ev5cvWtQ= |
|
106 | 07a92bbd02e5e3a625e0820389b47786b02b2cea 0 iQIVAwUAVPSP9SBXgaxoKi1yAQLkBQ//dRQExJHFepJfZ0gvGnUoYI4APsLmne5XtfeXJ8OtUyC4a6RylxA5BavDWgXwUh9BGhOX2cBSz1fyvzohrPrvNnlBrYKAvOIJGEAiBTXHYTxHINEKPtDF92Uz23T0Rn/wnSvvlbWF7Pvd+0DMJpFDEyr9n6jvVLR7mgxMaCqZbVaB1W/wTwDjni780WgVx8OPUXkLx3/DyarMcIiPeI5UN+FeHDovTsBWFC95msFLm80PMRPuHOejWp65yyEemGujZEPO2D5VVah7fshM2HTz63+bkEBYoqrftuv3vXKBRG78MIrUrKpqxmnCKNKDUUWJ4yk3+NwuOiHlKdly5kZ7MNFaL73XKo8HH287lDWz0lIazs91dQA9a9JOyTsp8YqGtIJGGCbhrUDtiQJ199oBU84mw3VH/EEzm4mPv4sW5fm7BnnoH/a+9vXySc+498rkdLlzFwxrQkWyJ/pFOx4UA3mCtGQK+OSwLPc+X4SRqA4fiyqKxVAL1kpLTSDL3QA82I7GzBaXsxUXzS4nmteMhUyzTdwAhKVydL0gC3d7NmkAFSyRjdGzutUUXshYxg0ywRgYebe8uzJcTj4nNRgaalYLdg3guuDulD+dJmILsrcLmA6KD/pvfDn8PYt+4ZjNIvN2E9GF6uXDu4Ux+AlOTLk9BChxUF8uBX9ev5cvWtQ= | |
107 | 2e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 0 iQIVAwUAVRw4nyBXgaxoKi1yAQIFExAAkbCPtLjQlJvPaYCL1KhNR+ZVAmn7JrFH3XhvR26RayYbs4NxR3W1BhwhDy9+W+28szEx1kQvmr6t1bXAFywY0tNJOeuLU7uFfmbgAfYgkQ9kpsQNqFYkjbCyftw0S9vX9VOJ9DqUoDWuKfX7VzjkwE9dCfKI5F+dvzxnd6ZFjB85nyHBQuTZlzXl0+csY212RJ2G2j/mzEBVyeZj9l7Rm+1X8AC1xQMWRJGiyd0b7nhYqoOcceeJFAV1t9QO4+gjmkM5kL0orjxTnuVsxPTxcC5ca1BfidPWrZEto3duHWNiATGnCDylxxr52BxCAS+BWePW9J0PROtw1pYaZ9pF4N5X5LSXJzqX7ZiNGckxqIjry09+Tbsa8FS0VkkYBEiGotpuo4Jd05V6qpXfW2JqAfEVo6X6aGvPM2B7ZUtKi30I4J+WprrOP3WgZ/ZWHe1ERYKgjDqisn3t/D40q30WQUeQGltGsOX0Udqma2RjBugO5BHGzJ2yer4GdJXg7q1OMzrjAEuz1IoKvIB/o1pg86quVA4H2gQnL1B8t1M38/DIafyw7mrEY4Z3GL44Reev63XVvDE099Vbhqp7ufwq81Fpq7Xxa5vsr9SJ+8IqqQr8AcYSuK3G3L6BmIuSUAYMRqgl35FWoWkGyZIG5c6K6zI8w5Pb0aGi6Lb2Wfb9zbc= |
|
107 | 2e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 0 iQIVAwUAVRw4nyBXgaxoKi1yAQIFExAAkbCPtLjQlJvPaYCL1KhNR+ZVAmn7JrFH3XhvR26RayYbs4NxR3W1BhwhDy9+W+28szEx1kQvmr6t1bXAFywY0tNJOeuLU7uFfmbgAfYgkQ9kpsQNqFYkjbCyftw0S9vX9VOJ9DqUoDWuKfX7VzjkwE9dCfKI5F+dvzxnd6ZFjB85nyHBQuTZlzXl0+csY212RJ2G2j/mzEBVyeZj9l7Rm+1X8AC1xQMWRJGiyd0b7nhYqoOcceeJFAV1t9QO4+gjmkM5kL0orjxTnuVsxPTxcC5ca1BfidPWrZEto3duHWNiATGnCDylxxr52BxCAS+BWePW9J0PROtw1pYaZ9pF4N5X5LSXJzqX7ZiNGckxqIjry09+Tbsa8FS0VkkYBEiGotpuo4Jd05V6qpXfW2JqAfEVo6X6aGvPM2B7ZUtKi30I4J+WprrOP3WgZ/ZWHe1ERYKgjDqisn3t/D40q30WQUeQGltGsOX0Udqma2RjBugO5BHGzJ2yer4GdJXg7q1OMzrjAEuz1IoKvIB/o1pg86quVA4H2gQnL1B8t1M38/DIafyw7mrEY4Z3GL44Reev63XVvDE099Vbhqp7ufwq81Fpq7Xxa5vsr9SJ+8IqqQr8AcYSuK3G3L6BmIuSUAYMRqgl35FWoWkGyZIG5c6K6zI8w5Pb0aGi6Lb2Wfb9zbc= | |
|
108 | e89f909edffad558b56f4affa8239e4832f88de0 0 iQIVAwUAVTBozCBXgaxoKi1yAQLHeg/+IvfpPmG7OSqCoHvMVETYdrqT7lKCwfCQWMFOC/2faWs1n4R/qQNm6ckE5OY888RK8tVQ7ue03Pg/iyWgQlYfS7Njd3WPjS4JsnEBxIvuGkIu6TPIXAUAH0PFTBh0cZEICDpPEVT2X3bPRwDHA+hUE9RrxM5zJ39Fpk/pTYCjQ9UKfEhXlEfka75YB39g2Y/ssaSbn5w/tAAx8sL72Y4G96D4IV2seLHZhB3VQ7UZKThEWn6UdVOoKj+urIwGaBYMeekGVtHSh6fnHOw3EtDO9mQ5HtAz2Bl4CwRYN8eSN+Dwgr+mdk8MWpQQJ+i1A8jUhUp8gn1Pe5GkIH4CWZ9+AvLLnshe2MkVaTT1g7EQk37tFkkdZDRBsOHIvpF71B9pEA1gMUlX4gKgh5YwukgpQlDmFCfY7XmX6eXw9Ub+EckEwYuGMz7Fbwe9J/Ce4DxvgJgq3/cu/jb3bmbewH6tZmcrlqziqqA8GySIwcURnF1c37e7+e7x1jhFJfCWpHzvCusjKhUp9tZsl9Rt1Bo/y41QY+avY7//ymhbwTMKgqjzCYoA+ipF4JfZlFiZF+JhvOSIFb0ltkfdqKD+qOjlkFaglvQU1bpGKLJ6cz4Xk2Jqt5zhcrpyDMGVv9aiWywCK2ZP34RNaJ6ZFwzwdpXihqgkm5dBGoZ4ztFUfmjXzIg= | |||
|
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= |
@@ -118,3 +118,5 b' fbdd5195528fae4f41feebc1838215c110b25d6a' | |||||
118 | 5b4ed033390bf6e2879c8f5c28c84e1ee3b87231 3.3.1 |
|
118 | 5b4ed033390bf6e2879c8f5c28c84e1ee3b87231 3.3.1 | |
119 | 07a92bbd02e5e3a625e0820389b47786b02b2cea 3.3.2 |
|
119 | 07a92bbd02e5e3a625e0820389b47786b02b2cea 3.3.2 | |
120 | 2e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 3.3.3 |
|
120 | 2e2e9a0750f91a6fe0ad88e4de34f8efefdcab08 3.3.3 | |
|
121 | e89f909edffad558b56f4affa8239e4832f88de0 3.4-rc | |||
|
122 | 8cc6036bca532e06681c5a8fa37efaa812de67b5 3.4 |
@@ -120,6 +120,7 b' i18n/hg.pot: $(PYFILES) $(DOCFILES) i18n' | |||||
120 | mercurial/templatefilters.py mercurial/templatekw.py \ |
|
120 | mercurial/templatefilters.py mercurial/templatekw.py \ | |
121 | mercurial/templater.py \ |
|
121 | mercurial/templater.py \ | |
122 | mercurial/filemerge.py \ |
|
122 | mercurial/filemerge.py \ | |
|
123 | mercurial/hgweb/webcommands.py \ | |||
123 | $(DOCFILES) > i18n/hg.pot.tmp |
|
124 | $(DOCFILES) > i18n/hg.pot.tmp | |
124 | # All strings marked for translation in Mercurial contain |
|
125 | # All strings marked for translation in Mercurial contain | |
125 | # ASCII characters only. But some files contain string |
|
126 | # ASCII characters only. But some files contain string |
@@ -301,6 +301,8 b' pypats = [' | |||||
301 | "missing _() in ui message (use () to hide false-positives)"), |
|
301 | "missing _() in ui message (use () to hide false-positives)"), | |
302 | (r'release\(.*wlock, .*lock\)', "wrong lock release order"), |
|
302 | (r'release\(.*wlock, .*lock\)', "wrong lock release order"), | |
303 | (r'\b__bool__\b', "__bool__ should be __nonzero__ in Python 2"), |
|
303 | (r'\b__bool__\b', "__bool__ should be __nonzero__ in Python 2"), | |
|
304 | (r'os\.path\.join\(.*, *(""|\'\')\)', | |||
|
305 | "use pathutil.normasprefix(path) instead of os.path.join(path, '')"), | |||
304 | ], |
|
306 | ], | |
305 | # warnings |
|
307 | # warnings | |
306 | [ |
|
308 | [ |
@@ -80,7 +80,6 b' Source: dist\\w9xpopen.exe; DestDir: {app' | |||||
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\library.zip; DestDir: {app} | |
82 | Source: dist\add_path.exe; DestDir: {app} |
|
82 | Source: dist\add_path.exe; DestDir: {app} | |
83 | Source: dist\cacert.pem; Destdir: {app} |
|
|||
84 | Source: doc\*.html; DestDir: {app}\Docs |
|
83 | Source: doc\*.html; DestDir: {app}\Docs | |
85 | Source: doc\style.css; DestDir: {app}\Docs |
|
84 | Source: doc\style.css; DestDir: {app}\Docs | |
86 | Source: mercurial\help\*.txt; DestDir: {app}\help |
|
85 | Source: mercurial\help\*.txt; DestDir: {app}\help | |
@@ -93,7 +92,6 b' Source: COPYING; DestDir: {app}; DestNam' | |||||
93 | [INI] |
|
92 | [INI] | |
94 | Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ |
|
93 | Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/ | |
95 | Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad |
|
94 | Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad | |
96 | Filename: {app}\default.d\cacerts.rc; Section: web; Key: cacerts; String: {app}\cacert.pem |
|
|||
97 |
|
95 | |||
98 | [UninstallDelete] |
|
96 | [UninstallDelete] | |
99 | Type: files; Name: {app}\Mercurial.url |
|
97 | Type: files; Name: {app}\Mercurial.url |
@@ -44,8 +44,6 b'' | |||||
44 | <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> |
|
44 | <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> | |
45 | <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> |
|
45 | <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> | |
46 | <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> |
|
46 | <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> | |
47 | <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?> |
|
|||
48 | <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?> |
|
|||
49 | <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> |
|
47 | <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> | |
50 |
|
48 | |||
51 | </Include> |
|
49 | </Include> |
@@ -82,15 +82,6 b'' | |||||
82 | <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' |
|
82 | <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc' | |
83 | ReadOnly='yes' KeyPath='yes'/> |
|
83 | ReadOnly='yes' KeyPath='yes'/> | |
84 | </Component> |
|
84 | </Component> | |
85 | <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'> |
|
|||
86 | <CreateFolder/> |
|
|||
87 | <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc" |
|
|||
88 | Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" /> |
|
|||
89 | </Component> |
|
|||
90 | <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'> |
|
|||
91 | <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem' |
|
|||
92 | ReadOnly='yes' KeyPath='yes'/> |
|
|||
93 | </Component> |
|
|||
94 | </Directory> |
|
85 | </Directory> | |
95 |
|
86 | |||
96 | </Directory> |
|
87 | </Directory> | |
@@ -132,8 +123,6 b'' | |||||
132 | <ComponentRef Id='COPYING' /> |
|
123 | <ComponentRef Id='COPYING' /> | |
133 | <ComponentRef Id='mercurial.rc' /> |
|
124 | <ComponentRef Id='mercurial.rc' /> | |
134 | <ComponentRef Id='mergetools.rc' /> |
|
125 | <ComponentRef Id='mergetools.rc' /> | |
135 | <ComponentRef Id='paths.rc' /> |
|
|||
136 | <ComponentRef Id='cacert.pem' /> |
|
|||
137 | <ComponentRef Id='helpFolder' /> |
|
126 | <ComponentRef Id='helpFolder' /> | |
138 | <ComponentGroupRef Id='templatesFolder' /> |
|
127 | <ComponentGroupRef Id='templatesFolder' /> | |
139 | <MergeRef Id='VCRuntime' /> |
|
128 | <MergeRef Id='VCRuntime' /> |
@@ -17,19 +17,12 b' Typical uses for censor are due to secur' | |||||
17 | * Licensed data/code/libraries for which the license has expired |
|
17 | * Licensed data/code/libraries for which the license has expired | |
18 | * Personally Identifiable Information or other private data |
|
18 | * Personally Identifiable Information or other private data | |
19 |
|
19 | |||
20 | Censored file revisions are listed in a tracked file called .hgcensored stored |
|
|||
21 | in the repository root. The censor command adds an entry to the .hgcensored file |
|
|||
22 | in the working directory and commits it (much like ``hg tag`` and .hgtags). The |
|
|||
23 | censored file data is then replaced with a pointer to the new commit, enabling |
|
|||
24 | verification. |
|
|||
25 |
|
||||
26 | Censored nodes can interrupt mercurial's typical operation whenever the excised |
|
20 | Censored nodes can interrupt mercurial's typical operation whenever the excised | |
27 | data needs to be materialized. Some commands, like ``hg cat``/``hg revert``, |
|
21 | data needs to be materialized. Some commands, like ``hg cat``/``hg revert``, | |
28 | simply fail when asked to produce censored data. Others, like ``hg verify`` and |
|
22 | simply fail when asked to produce censored data. Others, like ``hg verify`` and | |
29 | ``hg update``, must be capable of tolerating censored data to continue to |
|
23 | ``hg update``, must be capable of tolerating censored data to continue to | |
30 | function in a meaningful way. Such commands only tolerate censored file |
|
24 | function in a meaningful way. Such commands only tolerate censored file | |
31 |
revisions if they are allowed by the policy |
|
25 | revisions if they are allowed by the "censor.policy=ignore" config option. | |
32 | config option. |
|
|||
33 | """ |
|
26 | """ | |
34 |
|
27 | |||
35 | from mercurial.node import short |
|
28 | from mercurial.node import short |
@@ -445,7 +445,7 b' class colorui(uimod.ui):' | |||||
445 | return super(colorui, self).write_err(*args, **opts) |
|
445 | return super(colorui, self).write_err(*args, **opts) | |
446 |
|
446 | |||
447 | label = opts.get('label', '') |
|
447 | label = opts.get('label', '') | |
448 | if self._bufferstates and self._bufferstates[-1]: |
|
448 | if self._bufferstates and self._bufferstates[-1][0]: | |
449 | return self.write(*args, **opts) |
|
449 | return self.write(*args, **opts) | |
450 | if self._colormode == 'win32': |
|
450 | if self._colormode == 'win32': | |
451 | for a in args: |
|
451 | for a in args: |
@@ -1293,7 +1293,7 b' class svn_sink(converter_sink, commandli' | |||||
1293 | try: |
|
1293 | try: | |
1294 | rev = self.commit_re.search(output).group(1) |
|
1294 | rev = self.commit_re.search(output).group(1) | |
1295 | except AttributeError: |
|
1295 | except AttributeError: | |
1296 | if not files: |
|
1296 | if parents and not files: | |
1297 | return parents[0] |
|
1297 | return parents[0] | |
1298 | self.ui.warn(_('unexpected svn output:\n')) |
|
1298 | self.ui.warn(_('unexpected svn output:\n')) | |
1299 | self.ui.warn(output) |
|
1299 | self.ui.warn(output) |
@@ -145,10 +145,10 b' repo, you can add a ``--force`` option.' | |||||
145 |
|
145 | |||
146 | Histedit rule lines are truncated to 80 characters by default. You |
|
146 | Histedit rule lines are truncated to 80 characters by default. You | |
147 | can customise this behaviour by setting a different length in your |
|
147 | can customise this behaviour by setting a different length in your | |
148 | configuration file: |
|
148 | configuration file:: | |
149 |
|
149 | |||
150 | [histedit] |
|
150 | [histedit] | |
151 | linelen = 120 # truncate rule lines at 120 characters |
|
151 | linelen = 120 # truncate rule lines at 120 characters | |
152 | """ |
|
152 | """ | |
153 |
|
153 | |||
154 | try: |
|
154 | try: | |
@@ -246,7 +246,8 b' class histeditstate(object):' | |||||
246 | fp.write('%s\n' % self.keep) |
|
246 | fp.write('%s\n' % self.keep) | |
247 | fp.write('%d\n' % len(self.rules)) |
|
247 | fp.write('%d\n' % len(self.rules)) | |
248 | for rule in self.rules: |
|
248 | for rule in self.rules: | |
249 |
fp.write('%s |
|
249 | fp.write('%s\n' % rule[0]) # action | |
|
250 | fp.write('%s\n' % rule[1]) # remainder | |||
250 | fp.write('%d\n' % len(self.replacements)) |
|
251 | fp.write('%d\n' % len(self.replacements)) | |
251 | for replacement in self.replacements: |
|
252 | for replacement in self.replacements: | |
252 | fp.write('%s%s\n' % (node.hex(replacement[0]), ''.join(node.hex(r) |
|
253 | fp.write('%s%s\n' % (node.hex(replacement[0]), ''.join(node.hex(r) | |
@@ -276,11 +277,11 b' class histeditstate(object):' | |||||
276 | rulelen = int(lines[index]) |
|
277 | rulelen = int(lines[index]) | |
277 | index += 1 |
|
278 | index += 1 | |
278 | for i in xrange(rulelen): |
|
279 | for i in xrange(rulelen): | |
|
280 | ruleaction = lines[index] | |||
|
281 | index += 1 | |||
279 | rule = lines[index] |
|
282 | rule = lines[index] | |
280 | rulehash = rule[:40] |
|
|||
281 | ruleaction = rule[40:] |
|
|||
282 | rules.append((ruleaction, rulehash)) |
|
|||
283 | index += 1 |
|
283 | index += 1 | |
|
284 | rules.append((ruleaction, rule)) | |||
284 |
|
285 | |||
285 | # Replacements |
|
286 | # Replacements | |
286 | replacements = [] |
|
287 | replacements = [] | |
@@ -412,7 +413,7 b' def applychanges(ui, repo, ctx, opts):' | |||||
412 | repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') |
|
413 | repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') | |
413 | return stats |
|
414 | return stats | |
414 |
|
415 | |||
415 | def collapse(repo, first, last, commitopts): |
|
416 | def collapse(repo, first, last, commitopts, skipprompt=False): | |
416 | """collapse the set of revisions from first to last as new one. |
|
417 | """collapse the set of revisions from first to last as new one. | |
417 |
|
418 | |||
418 | Expected commit options are: |
|
419 | Expected commit options are: | |
@@ -473,7 +474,7 b' def collapse(repo, first, last, commitop' | |||||
473 |
|
474 | |||
474 | parents = (first.p1().node(), first.p2().node()) |
|
475 | parents = (first.p1().node(), first.p2().node()) | |
475 | editor = None |
|
476 | editor = None | |
476 | if not commitopts.get('rollup'): |
|
477 | if not skipprompt: | |
477 | editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold') |
|
478 | editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold') | |
478 | new = context.memctx(repo, |
|
479 | new = context.memctx(repo, | |
479 | parents=parents, |
|
480 | parents=parents, | |
@@ -574,7 +575,8 b' class fold(histeditaction):' | |||||
574 | try: |
|
575 | try: | |
575 | phasemin = max(ctx.phase(), oldctx.phase()) |
|
576 | phasemin = max(ctx.phase(), oldctx.phase()) | |
576 | repo.ui.setconfig('phases', 'new-commit', phasemin, 'histedit') |
|
577 | repo.ui.setconfig('phases', 'new-commit', phasemin, 'histedit') | |
577 |
n = collapse(repo, ctx, repo[newnode], commitopts |
|
578 | n = collapse(repo, ctx, repo[newnode], commitopts, | |
|
579 | skipprompt=self.skipprompt()) | |||
578 | finally: |
|
580 | finally: | |
579 | repo.ui.restoreconfig(phasebackup) |
|
581 | repo.ui.restoreconfig(phasebackup) | |
580 | if n is None: |
|
582 | if n is None: | |
@@ -711,7 +713,7 b' def _histedit(ui, repo, state, *freeargs' | |||||
711 | goal = 'abort' |
|
713 | goal = 'abort' | |
712 | elif editplan: |
|
714 | elif editplan: | |
713 | if util.any((outg, revs, freeargs)): |
|
715 | if util.any((outg, revs, freeargs)): | |
714 | raise util.Abort(_('only --commands argument allowed with' |
|
716 | raise util.Abort(_('only --commands argument allowed with ' | |
715 | '--edit-plan')) |
|
717 | '--edit-plan')) | |
716 | goal = 'edit-plan' |
|
718 | goal = 'edit-plan' | |
717 | else: |
|
719 | else: |
@@ -305,6 +305,9 b' def overridelog(orig, ui, repo, *pats, *' | |||||
305 | pats = set(p) |
|
305 | pats = set(p) | |
306 |
|
306 | |||
307 | def fixpats(pat, tostandin=lfutil.standin): |
|
307 | def fixpats(pat, tostandin=lfutil.standin): | |
|
308 | if pat.startswith('set:'): | |||
|
309 | return pat | |||
|
310 | ||||
308 | kindpat = match_._patsplit(pat, None) |
|
311 | kindpat = match_._patsplit(pat, None) | |
309 |
|
312 | |||
310 | if kindpat[0] is not None: |
|
313 | if kindpat[0] is not None: | |
@@ -838,6 +841,12 b' def hgclone(orig, ui, opts, *args, **kwa' | |||||
838 | sourcerepo, destrepo = result |
|
841 | sourcerepo, destrepo = result | |
839 | repo = destrepo.local() |
|
842 | repo = destrepo.local() | |
840 |
|
843 | |||
|
844 | # When cloning to a remote repo (like through SSH), no repo is available | |||
|
845 | # from the peer. Therefore the largefiles can't be downloaded and the | |||
|
846 | # hgrc can't be updated. | |||
|
847 | if not repo: | |||
|
848 | return result | |||
|
849 | ||||
841 | # If largefiles is required for this repo, permanently enable it locally |
|
850 | # If largefiles is required for this repo, permanently enable it locally | |
842 | if 'largefiles' in repo.requirements: |
|
851 | if 'largefiles' in repo.requirements: | |
843 | fp = repo.vfs('hgrc', 'a', text=True) |
|
852 | fp = repo.vfs('hgrc', 'a', text=True) |
@@ -822,7 +822,7 b' class queue(object):' | |||||
822 | except AbortNoCleanup: |
|
822 | except AbortNoCleanup: | |
823 | tr.close() |
|
823 | tr.close() | |
824 | self.savedirty() |
|
824 | self.savedirty() | |
825 | return 2, repo.dirstate.p1() |
|
825 | raise | |
826 | except: # re-raises |
|
826 | except: # re-raises | |
827 | try: |
|
827 | try: | |
828 | tr.abort() |
|
828 | tr.abort() | |
@@ -880,7 +880,8 b' class queue(object):' | |||||
880 | touched = set(touched) & tobackup |
|
880 | touched = set(touched) & tobackup | |
881 | if touched and keepchanges: |
|
881 | if touched and keepchanges: | |
882 | raise AbortNoCleanup( |
|
882 | raise AbortNoCleanup( | |
883 |
_("local changes found |
|
883 | _("conflicting local changes found"), | |
|
884 | hint=_("did you forget to qrefresh?")) | |||
884 | self.backup(repo, touched, copy=True) |
|
885 | self.backup(repo, touched, copy=True) | |
885 | tobackup = tobackup - touched |
|
886 | tobackup = tobackup - touched | |
886 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
887 | (patcherr, files, fuzz) = self.patch(repo, pf) | |
@@ -1417,6 +1418,8 b' class queue(object):' | |||||
1417 | else: |
|
1418 | else: | |
1418 | ret = self.apply(repo, s, list, all_files=all_files, |
|
1419 | ret = self.apply(repo, s, list, all_files=all_files, | |
1419 | tobackup=tobackup, keepchanges=keepchanges) |
|
1420 | tobackup=tobackup, keepchanges=keepchanges) | |
|
1421 | except AbortNoCleanup: | |||
|
1422 | raise | |||
1420 | except: # re-raises |
|
1423 | except: # re-raises | |
1421 | self.ui.warn(_('cleaning up working directory...')) |
|
1424 | self.ui.warn(_('cleaning up working directory...')) | |
1422 | node = repo.dirstate.p1() |
|
1425 | node = repo.dirstate.p1() |
@@ -1040,6 +1040,10 b' def pullrebase(orig, ui, repo, *args, **' | |||||
1040 | # dropping it |
|
1040 | # dropping it | |
1041 | if 'rev' in opts: |
|
1041 | if 'rev' in opts: | |
1042 | del opts['rev'] |
|
1042 | del opts['rev'] | |
|
1043 | # positional argument from pull conflicts with rebase's own | |||
|
1044 | # --source. | |||
|
1045 | if 'source' in opts: | |||
|
1046 | del opts['source'] | |||
1043 | rebase(ui, repo, **opts) |
|
1047 | rebase(ui, repo, **opts) | |
1044 | branch = repo[None].branch() |
|
1048 | branch = repo[None].branch() | |
1045 | dest = repo[branch].rev() |
|
1049 | dest = repo[branch].rev() |
@@ -658,7 +658,8 b' def unshelve(ui, repo, *shelved, **opts)' | |||||
658 | ('p', 'patch', None, |
|
658 | ('p', 'patch', None, | |
659 | _('show patch')), |
|
659 | _('show patch')), | |
660 | ('i', 'interactive', None, |
|
660 | ('i', 'interactive', None, | |
661 |
_('interactive mode, only works while creating a shelve' |
|
661 | _('interactive mode, only works while creating a shelve' | |
|
662 | '(EXPERIMENTAL)')), | |||
662 | ('', 'stat', None, |
|
663 | ('', 'stat', None, | |
663 | _('output diffstat-style summary of changes'))] + commands.walkopts, |
|
664 | _('output diffstat-style summary of changes'))] + commands.walkopts, | |
664 | _('hg shelve [OPTION]... [FILE]...')) |
|
665 | _('hg shelve [OPTION]... [FILE]...')) |
This diff has been collapsed as it changes many lines, (1671 lines changed) Show them Hide them | |||||
@@ -54,6 +54,7 b'' | |||||
54 | # bisect 二分探索 |
|
54 | # bisect 二分探索 | |
55 | # branch ブランチ |
|
55 | # branch ブランチ | |
56 | # bundle( file) バンドルファイル |
|
56 | # bundle( file) バンドルファイル | |
|
57 | # censored( file/node) 検閲対象(ファイル/ノード) | |||
57 | # change チェンジセット/差分 |
|
58 | # change チェンジセット/差分 | |
58 | # changegroup( file) バンドルファイル |
|
59 | # changegroup( file) バンドルファイル | |
59 | # changeset リビジョン (or 「チェンジセット」/「変更内容」) |
|
60 | # changeset リビジョン (or 「チェンジセット」/「変更内容」) | |
@@ -76,6 +77,7 b'' | |||||
76 | # directory ディレクトリ |
|
77 | # directory ディレクトリ | |
77 | # dirstate dirstate |
|
78 | # dirstate dirstate | |
78 | # entry エントリ |
|
79 | # entry エントリ | |
|
80 | # experimental 実験的実装 | |||
79 | # extend(ed) 拡張 |
|
81 | # extend(ed) 拡張 | |
80 | # extension (Mercurialの)エクステンション |
|
82 | # extension (Mercurialの)エクステンション | |
81 | # fold (revision/patch) (リビジョン/パッチの)併合 |
|
83 | # fold (revision/patch) (リビジョン/パッチの)併合 | |
@@ -83,6 +85,7 b'' | |||||
83 | # (... からの相対パスに対して、 |
|
85 | # (... からの相対パスに対して、 | |
84 | # パス先頭からのパターン合致で判定する) |
|
86 | # パス先頭からのパターン合致で判定する) | |
85 | # graft 移植 |
|
87 | # graft 移植 | |
|
88 | # handler (of web) 機能 | |||
86 | # hash identifier(s) ハッシュ値 |
|
89 | # hash identifier(s) ハッシュ値 | |
87 | # head ヘッド |
|
90 | # head ヘッド | |
88 | # head changeset(s) ヘッド |
|
91 | # head changeset(s) ヘッド | |
@@ -104,6 +107,10 b'' | |||||
104 | # node リビジョン (あるいは「対象」という言い回し) |
|
107 | # node リビジョン (あるいは「対象」という言い回し) | |
105 | # note 備考 |
|
108 | # note 備考 | |
106 | # patch パッチ |
|
109 | # patch パッチ | |
|
110 | # phase フェーズ | |||
|
111 | # draft (,) draft (※ 予約語扱い) | |||
|
112 | # public (,) public (※ 予約語扱い) | |||
|
113 | # secret (,) secret (※ 予約語扱い) | |||
107 | # platform 稼働環境 |
|
114 | # platform 稼働環境 | |
108 | # pop(patch) (パッチの)適用解除 |
|
115 | # pop(patch) (パッチの)適用解除 | |
109 | # progress (, in) 未完了(interrupted rebase/graft/histedit/transplant) |
|
116 | # progress (, in) 未完了(interrupted rebase/graft/histedit/transplant) | |
@@ -111,6 +118,7 b'' | |||||
111 | # pull (追加リビジョンの)取り込み |
|
118 | # pull (追加リビジョンの)取り込み | |
112 | # push (追加リビジョンの)反映 |
|
119 | # push (追加リビジョンの)反映 | |
113 | # push(patch) (パッチの)適用 |
|
120 | # push(patch) (パッチの)適用 | |
|
121 | # query string argument クエリ文字列引数 | |||
114 | # raise(of exception) (例外の)発生 |
|
122 | # raise(of exception) (例外の)発生 | |
115 | # reject(s) 却下差分 |
|
123 | # reject(s) 却下差分 | |
116 | # remote(host) 遠隔(ホスト) |
|
124 | # remote(host) 遠隔(ホスト) | |
@@ -135,11 +143,13 b'' | |||||
135 | # support(, not) (未)サポート |
|
143 | # support(, not) (未)サポート | |
136 | # support(, un) (未)サポート |
|
144 | # support(, un) (未)サポート | |
137 | # tag タグ |
|
145 | # tag タグ | |
|
146 | # tombstone (of censor) 墓碑データ | |||
138 | # topological xxxx 構造的 |
|
147 | # topological xxxx 構造的 | |
139 | # tracked xxxx 構成管理対象の xxxx |
|
148 | # tracked xxxx 構成管理対象の xxxx | |
140 | # tracked, un 未登録 |
|
149 | # tracked, un 未登録 | |
141 | # type, xxxxx xxxx 種別 |
|
150 | # type, xxxxx xxxx 種別 | |
142 | # unknown xxxx 未知の xxxx (or 構成管理対象外) |
|
151 | # unknown xxxx 未知の xxxx (or 構成管理対象外) | |
|
152 | # URL parameter (of web) URL パス要素 (場合によっては単に "引数") | |||
143 | # user ユーザ |
|
153 | # user ユーザ | |
144 | # working copy(of xxx) 作業領域(中の xxx) |
|
154 | # working copy(of xxx) 作業領域(中の xxx) | |
145 | # working directory 作業領域 |
|
155 | # working directory 作業領域 | |
@@ -149,8 +159,8 b' msgid ""' | |||||
149 | msgstr "" |
|
159 | msgstr "" | |
150 | "Project-Id-Version: Mercurial\n" |
|
160 | "Project-Id-Version: Mercurial\n" | |
151 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
161 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
152 |
"POT-Creation-Date: 2015-0 |
|
162 | "POT-Creation-Date: 2015-04-29 18:27+0900\n" | |
153 |
"PO-Revision-Date: 2015-0 |
|
163 | "PO-Revision-Date: 2015-04-29 21:20+0900\n" | |
154 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" |
|
164 | "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" | |
155 | "Language-Team: Japanese\n" |
|
165 | "Language-Team: Japanese\n" | |
156 | "Language: ja\n" |
|
166 | "Language: ja\n" | |
@@ -1347,6 +1357,121 b' msgstr "\xe3\x83\x95\xe3\x83\x83\xe3\x82\xaf\xe7\xa8\xae\xe5\x88\xa5 %s \xe3\x81\xab\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 ID \xe3\x81\x8c\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x97\xe3\x81\x9f"' | |||||
1347 | msgid "Bugzilla error: %s" |
|
1357 | msgid "Bugzilla error: %s" | |
1348 | msgstr "Bugzilla エラー: %s" |
|
1358 | msgstr "Bugzilla エラー: %s" | |
1349 |
|
1359 | |||
|
1360 | msgid "erase file content at a given revision" | |||
|
1361 | msgstr "指定リビジョンのファイル内容の検閲/消去" | |||
|
1362 | ||||
|
1363 | msgid "" | |||
|
1364 | "The censor command instructs Mercurial to erase all content of a file at a " | |||
|
1365 | "given\n" | |||
|
1366 | "revision *without updating the changeset hash.* This allows existing history " | |||
|
1367 | "to\n" | |||
|
1368 | "remain valid while preventing future clones/pulls from receiving the erased\n" | |||
|
1369 | "data." | |||
|
1370 | msgstr "" | |||
|
1371 | "censor コマンドは、 指定リビジョン時点における、 指定ファイルの内容を、\n" | |||
|
1372 | "消去しますが、 当該リビジョンの *ハッシュ値は変えない* 点が特徴です。\n" | |||
|
1373 | "ハッシュ値が変わらないため、 既存の履歴の有効性は維持したままで、\n" | |||
|
1374 | "消去されたデータが clone/pull 等で伝搬することを防止できます。" | |||
|
1375 | ||||
|
1376 | msgid "" | |||
|
1377 | "Typical uses for censor are due to security or legal requirements, " | |||
|
1378 | "including::" | |||
|
1379 | msgstr "" | |||
|
1380 | "censor コマンドによる検閲/消去が、 必要とされる典型的なケースは、\n" | |||
|
1381 | "以下のようなデータの扱いで、 セキュリティ的/法的に必要とされるケースです::" | |||
|
1382 | ||||
|
1383 | msgid "" | |||
|
1384 | " * Passwords, private keys, crytographic material\n" | |||
|
1385 | " * Licensed data/code/libraries for which the license has expired\n" | |||
|
1386 | " * Personally Identifiable Information or other private data" | |||
|
1387 | msgstr "" | |||
|
1388 | " * パスワード、秘密鍵、暗号化情報\n" | |||
|
1389 | " * 有効期限の切れたライセンスにひも付いた、データ/プログラム/ライブラリ\n" | |||
|
1390 | " * 個人識別情報、あるいはそれに類する個人情報" | |||
|
1391 | ||||
|
1392 | msgid "" | |||
|
1393 | "Censored file revisions are listed in a tracked file called .hgcensored " | |||
|
1394 | "stored\n" | |||
|
1395 | "in the repository root. The censor command adds an entry to the .hgcensored " | |||
|
1396 | "file\n" | |||
|
1397 | "in the working directory and commits it (much like ``hg tag`` and .hgtags). " | |||
|
1398 | "The\n" | |||
|
1399 | "censored file data is then replaced with a pointer to the new commit, " | |||
|
1400 | "enabling\n" | |||
|
1401 | "verification." | |||
|
1402 | msgstr "" | |||
|
1403 | ||||
|
1404 | msgid "" | |||
|
1405 | "Censored nodes can interrupt mercurial's typical operation whenever the " | |||
|
1406 | "excised\n" | |||
|
1407 | "data needs to be materialized. Some commands, like ``hg cat``/``hg " | |||
|
1408 | "revert``,\n" | |||
|
1409 | "simply fail when asked to produce censored data. Others, like ``hg verify`` " | |||
|
1410 | "and\n" | |||
|
1411 | "``hg update``, must be capable of tolerating censored data to continue to\n" | |||
|
1412 | "function in a meaningful way. Such commands only tolerate censored file\n" | |||
|
1413 | "revisions if they are allowed by the policy specified by the \"censor.allow" | |||
|
1414 | "\"\n" | |||
|
1415 | "config option.\n" | |||
|
1416 | msgstr "" | |||
|
1417 | "検閲によって消去されたファイル内容は、 参照することができなくなります。\n" | |||
|
1418 | ":hg:`cat` や :hg:`revert` 等のコマンドは、 単純に処理が中断されます。\n" | |||
|
1419 | ":hg:`verify` や :hg:`update` 等の場合、 検閲済みのファイルを無視して、\n" | |||
|
1420 | "処理を継続することもできます。 検閲済みファイルによる中断を回避するには、\n" | |||
|
1421 | "``[censor] allow`` 設定を有効にしてください。\n" | |||
|
1422 | ||||
|
1423 | msgid "REV" | |||
|
1424 | msgstr "リビジョン" | |||
|
1425 | ||||
|
1426 | msgid "censor file from specified revision" | |||
|
1427 | msgstr "指定リビジョンのファイル内容の検閲" | |||
|
1428 | ||||
|
1429 | msgid "TEXT" | |||
|
1430 | msgstr "テキスト" | |||
|
1431 | ||||
|
1432 | msgid "replacement tombstone data" | |||
|
1433 | msgstr "差し替え用の墓碑 (tombstone) データ" | |||
|
1434 | ||||
|
1435 | msgid "-r REV [-t TEXT] [FILE]" | |||
|
1436 | msgstr "-r REV [-t TEXT] [FILE]" | |||
|
1437 | ||||
|
1438 | msgid "must specify file path to censor" | |||
|
1439 | msgstr "検閲対象ファイルを指定してください" | |||
|
1440 | ||||
|
1441 | msgid "must specify revision to censor" | |||
|
1442 | msgstr "検閲対象リビジョンを指定してください" | |||
|
1443 | ||||
|
1444 | msgid "cannot censor file with no history" | |||
|
1445 | msgstr "履歴のないファイルは検閲できません" | |||
|
1446 | ||||
|
1447 | #, python-format | |||
|
1448 | msgid "invalid revision identifier %s" | |||
|
1449 | msgstr "リビジョン指定 %s は不正です" | |||
|
1450 | ||||
|
1451 | #, python-format | |||
|
1452 | msgid "file does not exist at revision %s" | |||
|
1453 | msgstr "指定ファイルはリビジョン %s に存在しません" | |||
|
1454 | ||||
|
1455 | #, python-format | |||
|
1456 | msgid "cannot censor file in heads (%s)" | |||
|
1457 | msgstr "ヘッドリビジョン (%s) の内容は検閲できません" | |||
|
1458 | ||||
|
1459 | msgid "clean/delete and commit first" | |||
|
1460 | msgstr "" | |||
|
1461 | ||||
|
1462 | msgid "cannot censor working directory" | |||
|
1463 | msgstr "作業領域の親リビジョンの内容は検閲できません" | |||
|
1464 | ||||
|
1465 | msgid "clean/delete/update first" | |||
|
1466 | msgstr "" | |||
|
1467 | ||||
|
1468 | #, python-format | |||
|
1469 | msgid "censor does not support revlog version %d" | |||
|
1470 | msgstr "revlog バージョン %d では検閲機能を使用できません" | |||
|
1471 | ||||
|
1472 | msgid "censor tombstone must be no longer than censored data" | |||
|
1473 | msgstr "差し替え用の墓碑データは、検閲対象データよりも短くしてください" | |||
|
1474 | ||||
1350 | msgid "command to display child changesets (DEPRECATED)" |
|
1475 | msgid "command to display child changesets (DEPRECATED)" | |
1351 | msgstr "子リビジョン表示のコマンド (非推奨)" |
|
1476 | msgstr "子リビジョン表示のコマンド (非推奨)" | |
1352 |
|
1477 | |||
@@ -1356,9 +1481,6 b' msgid ""' | |||||
1356 | msgstr "" |
|
1481 | msgstr "" | |
1357 | "本エクステンションは非推奨です (:hg:`log -r \"children(REV)\"` で代替可能)\n" |
|
1482 | "本エクステンションは非推奨です (:hg:`log -r \"children(REV)\"` で代替可能)\n" | |
1358 |
|
1483 | |||
1359 | msgid "REV" |
|
|||
1360 | msgstr "リビジョン" |
|
|||
1361 |
|
||||
1362 | msgid "show children of the specified revision" |
|
1484 | msgid "show children of the specified revision" | |
1363 | msgstr "指定リビジョンの子リビジョンの表示" |
|
1485 | msgstr "指定リビジョンの子リビジョンの表示" | |
1364 |
|
1486 | |||
@@ -1405,6 +1527,9 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe6\x97\xa5\xe6\x99\x82\xe3\x81\xa8\xe4\xb8\x80\xe8\x87\xb4\xe3\x81\x97\xe3\x81\x9f\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe5\x87\xa6\xe7\x90\x86\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xa8\xe3\x81\x99\xe3\x82\x8b"' | |||||
1405 | msgid "TEMPLATE" |
|
1527 | msgid "TEMPLATE" | |
1406 | msgstr "テンプレート" |
|
1528 | msgstr "テンプレート" | |
1407 |
|
1529 | |||
|
1530 | msgid "template to group changesets (DEPRECATED)" | |||
|
1531 | msgstr "リビジョン表示をグループ化するためのテンプレート (非推奨)" | |||
|
1532 | ||||
1408 | msgid "template to group changesets" |
|
1533 | msgid "template to group changesets" | |
1409 | msgstr "リビジョン表示をグループ化するためのテンプレート" |
|
1534 | msgstr "リビジョン表示をグループ化するためのテンプレート" | |
1410 |
|
1535 | |||
@@ -1796,7 +1921,7 b' msgid ""' | |||||
1796 | "emit codes that less doesn't understand. You can work around this by\n" |
|
1921 | "emit codes that less doesn't understand. You can work around this by\n" | |
1797 | "either using ansi mode (or auto mode), or by using less -r (which will\n" |
|
1922 | "either using ansi mode (or auto mode), or by using less -r (which will\n" | |
1798 | "pass through all terminal control codes, not just color control\n" |
|
1923 | "pass through all terminal control codes, not just color control\n" | |
1799 |
"codes). |
|
1924 | "codes)." | |
1800 | msgstr "" |
|
1925 | msgstr "" | |
1801 | "pager エクステンションでの ``less -R`` 使用と、 terminfo 使用の併用は、\n" |
|
1926 | "pager エクステンションでの ``less -R`` 使用と、 terminfo 使用の併用は、\n" | |
1802 | "稼動環境によっては、 色付けが正しく機能しない可能性があります。\n" |
|
1927 | "稼動環境によっては、 色付けが正しく機能しない可能性があります。\n" | |
@@ -1804,7 +1929,29 b' msgstr ""' | |||||
1804 | "が解釈しない色指定制御が terminfo 使用時に除外される場合があるためです。\n" |
|
1929 | "が解釈しない色指定制御が terminfo 使用時に除外される場合があるためです。\n" | |
1805 | "このような場合、 端末指定に ansi (または auto) を用いるか、 ``less -r``\n" |
|
1930 | "このような場合、 端末指定に ansi (または auto) を用いるか、 ``less -r``\n" | |
1806 | "(色指定以外の全ての端末制御が、 透過的に伝播されます) を使用することで、\n" |
|
1931 | "(色指定以外の全ての端末制御が、 透過的に伝播されます) を使用することで、\n" | |
1807 |
"状況が改善される可能性があります。 |
|
1932 | "状況が改善される可能性があります。" | |
|
1933 | ||||
|
1934 | msgid "" | |||
|
1935 | "On some systems (such as MSYS in Windows), the terminal may support\n" | |||
|
1936 | "a different color mode than the pager (activated via the \"pager\"\n" | |||
|
1937 | "extension). It is possible to define separate modes depending on whether\n" | |||
|
1938 | "the pager is active::" | |||
|
1939 | msgstr "" | |||
|
1940 | "環境によっては、 \"pager\" エクステンションが起動するページャプログラムと、\n" | |||
|
1941 | "ターミナルソフトの色付け方式が異なる場合があります (Windows 上の MSYS 等)。\n" | |||
|
1942 | "ページャプログラム起動の有無に応じて、 異なる色付け方式の指定が可能です::" | |||
|
1943 | ||||
|
1944 | msgid "" | |||
|
1945 | " [color]\n" | |||
|
1946 | " mode = auto\n" | |||
|
1947 | " pagermode = ansi" | |||
|
1948 | msgstr "" | |||
|
1949 | " [color]\n" | |||
|
1950 | " mode = auto\n" | |||
|
1951 | " pagermode = ansi" | |||
|
1952 | ||||
|
1953 | msgid "If ``pagermode`` is not defined, the ``mode`` will be used.\n" | |||
|
1954 | msgstr "``pagermode`` が無指定の場合は、 ``mode`` 設定が使用されます。\n" | |||
1808 |
|
1955 | |||
1809 | msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n" |
|
1956 | msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n" | |
1810 | msgstr "" |
|
1957 | msgstr "" | |
@@ -3140,19 +3287,19 b' msgstr ""' | |||||
3140 |
|
3287 | |||
3141 | msgid "" |
|
3288 | msgid "" | |
3142 | "The extension reads its configuration from a versioned ``.hgeol``\n" |
|
3289 | "The extension reads its configuration from a versioned ``.hgeol``\n" | |
3143 |
"configuration file found in the root of the working |
|
3290 | "configuration file found in the root of the working directory. The\n" | |
3144 | "``.hgeol`` file use the same syntax as all other Mercurial\n" |
|
3291 | "``.hgeol`` file use the same syntax as all other Mercurial\n" | |
3145 | "configuration files. It uses two sections, ``[patterns]`` and\n" |
|
3292 | "configuration files. It uses two sections, ``[patterns]`` and\n" | |
3146 | "``[repository]``." |
|
3293 | "``[repository]``." | |
3147 | msgstr "" |
|
3294 | msgstr "" | |
3148 | "本エクステンションは、 作業領域のルート直下のファイル ``.hgeol``\n" |
|
3295 | "本エクステンションは、 作業領域のルート直下のファイル ``.hgeol``\n" | |
3149 |
"( |
|
3296 | "(履歴管理可能) から設定を読み込みます。 ``.hgeol`` ファイルの文法は、\n" | |
3150 | "他の Mercurial 設定ファイルと同じです。 本設定ファイルでは、\n" |
|
3297 | "他の Mercurial 設定ファイルと同じです。 本設定ファイルでは、\n" | |
3151 | "``[patterns]`` と ``[repository]`` の2つのセクションを記述可能です。" |
|
3298 | "``[patterns]`` と ``[repository]`` の2つのセクションを記述可能です。" | |
3152 |
|
3299 | |||
3153 | msgid "" |
|
3300 | msgid "" | |
3154 | "The ``[patterns]`` section specifies how line endings should be\n" |
|
3301 | "The ``[patterns]`` section specifies how line endings should be\n" | |
3155 |
"converted between the working |
|
3302 | "converted between the working directory and the repository. The format is\n" | |
3156 | "specified by a file pattern. The first match is used, so put more\n" |
|
3303 | "specified by a file pattern. The first match is used, so put more\n" | |
3157 | "specific patterns first. The available line endings are ``LF``,\n" |
|
3304 | "specific patterns first. The available line endings are ``LF``,\n" | |
3158 | "``CRLF``, and ``BIN``." |
|
3305 | "``CRLF``, and ``BIN``." | |
@@ -3230,7 +3377,7 b' msgstr ""' | |||||
3230 |
|
3377 | |||
3231 | msgid "" |
|
3378 | msgid "" | |
3232 | " The rules will first apply when files are touched in the working\n" |
|
3379 | " The rules will first apply when files are touched in the working\n" | |
3233 |
" |
|
3380 | " directory, e.g. by updating to null and back to tip to touch all files." | |
3234 | msgstr "" |
|
3381 | msgstr "" | |
3235 | " 変換設定の適用契機は、 作業領域中のファイルに対する最初の更新です。\n" |
|
3382 | " 変換設定の適用契機は、 作業領域中のファイルに対する最初の更新です。\n" | |
3236 | " 例えば、 :hg:`update null` 後の :hg:`update tip` により、\n" |
|
3383 | " 例えば、 :hg:`update null` 後の :hg:`update tip` により、\n" | |
@@ -3664,9 +3811,11 b' msgstr ""' | |||||
3664 | " 成功時のコマンド終了値は 0 です。\n" |
|
3811 | " 成功時のコマンド終了値は 0 です。\n" | |
3665 | " " |
|
3812 | " " | |
3666 |
|
3813 | |||
3667 | msgid "" |
|
3814 | msgid "working directory not at branch tip" | |
3668 | "working dir not at branch tip (use \"hg update\" to check out branch tip)" |
|
3815 | msgstr "作業領域の親リビジョンはブランチの最新ではありません" | |
3669 | msgstr "作業領域はブランチの最新ではありません(\"hg update\" で最新に更新可能)" |
|
3816 | ||
|
3817 | msgid "use \"hg update\" to check out branch tip" | |||
|
3818 | msgstr "\"hg update\" でブランチの最新に更新可能" | |||
3670 |
|
3819 | |||
3671 | msgid "" |
|
3820 | msgid "" | |
3672 | "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" |
|
3821 | "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
@@ -3757,9 +3906,6 b' msgstr "ID"' | |||||
3757 | msgid "the key id to sign with" |
|
3906 | msgid "the key id to sign with" | |
3758 | msgstr "署名に使用する鍵ID" |
|
3907 | msgstr "署名に使用する鍵ID" | |
3759 |
|
3908 | |||
3760 | msgid "TEXT" |
|
|||
3761 | msgstr "テキスト" |
|
|||
3762 |
|
||||
3763 | msgid "use text as commit message" |
|
3909 | msgid "use text as commit message" | |
3764 | msgstr "指定テキストをコミットログとして使用" |
|
3910 | msgstr "指定テキストをコミットログとして使用" | |
3765 |
|
3911 | |||
@@ -4053,14 +4199,14 b' msgstr "\xe6\xa4\x9c\xe7\xb4\xa2"' | |||||
4053 | msgid "diff trees from two commits" |
|
4199 | msgid "diff trees from two commits" | |
4054 | msgstr "2リビジョン間の差分ツリー表示" |
|
4200 | msgstr "2リビジョン間の差分ツリー表示" | |
4055 |
|
4201 | |||
4056 |
msgid " |
|
4202 | msgid "REV REV" | |
4057 |
msgstr " |
|
4203 | msgstr "REV REV" | |
4058 |
|
4204 | |||
4059 | msgid "output common ancestor information" |
|
4205 | msgid "output common ancestor information" | |
4060 | msgstr "共通の祖先リビジョンの情報表示" |
|
4206 | msgstr "共通の祖先リビジョンの情報表示" | |
4061 |
|
4207 | |||
4062 |
msgid " |
|
4208 | msgid "[OPTION]... TYPE FILE" | |
4063 |
msgstr " |
|
4209 | msgstr "[OPTION]... TYPE FILE" | |
4064 |
|
4210 | |||
4065 | msgid "cat a specific revision" |
|
4211 | msgid "cat a specific revision" | |
4066 | msgstr "指定リビジョン時点の内容表示" |
|
4212 | msgstr "指定リビジョン時点の内容表示" | |
@@ -4071,16 +4217,6 b' msgstr "cat-file: \xe7\xa8\xae\xe5\x88\xa5\xe3\x82\x82\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x82\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"' | |||||
4071 | msgid "aborting hg cat-file only understands commits\n" |
|
4217 | msgid "aborting hg cat-file only understands commits\n" | |
4072 | msgstr "中止: catfile は commit 種別でのみ実行可能です\n" |
|
4218 | msgstr "中止: catfile は commit 種別でのみ実行可能です\n" | |
4073 |
|
4219 | |||
4074 | #. i18n: bisect changeset status |
|
|||
4075 | msgid "ignored" |
|
|||
4076 | msgstr "無視" |
|
|||
4077 |
|
||||
4078 | msgid "hg debug-rev-parse REV" |
|
|||
4079 | msgstr "hg debug-rev-parse REV" |
|
|||
4080 |
|
||||
4081 | msgid "parse given revisions" |
|
|||
4082 | msgstr "指定リビジョンの解析" |
|
|||
4083 |
|
||||
4084 | msgid "header" |
|
4220 | msgid "header" | |
4085 | msgstr "ヘッダ" |
|
4221 | msgstr "ヘッダ" | |
4086 |
|
4222 | |||
@@ -4096,20 +4232,14 b' msgstr "\xe6\x9c\x80\xe5\xa4\xa7\xe6\x95\xb0"' | |||||
4096 | msgid "print revisions" |
|
4232 | msgid "print revisions" | |
4097 | msgstr "リビジョンの表示" |
|
4233 | msgstr "リビジョンの表示" | |
4098 |
|
4234 | |||
4099 | msgid "hg debug-config" |
|
|||
4100 | msgstr "hg debug-config" |
|
|||
4101 |
|
||||
4102 | msgid "print extension options" |
|
|||
4103 | msgstr "エクステンション設定の表示" |
|
|||
4104 |
|
||||
4105 | msgid "NUM" |
|
4235 | msgid "NUM" | |
4106 | msgstr "数値" |
|
4236 | msgstr "数値" | |
4107 |
|
4237 | |||
4108 | msgid "limit number of changes displayed" |
|
4238 | msgid "limit number of changes displayed" | |
4109 | msgstr "最大表示リビジョン数" |
|
4239 | msgstr "最大表示リビジョン数" | |
4110 |
|
4240 | |||
4111 |
msgid " |
|
4241 | msgid "[-l LIMIT] [REVRANGE]" | |
4112 |
msgstr " |
|
4242 | msgstr "[-l LIMIT] [REVRANGE]" | |
4113 |
|
4243 | |||
4114 | msgid "start interactive history viewer" |
|
4244 | msgid "start interactive history viewer" | |
4115 | msgstr "対話的な履歴参照の開始" |
|
4245 | msgstr "対話的な履歴参照の開始" | |
@@ -4409,12 +4539,27 b' msgid ""' | |||||
4409 | "If you run ``hg histedit --outgoing`` on the clone then it is the same\n" |
|
4539 | "If you run ``hg histedit --outgoing`` on the clone then it is the same\n" | |
4410 | "as running ``hg histedit 836302820282``. If you need plan to push to a\n" |
|
4540 | "as running ``hg histedit 836302820282``. If you need plan to push to a\n" | |
4411 | "repository that Mercurial does not detect to be related to the source\n" |
|
4541 | "repository that Mercurial does not detect to be related to the source\n" | |
4412 |
"repo, you can add a ``--force`` option. |
|
4542 | "repo, you can add a ``--force`` option." | |
4413 | msgstr "" |
|
4543 | msgstr "" | |
4414 | "複製『先』のリポジトリで ``hg histedit --outgoing`` を実行した場合、\n" |
|
4544 | "複製『先』のリポジトリで ``hg histedit --outgoing`` を実行した場合、\n" | |
4415 | "``hg histedit 836302820282`` 実行と同じ結果となります。 Mercurial が、\n" |
|
4545 | "``hg histedit 836302820282`` 実行と同じ結果となります。 Mercurial が、\n" | |
4416 | "連携先リポジトリとの関連性を、 検出できない場合でも、 ``--force``\n" |
|
4546 | "連携先リポジトリとの関連性を、 検出できない場合でも、 ``--force``\n" | |
4417 |
"を指定することで、 元リポジトリとの関連ありとみなすことができます。 |
|
4547 | "を指定することで、 元リポジトリとの関連ありとみなすことができます。" | |
|
4548 | ||||
|
4549 | msgid "" | |||
|
4550 | "Histedit rule lines are truncated to 80 characters by default. You\n" | |||
|
4551 | "can customise this behaviour by setting a different length in your\n" | |||
|
4552 | "configuration file::" | |||
|
4553 | msgstr "" | |||
|
4554 | "histedit での改変指示行は、 80 カラムでの切り詰めがデフォルトです。\n" | |||
|
4555 | "以下の設定により、 切り詰めのカラム幅を変更できます::" | |||
|
4556 | ||||
|
4557 | msgid "" | |||
|
4558 | " [histedit]\n" | |||
|
4559 | " linelen = 120 # truncate rule lines at 120 characters\n" | |||
|
4560 | msgstr "" | |||
|
4561 | " [histedit]\n" | |||
|
4562 | " linelen = 120 # 改変指示行を 120 カラムで切り詰め\n" | |||
4418 |
|
4563 | |||
4419 | #. i18n: command names and abbreviations must remain untranslated |
|
4564 | #. i18n: command names and abbreviations must remain untranslated | |
4420 | #, python-format |
|
4565 | #, python-format | |
@@ -4448,6 +4593,10 b' msgstr ""' | |||||
4448 | msgid "no histedit in progress" |
|
4593 | msgid "no histedit in progress" | |
4449 | msgstr "実施中の histedit による履歴改変はありません" |
|
4594 | msgstr "実施中の histedit による履歴改変はありません" | |
4450 |
|
4595 | |||
|
4596 | #, python-format | |||
|
4597 | msgid "unknown changeset %s listed" | |||
|
4598 | msgstr "未知のリビジョン %s が指定されました" | |||
|
4599 | ||||
4451 | msgid "Fix up the change and run hg histedit --continue" |
|
4600 | msgid "Fix up the change and run hg histedit --continue" | |
4452 | msgstr "衝突解消後に 'hg histedit --continue' を実行してください" |
|
4601 | msgstr "衝突解消後に 'hg histedit --continue' を実行してください" | |
4453 |
|
4602 | |||
@@ -4463,8 +4612,10 b' msgstr ""' | |||||
4463 | "作業完了後は 'hg histedit --continue' で histedit を再開します。" |
|
4612 | "作業完了後は 'hg histedit --continue' で histedit を再開します。" | |
4464 |
|
4613 | |||
4465 | #, python-format |
|
4614 | #, python-format | |
4466 | msgid "%s: empty changeset" |
|
4615 | msgid "" | |
4467 | msgstr "%s: 空のリビジョン" |
|
4616 | "%s: cannot fold - working copy is not a descendant of previous commit %s\n" | |
|
4617 | msgstr "" | |||
|
4618 | "%s: 併合できません - 作業領域は直前のコミット %s の子孫ではありません\n" | |||
4468 |
|
4619 | |||
4469 | #, python-format |
|
4620 | #, python-format | |
4470 | msgid "comparing with %s\n" |
|
4621 | msgid "comparing with %s\n" | |
@@ -4479,12 +4630,15 b' msgstr "\xe7\xb4\x9b\xe3\x82\x89\xe3\x82\x8f\xe3\x81\x97\xe3\x81\x84\xe5\x8f\x8d\xe6\x98\xa0\xe5\x80\x99\xe8\xa3\x9c\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
4479 | msgid "see \"hg help histedit\" for more detail" |
|
4630 | msgid "see \"hg help histedit\" for more detail" | |
4480 | msgstr "詳細は \"hg help histedit\" を参照" |
|
4631 | msgstr "詳細は \"hg help histedit\" を参照" | |
4481 |
|
4632 | |||
4482 |
msgid " |
|
4633 | msgid "read history edits from the specified file" | |
4483 |
msgstr "履歴改変 |
|
4634 | msgstr "履歴改変指示を指定ファイルから読み込み" | |
4484 |
|
4635 | |||
4485 | msgid "continue an edit already in progress" |
|
4636 | msgid "continue an edit already in progress" | |
4486 | msgstr "中断された未完了の履歴改変を再開" |
|
4637 | msgstr "中断された未完了の履歴改変を再開" | |
4487 |
|
4638 | |||
|
4639 | msgid "edit remaining actions list" | |||
|
4640 | msgstr "残りの改変指示内容の編集" | |||
|
4641 | ||||
4488 | msgid "don't strip old nodes after edit is complete" |
|
4642 | msgid "don't strip old nodes after edit is complete" | |
4489 | msgstr "改変元の履歴を改変完了後も保持" |
|
4643 | msgstr "改変元の履歴を改変完了後も保持" | |
4490 |
|
4644 | |||
@@ -4565,6 +4719,9 b' msgstr "--continue \xe6\x8c\x87\xe5\xae\x9a\xe6\x99\x82\xe3\x81\xaf\xe5\xbc\x95\xe6\x95\xb0\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
4565 | msgid "no arguments allowed with --abort" |
|
4719 | msgid "no arguments allowed with --abort" | |
4566 | msgstr "--abort 指定時は引数を指定できません" |
|
4720 | msgstr "--abort 指定時は引数を指定できません" | |
4567 |
|
4721 | |||
|
4722 | msgid "only --commands argument allowed with --edit-plan" | |||
|
4723 | msgstr "--edit-plan 指定時には、--commands 以外のオプションは指定できません" | |||
|
4724 | ||||
4568 | msgid "history edit already in progress, try --continue or --abort" |
|
4725 | msgid "history edit already in progress, try --continue or --abort" | |
4569 | msgstr "履歴改変が未完了です。 --continue または --abortを指定してください" |
|
4726 | msgstr "履歴改変が未完了です。 --continue または --abortを指定してください" | |
4570 |
|
4727 | |||
@@ -4584,8 +4741,8 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe7\xbe\xa4\xe3\x81\xaf\xe3\x80\x81\xe5\x8d\x98\xe4\xb8\x80\xe3\x81\xae\xe5\x85\xb1\xe9\x80\x9a\xe7\xa5\x96\xe5\x85\x88\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe6\x8c\x81\xe3\x81\xa4\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99"' | |||||
4584 | msgid "%s is not an ancestor of working directory" |
|
4741 | msgid "%s is not an ancestor of working directory" | |
4585 | msgstr "%s は作業領域の祖先ではありません" |
|
4742 | msgstr "%s は作業領域の祖先ではありません" | |
4586 |
|
4743 | |||
4587 | msgid "use \"histedit --abort\" to clear broken state" |
|
4744 | msgid "working copy still dirty" | |
4588 | msgstr "不整合な状態のクリアは \"histedit --abort\"" |
|
4745 | msgstr "作業領域に未コミットな変更が残っています" | |
4589 |
|
4746 | |||
4590 | msgid "cannot edit history that would orphan nodes" |
|
4747 | msgid "cannot edit history that would orphan nodes" | |
4591 | msgstr "履歴ツリーが分断されるような履歴改変はできません" |
|
4748 | msgstr "履歴ツリーが分断されるような履歴改変はできません" | |
@@ -4601,10 +4758,6 b' msgstr "\xe6\x94\xb9\xe5\xa4\x89\xe4\xb8\x8d\xe8\x83\xbd\xe3\x81\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99: %s"' | |||||
4601 | msgid "malformed line \"%s\"" |
|
4758 | msgid "malformed line \"%s\"" | |
4602 | msgstr "不正な行 \"%s\"" |
|
4759 | msgstr "不正な行 \"%s\"" | |
4603 |
|
4760 | |||
4604 | #, python-format |
|
|||
4605 | msgid "unknown changeset %s listed" |
|
|||
4606 | msgstr "未知のリビジョン %s が指定されました" |
|
|||
4607 |
|
||||
4608 | msgid "may not use changesets other than the ones listed" |
|
4761 | msgid "may not use changesets other than the ones listed" | |
4609 | msgstr "対象範囲以外のリビジョンは指定できません" |
|
4762 | msgstr "対象範囲以外のリビジョンは指定できません" | |
4610 |
|
4763 | |||
@@ -4627,6 +4780,10 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe7\xa0\xb4\xe6\xa3\x84\xe3\x81\xab\xe3\x81\xaf drop \xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99"' | |||||
4627 | msgid "histedit: moving bookmarks %s from %s to %s\n" |
|
4780 | msgid "histedit: moving bookmarks %s from %s to %s\n" | |
4628 | msgstr "histedit: ブックマーク %s を %s から %s に移動中\n" |
|
4781 | msgstr "histedit: ブックマーク %s を %s から %s に移動中\n" | |
4629 |
|
4782 | |||
|
4783 | #, python-format | |||
|
4784 | msgid "histedit in progress, can't strip %s" | |||
|
4785 | msgstr "histedit による履歴改変が未完了のため、%s を除外できません" | |||
|
4786 | ||||
4630 | #. i18n: column positioning for "hg summary" |
|
4787 | #. i18n: column positioning for "hg summary" | |
4631 | #, python-format |
|
4788 | #, python-format | |
4632 | msgid "hist: %s (histedit --continue)\n" |
|
4789 | msgid "hist: %s (histedit --continue)\n" | |
@@ -5436,9 +5593,6 b' msgstr "%s \xe3\x82\x92\xe7\x99\xbb\xe9\x8c\xb2\xe9\x99\xa4\xe5\xa4\x96\xe4\xb8\xad\\n"' | |||||
5436 | msgid "--normal cannot be used with --large" |
|
5593 | msgid "--normal cannot be used with --large" | |
5437 | msgstr "--normal と --large は併用できません" |
|
5594 | msgstr "--normal と --large は併用できません" | |
5438 |
|
5595 | |||
5439 | msgid "uncommitted changes" |
|
|||
5440 | msgstr "作業領域の変更が未コミットです" |
|
|||
5441 |
|
||||
5442 | #, python-format |
|
5596 | #, python-format | |
5443 | msgid "" |
|
5597 | msgid "" | |
5444 | "remote turned local normal file %s into a largefile\n" |
|
5598 | "remote turned local normal file %s into a largefile\n" | |
@@ -5494,6 +5648,9 b' msgstr "files \xe3\x81\xa7\xe3\x81\xae\xe3\x82\xa2\xe3\x83\xbc\xe3\x82\xab\xe3\x82\xa4\xe3\x83\x96\xe3\x81\xab\xe3\x81\xaf\xe6\x8e\xa5\xe9\xa0\xad\xe8\xbe\x9e\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
5494 | msgid "largefile %s not found in repo store or system cache" |
|
5648 | msgid "largefile %s not found in repo store or system cache" | |
5495 | msgstr "大容量ファイル %s がリポジトリにもシステムキャッシュにもありません" |
|
5649 | msgstr "大容量ファイル %s がリポジトリにもシステムキャッシュにもありません" | |
5496 |
|
5650 | |||
|
5651 | msgid "uncommitted changes" | |||
|
5652 | msgstr "作業領域の変更が未コミットです" | |||
|
5653 | ||||
5497 | #, python-format |
|
5654 | #, python-format | |
5498 | msgid "not removing %s: file is already untracked\n" |
|
5655 | msgid "not removing %s: file is already untracked\n" | |
5499 | msgstr "%s は削除されません: ファイルは既に未登録です\n" |
|
5656 | msgstr "%s は削除されません: ファイルは既に未登録です\n" | |
@@ -5840,8 +5997,11 b' msgstr "%s \xe3\x82\x92\xe9\x81\xa9\xe7\x94\xa8\xe4\xb8\xad\\n"' | |||||
5840 | msgid "unable to read %s\n" |
|
5997 | msgid "unable to read %s\n" | |
5841 | msgstr "ファイル %s が読み込めません\n" |
|
5998 | msgstr "ファイル %s が読み込めません\n" | |
5842 |
|
5999 | |||
5843 |
msgid "local changes found |
|
6000 | msgid "conflicting local changes found" | |
5844 | msgstr "作業領域に変更がありますので qrefresh を実施してください" |
|
6001 | msgstr "作業領域中の未コミット変更と衝突します" | |
|
6002 | ||||
|
6003 | msgid "did you forget to qrefresh?" | |||
|
6004 | msgstr "qrefresh の実施を忘れていませんか?" | |||
5845 |
|
6005 | |||
5846 | #, python-format |
|
6006 | #, python-format | |
5847 | msgid "patch %s is empty\n" |
|
6007 | msgid "patch %s is empty\n" | |
@@ -5853,7 +6013,7 b' msgstr "qpush \xe3\x81\xae\xe5\x86\x85\xe5\xae\xb9\xe3\x81\x8c\xe9\x81\xa9\xe7\x94\xa8\xe5\x85\x88\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xa8\xe5\xae\x8c\xe5\x85\xa8\xe3\x81\xab\xe4\xb8\x80\xe8\x87\xb4\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
5853 | msgid "repository commit failed" |
|
6013 | msgid "repository commit failed" | |
5854 | msgstr "リポジトリのコミット操作に失敗" |
|
6014 | msgstr "リポジトリのコミット操作に失敗" | |
5855 |
|
6015 | |||
5856 | msgid "patch failed, rejects left in working dir\n" |
|
6016 | msgid "patch failed, rejects left in working directory\n" | |
5857 | msgstr "パッチ適用が失敗し、 却下差分は作業領域に残されています\n" |
|
6017 | msgstr "パッチ適用が失敗し、 却下差分は作業領域に残されています\n" | |
5858 |
|
6018 | |||
5859 | msgid "fuzz found when applying patch, stopping\n" |
|
6019 | msgid "fuzz found when applying patch, stopping\n" | |
@@ -5896,6 +6056,9 b' msgstr "\xe9\x81\xa9\xe7\x94\xa8\xe4\xb8\xad\xe3\x81\xae\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
5896 | msgid "working directory revision is not qtip" |
|
6056 | msgid "working directory revision is not qtip" | |
5897 | msgstr "作業領域の親リビジョンは qtip ではありません" |
|
6057 | msgstr "作業領域の親リビジョンは qtip ではありません" | |
5898 |
|
6058 | |||
|
6059 | msgid "local changes found, refresh first" | |||
|
6060 | msgstr "作業領域に変更がありますので qrefresh を実施してください" | |||
|
6061 | ||||
5899 | msgid "local changed subrepos found, refresh first" |
|
6062 | msgid "local changed subrepos found, refresh first" | |
5900 | msgstr "サブリポジトリに変更がありますので qrefresh を実施してください" |
|
6063 | msgstr "サブリポジトリに変更がありますので qrefresh を実施してください" | |
5901 |
|
6064 | |||
@@ -8647,78 +8810,6 b' msgstr "\'hg rebase --continue\' \xe3\x81\x8b \'hg rebase --abort\' \xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"' | |||||
8647 | msgid "commands to interactively select changes for commit/qrefresh" |
|
8810 | msgid "commands to interactively select changes for commit/qrefresh" | |
8648 | msgstr "commit や qrefresh における対話的な変更取り込みの選択" |
|
8811 | msgstr "commit や qrefresh における対話的な変更取り込みの選択" | |
8649 |
|
8812 | |||
8650 | msgid "this modifies a binary file (all or nothing)\n" |
|
|||
8651 | msgstr "これはバイナリファイルに対する変更です(部分的な選択は不可能)\n" |
|
|||
8652 |
|
||||
8653 | msgid "this is a binary file\n" |
|
|||
8654 | msgstr "これはバイナリファイルです\n" |
|
|||
8655 |
|
||||
8656 | #, python-format |
|
|||
8657 | msgid "%d hunks, %d lines changed\n" |
|
|||
8658 | msgstr "%d 個の差分、 %d 行の変更\n" |
|
|||
8659 |
|
||||
8660 | msgid "" |
|
|||
8661 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " |
|
|||
8662 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " |
|
|||
8663 | "changes to this &file$$ &Done, skip remaining changes and files$$ Record " |
|
|||
8664 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &? " |
|
|||
8665 | "(display help)" |
|
|||
8666 | msgstr "" |
|
|||
8667 | "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編" |
|
|||
8668 | "集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)" |
|
|||
8669 | "の以後の全ての変更を記録$$ 以後の全ての変更を無視=記録作業を完了(&done)$$ 以" |
|
|||
8670 | "後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)" |
|
|||
8671 |
|
||||
8672 | msgid "cannot edit patch for whole file" |
|
|||
8673 | msgstr "ファイル全体に対するパッチは編集できません" |
|
|||
8674 |
|
||||
8675 | msgid "cannot edit patch for binary file" |
|
|||
8676 | msgstr "バイナリファイル向けパッチは編集できません" |
|
|||
8677 |
|
||||
8678 | msgid "" |
|
|||
8679 | "\n" |
|
|||
8680 | "To remove '-' lines, make them ' ' lines (context).\n" |
|
|||
8681 | "To remove '+' lines, delete them.\n" |
|
|||
8682 | "Lines starting with # will be removed from the patch." |
|
|||
8683 | msgstr "" |
|
|||
8684 | "\n" |
|
|||
8685 | "'-' 行の削除は、行の ' ' (コンテキスト行)化で行います。\n" |
|
|||
8686 | "'+' 行の削除は、行自体の削除で行います。\n" |
|
|||
8687 | "'#' で始まる行は、パッチから除外されます。" |
|
|||
8688 |
|
||||
8689 | msgid "" |
|
|||
8690 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
|
|||
8691 | "added to the record list. If it does not apply cleanly, a rejects\n" |
|
|||
8692 | "file will be generated: you can use that when you try again. If\n" |
|
|||
8693 | "all lines of the hunk are removed, then the edit is aborted and\n" |
|
|||
8694 | "the hunk is left unchanged.\n" |
|
|||
8695 | msgstr "" |
|
|||
8696 | "パッチ適用が成功した場合、 編集後の差分は、 記録対象に追加されます。\n" |
|
|||
8697 | "適用が失敗した場合、 却下差分はファイルに保存されます。 再試行の際は、\n" |
|
|||
8698 | "このファイルを利用可能です。 差分の全行が削除された場合、\n" |
|
|||
8699 | "編集作業は中止され、差分はそのまま維持されます。\n" |
|
|||
8700 |
|
||||
8701 | msgid "edit failed" |
|
|||
8702 | msgstr "編集に失敗" |
|
|||
8703 |
|
||||
8704 | msgid "user quit" |
|
|||
8705 | msgstr "ユーザの指示により終了します" |
|
|||
8706 |
|
||||
8707 | #, python-format |
|
|||
8708 | msgid "examine changes to %s?" |
|
|||
8709 | msgstr "%s の変更点を調べますか?" |
|
|||
8710 |
|
||||
8711 | msgid " and " |
|
|||
8712 | msgstr " と " |
|
|||
8713 |
|
||||
8714 | #, python-format |
|
|||
8715 | msgid "record this change to '%s'?" |
|
|||
8716 | msgstr "この変更を '%s' に記録しますか?" |
|
|||
8717 |
|
||||
8718 | #, python-format |
|
|||
8719 | msgid "record change %d/%d to '%s'?" |
|
|||
8720 | msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?" |
|
|||
8721 |
|
||||
8722 | msgid "hg record [OPTION]... [FILE]..." |
|
8813 | msgid "hg record [OPTION]... [FILE]..." | |
8723 | msgstr "hg record [OPTION]... [FILE]..." |
|
8814 | msgstr "hg record [OPTION]... [FILE]..." | |
8724 |
|
8815 | |||
@@ -8789,20 +8880,6 b' msgstr ""' | |||||
8789 | msgid "'mq' extension not loaded" |
|
8880 | msgid "'mq' extension not loaded" | |
8790 | msgstr "'mq' エクステンションが読み込まれていません" |
|
8881 | msgstr "'mq' エクステンションが読み込まれていません" | |
8791 |
|
8882 | |||
8792 | #, python-format |
|
|||
8793 | msgid "running non-interactively, use %s instead" |
|
|||
8794 | msgstr "非対話的に実行する場合は、%s を使用してください" |
|
|||
8795 |
|
||||
8796 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" |
|
|||
8797 | msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)" |
|
|||
8798 |
|
||||
8799 | #, python-format |
|
|||
8800 | msgid "error parsing patch: %s" |
|
|||
8801 | msgstr "パッチ解析に失敗: %s" |
|
|||
8802 |
|
||||
8803 | msgid "no changes to record\n" |
|
|||
8804 | msgstr "記録可能な変更がありません\n" |
|
|||
8805 |
|
||||
8806 | msgid "interactively select changes to refresh" |
|
8883 | msgid "interactively select changes to refresh" | |
8807 | msgstr "パッチ更新内容を対話的に選択" |
|
8884 | msgstr "パッチ更新内容を対話的に選択" | |
8808 |
|
8885 | |||
@@ -8992,8 +9069,8 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"' | |||||
8992 | msgid "share a common history between several working directories" |
|
9069 | msgid "share a common history between several working directories" | |
8993 | msgstr "複数作業領域による履歴情報領域の共有" |
|
9070 | msgstr "複数作業領域による履歴情報領域の共有" | |
8994 |
|
9071 | |||
8995 |
msgid "do not create a working |
|
9072 | msgid "do not create a working directory" | |
8996 |
msgstr "作業領域 |
|
9073 | msgstr "作業領域へのファイルの取り出しを抑止します" | |
8997 |
|
9074 | |||
8998 | msgid "also share bookmarks" |
|
9075 | msgid "also share bookmarks" | |
8999 | msgstr "ブックマークも共有" |
|
9076 | msgstr "ブックマークも共有" | |
@@ -9238,6 +9315,9 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"' | |||||
9238 | msgid "show patch" |
|
9315 | msgid "show patch" | |
9239 | msgstr "パッチ形式での表示" |
|
9316 | msgstr "パッチ形式での表示" | |
9240 |
|
9317 | |||
|
9318 | msgid "interactive mode, only works while creating a shelve(EXPERIMENTAL)" | |||
|
9319 | msgstr "対話的な退避対象の選択 (退避実施時のみ指定可能) (実験的実装)" | |||
|
9320 | ||||
9241 | msgid "output diffstat-style summary of changes" |
|
9321 | msgid "output diffstat-style summary of changes" | |
9242 | msgstr "diffstat 形式の変更概要を出力" |
|
9322 | msgstr "diffstat 形式の変更概要を出力" | |
9243 |
|
9323 | |||
@@ -9329,10 +9409,6 b' msgstr ""' | |||||
9329 | "本エクステンションは、 指定リビジョンとその子孫を、 履歴から破棄します。\n" |
|
9409 | "本エクステンションは、 指定リビジョンとその子孫を、 履歴から破棄します。\n" | |
9330 | "詳細は :hg:`help strip` を参照してください。\n" |
|
9410 | "詳細は :hg:`help strip` を参照してください。\n" | |
9331 |
|
9411 | |||
9332 | #, python-format |
|
|||
9333 | msgid "uncommitted changes in subrepository %s" |
|
|||
9334 | msgstr "サブリポジトリ %s の変更が未コミットです" |
|
|||
9335 |
|
||||
9336 | msgid "local changes found" |
|
9412 | msgid "local changes found" | |
9337 | msgstr "作業領域に変更があります" |
|
9413 | msgstr "作業領域に変更があります" | |
9338 |
|
9414 | |||
@@ -9360,8 +9436,8 b' msgstr "\xe3\x83\x90\xe3\x83\x83\xe3\x82\xaf\xe3\x82\xa2\xe3\x83\x83\xe3\x83\x97\xe4\xbd\x9c\xe6\x88\x90\xe3\x81\xae\xe6\x8a\x91\xe6\xad\xa2(\xe9\x9d\x9e\xe6\x8e\xa8\xe5\xa5\xa8)"' | |||||
9360 | msgid "ignored (DEPRECATED)" |
|
9436 | msgid "ignored (DEPRECATED)" | |
9361 | msgstr "※ このオプションは無視されます (非推奨)" |
|
9437 | msgstr "※ このオプションは無視されます (非推奨)" | |
9362 |
|
9438 | |||
9363 |
msgid "do not modify working |
|
9439 | msgid "do not modify working directory during strip" | |
9364 |
msgstr "処理中の作業領域 |
|
9440 | msgstr "処理中の作業領域更新を抑止" | |
9365 |
|
9441 | |||
9366 | msgid "remove revs only reachable from given bookmark" |
|
9442 | msgid "remove revs only reachable from given bookmark" | |
9367 | msgstr "指定ブックマークから、 到達可能なリビジョンのみを除外" |
|
9443 | msgstr "指定ブックマークから、 到達可能なリビジョンのみを除外" | |
@@ -9500,7 +9576,7 b' msgid "transplant log file is corrupt"' | |||||
9500 | msgstr "移植ログファイルが破損しています" |
|
9576 | msgstr "移植ログファイルが破損しています" | |
9501 |
|
9577 | |||
9502 | #, python-format |
|
9578 | #, python-format | |
9503 | msgid "working dir not at transplant parent %s" |
|
9579 | msgid "working directory not at transplant parent %s" | |
9504 | msgstr "作業領域が移植親 %s ではありません" |
|
9580 | msgstr "作業領域が移植親 %s ではありません" | |
9505 |
|
9581 | |||
9506 | msgid "commit failed" |
|
9582 | msgid "commit failed" | |
@@ -9984,12 +10060,40 b' msgstr "\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf %s \xe3\x81\xae\xe5\x8f\x96\xe3\x82\x8a\xe8\xbe\xbc\xe3\x81\xbf\xe4\xb8\xad\\n"' | |||||
9984 | msgid "divergent bookmark %s stored as %s\n" |
|
10060 | msgid "divergent bookmark %s stored as %s\n" | |
9985 | msgstr "分岐するブックマーク %s を %s として保存\n" |
|
10061 | msgstr "分岐するブックマーク %s を %s として保存\n" | |
9986 |
|
10062 | |||
|
10063 | #, python-format | |||
|
10064 | msgid "warning: failed to assign numbered name to divergent bookmark %s\n" | |||
|
10065 | msgstr "警告: ブックマーク %s への分岐番号の割り当てに失敗しました\n" | |||
|
10066 | ||||
9987 | msgid "searching for changed bookmarks\n" |
|
10067 | msgid "searching for changed bookmarks\n" | |
9988 | msgstr "変更されたブックマークを探索中\n" |
|
10068 | msgstr "変更されたブックマークを探索中\n" | |
9989 |
|
10069 | |||
|
10070 | #. i18n: "added" refers to a bookmark | |||
|
10071 | #. i18n: "added refers to a bookmark | |||
|
10072 | msgid "added" | |||
|
10073 | msgstr "追加" | |||
|
10074 | ||||
|
10075 | #. i18n: "advanced" refers to a bookmark | |||
|
10076 | msgid "advanced" | |||
|
10077 | msgstr "更新" | |||
|
10078 | ||||
|
10079 | #. i18n: "diverged" refers to a bookmark | |||
|
10080 | msgid "diverged" | |||
|
10081 | msgstr "分岐" | |||
|
10082 | ||||
|
10083 | #. i18n: "changed" refers to a bookmark | |||
|
10084 | msgid "changed" | |||
|
10085 | msgstr "変更" | |||
|
10086 | ||||
9990 | msgid "no changed bookmarks found\n" |
|
10087 | msgid "no changed bookmarks found\n" | |
9991 | msgstr "変更されたブックマークはありません\n" |
|
10088 | msgstr "変更されたブックマークはありません\n" | |
9992 |
|
10089 | |||
|
10090 | #. i18n: "deleted" refers to a bookmark | |||
|
10091 | msgid "deleted" | |||
|
10092 | msgstr "削除" | |||
|
10093 | ||||
|
10094 | msgid "File pointer is not seekable" | |||
|
10095 | msgstr "対象ファイルは seek できません" | |||
|
10096 | ||||
9993 | msgid "not a Mercurial bundle" |
|
10097 | msgid "not a Mercurial bundle" | |
9994 | msgstr "Mercurial のバンドル形式ではありません" |
|
10098 | msgstr "Mercurial のバンドル形式ではありません" | |
9995 |
|
10099 | |||
@@ -9997,6 +10101,9 b' msgstr "Mercurial \xe3\x81\xae\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
9997 | msgid "unknown bundle version %s" |
|
10101 | msgid "unknown bundle version %s" | |
9998 | msgstr "未知のバンドル形式バージョン %s" |
|
10102 | msgstr "未知のバンドル形式バージョン %s" | |
9999 |
|
10103 | |||
|
10104 | msgid "Seek failed\n" | |||
|
10105 | msgstr "seek に失敗しました\n" | |||
|
10106 | ||||
10000 | #, python-format |
|
10107 | #, python-format | |
10001 | msgid "remote-changegroup: missing \"%s\" param" |
|
10108 | msgid "remote-changegroup: missing \"%s\" param" | |
10002 | msgstr "remote-changegroup: パラメータ \"%s\" 指定がありません" |
|
10109 | msgstr "remote-changegroup: パラメータ \"%s\" 指定がありません" | |
@@ -10045,8 +10152,8 b' msgstr "\xe4\xba\x88\xe6\x9c\x9f\xe3\x81\x9b\xe3\x81\xac\xe3\x83\x87\xe3\x83\xbc\xe3\x82\xbf\xe7\xb5\x82\xe7\xab\xaf (\xe5\xae\x9f\xe3\x83\x87\xe3\x83\xbc\xe3\x82\xbf:%d \xe3\x83\x90\xe3\x82\xa4\xe3\x83\x88 \xe6\x9c\x9f\xe5\xbe\x85\xe3\x83\x87\xe3\x83\xbc\xe3\x82\xbf:%d \xe3\x83\x90\xe3\x82\xa4\xe3\x83\x88)"' | |||||
10045 | msgid "invalid chunk length %d" |
|
10152 | msgid "invalid chunk length %d" | |
10046 | msgstr "不正なデータ長: %d" |
|
10153 | msgstr "不正なデータ長: %d" | |
10047 |
|
10154 | |||
10048 |
msgid " |
|
10155 | msgid "old bundle types only supports v1 changegroups" | |
10049 |
msgstr "bundle |
|
10156 | msgstr "旧来の bundle 形式で使用できるのは v1 changegroups のみです" | |
10050 |
|
10157 | |||
10051 | msgid "bundling" |
|
10158 | msgid "bundling" | |
10052 | msgstr "バンドル生成中" |
|
10159 | msgstr "バンドル生成中" | |
@@ -10080,6 +10187,10 b' msgstr "%d \xe5\x80\x8b\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99\\n"' | |||||
10080 | msgid "received file revlog group is empty" |
|
10187 | msgid "received file revlog group is empty" | |
10081 | msgstr "ファイルのリビジョンログが空です" |
|
10188 | msgstr "ファイルのリビジョンログが空です" | |
10082 |
|
10189 | |||
|
10190 | #, python-format | |||
|
10191 | msgid "received delta base is censored: %s" | |||
|
10192 | msgstr "受理した履歴情報は検閲対象リビジョン由来のものです: %s" | |||
|
10193 | ||||
10083 | msgid "received spurious file revlog entry" |
|
10194 | msgid "received spurious file revlog entry" | |
10084 | msgstr "ファイルのリビジョンログが不正な情報を含んでいます" |
|
10195 | msgstr "ファイルのリビジョンログが不正な情報を含んでいます" | |
10085 |
|
10196 | |||
@@ -10125,8 +10236,18 b' msgid "the name \'%s\' is reserved"' | |||||
10125 | msgstr "タグ名 '%s' はシステムで予約されています" |
|
10236 | msgstr "タグ名 '%s' はシステムで予約されています" | |
10126 |
|
10237 | |||
10127 | #, python-format |
|
10238 | #, python-format | |
10128 | msgid "uncommitted changes in subrepo %s" |
|
10239 | msgid "running non-interactively, use %s instead" | |
10129 | msgstr "サブリポジトリ %s の変更が未コミットです" |
|
10240 | msgstr "非対話的に実行する場合は、%s を使用してください" | |
|
10241 | ||||
|
10242 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |||
|
10243 | msgstr "マージの部分コミットはできません (\"hg commit\" を使用してください)" | |||
|
10244 | ||||
|
10245 | #, python-format | |||
|
10246 | msgid "error parsing patch: %s" | |||
|
10247 | msgstr "パッチ解析に失敗: %s" | |||
|
10248 | ||||
|
10249 | msgid "no changes to record\n" | |||
|
10250 | msgstr "記録可能な変更がありません\n" | |||
10130 |
|
10251 | |||
10131 | msgid "options --message and --logfile are mutually exclusive" |
|
10252 | msgid "options --message and --logfile are mutually exclusive" | |
10132 | msgstr "--message と --logfile は同時に指定できません" |
|
10253 | msgstr "--message と --logfile は同時に指定できません" | |
@@ -10190,8 +10311,8 b' msgid "%s: not recording copy - %s does ' | |||||
10190 | msgstr "%s: 複製は記録されていません - %s は存在しません\n" |
|
10311 | msgstr "%s: 複製は記録されていません - %s は存在しません\n" | |
10191 |
|
10312 | |||
10192 | #, python-format |
|
10313 | #, python-format | |
10193 |
msgid "%s: deleted in working |
|
10314 | msgid "%s: deleted in working directory\n" | |
10194 |
msgstr "%s: 作業領域から削除 |
|
10315 | msgstr "%s: 作業領域から削除済みです\n" | |
10195 |
|
10316 | |||
10196 | #, python-format |
|
10317 | #, python-format | |
10197 | msgid "%s: cannot copy - %s\n" |
|
10318 | msgid "%s: cannot copy - %s\n" | |
@@ -10248,6 +10369,10 b' msgstr "\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe3\x81\xab\xe3\x81\xaf\xe7\xa0\xb4\xe6\x90\x8d\xe3\x81\xbe\xe3\x81\x9f\xe3\x81\xaf\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xae\xe6\xac\xa0\xe8\x90\xbd\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99"' | |||||
10248 | msgid "created %s" |
|
10369 | msgid "created %s" | |
10249 | msgstr "%s を作成" |
|
10370 | msgstr "%s を作成" | |
10250 |
|
10371 | |||
|
10372 | #, python-format | |||
|
10373 | msgid "warning: %s not inside relative root %s\n" | |||
|
10374 | msgstr "警告: %s は相対ルート %s の範囲外です\n" | |||
|
10375 | ||||
10251 | #. i18n: column positioning for "hg log" |
|
10376 | #. i18n: column positioning for "hg log" | |
10252 | #, python-format |
|
10377 | #, python-format | |
10253 | msgid "changeset: %d:%s\n" |
|
10378 | msgid "changeset: %d:%s\n" | |
@@ -10607,6 +10732,9 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe3\x82\x92\xe5\x8f\x96\xe3\x82\x8a\xe6\xb6\x88\xe3\x81\x99\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xae\xe5\xb7\xae\xe5\x88\x86\xe3\x82\x92\xe7\x94\x9f\xe6\x88\x90"' | |||||
10607 | msgid "number of lines of context to show" |
|
10732 | msgid "number of lines of context to show" | |
10608 | msgstr "差分コンテキストの行数" |
|
10733 | msgstr "差分コンテキストの行数" | |
10609 |
|
10734 | |||
|
10735 | msgid "produce diffs relative to subdirectory" | |||
|
10736 | msgstr "差分生成の起点ディレクトリ指定" | |||
|
10737 | ||||
10610 | msgid "SIMILARITY" |
|
10738 | msgid "SIMILARITY" | |
10611 | msgstr "類似度" |
|
10739 | msgstr "類似度" | |
10612 |
|
10740 | |||
@@ -11591,8 +11719,8 b' msgstr ""' | |||||
11591 | " :``%r``: ゼロ詰めのリビジョン番号\n" |
|
11719 | " :``%r``: ゼロ詰めのリビジョン番号\n" | |
11592 | " :``%b``: 対象リポジトリパスの末尾要素" |
|
11720 | " :``%b``: 対象リポジトリパスの末尾要素" | |
11593 |
|
11721 | |||
11594 |
msgid "the clone will include an empty working |
|
11722 | msgid "the clone will include an empty working directory (only a repository)" | |
11595 |
msgstr " |
|
11723 | msgstr "複製先の作業領域を空にする(管理領域のみの複製)" | |
11596 |
|
11724 | |||
11597 | msgid "revision, tag or branch to check out" |
|
11725 | msgid "revision, tag or branch to check out" | |
11598 | msgstr "作業領域更新用リビジョン(タグ名/ブランチ名)" |
|
11726 | msgstr "作業領域更新用リビジョン(タグ名/ブランチ名)" | |
@@ -11791,12 +11919,15 b' msgstr "\xe6\x96\xb0\xe8\xa6\x8f\xef\xbc\x8f\xe4\xb8\x8d\xe5\x9c\xa8\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe3\x80\x81\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe5\x89\x8d\xe3\x81\xab\xe7\x99\xbb\xe9\x8c\xb2\xef\xbc\x8f\xe9\x99\xa4\xe5\xa4\x96\xe5\xaf\xbe\xe8\xb1\xa1\xe5\x8c\x96"' | |||||
11791 | msgid "mark a branch as closed, hiding it from the branch list" |
|
11919 | msgid "mark a branch as closed, hiding it from the branch list" | |
11792 | msgstr "ブランチを閉鎖し、 ブランチ一覧での表示から除外" |
|
11920 | msgstr "ブランチを閉鎖し、 ブランチ一覧での表示から除外" | |
11793 |
|
11921 | |||
11794 | msgid "amend the parent of the working dir" |
|
11922 | msgid "amend the parent of the working directory" | |
11795 | msgstr "作業領域の親リビジョンの改変" |
|
11923 | msgstr "作業領域の親リビジョンの改変" | |
11796 |
|
11924 | |||
11797 | msgid "use the secret phase for committing" |
|
11925 | msgid "use the secret phase for committing" | |
11798 | msgstr "secret フェーズでコミット中" |
|
11926 | msgstr "secret フェーズでコミット中" | |
11799 |
|
11927 | |||
|
11928 | msgid "use interactive mode" | |||
|
11929 | msgstr "操作対象変更の対話的な選択" | |||
|
11930 | ||||
11800 | msgid "commit the specified files or all outstanding changes" |
|
11931 | msgid "commit the specified files or all outstanding changes" | |
11801 | msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録" |
|
11932 | msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録" | |
11802 |
|
11933 | |||
@@ -11959,6 +12090,9 b' msgstr "--local \xe3\x81\xa8 --global \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
11959 | msgid "can't use --local outside a repository" |
|
12090 | msgid "can't use --local outside a repository" | |
11960 | msgstr "リポジトリの外側では --local を指定できません" |
|
12091 | msgstr "リポジトリの外側では --local を指定できません" | |
11961 |
|
12092 | |||
|
12093 | msgid "edit failed" | |||
|
12094 | msgstr "編集に失敗" | |||
|
12095 | ||||
11962 | msgid "only one config item permitted" |
|
12096 | msgid "only one config item permitted" | |
11963 | msgstr "複数の設定項目指定は無効です" |
|
12097 | msgstr "複数の設定項目指定は無効です" | |
11964 |
|
12098 | |||
@@ -12199,10 +12333,6 b' msgstr "-c|-m|FILE REV"' | |||||
12199 | msgid "dump the contents of a data file revision" |
|
12333 | msgid "dump the contents of a data file revision" | |
12200 | msgstr "データファイルリビジョンの内容表示" |
|
12334 | msgstr "データファイルリビジョンの内容表示" | |
12201 |
|
12335 | |||
12202 | #, python-format |
|
|||
12203 | msgid "invalid revision identifier %s" |
|
|||
12204 | msgstr "リビジョン指定 %s は不正です" |
|
|||
12205 |
|
||||
12206 | msgid "try extended date formats" |
|
12336 | msgid "try extended date formats" | |
12207 | msgstr "拡張日時形式の使用" |
|
12337 | msgstr "拡張日時形式の使用" | |
12208 |
|
12338 | |||
@@ -12595,10 +12725,13 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe8\xa6\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe6\x89\x8b\xe5\x8b\x95\xe8\xa8\xad\xe5\xae\x9a"' | |||||
12595 |
|
12725 | |||
12596 | msgid "" |
|
12726 | msgid "" | |
12597 | " This is useful for writing repository conversion tools, but should\n" |
|
12727 | " This is useful for writing repository conversion tools, but should\n" | |
12598 | " be used with care." |
|
12728 | " be used with care. For example, neither the working directory nor the\n" | |
12599 | msgstr "" |
|
12729 | " dirstate is updated, so file status may be incorrect after running this\n" | |
12600 | " 本コマンドはリポジトリ変換ツールの作成に有用ですが、 利用には注意が\n" |
|
12730 | " command." | |
12601 | " 必要です。" |
|
12731 | msgstr "" | |
|
12732 | " 本コマンドはリポジトリ変換ツール等で有用ですが、 十分な注意が必要です。\n" | |||
|
12733 | " 本コマンドは、 作業領域中のファイルも dirstate も更新しませんので、\n" | |||
|
12734 | " 実行直後の状態表示は、 想定しているものと異なるかもしれません。" | |||
12602 |
|
12735 | |||
12603 | msgid "do not display the saved mtime" |
|
12736 | msgid "do not display the saved mtime" | |
12604 | msgstr "記録された mtime 情報の表示抑止" |
|
12737 | msgstr "記録された mtime 情報の表示抑止" | |
@@ -12926,9 +13059,10 b' msgstr ""' | |||||
12926 |
|
13059 | |||
12927 | msgid "" |
|
13060 | msgid "" | |
12928 | " If no patterns are given to match, this command prints the names\n" |
|
13061 | " If no patterns are given to match, this command prints the names\n" | |
12929 |
" of all files under Mercurial control in the working |
|
13062 | " of all files under Mercurial control in the working directory." | |
12930 | msgstr "" |
|
13063 | msgstr "" | |
12931 | " パターン指定が無い場合、 全ての管理対象ファイルが一覧表示されます。" |
|
13064 | " パターン指定が無い場合、 本コマンドは構成管理対象下にある作業領域中の\n" | |
|
13065 | " 全てのファイル名を表示します。" | |||
12932 |
|
13066 | |||
12933 | msgid " - list all files under the current directory::" |
|
13067 | msgid " - list all files under the current directory::" | |
12934 | msgstr " - 現ディレクトリ配下の全てのファイルの列挙::" |
|
13068 | msgstr " - 現ディレクトリ配下の全てのファイルの列挙::" | |
@@ -13372,7 +13506,7 b' msgstr "\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf\xe3\x81\xae\xe8\xa1\xa8\xe7\xa4\xba"' | |||||
13372 | msgid "[-nibtB] [-r REV] [SOURCE]" |
|
13506 | msgid "[-nibtB] [-r REV] [SOURCE]" | |
13373 | msgstr "[-nibtB] [-r REV] [SOURCE]" |
|
13507 | msgstr "[-nibtB] [-r REV] [SOURCE]" | |
13374 |
|
13508 | |||
13375 |
msgid "identify the working |
|
13509 | msgid "identify the working directory or specified revision" | |
13376 | msgstr "作業領域または特定リビジョンの識別情報表示" |
|
13510 | msgstr "作業領域または特定リビジョンの識別情報表示" | |
13377 |
|
13511 | |||
13378 | msgid "" |
|
13512 | msgid "" | |
@@ -13449,6 +13583,9 b' msgstr "\xe9\x81\xa9\xe7\x94\xa8\xe5\xa4\xb1\xe6\x95\x97\xe3\x81\x8c\xe3\x81\x82\xe3\x81\xa3\xe3\x81\xa6\xe3\x82\x82\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd"' | |||||
13449 | msgid "apply patch to the nodes from which it was generated" |
|
13583 | msgid "apply patch to the nodes from which it was generated" | |
13450 | msgstr "パッチ作成時と同じ親リビジョンに対して適用" |
|
13584 | msgstr "パッチ作成時と同じ親リビジョンに対して適用" | |
13451 |
|
13585 | |||
|
13586 | msgid "apply patch to subdirectory" | |||
|
13587 | msgstr "パッチ適用先サブディレクトリの指定" | |||
|
13588 | ||||
13452 | msgid "use any branch information in patch (implied by --exact)" |
|
13589 | msgid "use any branch information in patch (implied by --exact)" | |
13453 | msgstr "パッチ中のブランチ情報を利用(--exact 指定時は自動適用)" |
|
13590 | msgstr "パッチ中のブランチ情報を利用(--exact 指定時は自動適用)" | |
13454 |
|
13591 | |||
@@ -13601,6 +13738,9 b' msgstr "--similarity \xe3\x81\xa8 --bypass \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
13601 | msgid "cannot use --exact with --edit" |
|
13738 | msgid "cannot use --exact with --edit" | |
13602 | msgstr "--exact と --edit は併用できません" |
|
13739 | msgstr "--exact と --edit は併用できません" | |
13603 |
|
13740 | |||
|
13741 | msgid "cannot use --exact with --prefix" | |||
|
13742 | msgstr "--exact と --prefix は併用できません" | |||
|
13743 | ||||
13604 | msgid "applying patch from stdin\n" |
|
13744 | msgid "applying patch from stdin\n" | |
13605 | msgstr "標準入力からのパッチを適用中\n" |
|
13745 | msgstr "標準入力からのパッチを適用中\n" | |
13606 |
|
13746 | |||
@@ -13647,17 +13787,64 b' msgstr ""' | |||||
13647 | " 未取り込みリビジョンを検索します。 これらのリビジョンは\n" |
|
13787 | " 未取り込みリビジョンを検索します。 これらのリビジョンは\n" | |
13648 | " :hg:`pull` を実行した際に、 取り込み対象となります。" |
|
13788 | " :hg:`pull` を実行した際に、 取り込み対象となります。" | |
13649 |
|
13789 | |||
13650 | msgid "" |
|
|||
13651 | " For remote repository, using --bundle avoids downloading the\n" |
|
|||
13652 | " changesets twice if the incoming is followed by a pull." |
|
|||
13653 | msgstr "" |
|
|||
13654 | " --bundle での書き出し結果を利用した :hg:`pull` の実施は、\n" |
|
|||
13655 | " :hg:`pull` での再度のデータ転送を抑止できるため、\n" |
|
|||
13656 | " (データ転送コストの高い) 遠隔ホストとの連携では特に有用です。" |
|
|||
13657 |
|
||||
13658 | msgid " See pull for valid source format details." |
|
13790 | msgid " See pull for valid source format details." | |
13659 | msgstr " 対象リポジトリの指定形式は :hg:`help pull` を参照してください。" |
|
13791 | msgstr " 対象リポジトリの指定形式は :hg:`help pull` を参照してください。" | |
13660 |
|
13792 | |||
|
13793 | msgid "" | |||
|
13794 | " With -B/--bookmarks, the result of bookmark comparison between\n" | |||
|
13795 | " local and remote repositories is displayed. With -v/--verbose,\n" | |||
|
13796 | " status is also displayed for each bookmark like below::" | |||
|
13797 | msgstr "" | |||
|
13798 | " -B/--bookmarks 指定時は、 手元のリポジトリと連携先リポジトリとの、\n" | |||
|
13799 | " ブックマーク比較結果が表示されます。 -v/--verbose が指定された場合、\n" | |||
|
13800 | " 各ブックマーク毎に、 以下の様な状態情報が表示されます::" | |||
|
13801 | ||||
|
13802 | msgid "" | |||
|
13803 | " BM1 01234567890a added\n" | |||
|
13804 | " BM2 1234567890ab advanced\n" | |||
|
13805 | " BM3 234567890abc diverged\n" | |||
|
13806 | " BM4 34567890abcd changed" | |||
|
13807 | msgstr "" | |||
|
13808 | " BM1 01234567890a 追加\n" | |||
|
13809 | " BM2 1234567890ab 更新\n" | |||
|
13810 | " BM3 234567890abc 分岐\n" | |||
|
13811 | " BM4 34567890abcd 変更" | |||
|
13812 | ||||
|
13813 | msgid "" | |||
|
13814 | " The action taken locally when pulling depends on the\n" | |||
|
13815 | " status of each bookmark:" | |||
|
13816 | msgstr "" | |||
|
13817 | " 各ブックマークの状態に応じて、 手元のリポジトリで :hg:`pull`\n" | |||
|
13818 | " 時に実施される処理が異なります:" | |||
|
13819 | ||||
|
13820 | msgid "" | |||
|
13821 | " :``added``: pull will create it\n" | |||
|
13822 | " :``advanced``: pull will update it\n" | |||
|
13823 | " :``diverged``: pull will create a divergent bookmark\n" | |||
|
13824 | " :``changed``: result depends on remote changesets" | |||
|
13825 | msgstr "" | |||
|
13826 | " :``追加``: 当該ブックマークを作成\n" | |||
|
13827 | " :``更新``: 当該ブックマークを更新\n" | |||
|
13828 | " :``分岐``: (@付きの)分岐先ブックマークを作成\n" | |||
|
13829 | " :``変更``: 参照先リビジョンに応じて挙動が変化" | |||
|
13830 | ||||
|
13831 | msgid "" | |||
|
13832 | " From the point of view of pulling behavior, bookmark\n" | |||
|
13833 | " existing only in the remote repository are treated as ``added``,\n" | |||
|
13834 | " even if it is in fact locally deleted." | |||
|
13835 | msgstr "" | |||
|
13836 | " 仮に手元のリポジトリで削除されたブックマークであったとしても、\n" | |||
|
13837 | " :hg:`pull` 挙動の観点から、 連携先にのみ存在するものは、 ``追加``\n" | |||
|
13838 | " 扱いされます。" | |||
|
13839 | ||||
|
13840 | msgid "" | |||
|
13841 | " For remote repository, using --bundle avoids downloading the\n" | |||
|
13842 | " changesets twice if the incoming is followed by a pull." | |||
|
13843 | msgstr "" | |||
|
13844 | " --bundle での書き出し結果を利用した :hg:`pull` の実施は、\n" | |||
|
13845 | " :hg:`pull` での再度のデータ転送を抑止できるため、\n" | |||
|
13846 | " (データ転送コストの高い) 遠隔ホストとの連携では特に有用です。" | |||
|
13847 | ||||
13661 | msgid " - show incoming changes with patches and full description::" |
|
13848 | msgid " - show incoming changes with patches and full description::" | |
13662 | msgstr " - 取り込み対象リビジョン群の変更内容・コミットログ全体も表示::" |
|
13849 | msgstr " - 取り込み対象リビジョン群の変更内容・コミットログ全体も表示::" | |
13663 |
|
13850 | |||
@@ -13739,13 +13926,6 b' msgstr ""' | |||||
13739 | " 対象とする場合は \"--include .\" を指定します。" |
|
13926 | " 対象とする場合は \"--include .\" を指定します。" | |
13740 |
|
13927 | |||
13741 | msgid "" |
|
13928 | msgid "" | |
13742 | " If no patterns are given to match, this command prints the names\n" |
|
|||
13743 | " of all files under Mercurial control in the working directory." |
|
|||
13744 | msgstr "" |
|
|||
13745 | " パターン指定が無い場合、 本コマンドは構成管理対象下にある作業領域中の\n" |
|
|||
13746 | " 全てのファイル名を表示します。" |
|
|||
13747 |
|
||||
13748 | msgid "" |
|
|||
13749 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
13929 | " If you want to feed the output of this command into the \"xargs\"\n" | |
13750 | " command, use the -0 option to both this command and \"xargs\". This\n" |
|
13930 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
13751 | " will avoid the problem of \"xargs\" treating single filenames that\n" |
|
13931 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
@@ -14081,6 +14261,48 b' msgid " See pull for details of valid' | |||||
14081 | msgstr " 有効なリポジトリ指定形式は :hg:`pull` を参照してください。" |
|
14261 | msgstr " 有効なリポジトリ指定形式は :hg:`pull` を参照してください。" | |
14082 |
|
14262 | |||
14083 | msgid "" |
|
14263 | msgid "" | |
|
14264 | " BM1 01234567890a added\n" | |||
|
14265 | " BM2 deleted\n" | |||
|
14266 | " BM3 234567890abc advanced\n" | |||
|
14267 | " BM4 34567890abcd diverged\n" | |||
|
14268 | " BM5 4567890abcde changed" | |||
|
14269 | msgstr "" | |||
|
14270 | " BM1 01234567890a 追加\n" | |||
|
14271 | " BM2 削除\n" | |||
|
14272 | " BM3 234567890abc 更新\n" | |||
|
14273 | " BM4 34567890abcd 分岐\n" | |||
|
14274 | " BM5 4567890abcde 変更" | |||
|
14275 | ||||
|
14276 | msgid "" | |||
|
14277 | " The action taken when pushing depends on the\n" | |||
|
14278 | " status of each bookmark:" | |||
|
14279 | msgstr "" | |||
|
14280 | " 各ブックマークの状態に応じて、 連携先リポジトリで :hg:`push`\n" | |||
|
14281 | " 時に実施される処理が異なります:" | |||
|
14282 | ||||
|
14283 | msgid "" | |||
|
14284 | " :``added``: push with ``-B`` will create it\n" | |||
|
14285 | " :``deleted``: push with ``-B`` will delete it\n" | |||
|
14286 | " :``advanced``: push will update it\n" | |||
|
14287 | " :``diverged``: push with ``-B`` will update it\n" | |||
|
14288 | " :``changed``: push with ``-B`` will update it" | |||
|
14289 | msgstr "" | |||
|
14290 | " :``追加``: ``-B`` 併用時のみ当該ブックマークを作成\n" | |||
|
14291 | " :``削除``: ``-B`` 併用時のみ当該ブックマークを削除\n" | |||
|
14292 | " :``更新``: 当該ブックマークを更新\n" | |||
|
14293 | " :``分岐``: ``-B`` 併用時のみ当該ブックマークを更新\n" | |||
|
14294 | " :``変更``: ``-B`` 併用時のみ当該ブックマークを更新" | |||
|
14295 | ||||
|
14296 | msgid "" | |||
|
14297 | " From the point of view of pushing behavior, bookmarks\n" | |||
|
14298 | " existing only in the remote repository are treated as\n" | |||
|
14299 | " ``deleted``, even if it is in fact added remotely." | |||
|
14300 | msgstr "" | |||
|
14301 | " 仮に連携先リポジトリで追加されたブックマークであったとしても、\n" | |||
|
14302 | " :hg:`push` 挙動の観点から、 連携先にのみ存在するものは、 ``削除``\n" | |||
|
14303 | " 扱いされます。" | |||
|
14304 | ||||
|
14305 | msgid "" | |||
14084 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" |
|
14306 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" | |
14085 | " " |
|
14307 | " " | |
14086 | msgstr "" |
|
14308 | msgstr "" | |
@@ -14413,6 +14635,12 b' msgstr "\xe3\x83\x87\xe3\x83\x95\xe3\x82\xa9\xe3\x83\xab\xe3\x83\x88\xe3\x81\xae\xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x81\x8c\xe8\xa8\xad\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
14413 | msgid "see the \"path\" section in \"hg help config\"" |
|
14635 | msgid "see the \"path\" section in \"hg help config\"" | |
14414 | msgstr "\"hg help config\" の \"path\" セクションを参照してください" |
|
14636 | msgstr "\"hg help config\" の \"path\" セクションを参照してください" | |
14415 |
|
14637 | |||
|
14638 | msgid "specified revisions evaluate to an empty set" | |||
|
14639 | msgstr "リビジョン指定対象は空です" | |||
|
14640 | ||||
|
14641 | msgid "use different revision arguments" | |||
|
14642 | msgstr "rev オプションの指定値を変更してください" | |||
|
14643 | ||||
14416 | msgid "roll back an interrupted transaction" |
|
14644 | msgid "roll back an interrupted transaction" | |
14417 | msgstr "中断されたトランザクションの取り消し" |
|
14645 | msgstr "中断されたトランザクションの取り消し" | |
14418 |
|
14646 | |||
@@ -14662,6 +14890,9 b' msgstr "\xe5\xbd\x93\xe8\xa9\xb2\xe6\x97\xa5\xe6\x99\x82\xe3\x81\xae\xe6\x9c\x80\xe6\x96\xb0\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8"' | |||||
14662 | msgid "revert to the specified revision" |
|
14890 | msgid "revert to the specified revision" | |
14663 | msgstr "当該リビジョン時点の内容で復旧" |
|
14891 | msgstr "当該リビジョン時点の内容で復旧" | |
14664 |
|
14892 | |||
|
14893 | msgid "interactively select the changes (EXPERIMENTAL)" | |||
|
14894 | msgstr "操作対象変更の対話的な選択 (実験的実装)" | |||
|
14895 | ||||
14665 | msgid "[OPTION]... [-r REV] [NAME]..." |
|
14896 | msgid "[OPTION]... [-r REV] [NAME]..." | |
14666 | msgstr "[OPTION]... [-r REV] [NAME]..." |
|
14897 | msgstr "[OPTION]... [-r REV] [NAME]..." | |
14667 |
|
14898 | |||
@@ -15050,6 +15281,16 b' msgstr " - \xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xa8\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xa8\xe3\x81\xae\xe9\x96\x93\xe3\x81\xa7\xe3\x81\xae\xe7\x8a\xb6\xe6\x85\x8b\xe5\xa4\x89\xe6\x9b\xb4\xe3\x82\x92\xe8\xa1\xa8\xe7\xa4\xba::"' | |||||
15050 | msgid " hg status --rev 9353" |
|
15281 | msgid " hg status --rev 9353" | |
15051 | msgstr " hg status --rev 9353" |
|
15282 | msgstr " hg status --rev 9353" | |
15052 |
|
15283 | |||
|
15284 | msgid "" | |||
|
15285 | " - show changes in the working directory relative to the\n" | |||
|
15286 | " current directory (see :hg:`help patterns` for more information)::" | |||
|
15287 | msgstr "" | |||
|
15288 | " - 作業領域中の状態を、現ディレクトリ相対で表示 (パターン指定の詳細は\n" | |||
|
15289 | " :hg:`help patterns` を参照)::" | |||
|
15290 | ||||
|
15291 | msgid " hg status re:" | |||
|
15292 | msgstr " hg status re:" | |||
|
15293 | ||||
15053 | msgid " - show all changes including copies in an existing changeset::" |
|
15294 | msgid " - show all changes including copies in an existing changeset::" | |
15054 | msgstr " - 指定リビジョンにおける状態変更 (複製元含む) を表示::" |
|
15295 | msgstr " - 指定リビジョンにおける状態変更 (複製元含む) を表示::" | |
15055 |
|
15296 | |||
@@ -15515,11 +15756,11 b' msgid "(see http://mercurial.selenic.com' | |||||
15515 | msgstr "(詳細は http://mercurial.selenic.com を参照)" |
|
15756 | msgstr "(詳細は http://mercurial.selenic.com を参照)" | |
15516 |
|
15757 | |||
15517 | msgid "" |
|
15758 | msgid "" | |
15518 |
"Copyright (C) 2005-201 |
|
15759 | "Copyright (C) 2005-2015 Matt Mackall and others\n" | |
15519 | "This is free software; see the source for copying conditions. There is NO\n" |
|
15760 | "This is free software; see the source for copying conditions. There is NO\n" | |
15520 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
15761 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
15521 | msgstr "" |
|
15762 | msgstr "" | |
15522 |
"Copyright (C) 2005-201 |
|
15763 | "Copyright (C) 2005-2015 Matt Mackall 他\n" | |
15523 | "本製品はフリーソフトウェアです。\n" |
|
15764 | "本製品はフリーソフトウェアです。\n" | |
15524 | "頒布条件に関しては同梱されるライセンス条項をお読みください。\n" |
|
15765 | "頒布条件に関しては同梱されるライセンス条項をお読みください。\n" | |
15525 | "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n" |
|
15766 | "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n" | |
@@ -15593,7 +15834,7 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %s \xe3\x81\xab\xe5\xbd\x93\xe8\xa9\xb2\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xaf\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
15593 |
|
15834 | |||
15594 | #, python-format |
|
15835 | #, python-format | |
15595 | msgid "censored node: %s" |
|
15836 | msgid "censored node: %s" | |
15596 | msgstr "監査ノードです: %s" |
|
15837 | msgstr "検閲対象リビジョンです: filelog %s" | |
15597 |
|
15838 | |||
15598 | msgid "set censor.policy to ignore errors" |
|
15839 | msgid "set censor.policy to ignore errors" | |
15599 | msgstr "エラーを無視する場合は censor.policy 設定を ignore に" |
|
15840 | msgstr "エラーを無視する場合は censor.policy 設定を ignore に" | |
@@ -15633,6 +15874,46 b' msgstr "%s \xe3\x81\xaf\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x97\xe3\x81\x9f!\\n"' | |||||
15633 | msgid "copy failed: %s is not a file or a symbolic link\n" |
|
15874 | msgid "copy failed: %s is not a file or a symbolic link\n" | |
15634 | msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n" |
|
15875 | msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n" | |
15635 |
|
15876 | |||
|
15877 | msgid "the python curses/wcurses module is not available/installed" | |||
|
15878 | msgstr "Python の curses/wcurses モジュールが利用できません" | |||
|
15879 | ||||
|
15880 | msgid "starting interactive selection\n" | |||
|
15881 | msgstr "対話的な選択の開始\n" | |||
|
15882 | ||||
|
15883 | msgid "cannot edit patch for whole file" | |||
|
15884 | msgstr "ファイル全体に対するパッチは編集できません" | |||
|
15885 | ||||
|
15886 | msgid "cannot edit patch for binary file" | |||
|
15887 | msgstr "バイナリファイル向けパッチは編集できません" | |||
|
15888 | ||||
|
15889 | msgid "" | |||
|
15890 | "\n" | |||
|
15891 | " to remove '-' lines, make them ' ' lines (context).\n" | |||
|
15892 | " to remove '+' lines, delete them.\n" | |||
|
15893 | " lines starting with # will be removed from the patch." | |||
|
15894 | msgstr "" | |||
|
15895 | "\n" | |||
|
15896 | " '-' 行の削除は、行頭の ' ' (コンテキスト行)化で行います。\n" | |||
|
15897 | " '+' 行の削除は、行自体の削除で行います。\n" | |||
|
15898 | " '#' で始まる行は、パッチから除外されます。" | |||
|
15899 | ||||
|
15900 | msgid "" | |||
|
15901 | " if the patch applies cleanly, the edited hunk will immediately be\n" | |||
|
15902 | " added to the record list. if it does not apply cleanly, a rejects\n" | |||
|
15903 | " file will be generated: you can use that when you try again. if\n" | |||
|
15904 | " all lines of the hunk are removed, then the edit is aborted and\n" | |||
|
15905 | " the hunk is left unchanged.\n" | |||
|
15906 | " " | |||
|
15907 | msgstr "" | |||
|
15908 | " パッチ適用が成功した場合、 編集後の差分は、 記録対象に追加されます。\n" | |||
|
15909 | " 適用が失敗した場合、 却下差分はファイルに保存されます。 再試行の際は、\n" | |||
|
15910 | " このファイルを利用可能です。 差分の全行が削除された場合、\n" | |||
|
15911 | " 編集作業は中止され、差分はそのまま維持されます。\n" | |||
|
15912 | " " | |||
|
15913 | ||||
|
15914 | msgid "user quit" | |||
|
15915 | msgstr "ユーザの指示により終了します" | |||
|
15916 | ||||
15636 | #, python-format |
|
15917 | #, python-format | |
15637 | msgid "invalid character in dag description: %s..." |
|
15918 | msgid "invalid character in dag description: %s..." | |
15638 | msgstr "dag 記述に不正な文字が使われています: %s..." |
|
15919 | msgstr "dag 記述に不正な文字が使われています: %s..." | |
@@ -15752,6 +16033,14 b' msgstr "\xe5\x85\x88\xe9\xa0\xad\xe3\x81\xab\xe6\x83\xb3\xe5\xae\x9a\xe5\xa4\x96\xe3\x81\xae\xe7\xa9\xba\xe7\x99\xbd\xe6\x96\x87\xe5\xad\x97\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99\\n"' | |||||
15752 | msgid "hg: parse error: %s\n" |
|
16033 | msgid "hg: parse error: %s\n" | |
15753 | msgstr "hg: 解析エラー: %s\n" |
|
16034 | msgstr "hg: 解析エラー: %s\n" | |
15754 |
|
16035 | |||
|
16036 | #, python-format | |||
|
16037 | msgid "(did you mean %r?)\n" | |||
|
16038 | msgstr "(もしかして %r のことですか?)\n" | |||
|
16039 | ||||
|
16040 | #, python-format | |||
|
16041 | msgid "(did you mean one of %s?)\n" | |||
|
16042 | msgstr "(もしかして %s のいずれかのことですか?)\n" | |||
|
16043 | ||||
15755 | msgid "entering debugger - type c to continue starting hg or h for help\n" |
|
16044 | msgid "entering debugger - type c to continue starting hg or h for help\n" | |
15756 | msgstr "デバッガ動作開始 - 継続なら c 、 ヘルプなら h を入力してください\n" |
|
16045 | msgstr "デバッガ動作開始 - 継続なら c 、 ヘルプなら h を入力してください\n" | |
15757 |
|
16046 | |||
@@ -15807,7 +16096,7 b' msgstr " \xe7\xa9\xba\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\\n"' | |||||
15807 |
|
16096 | |||
15808 | #, python-format |
|
16097 | #, python-format | |
15809 | msgid "abort: file censored %s!\n" |
|
16098 | msgid "abort: file censored %s!\n" | |
15810 |
msgstr "中止: |
|
16099 | msgstr "中止: 検閲対象ファイルです: %s\n" | |
15811 |
|
16100 | |||
15812 | msgid "killed!\n" |
|
16101 | msgid "killed!\n" | |
15813 | msgstr "強制終了されました!\n" |
|
16102 | msgstr "強制終了されました!\n" | |
@@ -15971,6 +16260,10 b' msgid "unrecognized profiler \'%s\' - igno' | |||||
15971 | msgstr "不正なプロファイラ指定 '%s' を無視します\n" |
|
16260 | msgstr "不正なプロファイラ指定 '%s' を無視します\n" | |
15972 |
|
16261 | |||
15973 | #, python-format |
|
16262 | #, python-format | |
|
16263 | msgid "unknown identifier: %s" | |||
|
16264 | msgstr "未知の識別子: %s" | |||
|
16265 | ||||
|
16266 | #, python-format | |||
15974 | msgid "%s: not a Mercurial bundle" |
|
16267 | msgid "%s: not a Mercurial bundle" | |
15975 | msgstr "%s: Mercurial のバンドル形式ではありません" |
|
16268 | msgstr "%s: Mercurial のバンドル形式ではありません" | |
15976 |
|
16269 | |||
@@ -16329,10 +16622,6 b' msgstr ""' | |||||
16329 | msgid "clean takes no arguments" |
|
16622 | msgid "clean takes no arguments" | |
16330 | msgstr "clean には引数が指定できません" |
|
16623 | msgstr "clean には引数が指定できません" | |
16331 |
|
16624 | |||
16332 | #, python-format |
|
|||
16333 | msgid "not a function: %s" |
|
|||
16334 | msgstr "関数ではありません: %s" |
|
|||
16335 |
|
||||
16336 | msgid "" |
|
16625 | msgid "" | |
16337 | "``binary()``\n" |
|
16626 | "``binary()``\n" | |
16338 | " File that appears to be binary (contains NUL bytes)." |
|
16627 | " File that appears to be binary (contains NUL bytes)." | |
@@ -16400,6 +16689,20 b' msgid "hgignore takes no arguments"' | |||||
16400 | msgstr "hgignore には引数が指定できません" |
|
16689 | msgstr "hgignore には引数が指定できません" | |
16401 |
|
16690 | |||
16402 | msgid "" |
|
16691 | msgid "" | |
|
16692 | "``portable()``\n" | |||
|
16693 | " File that has a portable name. (This doesn't include filenames with " | |||
|
16694 | "case\n" | |||
|
16695 | " collisions.)" | |||
|
16696 | msgstr "" | |||
|
16697 | "``portable()``\n" | |||
|
16698 | " プラットフォーム間で可搬性のある名前のファイル\n" | |||
|
16699 | " (文字大小での衝突の有無/可能性は、 可搬性の判定に含まれません)" | |||
|
16700 | ||||
|
16701 | #. i18n: "portable" is a keyword | |||
|
16702 | msgid "portable takes no arguments" | |||
|
16703 | msgstr "portable には引数が指定できません" | |||
|
16704 | ||||
|
16705 | msgid "" | |||
16403 | "``grep(regex)``\n" |
|
16706 | "``grep(regex)``\n" | |
16404 | " File contains the given regular expression." |
|
16707 | " File contains the given regular expression." | |
16405 | msgstr "" |
|
16708 | msgstr "" | |
@@ -16533,6 +16836,10 b' msgid "untested"' | |||||
16533 | msgstr "untested" |
|
16836 | msgstr "untested" | |
16534 |
|
16837 | |||
16535 | #. i18n: bisect changeset status |
|
16838 | #. i18n: bisect changeset status | |
|
16839 | msgid "ignored" | |||
|
16840 | msgstr "無視" | |||
|
16841 | ||||
|
16842 | #. i18n: bisect changeset status | |||
16536 | msgid "good (implicit)" |
|
16843 | msgid "good (implicit)" | |
16537 | msgstr "good (推定)" |
|
16844 | msgstr "good (推定)" | |
16538 |
|
16845 | |||
@@ -16549,6 +16856,9 b' msgstr "\xe7\x84\xa1\xe5\x8a\xb9\xe5\x8c\x96\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x82\x8b\xe3\x82\xa8\xe3\x82\xaf\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3:"' | |||||
16549 | msgid "DEPRECATED" |
|
16856 | msgid "DEPRECATED" | |
16550 | msgstr "非推奨" |
|
16857 | msgstr "非推奨" | |
16551 |
|
16858 | |||
|
16859 | msgid "EXPERIMENTAL" | |||
|
16860 | msgstr "実験的実装" | |||
|
16861 | ||||
16552 | msgid " ([+] can be repeated)" |
|
16862 | msgid " ([+] can be repeated)" | |
16553 | msgstr " ([+] 印付きのオプションは複数回指定可能です)" |
|
16863 | msgstr " ([+] 印付きのオプションは複数回指定可能です)" | |
16554 |
|
16864 | |||
@@ -18484,6 +18794,67 b' msgstr ""' | |||||
18484 | " 通常のタグの場合は ``$HG_LOCAL=0`` になります。" |
|
18794 | " 通常のタグの場合は ``$HG_LOCAL=0`` になります。" | |
18485 |
|
18795 | |||
18486 | msgid "" |
|
18796 | msgid "" | |
|
18797 | "``pretxnopen``\n" | |||
|
18798 | " Run before any new repository transaction is open. The reason for the\n" | |||
|
18799 | " transaction will be in ``$HG_TXNNAME`` and a unique identifier for the\n" | |||
|
18800 | " transaction will be in ``HG_TXNID``. A non-zero status will prevent the\n" | |||
|
18801 | " transaction from being opened." | |||
|
18802 | msgstr "" | |||
|
18803 | "``pretxnopen``\n" | |||
|
18804 | " トランザクション開始直前に実行されます。 トランザクションの種別が\n" | |||
|
18805 | " ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID`` に設定されます。 \n" | |||
|
18806 | " 終了コードが非ゼロの場合、 トランザクションは開始されません。" | |||
|
18807 | ||||
|
18808 | msgid "" | |||
|
18809 | "``pretxnclose``\n" | |||
|
18810 | " Run right before the transaction is actually finalized. Any\n" | |||
|
18811 | " repository change will be visible to the hook program. This lets you\n" | |||
|
18812 | " validate the transaction content or change it. Exit status 0 allows\n" | |||
|
18813 | " the commit to proceed. Non-zero status will cause the transaction to\n" | |||
|
18814 | " be rolled back. The reason for the transaction opening will be in\n" | |||
|
18815 | " ``$HG_TXNNAME`` and a unique identifier for the transaction will be in\n" | |||
|
18816 | " ``HG_TXNID``. The rest of the available data will vary according the\n" | |||
|
18817 | " transaction type. New changesets will add ``$HG_NODE`` (id of the\n" | |||
|
18818 | " first added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables,\n" | |||
|
18819 | " bookmarks and phases changes will set ``HG_BOOKMARK_MOVED`` and\n" | |||
|
18820 | " ``HG_PHASES_MOVED`` to ``1``, etc." | |||
|
18821 | msgstr "" | |||
|
18822 | "``pretxnclose``\n" | |||
|
18823 | " トランザクション完了直前に実行されます。 適用予定の全ての履歴変更が、\n" | |||
|
18824 | " フックから参照できます。 トランザクション内容の検証や変更が可能です。\n" | |||
|
18825 | " 終了コードが 0 の場合、 トランザクション完了処理が継続されます。\n" | |||
|
18826 | " それ以外の場合、 トランザクションはロールバックされます。\n" | |||
|
18827 | " トランザクション種別が ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID``\n" | |||
|
18828 | " に設定されます。 それ以外の情報は、 トランザクション種別に依存します。\n" | |||
|
18829 | " 例えば、 新規リビジョン群を追加するトランザクションの場合、 ``$HG_NODE``\n" | |||
|
18830 | " (追加リビジョン群の最初のものの ID)、 ``$HG_URL`` および ``$HG_SOURCE``\n" | |||
|
18831 | " が設定されます。 ブックマークやフェーズの変更の場合、\n" | |||
|
18832 | " ``HG_BOOKMARK_MOVED`` や ``HG_PHASES_MOVED`` に ``1`` が設定されます。" | |||
|
18833 | ||||
|
18834 | msgid "" | |||
|
18835 | "``txnclose``\n" | |||
|
18836 | " Run after any repository transaction has been committed. At this\n" | |||
|
18837 | " point, the transaction can no longer be rolled back. The hook will run\n" | |||
|
18838 | " after the lock is released. See ``pretxnclose`` docs for details about\n" | |||
|
18839 | " available variables." | |||
|
18840 | msgstr "" | |||
|
18841 | "``txnclose``\n" | |||
|
18842 | " トランザクション完了直後に実行されます。 このフックの実行結果は、\n" | |||
|
18843 | " トランザクションのロールバックを生じません。 フック実行に先立って、\n" | |||
|
18844 | " 排他は解放されます。 参照可能な変数の詳細に関しては ``pretxnclose``\n" | |||
|
18845 | " の説明を参照してください。" | |||
|
18846 | ||||
|
18847 | msgid "" | |||
|
18848 | "``txnabort``\n" | |||
|
18849 | " Run when a transaction is aborted. See ``pretxnclose`` docs for details " | |||
|
18850 | "about\n" | |||
|
18851 | " available variables." | |||
|
18852 | msgstr "" | |||
|
18853 | "``txnabort``\n" | |||
|
18854 | " トランザクション中断時に実行されます。 参照可能な変数の詳細に関しては\n" | |||
|
18855 | " ``pretxnclose`` の説明を参照してください。" | |||
|
18856 | ||||
|
18857 | msgid "" | |||
18487 | "``pretxnchangegroup``\n" |
|
18858 | "``pretxnchangegroup``\n" | |
18488 | " Run after a changegroup has been added via push, pull or unbundle,\n" |
|
18859 | " Run after a changegroup has been added via push, pull or unbundle,\n" | |
18489 | " but before the transaction has been committed. Changegroup is\n" |
|
18860 | " but before the transaction has been committed. Changegroup is\n" | |
@@ -19708,13 +20079,16 b' msgid ""' | |||||
19708 | " format.\n" |
|
20079 | " format.\n" | |
19709 | " Defaults to showing the hash, tags, branches, bookmarks, author, and\n" |
|
20080 | " Defaults to showing the hash, tags, branches, bookmarks, author, and\n" | |
19710 | " the first line of the commit description.\n" |
|
20081 | " the first line of the commit description.\n" | |
19711 | " You have to pay attention to encodings of managed files, if you\n" |
|
20082 | " If you use non-ASCII characters in names for tags, branches, bookmarks,\n" | |
19712 | " use non-ASCII characters in tags, branches, bookmarks, author\n" |
|
20083 | " authors, and/or commit descriptions, you must pay attention to encodings " | |
19713 | " and/or commit descriptions. At template expansion, non-ASCII\n" |
|
20084 | "of\n" | |
19714 | " characters use the encoding specified by ``--encoding`` global\n" |
|
20085 | " managed files. At template expansion, non-ASCII characters use the " | |
19715 | " option, ``HGENCODING`` or other locale setting environment\n" |
|
20086 | "encoding\n" | |
19716 | " variables. The difference of encoding between merged file and\n" |
|
20087 | " specified by the ``--encoding`` global option, ``HGENCODING`` or other\n" | |
19717 | " conflict markers causes serious problem." |
|
20088 | " environment variables that govern your locale. If the encoding of the " | |
|
20089 | "merge\n" | |||
|
20090 | " markers is different from the encoding of the merged files,\n" | |||
|
20091 | " serious problems may occur." | |||
19718 | msgstr "" |
|
20092 | msgstr "" | |
19719 | "``mergemarkertemplate``\n" |
|
20093 | "``mergemarkertemplate``\n" | |
19720 | " マージで衝突が検出された際に、 ファイルに挿入される衝突マークの、\n" |
|
20094 | " マージで衝突が検出された際に、 ファイルに挿入される衝突マークの、\n" | |
@@ -19805,6 +20179,13 b' msgstr ""' | |||||
19805 | " デフォルト値: False" |
|
20179 | " デフォルト値: False" | |
19806 |
|
20180 | |||
19807 | msgid "" |
|
20181 | msgid "" | |
|
20182 | "``statuscopies``\n" | |||
|
20183 | " Display copies in the status command." | |||
|
20184 | msgstr "" | |||
|
20185 | "``statuscopies``\n" | |||
|
20186 | " :hg:`status` コマンドでの複製元ファイルの表示。." | |||
|
20187 | ||||
|
20188 | msgid "" | |||
19808 | "``ssh``\n" |
|
20189 | "``ssh``\n" | |
19809 | " command to use for SSH connections. Default is ``ssh``." |
|
20190 | " command to use for SSH connections. Default is ``ssh``." | |
19810 | msgstr "" |
|
20191 | msgstr "" | |
@@ -22212,13 +22593,13 b' msgstr "\xe3\x83\xa1\xe3\x83\xbc\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xb0\xe3\x83\xaa\xe3\x82\xb9\xe3\x83\x88: http://selenic.com/mailman/listinfo/mercurial"' | |||||
22212 | msgid "" |
|
22593 | msgid "" | |
22213 | "Copying\n" |
|
22594 | "Copying\n" | |
22214 | "\"\"\"\"\"\"\"\n" |
|
22595 | "\"\"\"\"\"\"\"\n" | |
22215 |
"Copyright (C) 2005-201 |
|
22596 | "Copyright (C) 2005-2015 Matt Mackall.\n" | |
22216 | "Free use of this software is granted under the terms of the GNU General\n" |
|
22597 | "Free use of this software is granted under the terms of the GNU General\n" | |
22217 | "Public License version 2 or any later version." |
|
22598 | "Public License version 2 or any later version." | |
22218 | msgstr "" |
|
22599 | msgstr "" | |
22219 | "Copying\n" |
|
22600 | "Copying\n" | |
22220 | "\"\"\"\"\"\"\"\n" |
|
22601 | "\"\"\"\"\"\"\"\n" | |
22221 |
"Copyright (C) 2005-201 |
|
22602 | "Copyright (C) 2005-2015 Matt Mackall.\n" | |
22222 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" |
|
22603 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" | |
22223 | "Public License の元での自由な利用が保証されています。" |
|
22604 | "Public License の元での自由な利用が保証されています。" | |
22224 |
|
22605 | |||
@@ -22276,14 +22657,14 b' msgid ""' | |||||
22276 | "Copying\n" |
|
22657 | "Copying\n" | |
22277 | "=======\n" |
|
22658 | "=======\n" | |
22278 | "This manual page is copyright 2006 Vadim Gelfer.\n" |
|
22659 | "This manual page is copyright 2006 Vadim Gelfer.\n" | |
22279 |
"Mercurial is copyright 2005-201 |
|
22660 | "Mercurial is copyright 2005-2015 Matt Mackall.\n" | |
22280 | "Free use of this software is granted under the terms of the GNU General\n" |
|
22661 | "Free use of this software is granted under the terms of the GNU General\n" | |
22281 | "Public License version 2 or any later version." |
|
22662 | "Public License version 2 or any later version." | |
22282 | msgstr "" |
|
22663 | msgstr "" | |
22283 | "Copying\n" |
|
22664 | "Copying\n" | |
22284 | "=======\n" |
|
22665 | "=======\n" | |
22285 | "本マニュアルページの著作権は copyright 2006 Vadim Gelfer です。\n" |
|
22666 | "本マニュアルページの著作権は copyright 2006 Vadim Gelfer です。\n" | |
22286 |
"Mercurial の著作権は copyright 2005-201 |
|
22667 | "Mercurial の著作権は copyright 2005-2015 Matt Mackall です。\n" | |
22287 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" |
|
22668 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" | |
22288 | "Public License の元での自由な利用が保証されています。" |
|
22669 | "Public License の元での自由な利用が保証されています。" | |
22289 |
|
22670 | |||
@@ -22554,14 +22935,14 b' msgid ""' | |||||
22554 | "Copying\n" |
|
22935 | "Copying\n" | |
22555 | "=======\n" |
|
22936 | "=======\n" | |
22556 | "This manual page is copyright 2005 Bryan O'Sullivan.\n" |
|
22937 | "This manual page is copyright 2005 Bryan O'Sullivan.\n" | |
22557 |
"Mercurial is copyright 2005-201 |
|
22938 | "Mercurial is copyright 2005-2015 Matt Mackall.\n" | |
22558 | "Free use of this software is granted under the terms of the GNU General\n" |
|
22939 | "Free use of this software is granted under the terms of the GNU General\n" | |
22559 | "Public License version 2 or any later version." |
|
22940 | "Public License version 2 or any later version." | |
22560 | msgstr "" |
|
22941 | msgstr "" | |
22561 | "Copying\n" |
|
22942 | "Copying\n" | |
22562 | "=======\n" |
|
22943 | "=======\n" | |
22563 | "本マニュアルの著作権は copyright 2005 Bryan O'Sullivan です。\n" |
|
22944 | "本マニュアルの著作権は copyright 2005 Bryan O'Sullivan です。\n" | |
22564 |
"Mercurial の著作権は copyright 2005-201 |
|
22945 | "Mercurial の著作権は copyright 2005-2015 Matt Mackall です。\n" | |
22565 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" |
|
22946 | "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n" | |
22566 | "Public License の元での自由な利用が保証されています。" |
|
22947 | "Public License の元での自由な利用が保証されています。" | |
22567 |
|
22948 | |||
@@ -22666,10 +23047,83 b' msgstr ""' | |||||
22666 |
|
23047 | |||
22667 | msgid "" |
|
23048 | msgid "" | |
22668 | "The ``collections`` section is deprecated and has been superseded by\n" |
|
23049 | "The ``collections`` section is deprecated and has been superseded by\n" | |
22669 |
"``paths``. |
|
23050 | "``paths``." | |
22670 | msgstr "" |
|
23051 | msgstr "" | |
22671 | "``collections`` セクションでの設定は非推奨なので、 代わりに ``paths``\n" |
|
23052 | "``collections`` セクションでの設定は非推奨なので、 代わりに ``paths``\n" | |
22672 |
"を使用してください。 |
|
23053 | "を使用してください。" | |
|
23054 | ||||
|
23055 | msgid "" | |||
|
23056 | "URLs and Common Arguments\n" | |||
|
23057 | "=========================" | |||
|
23058 | msgstr "" | |||
|
23059 | "URL と共通引数\n" | |||
|
23060 | "==============" | |||
|
23061 | ||||
|
23062 | msgid "" | |||
|
23063 | "URLs under each repository have the form ``/{command}[/{arguments}]``\n" | |||
|
23064 | "where ``{command}`` represents the name of a command or handler and\n" | |||
|
23065 | "``{arguments}`` represents any number of additional URL parameters\n" | |||
|
23066 | "to that command." | |||
|
23067 | msgstr "" | |||
|
23068 | "リポジトリ参照 URL 配下のパスは ``/{command}[/{arguments}]`` 形式です。\n" | |||
|
23069 | "``{command}`` は機能を、 ``{arguments}`` は機能に対する引数指定を表します。" | |||
|
23070 | ||||
|
23071 | msgid "" | |||
|
23072 | "The web server has a default style associated with it. Styles map to\n" | |||
|
23073 | "a collection of named templates. Each template is used to render a\n" | |||
|
23074 | "specific piece of data, such as a changeset or diff." | |||
|
23075 | msgstr "" | |||
|
23076 | "ウェブサーバにはデフォルトの表示スタイルがあります。 スタイル定義は、\n" | |||
|
23077 | "名前付きテンプレート群をまとめたものです。 個々のテンプレートは、\n" | |||
|
23078 | "リビジョン情報や差分など、 表示要素を文字列化します。" | |||
|
23079 | ||||
|
23080 | msgid "" | |||
|
23081 | "The style for the current request can be overwritten two ways. First,\n" | |||
|
23082 | "if ``{command}`` contains a hyphen (``-``), the text before the hyphen\n" | |||
|
23083 | "defines the style. For example, ``/atom-log`` will render the ``log``\n" | |||
|
23084 | "command handler with the ``atom`` style. The second way to set the\n" | |||
|
23085 | "style is with the ``style`` query string argument. For example,\n" | |||
|
23086 | "``/log?style=atom``. The hyphenated URL parameter is preferred." | |||
|
23087 | msgstr "" | |||
|
23088 | "ウェブサーバへの要求の際に、 スタイルを指定する方法は2つあります。\n" | |||
|
23089 | "``{command}`` がハイフン (``-``) を含む場合、 ハイフンの前の部分で、\n" | |||
|
23090 | "スタイル名を指定します。 例えば ``/atom-log`` は ``log`` 機能の結果を\n" | |||
|
23091 | "``atom`` スタイルで文字列化します。 もう一つの指定方法は、例えば\n" | |||
|
23092 | "``/log?style=atom`` のような、 ``style`` クエリ文字列引数での指定です。\n" | |||
|
23093 | "推奨される指定方法は、 ハイフンを使用する形式の方です。" | |||
|
23094 | ||||
|
23095 | msgid "" | |||
|
23096 | "Not all templates are available for all styles. Attempting to use\n" | |||
|
23097 | "a style that doesn't have all templates defined may result in an error\n" | |||
|
23098 | "rendering the page." | |||
|
23099 | msgstr "" | |||
|
23100 | "スタイルと処理の組み合わせ次第では、 未定義のテンプレートの存在により、\n" | |||
|
23101 | "応答が正しく文字列化されない可能性があります。" | |||
|
23102 | ||||
|
23103 | msgid "" | |||
|
23104 | "Many commands take a ``{revision}`` URL parameter. This defines the\n" | |||
|
23105 | "changeset to operate on. This is commonly specified as the short,\n" | |||
|
23106 | "12 digit hexidecimal abbreviation for the full 40 character unique\n" | |||
|
23107 | "revision identifier. However, any value described by\n" | |||
|
23108 | ":hg:`help revisions` typically works." | |||
|
23109 | msgstr "" | |||
|
23110 | "多くの処理で、 ``{command}`` に続く URL パス要素として ``{revision}``\n" | |||
|
23111 | "を指定できます。 これは処理対象のリビジョンを指定するものです。\n" | |||
|
23112 | "多くの場合、 16進12桁の短縮形式ハッシュ値が使用されますが、\n" | |||
|
23113 | ":hg:`help revisions` 中で説明されている形式は、 概ね機能します。" | |||
|
23114 | ||||
|
23115 | msgid "" | |||
|
23116 | "Commands and URLs\n" | |||
|
23117 | "=================" | |||
|
23118 | msgstr "" | |||
|
23119 | "コマンドと URL\n" | |||
|
23120 | "==============" | |||
|
23121 | ||||
|
23122 | msgid "The following web commands and their URLs are available:" | |||
|
23123 | msgstr "ウェブサーバに指定可能なコマンドと URL 形式を以下に示します:" | |||
|
23124 | ||||
|
23125 | msgid " .. webcommandsmarker\n" | |||
|
23126 | msgstr " .. webcommandsmarker\n" | |||
22673 |
|
23127 | |||
22674 | msgid "To merge files Mercurial uses merge tools." |
|
23128 | msgid "To merge files Mercurial uses merge tools." | |
22675 | msgstr "Mercurial でのファイル内容のマージには、 マージツールを使用します。" |
|
23129 | msgstr "Mercurial でのファイル内容のマージには、 マージツールを使用します。" | |
@@ -23708,14 +24162,14 b' msgid ""' | |||||
23708 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" |
|
24162 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" | |
23709 | " specified. However, if you specify the full path of a file in a\n" |
|
24163 | " specified. However, if you specify the full path of a file in a\n" | |
23710 | " subrepo, it will be added even without -S/--subrepos specified.\n" |
|
24164 | " subrepo, it will be added even without -S/--subrepos specified.\n" | |
23711 |
" |
|
24165 | " Subversion subrepositories are currently silently\n" | |
23712 | " ignored." |
|
24166 | " ignored." | |
23713 | msgstr "" |
|
24167 | msgstr "" | |
23714 | ":add: -S/--subrepos 指定が無い限り、 構成管理対象へのファイル登録は、\n" |
|
24168 | ":add: -S/--subrepos 指定が無い限り、 構成管理対象へのファイル登録は、\n" | |
23715 | " 再帰的には実施されません。 但し、 -S/--subrepos 指定が無くても、\n" |
|
24169 | " 再帰的には実施されません。 但し、 -S/--subrepos 指定が無くても、\n" | |
23716 | " サブリポジトリ中のファイルへのパスが、 直接指定された場合は、\n" |
|
24170 | " サブリポジトリ中のファイルへのパスが、 直接指定された場合は、\n" | |
23717 | " 対象ファイルを構成管理対象として登録します。 なお、 サブリポジトリが\n" |
|
24171 | " 対象ファイルを構成管理対象として登録します。 なお、 サブリポジトリが\n" | |
23718 |
" |
|
24172 | " Subversion 形式の場合、 現状では、 何の表示も無しに、\n" | |
23719 | " 登録要求を無視します。" |
|
24173 | " 登録要求を無視します。" | |
23720 |
|
24174 | |||
23721 | msgid "" |
|
24175 | msgid "" | |
@@ -23740,10 +24194,10 b' msgstr ""' | |||||
23740 |
|
24194 | |||
23741 | msgid "" |
|
24195 | msgid "" | |
23742 | ":cat: cat currently only handles exact file matches in subrepos.\n" |
|
24196 | ":cat: cat currently only handles exact file matches in subrepos.\n" | |
23743 |
" |
|
24197 | " Subversion subrepositories are currently ignored." | |
23744 | msgstr "" |
|
24198 | msgstr "" | |
23745 | ":cat: 現状では、 サブリポジトリ中のファイルと厳密一致した場合のみ、\n" |
|
24199 | ":cat: 現状では、 サブリポジトリ中のファイルと厳密一致した場合のみ、\n" | |
23746 |
" 処理を実施します。 |
|
24200 | " 処理を実施します。 Subversion 形式の場合は何も実施しません。" | |
23747 |
|
24201 | |||
23748 | msgid "" |
|
24202 | msgid "" | |
23749 | ":commit: commit creates a consistent snapshot of the state of the\n" |
|
24203 | ":commit: commit creates a consistent snapshot of the state of the\n" | |
@@ -23772,16 +24226,24 b' msgstr ""' | |||||
23772 | msgid "" |
|
24226 | msgid "" | |
23773 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" |
|
24227 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" | |
23774 | " specified. Changes are displayed as usual, on the subrepositories\n" |
|
24228 | " specified. Changes are displayed as usual, on the subrepositories\n" | |
23775 | " elements. Git subrepositories do not support --include/--exclude.\n" |
|
24229 | " elements. Subversion subrepositories are currently silently ignored." | |
23776 | " Subversion subrepositories are currently silently ignored." |
|
|||
23777 | msgstr "" |
|
24230 | msgstr "" | |
23778 | ":diff: -S/--subrepos 指定が無い限り、 差分表示は、 \n" |
|
24231 | ":diff: -S/--subrepos 指定が無い限り、 差分表示は、 \n" | |
23779 | " 再帰的には実施されません。\n" |
|
24232 | " 再帰的には実施されません。\n" | |
23780 | " サブリポジトリのファイルの差分表示は、 通常の差分表示形式と同じです。\n" |
|
24233 | " サブリポジトリのファイルの差分表示は、 通常の差分表示形式と同じです。\n" | |
23781 | " サブリポジトリが Git 形式の場合、 --include/--exclude は機能しません。\n" |
|
|||
23782 | " Subversion 形式の場合は、 何の表示も無しに、 差分表示要求を無視します。" |
|
24234 | " Subversion 形式の場合は、 何の表示も無しに、 差分表示要求を無視します。" | |
23783 |
|
24235 | |||
23784 | msgid "" |
|
24236 | msgid "" | |
|
24237 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" | |||
|
24238 | " specified. Git and Subversion subrepositories are currently\n" | |||
|
24239 | " silently ignored." | |||
|
24240 | msgstr "" | |||
|
24241 | ":files: -S/--subrepos 指定が無い限り、 ファイル一覧表示は、\n" | |||
|
24242 | " 再帰的には実施されません。 なお、 サブリポジトリが Git または\n" | |||
|
24243 | " Subversion 形式の場合、 現状では、 何の表示も無しに、\n" | |||
|
24244 | " 一覧表示要求を無視します。" | |||
|
24245 | ||||
|
24246 | msgid "" | |||
23785 | ":forget: forget currently only handles exact file matches in subrepos.\n" |
|
24247 | ":forget: forget currently only handles exact file matches in subrepos.\n" | |
23786 | " Git and Subversion subrepositories are currently silently ignored." |
|
24248 | " Git and Subversion subrepositories are currently silently ignored." | |
23787 | msgstr "" |
|
24249 | msgstr "" | |
@@ -23985,56 +24447,8 b' msgstr ""' | |||||
23985 | msgid "In addition to filters, there are some basic built-in functions:" |
|
24447 | msgid "In addition to filters, there are some basic built-in functions:" | |
23986 | msgstr "フィルタの他に、 以下の様な基本的な組み込み関数があります:" |
|
24448 | msgstr "フィルタの他に、 以下の様な基本的な組み込み関数があります:" | |
23987 |
|
24449 | |||
23988 | msgid "- date(date[, fmt])" |
|
24450 | msgid ".. functionsmarker" | |
23989 | msgstr "- date(date[, fmt])" |
|
24451 | msgstr ".. functionsmarker" | |
23990 |
|
||||
23991 | msgid "- diff([includepattern [, excludepattern]])" |
|
|||
23992 | msgstr "- diff([includepattern [, excludepattern]])" |
|
|||
23993 |
|
||||
23994 | msgid "- fill(text[, width])" |
|
|||
23995 | msgstr "- fill(text[, width])" |
|
|||
23996 |
|
||||
23997 | msgid "- get(dict, key)" |
|
|||
23998 | msgstr "- get(dict, key)" |
|
|||
23999 |
|
||||
24000 | msgid "- if(expr, then[, else])" |
|
|||
24001 | msgstr "- if(expr, then[, else])" |
|
|||
24002 |
|
||||
24003 | msgid "- ifcontains(expr, expr, then[, else])" |
|
|||
24004 | msgstr "- ifcontains(expr, expr, then[, else])" |
|
|||
24005 |
|
||||
24006 | msgid "- ifeq(expr, expr, then[, else])" |
|
|||
24007 | msgstr "- ifeq(expr, expr, then[, else])" |
|
|||
24008 |
|
||||
24009 | msgid "- join(list, sep)" |
|
|||
24010 | msgstr "- join(list, sep)" |
|
|||
24011 |
|
||||
24012 | msgid "- label(label, expr)" |
|
|||
24013 | msgstr "- label(label, expr)" |
|
|||
24014 |
|
||||
24015 | msgid "- pad(text, width[, fillchar, right])" |
|
|||
24016 | msgstr "- pad(text, width[, fillchar, right])" |
|
|||
24017 |
|
||||
24018 | msgid "- revset(query[, formatargs])" |
|
|||
24019 | msgstr "- revset(query[, formatargs])" |
|
|||
24020 |
|
||||
24021 | msgid "- rstdoc(text, style)" |
|
|||
24022 | msgstr "- rstdoc(text, style)" |
|
|||
24023 |
|
||||
24024 | msgid "- shortest(node)" |
|
|||
24025 | msgstr "- shortest(node)" |
|
|||
24026 |
|
||||
24027 | msgid "- startswith(string, text)" |
|
|||
24028 | msgstr "- startswith(string, text)" |
|
|||
24029 |
|
||||
24030 | msgid "- strip(text[, chars])" |
|
|||
24031 | msgstr "- strip(text[, chars])" |
|
|||
24032 |
|
||||
24033 | msgid "- sub(pat, repl, expr)" |
|
|||
24034 | msgstr "- sub(pat, repl, expr)" |
|
|||
24035 |
|
||||
24036 | msgid "- word(number, text[, separator])" |
|
|||
24037 | msgstr "- word(number, text[, separator])" |
|
|||
24038 |
|
24452 | |||
24039 | msgid "Also, for any expression that returns a list, there is a list operator:" |
|
24453 | msgid "Also, for any expression that returns a list, there is a list operator:" | |
24040 | msgstr "また、 列挙形式を返す expr に対しては、 以下の様な記述が可能です:" |
|
24454 | msgstr "また、 列挙形式を返す expr に対しては、 以下の様な記述が可能です:" | |
@@ -24388,12 +24802,476 b' msgstr "\xe3\x81\x93\xe3\x81\xae\xe3\x82\xb7\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xa0\xe3\x81\xa7\xe3\x81\xaf IPv6 \xe3\x82\x92\xe5\x88\xa9\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
24388 |
|
24802 | |||
24389 | #, python-format |
|
24803 | #, python-format | |
24390 | msgid "cannot start server at '%s:%d': %s" |
|
24804 | msgid "cannot start server at '%s:%d': %s" | |
24391 | msgstr "'%s:%d' でのサーバ起動に失敗: %s" |
|
24805 | msgstr "'%s:%d' でのサーバ待ちうけの起動に失敗: %s" | |
|
24806 | ||||
|
24807 | msgid "" | |||
|
24808 | "\n" | |||
|
24809 | " /log[/{revision}[/{path}]]\n" | |||
|
24810 | " --------------------------" | |||
|
24811 | msgstr "" | |||
|
24812 | "\n" | |||
|
24813 | " /log[/{revision}[/{path}]]\n" | |||
|
24814 | " --------------------------" | |||
|
24815 | ||||
|
24816 | msgid " Show repository or file history." | |||
|
24817 | msgstr " リポジトリまたはファイルに関する履歴の表示。" | |||
|
24818 | ||||
|
24819 | msgid "" | |||
|
24820 | " For URLs of the form ``/log/{revision}``, a list of changesets starting " | |||
|
24821 | "at\n" | |||
|
24822 | " the specified changeset identifier is shown. If ``{revision}`` is not\n" | |||
|
24823 | " defined, the default is ``tip``. This form is equivalent to the\n" | |||
|
24824 | " ``changelog`` handler." | |||
|
24825 | msgstr "" | |||
|
24826 | " ``/log/{revision}`` 形式 URL の場合、 revision 以前のリビジョンを、\n" | |||
|
24827 | " 一覧表示します。 ``{revision}`` 省略時は ``tip`` 指定とみなされます。\n" | |||
|
24828 | " この形式は ``changelog`` 機能と同等です。" | |||
|
24829 | ||||
|
24830 | msgid "" | |||
|
24831 | " For URLs of the form ``/log/{revision}/{file}``, the history for a " | |||
|
24832 | "specific\n" | |||
|
24833 | " file will be shown. This form is equivalent to the ``filelog`` handler." | |||
|
24834 | msgstr "" | |||
|
24835 | " ``/log/{revision}/{file}`` 形式 URL の場合、 一覧表示対象は ``{file}``\n" | |||
|
24836 | " に関するリビジョンに限定されます。 この形式は ``filelog``\n" | |||
|
24837 | " 機能と同等です。" | |||
|
24838 | ||||
|
24839 | msgid "" | |||
|
24840 | "\n" | |||
|
24841 | " /file/{revision}[/{path}]\n" | |||
|
24842 | " -------------------------" | |||
|
24843 | msgstr "" | |||
|
24844 | "\n" | |||
|
24845 | " /file/{revision}[/{path}]\n" | |||
|
24846 | " -------------------------" | |||
|
24847 | ||||
|
24848 | msgid " Show information about a directory or file in the repository." | |||
|
24849 | msgstr " リポジトリ中のディレクトリまたはファイルに関する情報の表示。" | |||
|
24850 | ||||
|
24851 | msgid " Info about the ``path`` given as a URL parameter will be rendered." | |||
|
24852 | msgstr " URL パス要素 ``{path}`` に関する情報を表示します。" | |||
|
24853 | ||||
|
24854 | msgid "" | |||
|
24855 | " If ``path`` is a directory, information about the entries in that\n" | |||
|
24856 | " directory will be rendered. This form is equivalent to the ``manifest``\n" | |||
|
24857 | " handler." | |||
|
24858 | msgstr "" | |||
|
24859 | " ``{path}`` がディレクトリ相当の場合、 配下の要素一覧が表示されます。\n" | |||
|
24860 | " この形式は ``manifest`` 機能と同等です。" | |||
|
24861 | ||||
|
24862 | msgid "" | |||
|
24863 | " If ``path`` is a file, information about that file will be shown via\n" | |||
|
24864 | " the ``filerevision`` template." | |||
|
24865 | msgstr "" | |||
|
24866 | " ``{path}`` がファイル相当の場合、 ファイル自体の情報を\n" | |||
|
24867 | " ``filerevision`` テンプレートを使って表示します。" | |||
|
24868 | ||||
|
24869 | msgid "" | |||
|
24870 | " If ``path`` is not defined, information about the root directory will\n" | |||
|
24871 | " be rendered." | |||
|
24872 | msgstr "" | |||
|
24873 | " ``{path}`` 部分が無指定の場合、 ルートディレクトリ指定とみなされます。" | |||
|
24874 | ||||
|
24875 | msgid "" | |||
|
24876 | "\n" | |||
|
24877 | " /changelog[/{revision}]\n" | |||
|
24878 | " -----------------------" | |||
|
24879 | msgstr "" | |||
|
24880 | "\n" | |||
|
24881 | " /changelog[/{revision}]\n" | |||
|
24882 | " -----------------------" | |||
|
24883 | ||||
|
24884 | msgid " Show information about multiple changesets." | |||
|
24885 | msgstr " リビジョン情報の表示。" | |||
|
24886 | ||||
|
24887 | msgid "" | |||
|
24888 | " If the optional ``revision`` URL argument is absent, information about\n" | |||
|
24889 | " all changesets starting at ``tip`` will be rendered. If the " | |||
|
24890 | "``revision``\n" | |||
|
24891 | " argument is present, changesets will be shown starting from the " | |||
|
24892 | "specified\n" | |||
|
24893 | " revision." | |||
|
24894 | msgstr "" | |||
|
24895 | " ``{revision}`` 省略時は、 ``tip`` 以前のリビジョンを一覧表示します。\n" | |||
|
24896 | " それ以外の場合、 指定リビジョン以前のリビジョンを一覧表示します。" | |||
|
24897 | ||||
|
24898 | msgid "" | |||
|
24899 | " If ``revision`` is absent, the ``rev`` query string argument may be\n" | |||
|
24900 | " defined. This will perform a search for changesets." | |||
|
24901 | msgstr "" | |||
|
24902 | " ``{revision}`` 省略時に、 クエリ文字列引数 ``rev`` が指定された場合、\n" | |||
|
24903 | " その値を使ってリビジョンの検索が実施されます。" | |||
|
24904 | ||||
|
24905 | msgid "" | |||
|
24906 | " The argument for ``rev`` can be a single revision, a revision set,\n" | |||
|
24907 | " or a literal keyword to search for in changeset data (equivalent to\n" | |||
|
24908 | " :hg:`log -k`)." | |||
|
24909 | msgstr "" | |||
|
24910 | " クエリ文字列引数 ``rev`` には、 単一の識別子、 revset 記述または、\n" | |||
|
24911 | " 単一の検索キーワード (:hg:`log -k` 相当) が指定可能です。" | |||
|
24912 | ||||
|
24913 | msgid "" | |||
|
24914 | " The ``revcount`` query string argument defines the maximum numbers of\n" | |||
|
24915 | " changesets to render." | |||
|
24916 | msgstr "" | |||
|
24917 | " クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。" | |||
|
24918 | ||||
|
24919 | msgid " For non-searches, the ``changelog`` template will be rendered." | |||
|
24920 | msgstr "" | |||
|
24921 | " 検索以外での表示形式には、 ``changelog`` テンプレートを使用します。" | |||
|
24922 | ||||
|
24923 | msgid "" | |||
|
24924 | "\n" | |||
|
24925 | " /shortlog\n" | |||
|
24926 | " ---------" | |||
|
24927 | msgstr "" | |||
|
24928 | "\n" | |||
|
24929 | " /shortlog\n" | |||
|
24930 | " ---------" | |||
|
24931 | ||||
|
24932 | msgid " Show basic information about a set of changesets." | |||
|
24933 | msgstr " 基本的なリビジョン情報の表示。" | |||
|
24934 | ||||
|
24935 | msgid "" | |||
|
24936 | " This accepts the same parameters as the ``changelog`` handler. The only\n" | |||
|
24937 | " difference is the ``shortlog`` template will be rendered instead of the\n" | |||
|
24938 | " ``changelog`` template." | |||
|
24939 | msgstr "" | |||
|
24940 | " この処理は ``changelog`` 機能と同様の引数を受理します。 ``changelog``\n" | |||
|
24941 | " 機能との違いは、 結果出力の際に ``changelog`` テンプレートではなく、\n" | |||
|
24942 | " ``shortlog`` テンプレートを使用する点です。" | |||
|
24943 | ||||
|
24944 | msgid "" | |||
|
24945 | "\n" | |||
|
24946 | " /changeset[/{revision}]\n" | |||
|
24947 | " -----------------------" | |||
|
24948 | msgstr "" | |||
|
24949 | "\n" | |||
|
24950 | " /changeset[/{revision}]\n" | |||
|
24951 | " -----------------------" | |||
|
24952 | ||||
|
24953 | msgid " Show information about a single changeset." | |||
|
24954 | msgstr " 指定リビジョンの情報の表示。" | |||
|
24955 | ||||
|
24956 | msgid "" | |||
|
24957 | " A URL path argument is the changeset identifier to show. See ``hg help\n" | |||
|
24958 | " revisions`` for possible values. If not defined, the ``tip`` changeset\n" | |||
|
24959 | " will be shown." | |||
|
24960 | msgstr "" | |||
|
24961 | " URL の ``{revision}`` 部分は、 表示対象リビジョンの識別用の情報です。\n" | |||
|
24962 | " 指定可能な識別情報の詳細は :hg:`help revisions` を参照してください。\n" | |||
|
24963 | " ``{revision}`` 省略時は、 ``tip`` 指定とみなされます。" | |||
|
24964 | ||||
|
24965 | msgid "" | |||
|
24966 | " The ``changeset`` template is rendered. Contents of the " | |||
|
24967 | "``changesettag``,\n" | |||
|
24968 | " ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many\n" | |||
|
24969 | " templates related to diffs may all be used to produce the output." | |||
|
24970 | msgstr "" | |||
|
24971 | " 結果出力には ``changeset`` テンプレートを使用します。 この表示は、\n" | |||
|
24972 | " ``changesettag``, ``changesetbookmark``, ``filenodelink``\n" | |||
|
24973 | " ``filenolink`` および差分表示に関するテンプレート出力から構成されます。" | |||
|
24974 | ||||
|
24975 | msgid "" | |||
|
24976 | "\n" | |||
|
24977 | " /manifest[/{revision}[/{path}]]\n" | |||
|
24978 | " -------------------------------" | |||
|
24979 | msgstr "" | |||
|
24980 | "\n" | |||
|
24981 | " /manifest[/{revision}[/{path}]]\n" | |||
|
24982 | " -------------------------------" | |||
|
24983 | ||||
|
24984 | msgid " Show information about a directory." | |||
|
24985 | msgstr " ディレクトリ情報の表示。" | |||
|
24986 | ||||
|
24987 | msgid "" | |||
|
24988 | " If the URL path arguments are omitted, information about the root\n" | |||
|
24989 | " directory for the ``tip`` changeset will be shown." | |||
|
24990 | msgstr "" | |||
|
24991 | " URL での引数指定がない場合、 ルートディレクトリ配下の ``tip``\n" | |||
|
24992 | " における要素一覧を表示します。" | |||
|
24993 | ||||
|
24994 | msgid "" | |||
|
24995 | " Because this handler can only show information for directories, it\n" | |||
|
24996 | " is recommended to use the ``file`` handler instead, as it can handle " | |||
|
24997 | "both\n" | |||
|
24998 | " directories and files." | |||
|
24999 | msgstr "" | |||
|
25000 | " ``manifest`` はディレクトリ表示専用なので、 ファイル/ディレクトリの、\n" | |||
|
25001 | " 両方に対応できる ``file`` 機能の使用をお勧めします。" | |||
|
25002 | ||||
|
25003 | msgid " The ``manifest`` template will be rendered for this handler." | |||
|
25004 | msgstr " 結果出力には ``manifest`` テンプレートを使用します。" | |||
|
25005 | ||||
|
25006 | msgid "" | |||
|
25007 | "\n" | |||
|
25008 | " /tags\n" | |||
|
25009 | " -----" | |||
|
25010 | msgstr "" | |||
|
25011 | "\n" | |||
|
25012 | " /tags\n" | |||
|
25013 | " -----" | |||
|
25014 | ||||
|
25015 | msgid " Show information about tags." | |||
|
25016 | msgstr " タグ情報の表示。" | |||
|
25017 | ||||
|
25018 | msgid " No arguments are accepted." | |||
|
25019 | msgstr " 指定可能な引数はありません。" | |||
|
25020 | ||||
|
25021 | msgid " The ``tags`` template is rendered." | |||
|
25022 | msgstr " 結果出力には ``tags`` テンプレートを使用します。" | |||
|
25023 | ||||
|
25024 | msgid "" | |||
|
25025 | "\n" | |||
|
25026 | " /bookmarks\n" | |||
|
25027 | " ----------" | |||
|
25028 | msgstr "" | |||
|
25029 | "\n" | |||
|
25030 | " /bookmarks\n" | |||
|
25031 | " ----------" | |||
|
25032 | ||||
|
25033 | msgid " Show information about bookmarks." | |||
|
25034 | msgstr " ブックマーク情報の表示。" | |||
|
25035 | ||||
|
25036 | msgid " The ``bookmarks`` template is rendered." | |||
|
25037 | msgstr " 結果出力には ``bookmarks`` テンプレートを使用します。" | |||
|
25038 | ||||
|
25039 | msgid "" | |||
|
25040 | "\n" | |||
|
25041 | " /branches\n" | |||
|
25042 | " ---------" | |||
|
25043 | msgstr "" | |||
|
25044 | "\n" | |||
|
25045 | " /branches\n" | |||
|
25046 | " ---------" | |||
|
25047 | ||||
|
25048 | msgid " Show information about branches." | |||
|
25049 | msgstr " 名前付きブランチ情報の表示。" | |||
|
25050 | ||||
|
25051 | msgid "" | |||
|
25052 | " All known branches are contained in the output, even closed branches." | |||
|
25053 | msgstr " 名前付きブランチを一覧表示します (閉鎖済みのものも含む)" | |||
|
25054 | ||||
|
25055 | msgid " The ``branches`` template is rendered." | |||
|
25056 | msgstr " 結果出力には ``branches`` テンプレートを使用します。" | |||
|
25057 | ||||
|
25058 | msgid "" | |||
|
25059 | "\n" | |||
|
25060 | " /summary\n" | |||
|
25061 | " --------" | |||
|
25062 | msgstr "" | |||
|
25063 | "\n" | |||
|
25064 | " /summary\n" | |||
|
25065 | " --------" | |||
|
25066 | ||||
|
25067 | msgid " Show a summary of repository state." | |||
|
25068 | msgstr " リポジトリの概要情報の表示" | |||
|
25069 | ||||
|
25070 | msgid "" | |||
|
25071 | " Information about the latest changesets, bookmarks, tags, and branches\n" | |||
|
25072 | " is captured by this handler." | |||
|
25073 | msgstr "" | |||
|
25074 | " 履歴、 ブックマーク、 タグおよびブランチの最新情報を表示します。\n" | |||
|
25075 | " (※ 訳注: デフォルトの表示スタイル paper は ``summary`` 未対応です)" | |||
|
25076 | ||||
|
25077 | msgid " The ``summary`` template is rendered." | |||
|
25078 | msgstr " 結果出力には ``summary`` テンプレートを使用します。" | |||
|
25079 | ||||
|
25080 | msgid "" | |||
|
25081 | "\n" | |||
|
25082 | " /diff/{revision}/{path}\n" | |||
|
25083 | " -----------------------" | |||
|
25084 | msgstr "" | |||
|
25085 | "\n" | |||
|
25086 | " /diff/{revision}/{path}\n" | |||
|
25087 | " -----------------------" | |||
|
25088 | ||||
|
25089 | msgid " Show how a file changed in a particular commit." | |||
|
25090 | msgstr " 指定リビジョンでの変更内容の表示。" | |||
|
25091 | ||||
|
25092 | msgid " The ``filediff`` template is rendered." | |||
|
25093 | msgstr " 結果出力には ``filediff`` テンプレートを使用します。" | |||
|
25094 | ||||
|
25095 | msgid "" | |||
|
25096 | " This hander is registered under both the ``/diff`` and ``/filediff``\n" | |||
|
25097 | " paths. ``/diff`` is used in modern code." | |||
|
25098 | msgstr "" | |||
|
25099 | " この機能は ``/diff`` と ``/filediff`` の両方の URL で利用可能です。\n" | |||
|
25100 | " 新しい実装では主に ``/diff`` を利用しています。" | |||
|
25101 | ||||
|
25102 | msgid "" | |||
|
25103 | "\n" | |||
|
25104 | " /comparison/{revision}/{path}\n" | |||
|
25105 | " -----------------------------" | |||
|
25106 | msgstr "" | |||
|
25107 | "\n" | |||
|
25108 | " /comparison/{revision}/{path}\n" | |||
|
25109 | " -----------------------------" | |||
|
25110 | ||||
|
25111 | msgid "" | |||
|
25112 | " Show a comparison between the old and new versions of a file from " | |||
|
25113 | "changes\n" | |||
|
25114 | " made on a particular revision." | |||
|
25115 | msgstr " 指定リビジョンにおける、 対象ファイルの変更内容の表示。" | |||
|
25116 | ||||
|
25117 | msgid "" | |||
|
25118 | " This is similar to the ``diff`` handler. However, this form features\n" | |||
|
25119 | " a split or side-by-side diff rather than a unified diff." | |||
|
25120 | msgstr "" | |||
|
25121 | " この機能と ``diff`` 機能の違いは、 表示形式の side-by-side (※ 訳注:\n" | |||
|
25122 | " 変更前後の内容を、 左右に表示) と unified diff の差です。" | |||
|
25123 | ||||
|
25124 | msgid "" | |||
|
25125 | " The ``context`` query string argument can be used to control the lines " | |||
|
25126 | "of\n" | |||
|
25127 | " context in the diff." | |||
|
25128 | msgstr "" | |||
|
25129 | " クエリ文字列引数 ``context`` で、 差分コンテキスト行数を指定できます。" | |||
|
25130 | ||||
|
25131 | msgid " The ``filecomparison`` template is rendered." | |||
|
25132 | msgstr " 結果出力には ``filecomparison`` テンプレートを使用します。" | |||
24392 |
|
25133 | |||
24393 | #, python-format |
|
25134 | #, python-format | |
24394 | msgid "(binary file %s, hash: %s)" |
|
25135 | msgid "(binary file %s, hash: %s)" | |
24395 | msgstr "(バイナリファイル %s, ハッシュ値: %s)" |
|
25136 | msgstr "(バイナリファイル %s, ハッシュ値: %s)" | |
24396 |
|
25137 | |||
|
25138 | msgid "" | |||
|
25139 | "\n" | |||
|
25140 | " /annotate/{revision}/{path}\n" | |||
|
25141 | " ---------------------------" | |||
|
25142 | msgstr "" | |||
|
25143 | "\n" | |||
|
25144 | " /annotate/{revision}/{path}\n" | |||
|
25145 | " ---------------------------" | |||
|
25146 | ||||
|
25147 | msgid " Show changeset information for each line in a file." | |||
|
25148 | msgstr " ファイル各行の由来リビジョンの表示。" | |||
|
25149 | ||||
|
25150 | msgid " The ``fileannotate`` template is rendered." | |||
|
25151 | msgstr " 結果出力には ``fileannotate`` テンプレートを使用します。" | |||
|
25152 | ||||
|
25153 | msgid "" | |||
|
25154 | "\n" | |||
|
25155 | " /filelog/{revision}/{path}\n" | |||
|
25156 | " --------------------------" | |||
|
25157 | msgstr "" | |||
|
25158 | "\n" | |||
|
25159 | " /filelog/{revision}/{path}\n" | |||
|
25160 | " --------------------------" | |||
|
25161 | ||||
|
25162 | msgid " Show information about the history of a file in the repository." | |||
|
25163 | msgstr " 指定ファイルの履歴の表示。" | |||
|
25164 | ||||
|
25165 | msgid "" | |||
|
25166 | " The ``revcount`` query string argument can be defined to control the\n" | |||
|
25167 | " maximum number of entries to show." | |||
|
25168 | msgstr "" | |||
|
25169 | " クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。" | |||
|
25170 | ||||
|
25171 | msgid " The ``filelog`` template will be rendered." | |||
|
25172 | msgstr " 結果出力には ``filelog`` テンプレートを使用します。" | |||
|
25173 | ||||
|
25174 | msgid "" | |||
|
25175 | "\n" | |||
|
25176 | " /archive/{revision}.{format}[/{path}]\n" | |||
|
25177 | " -------------------------------------" | |||
|
25178 | msgstr "" | |||
|
25179 | "\n" | |||
|
25180 | " /archive/{revision}.{format}[/{path}]\n" | |||
|
25181 | " -------------------------------------" | |||
|
25182 | ||||
|
25183 | msgid " Obtain an archive of repository content." | |||
|
25184 | msgstr " 特定リビジョン時点の内容のアーカイブでの取得。" | |||
|
25185 | ||||
|
25186 | msgid "" | |||
|
25187 | " The content and type of the archive is defined by a URL path parameter.\n" | |||
|
25188 | " ``format`` is the file extension of the archive type to be generated. e." | |||
|
25189 | "g.\n" | |||
|
25190 | " ``zip`` or ``tar.bz2``. Not all archive types may be allowed by your\n" | |||
|
25191 | " server configuration." | |||
|
25192 | msgstr "" | |||
|
25193 | " アーカイブの内容や種別は、 URL パス要素で指定します。 ``{format}``\n" | |||
|
25194 | " にはアーカイブのファイル拡張子を指定します (例: ``zip``, ``tar.bz2``\n" | |||
|
25195 | " )。 利用可能な種別は、 サーバ設定により異なります。" | |||
|
25196 | ||||
|
25197 | msgid "" | |||
|
25198 | " The optional ``path`` URL parameter controls content to include in the\n" | |||
|
25199 | " archive. If omitted, every file in the specified revision is present in " | |||
|
25200 | "the\n" | |||
|
25201 | " archive. If included, only the specified file or contents of the " | |||
|
25202 | "specified\n" | |||
|
25203 | " directory will be included in the archive." | |||
|
25204 | msgstr "" | |||
|
25205 | " URL パス要素 ``{path}`` は、 アーカイブ対象ファイルを指定します。\n" | |||
|
25206 | " 省略時は、 当該リビジョン時点の管理対象ファイル全てが格納されます。\n" | |||
|
25207 | " ``{path}`` 指定時は、 当該ファイル (ディレクトリ指定時は、\n" | |||
|
25208 | " 当該ディレクトリ配下のファイル) のみがアーカイブされます。" | |||
|
25209 | ||||
|
25210 | msgid "" | |||
|
25211 | " No template is used for this handler. Raw, binary content is generated." | |||
|
25212 | msgstr "" | |||
|
25213 | " この処理の結果出力では、 テンプレートを使用しません。\n" | |||
|
25214 | " アーカイブ内容そのままが出力されます。" | |||
|
25215 | ||||
|
25216 | msgid "" | |||
|
25217 | "\n" | |||
|
25218 | " /graph[/{revision}]\n" | |||
|
25219 | " -------------------" | |||
|
25220 | msgstr "" | |||
|
25221 | "\n" | |||
|
25222 | " /graph[/{revision}]\n" | |||
|
25223 | " -------------------" | |||
|
25224 | ||||
|
25225 | msgid " Show information about the graphical topology of the repository." | |||
|
25226 | msgstr " 履歴情報のグラフ表示。" | |||
|
25227 | ||||
|
25228 | msgid "" | |||
|
25229 | " Information rendered by this handler can be used to create visual\n" | |||
|
25230 | " representations of repository topology." | |||
|
25231 | msgstr " この機能は、 履歴の木構造をグラフで描画します。" | |||
|
25232 | ||||
|
25233 | msgid " The ``revision`` URL parameter controls the starting changeset." | |||
|
25234 | msgstr " URL パス要素 ``{revision}`` で、表示開始リビジョンを指定できます。" | |||
|
25235 | ||||
|
25236 | msgid "" | |||
|
25237 | " The ``revcount`` query string argument can define the number of " | |||
|
25238 | "changesets\n" | |||
|
25239 | " to show information for." | |||
|
25240 | msgstr "" | |||
|
25241 | " クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。" | |||
|
25242 | ||||
|
25243 | msgid " This handler will render the ``graph`` template." | |||
|
25244 | msgstr " 結果出力には ``graph`` テンプレートを使用します。" | |||
|
25245 | ||||
|
25246 | msgid "" | |||
|
25247 | "\n" | |||
|
25248 | " /help[/{topic}]\n" | |||
|
25249 | " ---------------" | |||
|
25250 | msgstr "" | |||
|
25251 | "\n" | |||
|
25252 | " /help[/{topic}]\n" | |||
|
25253 | " ---------------" | |||
|
25254 | ||||
|
25255 | msgid " Render help documentation." | |||
|
25256 | msgstr " ヘルプドキュメントの表示。" | |||
|
25257 | ||||
|
25258 | msgid "" | |||
|
25259 | " This web command is roughly equivalent to :hg:`help`. If a ``topic``\n" | |||
|
25260 | " is defined, that help topic will be rendered. If not, an index of\n" | |||
|
25261 | " available help topics will be rendered." | |||
|
25262 | msgstr "" | |||
|
25263 | " この機能は :hg:`help` とおおむね同等です。 URL パス要素 ``{topic}``\n" | |||
|
25264 | " が指定された場合は、 当該トピックのヘルプが表示されます。\n" | |||
|
25265 | " それ以外の場合は、 トピックの一覧が表示されます。" | |||
|
25266 | ||||
|
25267 | msgid "" | |||
|
25268 | " The ``help`` template will be rendered when requesting help for a " | |||
|
25269 | "topic.\n" | |||
|
25270 | " ``helptopics`` will be rendered for the index of help topics." | |||
|
25271 | msgstr "" | |||
|
25272 | " 特定トピックの表示には ``help`` テンプレートを使用します。\n" | |||
|
25273 | " トピック一覧の表示には ``helptopics`` テンプレートを使用します。" | |||
|
25274 | ||||
24397 | #, python-format |
|
25275 | #, python-format | |
24398 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
|
25276 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
24399 | msgstr " 更新ファイル数 %d、 追加 %d 行(+)、 削除 %d 行(-)\n" |
|
25277 | msgstr " 更新ファイル数 %d、 追加 %d 行(+)、 削除 %d 行(-)\n" | |
@@ -24534,6 +25412,10 b' msgid ".hg/sharedpath points to nonexist' | |||||
24534 | msgstr ".hg/sharedpath の参照先 %s は存在しません" |
|
25412 | msgstr ".hg/sharedpath の参照先 %s は存在しません" | |
24535 |
|
25413 | |||
24536 | #, python-format |
|
25414 | #, python-format | |
|
25415 | msgid "obsolete feature not enabled but %i markers found!\n" | |||
|
25416 | msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n" | |||
|
25417 | ||||
|
25418 | #, python-format | |||
24537 | msgid "warning: ignoring unknown working parent %s!\n" |
|
25419 | msgid "warning: ignoring unknown working parent %s!\n" | |
24538 | msgstr "警告: 作業領域の親 '%s' が未知のリビジョンです!\n" |
|
25420 | msgstr "警告: 作業領域の親 '%s' が未知のリビジョンです!\n" | |
24539 |
|
25421 | |||
@@ -24752,6 +25634,10 b' msgid "\'\\\\n\' and \'\\\\r\' disallowed in fil' | |||||
24752 | msgstr "'\\n' と '\\r' はファイル名で使用しないでください: %r" |
|
25634 | msgstr "'\\n' と '\\r' はファイル名で使用しないでください: %r" | |
24753 |
|
25635 | |||
24754 | #, python-format |
|
25636 | #, python-format | |
|
25637 | msgid "unable to read file list (%s)" | |||
|
25638 | msgstr "一覧ファイル(%s)が読み込めません" | |||
|
25639 | ||||
|
25640 | #, python-format | |||
24755 | msgid "invalid pattern (%s): %s" |
|
25641 | msgid "invalid pattern (%s): %s" | |
24756 | msgstr "不正パターン (%s): %s" |
|
25642 | msgstr "不正パターン (%s): %s" | |
24757 |
|
25643 | |||
@@ -24759,10 +25645,6 b' msgid "invalid pattern"' | |||||
24759 | msgstr "不正パターン" |
|
25645 | msgstr "不正パターン" | |
24760 |
|
25646 | |||
24761 | #, python-format |
|
25647 | #, python-format | |
24762 | msgid "unable to read file list (%s)" |
|
|||
24763 | msgstr "一覧ファイル(%s)が読み込めません" |
|
|||
24764 |
|
||||
24765 | #, python-format |
|
|||
24766 | msgid "diff context lines count must be an integer, not %r" |
|
25648 | msgid "diff context lines count must be an integer, not %r" | |
24767 | msgstr "差分コンテキストでの行数指定が不正です: %r" |
|
25649 | msgstr "差分コンテキストでの行数指定が不正です: %r" | |
24768 |
|
25650 | |||
@@ -24793,6 +25675,9 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\xa7\xa3\xe6\xb1\xba\xe4\xb8\xad\\n"' | |||||
24793 | msgid "note: merging %s and %s using bids from ancestors %s\n" |
|
25675 | msgid "note: merging %s and %s using bids from ancestors %s\n" | |
24794 | msgstr "備考: 以下の祖先の評価選考を元に %s と %s をマージ中: %s\n" |
|
25676 | msgstr "備考: 以下の祖先の評価選考を元に %s と %s をマージ中: %s\n" | |
24795 |
|
25677 | |||
|
25678 | msgid " and " | |||
|
25679 | msgstr " と " | |||
|
25680 | ||||
24796 | #, python-format |
|
25681 | #, python-format | |
24797 | msgid "" |
|
25682 | msgid "" | |
24798 | "\n" |
|
25683 | "\n" | |
@@ -24843,10 +25728,6 b' msgstr "\'hg update\' \xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd\xe3\x81\x99\xe3\x82\x8b\xe3\x81\x8b\xe3\x80\x81\'hg heads\' \xe7\xb5\x90\xe6\x9e\x9c\xe3\x82\x92\xe7\xa2\xba\xe8\xaa\x8d\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"' | |||||
24843 | msgid "use 'hg status' to list changes" |
|
25728 | msgid "use 'hg status' to list changes" | |
24844 | msgstr "変更一覧は 'hg status' で確認できます" |
|
25729 | msgstr "変更一覧は 'hg status' で確認できます" | |
24845 |
|
25730 | |||
24846 | #, python-format |
|
|||
24847 | msgid "uncommitted changes in subrepository '%s'" |
|
|||
24848 | msgstr "サブリポジトリ '%s' の変更が未コミットです" |
|
|||
24849 |
|
||||
24850 | msgid "commit and merge, or update --clean to discard changes" |
|
25731 | msgid "commit and merge, or update --clean to discard changes" | |
24851 | msgstr "コミット後にマージするか、変更を破棄 (update --clean) してください" |
|
25732 | msgstr "コミット後にマージするか、変更を破棄 (update --clean) してください" | |
24852 |
|
25733 | |||
@@ -25011,6 +25892,63 b' msgstr "\xe5\xb7\xae\xe5\x88\x86 #%d \xe3\x81\xae\xe9\x81\xa9\xe7\x94\xa8\xe6\x88\x90\xe5\x8a\x9f:%d \xe8\xa1\x8c\xe7\x9b\xae (\xe4\xbd\x8d\xe7\xbd\xae\xe8\xa3\x9c\xe6\xad\xa3 %d \xe8\xa1\x8c)\\n"' | |||||
25011 | msgid "Hunk #%d FAILED at %d\n" |
|
25892 | msgid "Hunk #%d FAILED at %d\n" | |
25012 | msgstr "差分 #%d の適用失敗:%d 行目\n" |
|
25893 | msgstr "差分 #%d の適用失敗:%d 行目\n" | |
25013 |
|
25894 | |||
|
25895 | msgid "this modifies a binary file (all or nothing)\n" | |||
|
25896 | msgstr "これはバイナリファイルに対する変更です(部分的な選択は不可能)\n" | |||
|
25897 | ||||
|
25898 | msgid "this is a binary file\n" | |||
|
25899 | msgstr "これはバイナリファイルです\n" | |||
|
25900 | ||||
|
25901 | #, python-format | |||
|
25902 | msgid "%d hunks, %d lines changed\n" | |||
|
25903 | msgstr "%d 個の差分、 %d 行の変更\n" | |||
|
25904 | ||||
|
25905 | msgid "" | |||
|
25906 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " | |||
|
25907 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " | |||
|
25908 | "changes to this &file$$ &Done, skip remaining changes and files$$ Record " | |||
|
25909 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &? " | |||
|
25910 | "(display help)" | |||
|
25911 | msgstr "" | |||
|
25912 | "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編" | |||
|
25913 | "集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)" | |||
|
25914 | "の以後の全ての変更を記録$$ 以後の全ての変更を無視=記録作業を完了(&done)$$ 以" | |||
|
25915 | "後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)" | |||
|
25916 | ||||
|
25917 | msgid "" | |||
|
25918 | "\n" | |||
|
25919 | "To remove '-' lines, make them ' ' lines (context).\n" | |||
|
25920 | "To remove '+' lines, delete them.\n" | |||
|
25921 | "Lines starting with # will be removed from the patch." | |||
|
25922 | msgstr "" | |||
|
25923 | "\n" | |||
|
25924 | "'-' 行の削除は、行の ' ' (コンテキスト行)化で行います。\n" | |||
|
25925 | "'+' 行の削除は、行自体の削除で行います。\n" | |||
|
25926 | "'#' で始まる行は、パッチから除外されます。" | |||
|
25927 | ||||
|
25928 | msgid "" | |||
|
25929 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |||
|
25930 | "added to the record list. If it does not apply cleanly, a rejects\n" | |||
|
25931 | "file will be generated: you can use that when you try again. If\n" | |||
|
25932 | "all lines of the hunk are removed, then the edit is aborted and\n" | |||
|
25933 | "the hunk is left unchanged.\n" | |||
|
25934 | msgstr "" | |||
|
25935 | "パッチ適用が成功した場合、 編集後の差分は、 記録対象に追加されます。\n" | |||
|
25936 | "適用が失敗した場合、 却下差分はファイルに保存されます。 再試行の際は、\n" | |||
|
25937 | "このファイルを利用可能です。 差分の全行が削除された場合、\n" | |||
|
25938 | "編集作業は中止され、差分はそのまま維持されます。\n" | |||
|
25939 | ||||
|
25940 | #, python-format | |||
|
25941 | msgid "examine changes to %s?" | |||
|
25942 | msgstr "%s の変更点を調べますか?" | |||
|
25943 | ||||
|
25944 | #, python-format | |||
|
25945 | msgid "record this change to '%s'?" | |||
|
25946 | msgstr "この変更を '%s' に記録しますか?" | |||
|
25947 | ||||
|
25948 | #, python-format | |||
|
25949 | msgid "record change %d/%d to '%s'?" | |||
|
25950 | msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?" | |||
|
25951 | ||||
25014 | #, python-format |
|
25952 | #, python-format | |
25015 | msgid "bad hunk #%d" |
|
25953 | msgid "bad hunk #%d" | |
25016 | msgstr "不正な差分: #%d" |
|
25954 | msgstr "不正な差分: #%d" | |
@@ -25115,8 +26053,8 b' msgid "killed by signal %d"' | |||||
25115 | msgstr "シグナル %d で強制終了されました" |
|
26053 | msgstr "シグナル %d で強制終了されました" | |
25116 |
|
26054 | |||
25117 | #, python-format |
|
26055 | #, python-format | |
25118 | msgid "unknown strip-bundle2-version value %r; " |
|
26056 | msgid "unknown strip-bundle2-version value %r; should be one of %r\n" | |
25119 | msgstr "" |
|
26057 | msgstr "strip-bundle2-version 値 %r は未知の値です; 使用可能候補は %r\n" | |
25120 |
|
26058 | |||
25121 | #, python-format |
|
26059 | #, python-format | |
25122 | msgid "saved backup bundle to %s\n" |
|
26060 | msgid "saved backup bundle to %s\n" | |
@@ -25199,7 +26137,11 b' msgstr "linkrev -1 \xe3\x81\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92 %s \xe3\x81\xab\xe8\xbf\xbd\xe5\x8a\xa0\xe3\x81\x97\xe3\x82\x88\xe3\x81\x86\xe3\x81\xa8\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"' | |||||
25199 |
|
26137 | |||
25200 | #, python-format |
|
26138 | #, python-format | |
25201 | msgid "node %s is not censored" |
|
26139 | msgid "node %s is not censored" | |
25202 | msgstr "" |
|
26140 | msgstr "ノード %s は検閲対象ではありません" | |
|
26141 | ||||
|
26142 | #, python-format | |||
|
26143 | msgid "syntax error in revset '%s'" | |||
|
26144 | msgstr "revset 記述 '%s' での文法エラー" | |||
25203 |
|
26145 | |||
25204 | #, python-format |
|
26146 | #, python-format | |
25205 | msgid "at %s: %s" |
|
26147 | msgid "at %s: %s" | |
@@ -25584,7 +26526,8 b' msgstr "%s \xe3\x81\xab\xe3\x81\xaf\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe5\x90\x8d\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"' | |||||
25584 |
|
26526 | |||
25585 | msgid "" |
|
26527 | msgid "" | |
25586 | "``follow([file])``\n" |
|
26528 | "``follow([file])``\n" | |
25587 |
" An alias for ``::.`` (ancestors of the working |
|
26529 | " An alias for ``::.`` (ancestors of the working directory's first " | |
|
26530 | "parent).\n" | |||
25588 | " If a filename is specified, the history of the given file is followed,\n" |
|
26531 | " If a filename is specified, the history of the given file is followed,\n" | |
25589 | " including copies." |
|
26532 | " including copies." | |
25590 | msgstr "" |
|
26533 | msgstr "" | |
@@ -26138,6 +27081,19 b' msgstr "sort \xe3\x81\xab\xe3\x81\xaf\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\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"' | |||||
26138 | msgid "unknown sort key %r" |
|
27081 | msgid "unknown sort key %r" | |
26139 | msgstr "未知の整列方式 %r" |
|
27082 | msgstr "未知の整列方式 %r" | |
26140 |
|
27083 | |||
|
27084 | msgid "" | |||
|
27085 | "``subrepo([pattern])``\n" | |||
|
27086 | " Changesets that add, modify or remove the given subrepo. If no subrepo\n" | |||
|
27087 | " pattern is named, any subrepo changes are returned." | |||
|
27088 | msgstr "" | |||
|
27089 | "``subrepo([pattern])``\n" | |||
|
27090 | " 指定サブリポジトリの追加、変更または削除を行ったリビジョン。\n" | |||
|
27091 | " パターン指定がない場合は、 サブリポジトリになんらかの変更を行った、\n" | |||
|
27092 | " 全てのリビジョンが列挙されます。" | |||
|
27093 | ||||
|
27094 | msgid "subrepo requires a pattern" | |||
|
27095 | msgstr "subrepo にはパターン指定が必要です" | |||
|
27096 | ||||
26141 | #, python-format |
|
27097 | #, python-format | |
26142 | msgid "invalid regular expression: %s" |
|
27098 | msgid "invalid regular expression: %s" | |
26143 | msgstr "不正な正規表現: %s" |
|
27099 | msgstr "不正な正規表現: %s" | |
@@ -26195,6 +27151,10 b' msgstr ""' | |||||
26195 | " ユーザ名そのものが `re:` で始まる場合は、 ユーザ名を `literal:`\n" |
|
27151 | " ユーザ名そのものが `re:` で始まる場合は、 ユーザ名を `literal:`\n" | |
26196 | " 付きで指定してください。" |
|
27152 | " 付きで指定してください。" | |
26197 |
|
27153 | |||
|
27154 | #. i18n: "wdir" is a keyword | |||
|
27155 | msgid "wdir takes no arguments" | |||
|
27156 | msgstr "wdir には引数が指定できません" | |||
|
27157 | ||||
26198 | msgid "can't negate that" |
|
27158 | msgid "can't negate that" | |
26199 | msgstr "負値にできません" |
|
27159 | msgstr "負値にできません" | |
26200 |
|
27160 | |||
@@ -26432,16 +27392,16 b' msgid "(in subrepo %s)"' | |||||
26432 | msgstr "(サブリポジトリ %s で発生)" |
|
27392 | msgstr "(サブリポジトリ %s で発生)" | |
26433 |
|
27393 | |||
26434 | #, python-format |
|
27394 | #, python-format | |
26435 | msgid "warning: subrepo spec file %s not found\n" |
|
27395 | msgid "warning: subrepo spec file '%s' not found\n" | |
26436 | msgstr "警告: サブリポジトリの spec ファイル %s が見つかりません\n" |
|
27396 | msgstr "警告: サブリポジトリの spec ファイル '%s' が見つかりません\n" | |
26437 |
|
27397 | |||
26438 | #, python-format |
|
27398 | #, python-format | |
26439 | msgid "subrepo spec file %s not found" |
|
27399 | msgid "subrepo spec file '%s' not found" | |
26440 | msgstr "サブリポジトリの spec ファイル %s が見つかりません" |
|
27400 | msgstr "サブリポジトリの spec ファイル '%s' が見つかりません" | |
26441 |
|
27401 | |||
26442 | #, python-format |
|
27402 | #, python-format | |
26443 |
msgid "invalid subrepository revision specifier in |
|
27403 | msgid "invalid subrepository revision specifier in '%s' line %d" | |
26444 |
msgstr " |
|
27404 | msgstr "'%s' の %d 行目におけるサブリポジトリのリビジョン指定が不正です" | |
26445 |
|
27405 | |||
26446 | #, python-format |
|
27406 | #, python-format | |
26447 | msgid "bad subrepository pattern in %s: %s" |
|
27407 | msgid "bad subrepository pattern in %s: %s" | |
@@ -26518,6 +27478,10 b' msgstr "%s \xe3\x83\x95\xe3\x82\xa7\xe3\x83\xbc\xe3\x82\xba\xe3\x81\xa7\xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x81\xaf\xe3\x80\x81%s \xe3\x81\xaa\xe3\x82\xb5\xe3\x83\x96\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %s \xe3\x81\xa8\xe7\x9f\x9b\xe7\x9b\xbe\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"' | |||||
26518 | msgid "warning: changes are committed in %s phase from subrepository %s\n" |
|
27478 | msgid "warning: changes are committed in %s phase from subrepository %s\n" | |
26519 | msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n" |
|
27479 | msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n" | |
26520 |
|
27480 | |||
|
27481 | #, python-format | |||
|
27482 | msgid "uncommitted changes in subrepository '%s'" | |||
|
27483 | msgstr "サブリポジトリ '%s' の変更が未コミットです" | |||
|
27484 | ||||
26521 | msgid "addremove is not supported" |
|
27485 | msgid "addremove is not supported" | |
26522 | msgstr "addremove はサポートされていません" |
|
27486 | msgstr "addremove はサポートされていません" | |
26523 |
|
27487 | |||
@@ -26639,9 +27603,6 b' msgstr "\xe3\x82\xa8\xe3\x83\xb3\xe3\x83\x88\xe3\x83\xaa\xe3\x82\x92\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x82\x81\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
26639 | msgid "node '%s' is not well formed" |
|
27603 | msgid "node '%s' is not well formed" | |
26640 | msgstr "'%s' というノードはフォーマットが不適切です" |
|
27604 | msgstr "'%s' というノードはフォーマットが不適切です" | |
26641 |
|
27605 | |||
26642 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" |
|
|||
26643 | msgstr ".hg/cache/tags が無効なため再構築中\n" |
|
|||
26644 |
|
||||
26645 | msgid "" |
|
27606 | msgid "" | |
26646 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" |
|
27607 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
26647 | " every line except the last." |
|
27608 | " every line except the last." | |
@@ -26741,6 +27702,9 b' msgstr ""' | |||||
26741 | msgid ":localdate: Date. Converts a date to local date." |
|
27702 | msgid ":localdate: Date. Converts a date to local date." | |
26742 | msgstr ":localdate: 日時情報。 日時情報をローカルタイムゾーンに変換します。" |
|
27703 | msgstr ":localdate: 日時情報。 日時情報をローカルタイムゾーンに変換します。" | |
26743 |
|
27704 | |||
|
27705 | msgid ":lower: Any text. Converts the text to lowercase." | |||
|
27706 | msgstr ":lower: 文字列。 文字列を小文字に変換します。" | |||
|
27707 | ||||
26744 | msgid ":nonempty: Any text. Returns '(none)' if the string is empty." |
|
27708 | msgid ":nonempty: Any text. Returns '(none)' if the string is empty." | |
26745 | msgstr ":nonempty: 文字列。 与えられた文字列が空の場合 '(none)'となります。" |
|
27709 | msgstr ":nonempty: 文字列。 与えられた文字列が空の場合 '(none)'となります。" | |
26746 |
|
27710 | |||
@@ -26844,6 +27808,9 b' msgid ""' | |||||
26844 | " except the first starting with a tab character." |
|
27808 | " except the first starting with a tab character." | |
26845 | msgstr ":tabindent: 文字列。 最初の行以外の非空行をタブ文字で字下げします。" |
|
27809 | msgstr ":tabindent: 文字列。 最初の行以外の非空行をタブ文字で字下げします。" | |
26846 |
|
27810 | |||
|
27811 | msgid ":upper: Any text. Converts the text to uppercase." | |||
|
27812 | msgstr ":upper: 文字列。 文字列を大文字に変換します。" | |||
|
27813 | ||||
26847 | msgid "" |
|
27814 | msgid "" | |
26848 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" |
|
27815 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" | |
26849 | " \"foo bar\" becomes \"foo%20bar\"." |
|
27816 | " \"foo bar\" becomes \"foo%20bar\"." | |
@@ -27028,14 +27995,35 b' msgstr "\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xab\xe3\x82\xbf\xe6\x8c\x87\xe5\xae\x9a \'%s\' \xe3\x81\xaf\xe3\x82\xad\xe3\x83\xbc\xe3\x83\xaf\xe3\x83\xbc\xe3\x83\x89 \'%s\' \xe3\x81\xa8\xe4\xba\x92\xe6\x8f\x9b\xe6\x80\xa7\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"' | |||||
27028 | msgid "filter %s expects one argument" |
|
27995 | msgid "filter %s expects one argument" | |
27029 | msgstr "フィルタ %s は引数が1つ必要です" |
|
27996 | msgstr "フィルタ %s は引数が1つ必要です" | |
27030 |
|
27997 | |||
|
27998 | msgid "" | |||
|
27999 | ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n" | |||
|
28000 | " strings." | |||
|
28001 | msgstr "" | |||
|
28002 | ":date(date[, fmt]): 日付を文字列化します。 文字列化フォーマットの詳細は\n" | |||
|
28003 | " :hg:`help dates` を参照してください" | |||
|
28004 | ||||
27031 | #. i18n: "date" is a keyword |
|
28005 | #. i18n: "date" is a keyword | |
27032 | msgid "date expects one or two arguments" |
|
28006 | msgid "date expects one or two arguments" | |
27033 | msgstr "date の引数は1つまたは2つです" |
|
28007 | msgstr "date の引数は1つまたは2つです" | |
27034 |
|
28008 | |||
|
28009 | msgid "" | |||
|
28010 | ":diff([includepattern [, excludepattern]]): Show a diff, optionally\n" | |||
|
28011 | " specifying files to include or exclude." | |||
|
28012 | msgstr "" | |||
|
28013 | ":diff([includepattern [, excludepattern]]): 差分を表示します。\n" | |||
|
28014 | " 表示対象/除外対象ファイルのパターンを指定が可能です。" | |||
|
28015 | ||||
27035 | #. i18n: "diff" is a keyword |
|
28016 | #. i18n: "diff" is a keyword | |
27036 | msgid "diff expects one, two or no arguments" |
|
28017 | msgid "diff expects one, two or no arguments" | |
27037 | msgstr "diff の引数は最大2つです" |
|
28018 | msgstr "diff の引数は最大2つです" | |
27038 |
|
28019 | |||
|
28020 | msgid "" | |||
|
28021 | ":fill(text[, width[, initialident[, hangindent]]]): Fill many\n" | |||
|
28022 | " paragraphs with optional indentation. See the \"fill\" filter." | |||
|
28023 | msgstr "" | |||
|
28024 | ":fill(text[, width[, initialident[, hangindent]]]): 指定の字下げ形式で、\n" | |||
|
28025 | " パラグラフ群を字下げします。 \"fill\" フィルタも参照してください。" | |||
|
28026 | ||||
27039 | #. i18n: "fill" is a keyword |
|
28027 | #. i18n: "fill" is a keyword | |
27040 | msgid "fill expects one to four arguments" |
|
28028 | msgid "fill expects one to four arguments" | |
27041 | msgstr "fill の引数は1つから4つの間です" |
|
28029 | msgstr "fill の引数は1つから4つの間です" | |
@@ -27044,10 +28032,25 b' msgstr "fill \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf1\xe3\x81\xa4\xe3\x81\x8b\xe3\x82\x894\xe3\x81\xa4\xe3\x81\xae\xe9\x96\x93\xe3\x81\xa7\xe3\x81\x99"' | |||||
27044 | msgid "fill expects an integer width" |
|
28032 | msgid "fill expects an integer width" | |
27045 | msgstr "fill には数値を指定してください" |
|
28033 | msgstr "fill には数値を指定してください" | |
27046 |
|
28034 | |||
|
28035 | msgid "" | |||
|
28036 | ":pad(text, width[, fillchar=' '[, right=False]]): Pad text with a\n" | |||
|
28037 | " fill character." | |||
|
28038 | msgstr "" | |||
|
28039 | ":pad(text, width[, fillchar=' '[, right=False]]): fillchar 文字で\n" | |||
|
28040 | " text を width 幅に字詰めします。" | |||
|
28041 | ||||
27047 | #. i18n: "pad" is a keyword |
|
28042 | #. i18n: "pad" is a keyword | |
27048 | msgid "pad() expects two to four arguments" |
|
28043 | msgid "pad() expects two to four arguments" | |
27049 | msgstr "pad() の引数は2つから4つの間です" |
|
28044 | msgstr "pad() の引数は2つから4つの間です" | |
27050 |
|
28045 | |||
|
28046 | msgid "" | |||
|
28047 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" | |||
|
28048 | " are complex types. This function allows you to obtain the value of an\n" | |||
|
28049 | " attribute on these type." | |||
|
28050 | msgstr "" | |||
|
28051 | ":get(dict, key): dict から key 相当の情報を取得します。 この関数により、\n" | |||
|
28052 | " 複雑な形式を持つオブジェクトから、 情報を取得することができます。" | |||
|
28053 | ||||
27051 | #. i18n: "get" is a keyword |
|
28054 | #. i18n: "get" is a keyword | |
27052 | msgid "get() expects two arguments" |
|
28055 | msgid "get() expects two arguments" | |
27053 | msgstr "get() の引数は2つです" |
|
28056 | msgstr "get() の引数は2つです" | |
@@ -27056,46 +28059,116 b' msgstr "get() \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf2\xe3\x81\xa4\xe3\x81\xa7\xe3\x81\x99"' | |||||
27056 | msgid "get() expects a dict as first argument" |
|
28059 | msgid "get() expects a dict as first argument" | |
27057 | msgstr "get() の第1引数には辞書を指定してください" |
|
28060 | msgstr "get() の第1引数には辞書を指定してください" | |
27058 |
|
28061 | |||
|
28062 | msgid "" | |||
|
28063 | ":if(expr, then[, else]): Conditionally execute based on the result of\n" | |||
|
28064 | " an expression." | |||
|
28065 | msgstr "" | |||
|
28066 | ":if(expr, then[, else]): expr 結果に応じて then または else を実施します。" | |||
|
28067 | ||||
27059 | #. i18n: "if" is a keyword |
|
28068 | #. i18n: "if" is a keyword | |
27060 | msgid "if expects two or three arguments" |
|
28069 | msgid "if expects two or three arguments" | |
27061 | msgstr "if は2または3の引数が必要です" |
|
28070 | msgstr "if は2または3の引数が必要です" | |
27062 |
|
28071 | |||
|
28072 | msgid "" | |||
|
28073 | ":ifcontains(search, thing, then[, else]): Conditionally execute based\n" | |||
|
28074 | " on whether the item \"search\" is in \"thing\"." | |||
|
28075 | msgstr "" | |||
|
28076 | ":ifcontains(search, thing, then[, else]): \"search\" 結果が \"thing\"\n" | |||
|
28077 | " に含まれるか否かに応じて then または else を実施します。" | |||
|
28078 | ||||
27063 | #. i18n: "ifcontains" is a keyword |
|
28079 | #. i18n: "ifcontains" is a keyword | |
27064 | msgid "ifcontains expects three or four arguments" |
|
28080 | msgid "ifcontains expects three or four arguments" | |
27065 | msgstr "ifcontains は3または4の引数が必要です" |
|
28081 | msgstr "ifcontains は3または4の引数が必要です" | |
27066 |
|
28082 | |||
|
28083 | msgid "" | |||
|
28084 | ":ifeq(expr1, expr2, then[, else]): Conditionally execute based on\n" | |||
|
28085 | " whether 2 items are equivalent." | |||
|
28086 | msgstr "" | |||
|
28087 | ":ifeq(expr1, expr2, then[, else]): expr1 と expr2 の一致状況に応じて\n" | |||
|
28088 | " then または else を実施します。" | |||
|
28089 | ||||
27067 | #. i18n: "ifeq" is a keyword |
|
28090 | #. i18n: "ifeq" is a keyword | |
27068 | msgid "ifeq expects three or four arguments" |
|
28091 | msgid "ifeq expects three or four arguments" | |
27069 | msgstr "ifeq は3または4の引数が必要です" |
|
28092 | msgstr "ifeq は3または4の引数が必要です" | |
27070 |
|
28093 | |||
|
28094 | msgid ":join(list, sep): Join items in a list with a delimiter." | |||
|
28095 | msgstr ":join(list, sep): list 中の要素を sep で連結します。" | |||
|
28096 | ||||
27071 | #. i18n: "join" is a keyword |
|
28097 | #. i18n: "join" is a keyword | |
27072 | msgid "join expects one or two arguments" |
|
28098 | msgid "join expects one or two arguments" | |
27073 | msgstr "join の引数は1つまたは2つです" |
|
28099 | msgstr "join の引数は1つまたは2つです" | |
27074 |
|
28100 | |||
|
28101 | msgid "" | |||
|
28102 | ":label(label, expr): Apply a label to generated content. Content with\n" | |||
|
28103 | " a label applied can result in additional post-processing, such as\n" | |||
|
28104 | " automatic colorization." | |||
|
28105 | msgstr "" | |||
|
28106 | ":label(label, expr): expr の結果出力に label を付与します。\n" | |||
|
28107 | " label の付与は、 表示への色付け等の、 出力加工処理で使用されます。" | |||
|
28108 | ||||
|
28109 | msgid "" | |||
|
28110 | ":revset(query[, formatargs...]): Execute a revision set query. See\n" | |||
|
28111 | " :hg:`help revset`." | |||
|
28112 | msgstr "" | |||
|
28113 | ":revset(query[, formatargs...]): revset 記述による問い合わせを実行します。\n" | |||
|
28114 | " 詳細は :hg:`help revset` を参照してください。" | |||
|
28115 | ||||
27075 | #. i18n: "revset" is a keyword |
|
28116 | #. i18n: "revset" is a keyword | |
27076 | msgid "revset expects one or more arguments" |
|
28117 | msgid "revset expects one or more arguments" | |
27077 | msgstr "revset の引数は1つまたは2つです" |
|
28118 | msgstr "revset の引数は1つまたは2つです" | |
27078 |
|
28119 | |||
|
28120 | msgid ":rstdoc(text, style): Format ReStructuredText." | |||
|
28121 | msgstr ":rstdoc(text, style): 出力を ReStructuredText として整形します。" | |||
|
28122 | ||||
27079 | #. i18n: "rstdoc" is a keyword |
|
28123 | #. i18n: "rstdoc" is a keyword | |
27080 | msgid "rstdoc expects two arguments" |
|
28124 | msgid "rstdoc expects two arguments" | |
27081 | msgstr "rstdoc の引数は2つです" |
|
28125 | msgstr "rstdoc の引数は2つです" | |
27082 |
|
28126 | |||
|
28127 | msgid "" | |||
|
28128 | ":shortest(node, minlength=4): Obtain the shortest representation of\n" | |||
|
28129 | " a node." | |||
|
28130 | msgstr "" | |||
|
28131 | ":shortest(node, minlength=4): node リビジョンを特定可能な、\n" | |||
|
28132 | " 最短のハッシュ値識別子を算出します。" | |||
|
28133 | ||||
27083 | #. i18n: "shortest" is a keyword |
|
28134 | #. i18n: "shortest" is a keyword | |
27084 | msgid "shortest() expects one or two arguments" |
|
28135 | msgid "shortest() expects one or two arguments" | |
27085 | msgstr "shortest() の引数は1つまたは2つです" |
|
28136 | msgstr "shortest() の引数は1つまたは2つです" | |
27086 |
|
28137 | |||
|
28138 | msgid ":strip(text[, chars]): Strip characters from a string." | |||
|
28139 | msgstr "" | |||
|
28140 | ":strip(text[, chars]): chars 中の文字を text 両端から除外します。\n" | |||
|
28141 | " (※ 訳注: chars 無指定の場合は、 空白文字を除外)" | |||
|
28142 | ||||
27087 | #. i18n: "strip" is a keyword |
|
28143 | #. i18n: "strip" is a keyword | |
27088 | msgid "strip expects one or two arguments" |
|
28144 | msgid "strip expects one or two arguments" | |
27089 | msgstr "strip の引数は1つまたは2つです" |
|
28145 | msgstr "strip の引数は1つまたは2つです" | |
27090 |
|
28146 | |||
|
28147 | msgid "" | |||
|
28148 | ":sub(pattern, replacement, expression): Perform text substitution\n" | |||
|
28149 | " using regular expressions." | |||
|
28150 | msgstr "" | |||
|
28151 | ":sub(pattern, replacement, expression): 正規表現により文字列を置換します。" | |||
|
28152 | ||||
27091 | #. i18n: "sub" is a keyword |
|
28153 | #. i18n: "sub" is a keyword | |
27092 | msgid "sub expects three arguments" |
|
28154 | msgid "sub expects three arguments" | |
27093 | msgstr "sub は引数が3つ必要です" |
|
28155 | msgstr "sub は引数が3つ必要です" | |
27094 |
|
28156 | |||
|
28157 | msgid "" | |||
|
28158 | ":startswith(pattern, text): Returns the value from the \"text\" argument\n" | |||
|
28159 | " if it begins with the content from the \"pattern\" argument." | |||
|
28160 | msgstr "" | |||
|
28161 | ":startswith(pattern, text): text 冒頭が pattern と一致する場合は text を、\n" | |||
|
28162 | " それ以外の場合は空白文字を返却します。" | |||
|
28163 | ||||
27095 | #. i18n: "startswith" is a keyword |
|
28164 | #. i18n: "startswith" is a keyword | |
27096 | msgid "startswith expects two arguments" |
|
28165 | msgid "startswith expects two arguments" | |
27097 | msgstr "startswith の引数は2つです" |
|
28166 | msgstr "startswith の引数は2つです" | |
27098 |
|
28167 | |||
|
28168 | msgid ":word(number, text[, separator]): Return the nth word from a string." | |||
|
28169 | msgstr "" | |||
|
28170 | ":word(number, text[, separator]): text の冒頭 number 個の単語を抽出します。" | |||
|
28171 | ||||
27099 | #. i18n: "word" is a keyword |
|
28172 | #. i18n: "word" is a keyword | |
27100 | #, python-format |
|
28173 | #, python-format | |
27101 | msgid "word expects two or three arguments, got %d" |
|
28174 | msgid "word expects two or three arguments, got %d" | |
@@ -27152,7 +28225,7 b' msgid "couldn\'t read journal entry %r!\\n' | |||||
27152 | msgstr "ジャーナルファイル中のエントリ %r の解析に失敗\n" |
|
28225 | msgstr "ジャーナルファイル中のエントリ %r の解析に失敗\n" | |
27153 |
|
28226 | |||
27154 | msgid "journal was created by a different version of Mercurial\n" |
|
28227 | msgid "journal was created by a different version of Mercurial\n" | |
27155 |
msgstr "ジャーナルファイルは異なる版の |
|
28228 | msgstr "ジャーナルファイルは異なる版の Mercurial で作成されたものです\n" | |
27156 |
|
28229 | |||
27157 | msgid "already have changeset " |
|
28230 | msgid "already have changeset " | |
27158 | msgstr "既にあるリビジョンです " |
|
28231 | msgstr "既にあるリビジョンです " | |
@@ -27250,6 +28323,12 b' msgstr "\xe6\x83\xb3\xe5\xae\x9a\xe5\xa4\x96\xe3\x81\xae %s: \xe6\x83\xb3\xe5\xae\x9a %s \xe3\x81\xab\xe5\xaf\xbe\xe3\x81\x97\xe3\x81\xa6\xe5\xae\x9f\xe9\x9a\x9b\xe3\x81\xaf %s"' | |||||
27250 | msgid "command '%s' failed: %s" |
|
28323 | msgid "command '%s' failed: %s" | |
27251 | msgstr "コマンド '%s' が失敗: %s" |
|
28324 | msgstr "コマンド '%s' が失敗: %s" | |
27252 |
|
28325 | |||
|
28326 | msgid "linking" | |||
|
28327 | msgstr "ハードリンク中" | |||
|
28328 | ||||
|
28329 | msgid "copying" | |||
|
28330 | msgstr "コピー中" | |||
|
28331 | ||||
27253 | msgid "filename ends with '\\', which is invalid on Windows" |
|
28332 | msgid "filename ends with '\\', which is invalid on Windows" | |
27254 | msgstr "ファイル名の末尾が、 Windows 上で不正な文字 '\\' です" |
|
28333 | msgstr "ファイル名の末尾が、 Windows 上で不正な文字 '\\' です" | |
27255 |
|
28334 | |||
@@ -27540,7 +28619,7 b' msgid "unpacked size is %s, %s expected"' | |||||
27540 | msgstr "展開後サイズ %s は想定外です(期待値:%s)" |
|
28619 | msgstr "展開後サイズ %s は想定外です(期待値:%s)" | |
27541 |
|
28620 | |||
27542 | msgid "censored file data" |
|
28621 | msgid "censored file data" | |
27543 | msgstr "" |
|
28622 | msgstr "検閲対象ファイル" | |
27544 |
|
28623 | |||
27545 | #, python-format |
|
28624 | #, python-format | |
27546 | msgid "unpacking %s" |
|
28625 | msgid "unpacking %s" |
This diff has been collapsed as it changes many lines, (1796 lines changed) Show them Hide them | |||||
@@ -31,10 +31,10 b' msgid ""' | |||||
31 | msgstr "" |
|
31 | msgstr "" | |
32 | "Project-Id-Version: Mercurial\n" |
|
32 | "Project-Id-Version: Mercurial\n" | |
33 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
33 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
34 |
"POT-Creation-Date: 2015-0 |
|
34 | "POT-Creation-Date: 2015-04-22 23:06-0300\n" | |
35 |
"PO-Revision-Date: 2015-0 |
|
35 | "PO-Revision-Date: 2015-04-22 23:07-0300\n" | |
36 | "Last-Translator: Wagner Bruna <wbruna@softwareexpress.com.br>\n" |
|
36 | "Last-Translator: Wagner Bruna <wbruna@softwareexpress.com.br>\n" | |
37 |
"Language-Team: |
|
37 | "Language-Team: Brazilian Portuguese <>\n" | |
38 | "MIME-Version: 1.0\n" |
|
38 | "MIME-Version: 1.0\n" | |
39 | "Content-Type: text/plain; charset=UTF-8\n" |
|
39 | "Content-Type: text/plain; charset=UTF-8\n" | |
40 | "Content-Transfer-Encoding: 8bit\n" |
|
40 | "Content-Transfer-Encoding: 8bit\n" | |
@@ -1242,6 +1242,121 b' msgstr "gancho do tipo %s n\xc3\xa3o passa um id de revis\xc3\xa3o"' | |||||
1242 | msgid "Bugzilla error: %s" |
|
1242 | msgid "Bugzilla error: %s" | |
1243 | msgstr "Erro do Bugzilla: %s" |
|
1243 | msgstr "Erro do Bugzilla: %s" | |
1244 |
|
1244 | |||
|
1245 | msgid "erase file content at a given revision" | |||
|
1246 | msgstr "apaga conteúdo de arquivos na revisão pedida" | |||
|
1247 | ||||
|
1248 | msgid "" | |||
|
1249 | "The censor command instructs Mercurial to erase all content of a file at a given\n" | |||
|
1250 | "revision *without updating the changeset hash.* This allows existing history to\n" | |||
|
1251 | "remain valid while preventing future clones/pulls from receiving the erased\n" | |||
|
1252 | "data." | |||
|
1253 | msgstr "" | |||
|
1254 | "O comando censor faz com que o Mercurial apague o conteúdo de um\n" | |||
|
1255 | "arquivo em uma determinada revisão *sem alterar o hash da revisão*.\n" | |||
|
1256 | "Isso impede que clones ou pulls futuros recebam os dados apagados\n" | |||
|
1257 | "sem a necessidade de invalidar o histórico existente." | |||
|
1258 | ||||
|
1259 | msgid "" | |||
|
1260 | "Typical uses for censor are due to security or legal requirements, " | |||
|
1261 | "including::" | |||
|
1262 | msgstr "" | |||
|
1263 | "Usos típicos do comando censor envolvem exigências legais ou de segurança, " | |||
|
1264 | "incluindo::" | |||
|
1265 | ||||
|
1266 | msgid "" | |||
|
1267 | " * Passwords, private keys, crytographic material\n" | |||
|
1268 | " * Licensed data/code/libraries for which the license has expired\n" | |||
|
1269 | " * Personally Identifiable Information or other private data" | |||
|
1270 | msgstr "" | |||
|
1271 | " * Senhas, chaves privadas, material criptográfico\n" | |||
|
1272 | " * Código, bibliotecas ou dados licenciados cuja licença expirou\n" | |||
|
1273 | " * Informações Pessoalmente Identificáveis (PII) ou outros dados privados" | |||
|
1274 | ||||
|
1275 | msgid "" | |||
|
1276 | "Censored file revisions are listed in a tracked file called .hgcensored stored\n" | |||
|
1277 | "in the repository root. The censor command adds an entry to the .hgcensored file\n" | |||
|
1278 | "in the working directory and commits it (much like ``hg tag`` and .hgtags). The\n" | |||
|
1279 | "censored file data is then replaced with a pointer to the new commit, enabling\n" | |||
|
1280 | "verification." | |||
|
1281 | msgstr "" | |||
|
1282 | "Revisões de arquivo censuradas são listadas em um arquivo rastreado\n" | |||
|
1283 | "chamado .hgcensored, armazenado no raiz do repositório. O comando\n" | |||
|
1284 | "censor adiciona uma entrada ao arquivo .hgcensored e o consolida\n" | |||
|
1285 | "(de forma bastante similar a ``hg tag`` e .hgtags). Os dados do arquivo\n" | |||
|
1286 | "censurado são então substituídos por um ponteiro para a nova revisão,\n" | |||
|
1287 | "possibilitando verificação." | |||
|
1288 | ||||
|
1289 | msgid "" | |||
|
1290 | "Censored nodes can interrupt mercurial's typical operation whenever the excised\n" | |||
|
1291 | "data needs to be materialized. Some commands, like ``hg cat``/``hg revert``,\n" | |||
|
1292 | "simply fail when asked to produce censored data. Others, like ``hg verify`` and\n" | |||
|
1293 | "``hg update``, must be capable of tolerating censored data to continue to\n" | |||
|
1294 | "function in a meaningful way. Such commands only tolerate censored file\n" | |||
|
1295 | "revisions if they are allowed by the policy specified by the \"censor.allow\"\n" | |||
|
1296 | "config option.\n" | |||
|
1297 | msgstr "" | |||
|
1298 | "Nós censurados podem interromper a operação típica do Mercurial\n" | |||
|
1299 | "a qualquer momento em que os dados extirpados precisarem ser\n" | |||
|
1300 | "materializados. Alguns comandos, como ``hg cat`` e ``hg revert``,\n" | |||
|
1301 | "simplesmente falham se dados censurados forem solicitados.\n" | |||
|
1302 | "Outros, como ``hg verify`` e ``hg update``, devem ser capazes\n" | |||
|
1303 | "de tolerar dados censurados para funcionar adequadamente.\n" | |||
|
1304 | "Tais comandos tolerarão revisões de arquivos censuradas se\n" | |||
|
1305 | "isso for permitido pela política especificada pela opção de\n" | |||
|
1306 | "configuração \"censor.allow\".\n" | |||
|
1307 | ||||
|
1308 | msgid "REV" | |||
|
1309 | msgstr "REV" | |||
|
1310 | ||||
|
1311 | msgid "censor file from specified revision" | |||
|
1312 | msgstr "censura o arquivo na revisão especificada" | |||
|
1313 | ||||
|
1314 | msgid "TEXT" | |||
|
1315 | msgstr "TEXTO" | |||
|
1316 | ||||
|
1317 | msgid "replacement tombstone data" | |||
|
1318 | msgstr "dados da \"lápide\" usada para substituição" | |||
|
1319 | ||||
|
1320 | msgid "-r REV [-t TEXT] [FILE]" | |||
|
1321 | msgstr "-r REV [-t TEXTO] [ARQUIVO]" | |||
|
1322 | ||||
|
1323 | msgid "must specify file path to censor" | |||
|
1324 | msgstr "deve ser especificado um caminho para o arquivo a ser censurado" | |||
|
1325 | ||||
|
1326 | msgid "must specify revision to censor" | |||
|
1327 | msgstr "deve ser especificada uma revisão a ser censurada" | |||
|
1328 | ||||
|
1329 | msgid "cannot censor file with no history" | |||
|
1330 | msgstr "não é possível censurar um arquivo sem histórico" | |||
|
1331 | ||||
|
1332 | #, python-format | |||
|
1333 | msgid "invalid revision identifier %s" | |||
|
1334 | msgstr "identificador de revisão %s inválido" | |||
|
1335 | ||||
|
1336 | #, python-format | |||
|
1337 | msgid "file does not exist at revision %s" | |||
|
1338 | msgstr "o arquivo não existe na revisão %s" | |||
|
1339 | ||||
|
1340 | #, python-format | |||
|
1341 | msgid "cannot censor file in heads (%s)" | |||
|
1342 | msgstr "não é possível censurar um arquivo em cabeças (%s)" | |||
|
1343 | ||||
|
1344 | msgid "clean/delete and commit first" | |||
|
1345 | msgstr "limpe ou apague e consolide primeiro" | |||
|
1346 | ||||
|
1347 | msgid "cannot censor working directory" | |||
|
1348 | msgstr "não é possível censurar o diretório de trabalho" | |||
|
1349 | ||||
|
1350 | msgid "clean/delete/update first" | |||
|
1351 | msgstr "limpe, apague ou atualize primeiro" | |||
|
1352 | ||||
|
1353 | #, python-format | |||
|
1354 | msgid "censor does not support revlog version %d" | |||
|
1355 | msgstr "censor não suporta o revlog na versão %d" | |||
|
1356 | ||||
|
1357 | msgid "censor tombstone must be no longer than censored data" | |||
|
1358 | msgstr "lápide de censura não pode ser maior que os dados censurados" | |||
|
1359 | ||||
1245 | msgid "command to display child changesets (DEPRECATED)" |
|
1360 | msgid "command to display child changesets (DEPRECATED)" | |
1246 | msgstr "comando para exibir revisões filhas (OBSOLETO)" |
|
1361 | msgstr "comando para exibir revisões filhas (OBSOLETO)" | |
1247 |
|
1362 | |||
@@ -1252,9 +1367,6 b' msgstr ""' | |||||
1252 | "Esta extensão é obsoleta. Você deve usar :hg:`log -r\n" |
|
1367 | "Esta extensão é obsoleta. Você deve usar :hg:`log -r\n" | |
1253 | "\"children(REV)\"` em seu lugar.\n" |
|
1368 | "\"children(REV)\"` em seu lugar.\n" | |
1254 |
|
1369 | |||
1255 | msgid "REV" |
|
|||
1256 | msgstr "REV" |
|
|||
1257 |
|
||||
1258 | msgid "show children of the specified revision" |
|
1370 | msgid "show children of the specified revision" | |
1259 | msgstr "exibe o filho de uma revisão especifica" |
|
1371 | msgstr "exibe o filho de uma revisão especifica" | |
1260 |
|
1372 | |||
@@ -1301,6 +1413,9 b' msgstr "conta a frequ\xc3\xaancia das revis\xc3\xb5es que casem com a data especificada"' | |||||
1301 | msgid "TEMPLATE" |
|
1413 | msgid "TEMPLATE" | |
1302 | msgstr "MODELO" |
|
1414 | msgstr "MODELO" | |
1303 |
|
1415 | |||
|
1416 | msgid "template to group changesets (DEPRECATED)" | |||
|
1417 | msgstr "modelo para agrupar as revisões (OBSOLETO)" | |||
|
1418 | ||||
1304 | msgid "template to group changesets" |
|
1419 | msgid "template to group changesets" | |
1305 | msgstr "modelo para agrupar as revisões" |
|
1420 | msgstr "modelo para agrupar as revisões" | |
1306 |
|
1421 | |||
@@ -1700,7 +1815,7 b' msgid ""' | |||||
1700 | "emit codes that less doesn't understand. You can work around this by\n" |
|
1815 | "emit codes that less doesn't understand. You can work around this by\n" | |
1701 | "either using ansi mode (or auto mode), or by using less -r (which will\n" |
|
1816 | "either using ansi mode (or auto mode), or by using less -r (which will\n" | |
1702 | "pass through all terminal control codes, not just color control\n" |
|
1817 | "pass through all terminal control codes, not just color control\n" | |
1703 |
"codes). |
|
1818 | "codes)." | |
1704 | msgstr "" |
|
1819 | msgstr "" | |
1705 | "Note que, em alguns sistemas, o modo terminfo pode causar problemas ao\n" |
|
1820 | "Note que, em alguns sistemas, o modo terminfo pode causar problemas ao\n" | |
1706 | "usar coloração com a extensão pager e less -R. O comando less com a\n" |
|
1821 | "usar coloração com a extensão pager e less -R. O comando less com a\n" | |
@@ -1708,7 +1823,31 b' msgstr ""' | |||||
1708 | "pode por vezes emitir códigos não suportados pelo comando less.\n" |
|
1823 | "pode por vezes emitir códigos não suportados pelo comando less.\n" | |
1709 | "Para evitar esse problema, você pode usar o modo ansi (ou o modo auto)\n" |
|
1824 | "Para evitar esse problema, você pode usar o modo ansi (ou o modo auto)\n" | |
1710 | "ou o comando less -r (que propagará todos os códigos de terminal, não\n" |
|
1825 | "ou o comando less -r (que propagará todos os códigos de terminal, não\n" | |
1711 |
"apenas códigos de controle de cores). |
|
1826 | "apenas códigos de controle de cores)." | |
|
1827 | ||||
|
1828 | msgid "" | |||
|
1829 | "On some systems (such as MSYS in Windows), the terminal may support\n" | |||
|
1830 | "a different color mode than the pager (activated via the \"pager\"\n" | |||
|
1831 | "extension). It is possible to define separate modes depending on whether\n" | |||
|
1832 | "the pager is active::" | |||
|
1833 | msgstr "" | |||
|
1834 | "Em alguns sistemas (por exemplo MSYS no Windows), o terminal pode\n" | |||
|
1835 | "suportar um modo de coloração diferente do pager (ativado pela \n" | |||
|
1836 | "extensão \"pager\"). É possível definir modos diferentes dependentes\n" | |||
|
1837 | "da ativação do pager::" | |||
|
1838 | ||||
|
1839 | msgid "" | |||
|
1840 | " [color]\n" | |||
|
1841 | " mode = auto\n" | |||
|
1842 | " pagermode = ansi" | |||
|
1843 | msgstr "" | |||
|
1844 | " [color]\n" | |||
|
1845 | " mode = auto\n" | |||
|
1846 | " pagermode = ansi" | |||
|
1847 | ||||
|
1848 | msgid "If ``pagermode`` is not defined, the ``mode`` will be used.\n" | |||
|
1849 | msgstr "" | |||
|
1850 | "Se ``pagermode`` não estiver definido, a configuração ``mode`` será usada.\n" | |||
1712 |
|
1851 | |||
1713 | msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n" |
|
1852 | msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n" | |
1714 | msgstr "" |
|
1853 | msgstr "" | |
@@ -3094,19 +3233,19 b' msgstr ""' | |||||
3094 |
|
3233 | |||
3095 | msgid "" |
|
3234 | msgid "" | |
3096 | "The extension reads its configuration from a versioned ``.hgeol``\n" |
|
3235 | "The extension reads its configuration from a versioned ``.hgeol``\n" | |
3097 |
"configuration file found in the root of the working |
|
3236 | "configuration file found in the root of the working directory. The\n" | |
3098 | "``.hgeol`` file use the same syntax as all other Mercurial\n" |
|
3237 | "``.hgeol`` file use the same syntax as all other Mercurial\n" | |
3099 | "configuration files. It uses two sections, ``[patterns]`` and\n" |
|
3238 | "configuration files. It uses two sections, ``[patterns]`` and\n" | |
3100 | "``[repository]``." |
|
3239 | "``[repository]``." | |
3101 | msgstr "" |
|
3240 | msgstr "" | |
3102 | "A extensão lê sua configuração de um arquivo versionado chamado\n" |
|
3241 | "A extensão lê sua configuração de um arquivo versionado chamado\n" | |
3103 |
"``.hgeol`` localizado no raiz d |
|
3242 | "``.hgeol`` localizado no raiz do diretório de trabalho. O arquivo\n" | |
3104 | "``.hgeol`` usa a mesma sintaxe que outros arquivos de configuração\n" |
|
3243 | "``.hgeol`` usa a mesma sintaxe que outros arquivos de configuração\n" | |
3105 | "do Mercurial. Ele usa duas seções, ``[patterns]`` e ``[repository]``." |
|
3244 | "do Mercurial. Ele usa duas seções, ``[patterns]`` e ``[repository]``." | |
3106 |
|
3245 | |||
3107 | msgid "" |
|
3246 | msgid "" | |
3108 | "The ``[patterns]`` section specifies how line endings should be\n" |
|
3247 | "The ``[patterns]`` section specifies how line endings should be\n" | |
3109 |
"converted between the working |
|
3248 | "converted between the working directory and the repository. The format is\n" | |
3110 | "specified by a file pattern. The first match is used, so put more\n" |
|
3249 | "specified by a file pattern. The first match is used, so put more\n" | |
3111 | "specific patterns first. The available line endings are ``LF``,\n" |
|
3250 | "specific patterns first. The available line endings are ``LF``,\n" | |
3112 | "``CRLF``, and ``BIN``." |
|
3251 | "``CRLF``, and ``BIN``." | |
@@ -3188,10 +3327,10 b' msgstr ""' | |||||
3188 |
|
3327 | |||
3189 | msgid "" |
|
3328 | msgid "" | |
3190 | " The rules will first apply when files are touched in the working\n" |
|
3329 | " The rules will first apply when files are touched in the working\n" | |
3191 |
" |
|
3330 | " directory, e.g. by updating to null and back to tip to touch all files." | |
3192 | msgstr "" |
|
3331 | msgstr "" | |
3193 | " As regras passarão a ser aplicadas a partir do momento em que os\n" |
|
3332 | " As regras passarão a ser aplicadas a partir do momento em que os\n" | |
3194 |
" arquivos forem mexidos n |
|
3333 | " arquivos forem mexidos no diretório de trabalho, por exemplo após um\n" | |
3195 | " update para null e de volta para a revisão atual para mexer em\n" |
|
3334 | " update para null e de volta para a revisão atual para mexer em\n" | |
3196 | " todos os arquivos." |
|
3335 | " todos os arquivos." | |
3197 |
|
3336 | |||
@@ -3640,10 +3779,11 b' msgstr ""' | |||||
3640 | " Devolve 0 para indicar sucesso.\n" |
|
3779 | " Devolve 0 para indicar sucesso.\n" | |
3641 | " " |
|
3780 | " " | |
3642 |
|
3781 | |||
3643 |
msgid "working dir not at branch tip |
|
3782 | msgid "working directory not at branch tip" | |
3644 | msgstr "" |
|
3783 | msgstr "diretório de trabalho não está na tip do ramo" | |
3645 | "o diretório de trabalho não está na tip do ramo (use \"hg update\" para " |
|
3784 | ||
3646 | "obter a tip do ramo)" |
|
3785 | msgid "use \"hg update\" to check out branch tip" | |
|
3786 | msgstr "use \"hg update\" para obter a tip do ramo" | |||
3647 |
|
3787 | |||
3648 | msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" |
|
3788 | msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" | |
3649 | msgstr "múltiplas cabeças nesse ramo (use \"hg heads .\" e \"hg merge\" para mesclar" |
|
3789 | msgstr "múltiplas cabeças nesse ramo (use \"hg heads .\" e \"hg merge\" para mesclar" | |
@@ -3735,9 +3875,6 b' msgstr "ID"' | |||||
3735 | msgid "the key id to sign with" |
|
3875 | msgid "the key id to sign with" | |
3736 | msgstr "o id da chave com a qual assinar" |
|
3876 | msgstr "o id da chave com a qual assinar" | |
3737 |
|
3877 | |||
3738 | msgid "TEXT" |
|
|||
3739 | msgstr "TEXTO" |
|
|||
3740 |
|
||||
3741 | msgid "use text as commit message" |
|
3878 | msgid "use text as commit message" | |
3742 | msgstr "usa o texto como mensagem de consolidação" |
|
3879 | msgstr "usa o texto como mensagem de consolidação" | |
3743 |
|
3880 | |||
@@ -4041,14 +4178,14 b' msgstr "procura"' | |||||
4041 | msgid "diff trees from two commits" |
|
4178 | msgid "diff trees from two commits" | |
4042 | msgstr "calcula a diferença entre duas revisões" |
|
4179 | msgstr "calcula a diferença entre duas revisões" | |
4043 |
|
4180 | |||
4044 |
msgid " |
|
4181 | msgid "REV REV" | |
4045 |
msgstr " |
|
4182 | msgstr "REV REV" | |
4046 |
|
4183 | |||
4047 | msgid "output common ancestor information" |
|
4184 | msgid "output common ancestor information" | |
4048 | msgstr "exibe informação de ancestral comum" |
|
4185 | msgstr "exibe informação de ancestral comum" | |
4049 |
|
4186 | |||
4050 |
msgid " |
|
4187 | msgid "[OPTION]... TYPE FILE" | |
4051 |
msgstr " |
|
4188 | msgstr "[OPÇÃO]... TIPO ARQUIVO" | |
4052 |
|
4189 | |||
4053 | msgid "cat a specific revision" |
|
4190 | msgid "cat a specific revision" | |
4054 | msgstr "copia para a saída uma revisão específica" |
|
4191 | msgstr "copia para a saída uma revisão específica" | |
@@ -4059,16 +4196,6 b' msgstr "cat-file: tipo ou revis\xc3\xa3o n\xc3\xa3o fornecido\\n"' | |||||
4059 | msgid "aborting hg cat-file only understands commits\n" |
|
4196 | msgid "aborting hg cat-file only understands commits\n" | |
4060 | msgstr "abortando; hg cat-file entende apenas commits\n" |
|
4197 | msgstr "abortando; hg cat-file entende apenas commits\n" | |
4061 |
|
4198 | |||
4062 | #. i18n: bisect changeset status |
|
|||
4063 | msgid "ignored" |
|
|||
4064 | msgstr "ignorado" |
|
|||
4065 |
|
||||
4066 | msgid "hg debug-rev-parse REV" |
|
|||
4067 | msgstr "hg debug-rev-parse REV" |
|
|||
4068 |
|
||||
4069 | msgid "parse given revisions" |
|
|||
4070 | msgstr "decodifica as revisões dadas" |
|
|||
4071 |
|
||||
4072 | msgid "header" |
|
4199 | msgid "header" | |
4073 | msgstr "cabeçalho" |
|
4200 | msgstr "cabeçalho" | |
4074 |
|
4201 | |||
@@ -4084,20 +4211,14 b' msgstr "n\xc3\xbamero m\xc3\xa1ximo"' | |||||
4084 | msgid "print revisions" |
|
4211 | msgid "print revisions" | |
4085 | msgstr "imprime as revisões" |
|
4212 | msgstr "imprime as revisões" | |
4086 |
|
4213 | |||
4087 | msgid "hg debug-config" |
|
|||
4088 | msgstr "hg debug-config" |
|
|||
4089 |
|
||||
4090 | msgid "print extension options" |
|
|||
4091 | msgstr "imprime opções da extensão" |
|
|||
4092 |
|
||||
4093 | msgid "NUM" |
|
4214 | msgid "NUM" | |
4094 | msgstr "NÚMERO" |
|
4215 | msgstr "NÚMERO" | |
4095 |
|
4216 | |||
4096 | msgid "limit number of changes displayed" |
|
4217 | msgid "limit number of changes displayed" | |
4097 | msgstr "número limite de mudanças exibidas" |
|
4218 | msgstr "número limite de mudanças exibidas" | |
4098 |
|
4219 | |||
4099 |
msgid " |
|
4220 | msgid "[-l LIMIT] [REVRANGE]" | |
4100 |
msgstr " |
|
4221 | msgstr "[-l LIMITE] [SEQUÊNCIADEREVISÕES]" | |
4101 |
|
4222 | |||
4102 | msgid "start interactive history viewer" |
|
4223 | msgid "start interactive history viewer" | |
4103 | msgstr "inicia um visualizador de histórico interativo" |
|
4224 | msgstr "inicia um visualizador de histórico interativo" | |
@@ -4394,12 +4515,28 b' msgid ""' | |||||
4394 | "If you run ``hg histedit --outgoing`` on the clone then it is the same\n" |
|
4515 | "If you run ``hg histedit --outgoing`` on the clone then it is the same\n" | |
4395 | "as running ``hg histedit 836302820282``. If you need plan to push to a\n" |
|
4516 | "as running ``hg histedit 836302820282``. If you need plan to push to a\n" | |
4396 | "repository that Mercurial does not detect to be related to the source\n" |
|
4517 | "repository that Mercurial does not detect to be related to the source\n" | |
4397 |
"repo, you can add a ``--force`` option. |
|
4518 | "repo, you can add a ``--force`` option." | |
4398 | msgstr "" |
|
4519 | msgstr "" | |
4399 | "Rodar ``hg histedit --outgoing`` no clone será o mesmo que rodar\n" |
|
4520 | "Rodar ``hg histedit --outgoing`` no clone será o mesmo que rodar\n" | |
4400 | "``hg histedit 836302820282``. Caso você pretenda enviar revisões para\n" |
|
4521 | "``hg histedit 836302820282``. Caso você pretenda enviar revisões para\n" | |
4401 | "um repositório que o Mercurial detectar como não relacionado ao de\n" |
|
4522 | "um repositório que o Mercurial detectar como não relacionado ao de\n" | |
4402 |
"origem, você pode adicionar uma opção ``--force``. |
|
4523 | "origem, você pode adicionar uma opção ``--force``." | |
|
4524 | ||||
|
4525 | msgid "" | |||
|
4526 | "Histedit rule lines are truncated to 80 characters by default. You\n" | |||
|
4527 | "can customise this behaviour by setting a different length in your\n" | |||
|
4528 | "configuration file::" | |||
|
4529 | msgstr "" | |||
|
4530 | "As linhas de edição de histórico são por padrão truncadas em 80\n" | |||
|
4531 | "caracteres. Você pode personalizar este comportamento definindo\n" | |||
|
4532 | "um comprimento diferente em seu arquivo de configuração::" | |||
|
4533 | ||||
|
4534 | msgid "" | |||
|
4535 | " [histedit]\n" | |||
|
4536 | " linelen = 120 # truncate rule lines at 120 characters\n" | |||
|
4537 | msgstr "" | |||
|
4538 | " [histedit]\n" | |||
|
4539 | " linelen = 120 # trunca linhas de edição em 120 caracteres\n" | |||
4403 |
|
4540 | |||
4404 | #. i18n: command names and abbreviations must remain untranslated |
|
4541 | #. i18n: command names and abbreviations must remain untranslated | |
4405 | #, python-format |
|
4542 | #, python-format | |
@@ -4433,6 +4570,10 b' msgstr ""' | |||||
4433 | msgid "no histedit in progress" |
|
4570 | msgid "no histedit in progress" | |
4434 | msgstr "nenhuma edição de histórico em andamento" |
|
4571 | msgstr "nenhuma edição de histórico em andamento" | |
4435 |
|
4572 | |||
|
4573 | #, python-format | |||
|
4574 | msgid "unknown changeset %s listed" | |||
|
4575 | msgstr "revisão desconhecida %s listada" | |||
|
4576 | ||||
4436 | msgid "Fix up the change and run hg histedit --continue" |
|
4577 | msgid "Fix up the change and run hg histedit --continue" | |
4437 | msgstr "Conserte a mudança e execute hg histedit --continue" |
|
4578 | msgstr "Conserte a mudança e execute hg histedit --continue" | |
4438 |
|
4579 | |||
@@ -4448,8 +4589,11 b' msgstr ""' | |||||
4448 | "Quando tiver terminado, execute hg histedit --continue para retomar." |
|
4589 | "Quando tiver terminado, execute hg histedit --continue para retomar." | |
4449 |
|
4590 | |||
4450 | #, python-format |
|
4591 | #, python-format | |
4451 | msgid "%s: empty changeset" |
|
4592 | msgid "" | |
4452 | msgstr "%s: revisão vazia" |
|
4593 | "%s: cannot fold - working copy is not a descendant of previous commit %s\n" | |
|
4594 | msgstr "" | |||
|
4595 | "%s: não é possível combinar - a cópia de trabalho não é um descendente da " | |||
|
4596 | "revisão anterior %s\n" | |||
4453 |
|
4597 | |||
4454 | #, python-format |
|
4598 | #, python-format | |
4455 | msgid "comparing with %s\n" |
|
4599 | msgid "comparing with %s\n" | |
@@ -4464,12 +4608,15 b' msgstr "algumas revis\xc3\xb5es a serem enviadas s\xc3\xa3o amb\xc3\xadguas"' | |||||
4464 | msgid "see \"hg help histedit\" for more detail" |
|
4608 | msgid "see \"hg help histedit\" for more detail" | |
4465 | msgstr "veja \"hg help histedit\" para mais detalhes" |
|
4609 | msgstr "veja \"hg help histedit\" para mais detalhes" | |
4466 |
|
4610 | |||
4467 |
msgid " |
|
4611 | msgid "read history edits from the specified file" | |
4468 |
msgstr " |
|
4612 | msgstr "lê alterações de histórico a partir do arquivo especificado" | |
4469 |
|
4613 | |||
4470 | msgid "continue an edit already in progress" |
|
4614 | msgid "continue an edit already in progress" | |
4471 | msgstr "continua uma edição em andamento" |
|
4615 | msgstr "continua uma edição em andamento" | |
4472 |
|
4616 | |||
|
4617 | msgid "edit remaining actions list" | |||
|
4618 | msgstr "edita a lista de ações restante" | |||
|
4619 | ||||
4473 | msgid "don't strip old nodes after edit is complete" |
|
4620 | msgid "don't strip old nodes after edit is complete" | |
4474 | msgstr "não remove nós antigos após o término da edição" |
|
4621 | msgstr "não remove nós antigos após o término da edição" | |
4475 |
|
4622 | |||
@@ -4551,6 +4698,9 b' msgstr "--continue n\xc3\xa3o recebe argumentos adicionais"' | |||||
4551 | msgid "no arguments allowed with --abort" |
|
4698 | msgid "no arguments allowed with --abort" | |
4552 | msgstr "--abort não recebe argumentos adicionais" |
|
4699 | msgstr "--abort não recebe argumentos adicionais" | |
4553 |
|
4700 | |||
|
4701 | msgid "only --commands argument allowed with --edit-plan" | |||
|
4702 | msgstr "só o argumento de --commands pode ser usado com --edit-plan" | |||
|
4703 | ||||
4554 | msgid "history edit already in progress, try --continue or --abort" |
|
4704 | msgid "history edit already in progress, try --continue or --abort" | |
4555 | msgstr "" |
|
4705 | msgstr "" | |
4556 | "uma edição de histórico já está em progresso, tente --continue ou --abort" |
|
4706 | "uma edição de histórico já está em progresso, tente --continue ou --abort" | |
@@ -4571,8 +4721,8 b' msgstr "As revis\xc3\xb5es especificadas devem ter exatamente uma raiz comum"' | |||||
4571 | msgid "%s is not an ancestor of working directory" |
|
4721 | msgid "%s is not an ancestor of working directory" | |
4572 | msgstr "%s não é um ancestral do diretório de trabalho" |
|
4722 | msgstr "%s não é um ancestral do diretório de trabalho" | |
4573 |
|
4723 | |||
4574 | msgid "use \"histedit --abort\" to clear broken state" |
|
4724 | msgid "working copy still dirty" | |
4575 | msgstr "use \"histedit --abort\" para limpar o estado quebrado" |
|
4725 | msgstr "a cópia de trabalho ainda está suja" | |
4576 |
|
4726 | |||
4577 | msgid "cannot edit history that would orphan nodes" |
|
4727 | msgid "cannot edit history that would orphan nodes" | |
4578 | msgstr "não é possível editar histórico de forma a produzir nós órfãos" |
|
4728 | msgstr "não é possível editar histórico de forma a produzir nós órfãos" | |
@@ -4588,10 +4738,6 b' msgstr "n\xc3\xa3o \xc3\xa9 poss\xc3\xadvel editar uma revis\xc3\xa3o imut\xc3\xa1vel: %s"' | |||||
4588 | msgid "malformed line \"%s\"" |
|
4738 | msgid "malformed line \"%s\"" | |
4589 | msgstr "linha malformada \"%s\"" |
|
4739 | msgstr "linha malformada \"%s\"" | |
4590 |
|
4740 | |||
4591 | #, python-format |
|
|||
4592 | msgid "unknown changeset %s listed" |
|
|||
4593 | msgstr "revisão desconhecida %s listada" |
|
|||
4594 |
|
||||
4595 | msgid "may not use changesets other than the ones listed" |
|
4741 | msgid "may not use changesets other than the ones listed" | |
4596 | msgstr "não é possível usar revisões além das listadas" |
|
4742 | msgstr "não é possível usar revisões além das listadas" | |
4597 |
|
4743 | |||
@@ -4614,6 +4760,10 b' msgstr "voc\xc3\xaa gostaria de usar a a\xc3\xa7\xc3\xa3o drop?"' | |||||
4614 | msgid "histedit: moving bookmarks %s from %s to %s\n" |
|
4760 | msgid "histedit: moving bookmarks %s from %s to %s\n" | |
4615 | msgstr "histedit: movendo marcadores %s de %s para %s\n" |
|
4761 | msgstr "histedit: movendo marcadores %s de %s para %s\n" | |
4616 |
|
4762 | |||
|
4763 | #, python-format | |||
|
4764 | msgid "histedit in progress, can't strip %s" | |||
|
4765 | msgstr "edição de histórico em andamento, não é possível remover %s" | |||
|
4766 | ||||
4617 | #. i18n: column positioning for "hg summary" |
|
4767 | #. i18n: column positioning for "hg summary" | |
4618 | #, python-format |
|
4768 | #, python-format | |
4619 | msgid "hist: %s (histedit --continue)\n" |
|
4769 | msgid "hist: %s (histedit --continue)\n" | |
@@ -5446,9 +5596,6 b' msgstr "removendo %s\\n"' | |||||
5446 | msgid "--normal cannot be used with --large" |
|
5596 | msgid "--normal cannot be used with --large" | |
5447 | msgstr "--normal não pode ser usado com --large" |
|
5597 | msgstr "--normal não pode ser usado com --large" | |
5448 |
|
5598 | |||
5449 | msgid "uncommitted changes" |
|
|||
5450 | msgstr "alterações não consolidadas" |
|
|||
5451 |
|
||||
5452 | #, python-format |
|
5599 | #, python-format | |
5453 | msgid "" |
|
5600 | msgid "" | |
5454 | "remote turned local normal file %s into a largefile\n" |
|
5601 | "remote turned local normal file %s into a largefile\n" | |
@@ -5503,6 +5650,9 b' msgstr ""' | |||||
5503 | "largefile %s não encontrado no armazenamento do repositório nem no cache de " |
|
5650 | "largefile %s não encontrado no armazenamento do repositório nem no cache de " | |
5504 | "sistema" |
|
5651 | "sistema" | |
5505 |
|
5652 | |||
|
5653 | msgid "uncommitted changes" | |||
|
5654 | msgstr "alterações não consolidadas" | |||
|
5655 | ||||
5506 | #, python-format |
|
5656 | #, python-format | |
5507 | msgid "not removing %s: file is already untracked\n" |
|
5657 | msgid "not removing %s: file is already untracked\n" | |
5508 | msgstr "%s não removido: arquivo já não é rastreado\n" |
|
5658 | msgstr "%s não removido: arquivo já não é rastreado\n" | |
@@ -5854,8 +6004,11 b' msgstr "aplicando %s\\n"' | |||||
5854 | msgid "unable to read %s\n" |
|
6004 | msgid "unable to read %s\n" | |
5855 | msgstr "impossível ler %s\n" |
|
6005 | msgstr "impossível ler %s\n" | |
5856 |
|
6006 | |||
5857 |
msgid "local changes found |
|
6007 | msgid "conflicting local changes found" | |
5858 | msgstr "mudanças locais encontradas, você deve executar qrefresh primeiro" |
|
6008 | msgstr "mudanças locais conflitantes encontradas" | |
|
6009 | ||||
|
6010 | msgid "did you forget to qrefresh?" | |||
|
6011 | msgstr "você esqueceu de executar qrefresh?" | |||
5859 |
|
6012 | |||
5860 | #, python-format |
|
6013 | #, python-format | |
5861 | msgid "patch %s is empty\n" |
|
6014 | msgid "patch %s is empty\n" | |
@@ -5867,7 +6020,7 b' msgstr "qpush duplicaria com exatid\xc3\xa3o uma revis\xc3\xa3o filha"' | |||||
5867 | msgid "repository commit failed" |
|
6020 | msgid "repository commit failed" | |
5868 | msgstr "consolidação no repositório falhou" |
|
6021 | msgstr "consolidação no repositório falhou" | |
5869 |
|
6022 | |||
5870 | msgid "patch failed, rejects left in working dir\n" |
|
6023 | msgid "patch failed, rejects left in working directory\n" | |
5871 | msgstr "o patch falhou, rejeitos deixados no diretório de trabalho\n" |
|
6024 | msgstr "o patch falhou, rejeitos deixados no diretório de trabalho\n" | |
5872 |
|
6025 | |||
5873 | msgid "fuzz found when applying patch, stopping\n" |
|
6026 | msgid "fuzz found when applying patch, stopping\n" | |
@@ -5910,6 +6063,9 b' msgstr "nenhum patch aplicado"' | |||||
5910 | msgid "working directory revision is not qtip" |
|
6063 | msgid "working directory revision is not qtip" | |
5911 | msgstr "a revisão do diretório de trabalho não é a qtip" |
|
6064 | msgstr "a revisão do diretório de trabalho não é a qtip" | |
5912 |
|
6065 | |||
|
6066 | msgid "local changes found, refresh first" | |||
|
6067 | msgstr "mudanças locais encontradas, você deve executar qrefresh primeiro" | |||
|
6068 | ||||
5913 | msgid "local changed subrepos found, refresh first" |
|
6069 | msgid "local changed subrepos found, refresh first" | |
5914 | msgstr "" |
|
6070 | msgstr "" | |
5915 | "encontrados sub-repositórios modificados localmente, você deve executar " |
|
6071 | "encontrados sub-repositórios modificados localmente, você deve executar " | |
@@ -8729,81 +8885,6 b' msgid "commands to interactively select ' | |||||
8729 | msgstr "" |
|
8885 | msgstr "" | |
8730 | "comandos para selecionar interativamente mudanças em um commit ou qrefresh" |
|
8886 | "comandos para selecionar interativamente mudanças em um commit ou qrefresh" | |
8731 |
|
8887 | |||
8732 | msgid "this modifies a binary file (all or nothing)\n" |
|
|||
8733 | msgstr "isto modifica um arquivo binário (tudo ou nada)\n" |
|
|||
8734 |
|
||||
8735 | msgid "this is a binary file\n" |
|
|||
8736 | msgstr "este é um arquivo binário\n" |
|
|||
8737 |
|
||||
8738 | #, python-format |
|
|||
8739 | msgid "%d hunks, %d lines changed\n" |
|
|||
8740 | msgstr "%d trechos, %d linhas modificadas\n" |
|
|||
8741 |
|
||||
8742 | msgid "" |
|
|||
8743 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " |
|
|||
8744 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " |
|
|||
8745 | "changes to this &file$$ &Done, skip remaining changes and files$$ Record " |
|
|||
8746 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &? " |
|
|||
8747 | "(display help)" |
|
|||
8748 | msgstr "" |
|
|||
8749 | "[Ynesfdaq?]$$ (&Y) sim, grave esta mudança$$ &Não, descarte esta mudança$$ " |
|
|||
8750 | "&Edite esta mudança manualmente$$ De&Scarte as mudanças restantes neste " |
|
|||
8751 | "arquivo$$ (&F) grave as mudanças restantes deste arquivo$$ Termina&Do, " |
|
|||
8752 | "descarte as mudanças e arquivos restantes$$ Grave tod&As as mudanças de " |
|
|||
8753 | "todos os arquivos restantes$$ (&Q) encerra, sem gravar nenhuma mudança$$ &? " |
|
|||
8754 | "(exibe a ajuda)" |
|
|||
8755 |
|
||||
8756 | msgid "cannot edit patch for whole file" |
|
|||
8757 | msgstr "não é possível editar um patch para o arquivo inteiro" |
|
|||
8758 |
|
||||
8759 | msgid "cannot edit patch for binary file" |
|
|||
8760 | msgstr "não é possível editar um patch para um arquivo binário" |
|
|||
8761 |
|
||||
8762 | msgid "" |
|
|||
8763 | "\n" |
|
|||
8764 | "To remove '-' lines, make them ' ' lines (context).\n" |
|
|||
8765 | "To remove '+' lines, delete them.\n" |
|
|||
8766 | "Lines starting with # will be removed from the patch." |
|
|||
8767 | msgstr "" |
|
|||
8768 | "\n" |
|
|||
8769 | "Para remover linhas '-', marque-as como linhas ' ' (contexto).\n" |
|
|||
8770 | "Para remover linhas '+', apague-as.\n" |
|
|||
8771 | "Linhas iniciadas por '#' serão removidas do patch." |
|
|||
8772 |
|
||||
8773 | msgid "" |
|
|||
8774 | "If the patch applies cleanly, the edited hunk will immediately be\n" |
|
|||
8775 | "added to the record list. If it does not apply cleanly, a rejects\n" |
|
|||
8776 | "file will be generated: you can use that when you try again. If\n" |
|
|||
8777 | "all lines of the hunk are removed, then the edit is aborted and\n" |
|
|||
8778 | "the hunk is left unchanged.\n" |
|
|||
8779 | msgstr "" |
|
|||
8780 | "Se o patch aplicar de forma limpa, o trecho editado será adicionado\n" |
|
|||
8781 | "imediatamente à lista de gravação. Se o patch não aplicar de forma\n" |
|
|||
8782 | "limpa, um arquivo de rejeitos será gerado: você poderá usar esse\n" |
|
|||
8783 | "arquivo ao tentar novamente. Se todas as linhas do trecho forem\n" |
|
|||
8784 | "removidas, a edição será abortada e o trecho não será modificado.\n" |
|
|||
8785 |
|
||||
8786 | msgid "edit failed" |
|
|||
8787 | msgstr "falha ao editar" |
|
|||
8788 |
|
||||
8789 | msgid "user quit" |
|
|||
8790 | msgstr "usuário encerrou" |
|
|||
8791 |
|
||||
8792 | #, python-format |
|
|||
8793 | msgid "examine changes to %s?" |
|
|||
8794 | msgstr "examinar mudanças em %s?" |
|
|||
8795 |
|
||||
8796 | msgid " and " |
|
|||
8797 | msgstr " e " |
|
|||
8798 |
|
||||
8799 | #, python-format |
|
|||
8800 | msgid "record this change to '%s'?" |
|
|||
8801 | msgstr "gravar esta mudança em '%s'?" |
|
|||
8802 |
|
||||
8803 | #, python-format |
|
|||
8804 | msgid "record change %d/%d to '%s'?" |
|
|||
8805 | msgstr "gravar mudança %d/%d em '%s'?" |
|
|||
8806 |
|
||||
8807 | msgid "hg record [OPTION]... [FILE]..." |
|
8888 | msgid "hg record [OPTION]... [FILE]..." | |
8808 | msgstr "hg record [OPÇÃO]... [ARQUIVO]..." |
|
8889 | msgstr "hg record [OPÇÃO]... [ARQUIVO]..." | |
8809 |
|
8890 | |||
@@ -8878,20 +8959,6 b' msgstr ""' | |||||
8878 | msgid "'mq' extension not loaded" |
|
8959 | msgid "'mq' extension not loaded" | |
8879 | msgstr "extensão 'mq' não carregada" |
|
8960 | msgstr "extensão 'mq' não carregada" | |
8880 |
|
8961 | |||
8881 | #, python-format |
|
|||
8882 | msgid "running non-interactively, use %s instead" |
|
|||
8883 | msgstr "não está executando interativamente, use %s" |
|
|||
8884 |
|
||||
8885 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" |
|
|||
8886 | msgstr "não é possível consolidar parcialmente uma mesclagem (use \"hg commit\")" |
|
|||
8887 |
|
||||
8888 | #, python-format |
|
|||
8889 | msgid "error parsing patch: %s" |
|
|||
8890 | msgstr "erro decodificando patch: %s" |
|
|||
8891 |
|
||||
8892 | msgid "no changes to record\n" |
|
|||
8893 | msgstr "nenhuma mudança a ser gravada\n" |
|
|||
8894 |
|
||||
8895 | msgid "interactively select changes to refresh" |
|
8962 | msgid "interactively select changes to refresh" | |
8896 | msgstr "seleciona interativamente alterações para atualização do patch" |
|
8963 | msgstr "seleciona interativamente alterações para atualização do patch" | |
8897 |
|
8964 | |||
@@ -9084,8 +9151,8 b' msgstr "esquema personalizado %s:// conf' | |||||
9084 | msgid "share a common history between several working directories" |
|
9151 | msgid "share a common history between several working directories" | |
9085 | msgstr "compartilha histórico comum entre vários diretórios de trabalho" |
|
9152 | msgstr "compartilha histórico comum entre vários diretórios de trabalho" | |
9086 |
|
9153 | |||
9087 |
msgid "do not create a working |
|
9154 | msgid "do not create a working directory" | |
9088 |
msgstr "não cria um |
|
9155 | msgstr "não cria um diretório de trabalho" | |
9089 |
|
9156 | |||
9090 | msgid "also share bookmarks" |
|
9157 | msgid "also share bookmarks" | |
9091 | msgstr "compartilha também marcadores" |
|
9158 | msgstr "compartilha também marcadores" | |
@@ -9350,6 +9417,9 b' msgstr "usa o nome fornecido para a revis\xc3\xa3o da shelve"' | |||||
9350 | msgid "show patch" |
|
9417 | msgid "show patch" | |
9351 | msgstr "mostra o patch" |
|
9418 | msgstr "mostra o patch" | |
9352 |
|
9419 | |||
|
9420 | msgid "interactive mode, only works while creating a shelve(EXPERIMENTAL)" | |||
|
9421 | msgstr "modo interativo, funciona apenas ao criar uma shelve (EXPERIMENTAL)" | |||
|
9422 | ||||
9353 | msgid "output diffstat-style summary of changes" |
|
9423 | msgid "output diffstat-style summary of changes" | |
9354 | msgstr "imprime sumário de mudanças no estilo diffstat" |
|
9424 | msgstr "imprime sumário de mudanças no estilo diffstat" | |
9355 |
|
9425 | |||
@@ -9445,10 +9515,6 b' msgstr ""' | |||||
9445 | "descendentes do histórico do repositório. Veja a ajuda do\n" |
|
9515 | "descendentes do histórico do repositório. Veja a ajuda do\n" | |
9446 | "comando para mais detalhes.\n" |
|
9516 | "comando para mais detalhes.\n" | |
9447 |
|
9517 | |||
9448 | #, python-format |
|
|||
9449 | msgid "uncommitted changes in subrepository %s" |
|
|||
9450 | msgstr "mudanças não consolidadas no sub-repositório %s" |
|
|||
9451 |
|
||||
9452 | msgid "local changes found" |
|
9518 | msgid "local changes found" | |
9453 | msgstr "mudanças locais encontradas" |
|
9519 | msgstr "mudanças locais encontradas" | |
9454 |
|
9520 | |||
@@ -9479,8 +9545,8 b' msgstr "sem c\xc3\xb3pias de seguran\xc3\xa7a (OBSOLETO)"' | |||||
9479 | msgid "ignored (DEPRECATED)" |
|
9545 | msgid "ignored (DEPRECATED)" | |
9480 | msgstr "ignorado (OBSOLETO)" |
|
9546 | msgstr "ignorado (OBSOLETO)" | |
9481 |
|
9547 | |||
9482 |
msgid "do not modify working |
|
9548 | msgid "do not modify working directory during strip" | |
9483 |
msgstr "não modifica |
|
9549 | msgstr "não modifica o diretório de trabalho durante o strip" | |
9484 |
|
9550 | |||
9485 | msgid "remove revs only reachable from given bookmark" |
|
9551 | msgid "remove revs only reachable from given bookmark" | |
9486 | msgstr "remove revisões alcançáveis apenas pelo marcador dado" |
|
9552 | msgstr "remove revisões alcançáveis apenas pelo marcador dado" | |
@@ -9621,7 +9687,7 b' msgid "transplant log file is corrupt"' | |||||
9621 | msgstr "arquivo de log de transplante corrompido" |
|
9687 | msgstr "arquivo de log de transplante corrompido" | |
9622 |
|
9688 | |||
9623 | #, python-format |
|
9689 | #, python-format | |
9624 | msgid "working dir not at transplant parent %s" |
|
9690 | msgid "working directory not at transplant parent %s" | |
9625 | msgstr "diretório de trabalho não está no pai do transplante %s" |
|
9691 | msgstr "diretório de trabalho não está no pai do transplante %s" | |
9626 |
|
9692 | |||
9627 | msgid "commit failed" |
|
9693 | msgid "commit failed" | |
@@ -10122,12 +10188,40 b' msgstr "importando marcador %s\\n"' | |||||
10122 | msgid "divergent bookmark %s stored as %s\n" |
|
10188 | msgid "divergent bookmark %s stored as %s\n" | |
10123 | msgstr "marcador divergente %s guardado como %s\n" |
|
10189 | msgstr "marcador divergente %s guardado como %s\n" | |
10124 |
|
10190 | |||
|
10191 | #, python-format | |||
|
10192 | msgid "warning: failed to assign numbered name to divergent bookmark %s\n" | |||
|
10193 | msgstr "aviso: falha ao atribuir nome numerado para o marcador divergente %s\n" | |||
|
10194 | ||||
10125 | msgid "searching for changed bookmarks\n" |
|
10195 | msgid "searching for changed bookmarks\n" | |
10126 | msgstr "procurando por marcadores modificados\n" |
|
10196 | msgstr "procurando por marcadores modificados\n" | |
10127 |
|
10197 | |||
|
10198 | #. i18n: "added" refers to a bookmark | |||
|
10199 | #. i18n: "added refers to a bookmark | |||
|
10200 | msgid "added" | |||
|
10201 | msgstr "adicionado" | |||
|
10202 | ||||
|
10203 | #. i18n: "advanced" refers to a bookmark | |||
|
10204 | msgid "advanced" | |||
|
10205 | msgstr "avançado" | |||
|
10206 | ||||
|
10207 | #. i18n: "diverged" refers to a bookmark | |||
|
10208 | msgid "diverged" | |||
|
10209 | msgstr "divergente" | |||
|
10210 | ||||
|
10211 | #. i18n: "changed" refers to a bookmark | |||
|
10212 | msgid "changed" | |||
|
10213 | msgstr "modificado" | |||
|
10214 | ||||
10128 | msgid "no changed bookmarks found\n" |
|
10215 | msgid "no changed bookmarks found\n" | |
10129 | msgstr "nenhum marcador modificado encontrado\n" |
|
10216 | msgstr "nenhum marcador modificado encontrado\n" | |
10130 |
|
10217 | |||
|
10218 | #. i18n: "deleted" refers to a bookmark | |||
|
10219 | msgid "deleted" | |||
|
10220 | msgstr "apagado" | |||
|
10221 | ||||
|
10222 | msgid "File pointer is not seekable" | |||
|
10223 | msgstr "O ponteiro do arquivo não suporta seek" | |||
|
10224 | ||||
10131 | msgid "not a Mercurial bundle" |
|
10225 | msgid "not a Mercurial bundle" | |
10132 | msgstr "não é um arquivo de bundle do Mercurial" |
|
10226 | msgstr "não é um arquivo de bundle do Mercurial" | |
10133 |
|
10227 | |||
@@ -10135,6 +10229,9 b' msgstr "n\xc3\xa3o \xc3\xa9 um arquivo de bundle do Mercurial"' | |||||
10135 | msgid "unknown bundle version %s" |
|
10229 | msgid "unknown bundle version %s" | |
10136 | msgstr "versão de bundle %s desconhecida" |
|
10230 | msgstr "versão de bundle %s desconhecida" | |
10137 |
|
10231 | |||
|
10232 | msgid "Seek failed\n" | |||
|
10233 | msgstr "Seek falhou\n" | |||
|
10234 | ||||
10138 | #, python-format |
|
10235 | #, python-format | |
10139 | msgid "remote-changegroup: missing \"%s\" param" |
|
10236 | msgid "remote-changegroup: missing \"%s\" param" | |
10140 | msgstr "remote-changegroup: faltando parâmetro \"%s\"" |
|
10237 | msgstr "remote-changegroup: faltando parâmetro \"%s\"" | |
@@ -10184,8 +10281,8 b' msgstr ""' | |||||
10184 | msgid "invalid chunk length %d" |
|
10281 | msgid "invalid chunk length %d" | |
10185 | msgstr "comprimento de trecho inválido %d" |
|
10282 | msgstr "comprimento de trecho inválido %d" | |
10186 |
|
10283 | |||
10187 |
msgid " |
|
10284 | msgid "old bundle types only supports v1 changegroups" | |
10188 |
msgstr " |
|
10285 | msgstr "tipos de bundle antigos suportam apenas changegroups v1" | |
10189 |
|
10286 | |||
10190 | msgid "bundling" |
|
10287 | msgid "bundling" | |
10191 | msgstr "criando bundle" |
|
10288 | msgstr "criando bundle" | |
@@ -10219,6 +10316,10 b' msgstr "%d revis\xc3\xb5es encontradas\\n"' | |||||
10219 | msgid "received file revlog group is empty" |
|
10316 | msgid "received file revlog group is empty" | |
10220 | msgstr "grupo recebido de arquivos revlog vazio" |
|
10317 | msgstr "grupo recebido de arquivos revlog vazio" | |
10221 |
|
10318 | |||
|
10319 | #, python-format | |||
|
10320 | msgid "received delta base is censored: %s" | |||
|
10321 | msgstr "a base do delta recebido foi censurada: %s" | |||
|
10322 | ||||
10222 | msgid "received spurious file revlog entry" |
|
10323 | msgid "received spurious file revlog entry" | |
10223 | msgstr "recebida entrada de revlog de arquivo espúria" |
|
10324 | msgstr "recebida entrada de revlog de arquivo espúria" | |
10224 |
|
10325 | |||
@@ -10264,8 +10365,18 b' msgid "the name \'%s\' is reserved"' | |||||
10264 | msgstr "o nome '%s' é reservado" |
|
10365 | msgstr "o nome '%s' é reservado" | |
10265 |
|
10366 | |||
10266 | #, python-format |
|
10367 | #, python-format | |
10267 | msgid "uncommitted changes in subrepo %s" |
|
10368 | msgid "running non-interactively, use %s instead" | |
10268 | msgstr "mudanças não consolidadas no sub-repositório %s" |
|
10369 | msgstr "não está executando interativamente, use %s" | |
|
10370 | ||||
|
10371 | msgid "cannot partially commit a merge (use \"hg commit\" instead)" | |||
|
10372 | msgstr "não é possível consolidar parcialmente uma mesclagem (use \"hg commit\")" | |||
|
10373 | ||||
|
10374 | #, python-format | |||
|
10375 | msgid "error parsing patch: %s" | |||
|
10376 | msgstr "erro decodificando patch: %s" | |||
|
10377 | ||||
|
10378 | msgid "no changes to record\n" | |||
|
10379 | msgstr "nenhuma mudança a ser gravada\n" | |||
10269 |
|
10380 | |||
10270 | msgid "options --message and --logfile are mutually exclusive" |
|
10381 | msgid "options --message and --logfile are mutually exclusive" | |
10271 | msgstr "opções --message e --logfile são mutuamente exclusivas" |
|
10382 | msgstr "opções --message e --logfile são mutuamente exclusivas" | |
@@ -10331,8 +10442,8 b' msgid "%s: not recording copy - %s does ' | |||||
10331 | msgstr "%s: cópia não gravada - %s não existe\n" |
|
10442 | msgstr "%s: cópia não gravada - %s não existe\n" | |
10332 |
|
10443 | |||
10333 | #, python-format |
|
10444 | #, python-format | |
10334 |
msgid "%s: deleted in working |
|
10445 | msgid "%s: deleted in working directory\n" | |
10335 |
msgstr "%s: apagado n |
|
10446 | msgstr "%s: apagado no diretório de trabalho\n" | |
10336 |
|
10447 | |||
10337 | #, python-format |
|
10448 | #, python-format | |
10338 | msgid "%s: cannot copy - %s\n" |
|
10449 | msgid "%s: cannot copy - %s\n" | |
@@ -10389,6 +10500,10 b' msgstr "o patch est\xc3\xa1 danificado ou perde informa\xc3\xa7\xc3\xa3o"' | |||||
10389 | msgid "created %s" |
|
10500 | msgid "created %s" | |
10390 | msgstr "revisão %s criada" |
|
10501 | msgstr "revisão %s criada" | |
10391 |
|
10502 | |||
|
10503 | #, python-format | |||
|
10504 | msgid "warning: %s not inside relative root %s\n" | |||
|
10505 | msgstr "aviso: %s não está dentro do raiz relativo %s\n" | |||
|
10506 | ||||
10392 | #. i18n: column positioning for "hg log" |
|
10507 | #. i18n: column positioning for "hg log" | |
10393 | #, python-format |
|
10508 | #, python-format | |
10394 | msgid "changeset: %d:%s\n" |
|
10509 | msgid "changeset: %d:%s\n" | |
@@ -10758,6 +10873,9 b' msgstr "produz um diff que desfaz as mudan\xc3\xa7as"' | |||||
10758 | msgid "number of lines of context to show" |
|
10873 | msgid "number of lines of context to show" | |
10759 | msgstr "número de linhas de contexto a serem mostradas" |
|
10874 | msgstr "número de linhas de contexto a serem mostradas" | |
10760 |
|
10875 | |||
|
10876 | msgid "produce diffs relative to subdirectory" | |||
|
10877 | msgstr "produz diffs relativos ao subdiretório" | |||
|
10878 | ||||
10761 | msgid "SIMILARITY" |
|
10879 | msgid "SIMILARITY" | |
10762 | msgstr "SIMILARIDADE" |
|
10880 | msgstr "SIMILARIDADE" | |
10763 |
|
10881 | |||
@@ -11779,8 +11897,9 b' msgstr ""' | |||||
11779 | " :``%r``: número de ordem da revisão completado com zeros\n" |
|
11897 | " :``%r``: número de ordem da revisão completado com zeros\n" | |
11780 | " :``%b``: nome base do repositório" |
|
11898 | " :``%b``: nome base do repositório" | |
11781 |
|
11899 | |||
11782 |
msgid "the clone will include an empty working |
|
11900 | msgid "the clone will include an empty working directory (only a repository)" | |
11783 | msgstr "o clone irá conter uma cópia de trabalho vazia (apenas o repositório)" |
|
11901 | msgstr "" | |
|
11902 | "o clone irá conter um diretório de trabalho vazio (apenas o repositório)" | |||
11784 |
|
11903 | |||
11785 | msgid "revision, tag or branch to check out" |
|
11904 | msgid "revision, tag or branch to check out" | |
11786 | msgstr "revisão, etiqueta ou ramo a ser obtido" |
|
11905 | msgstr "revisão, etiqueta ou ramo a ser obtido" | |
@@ -11992,12 +12111,15 b' msgstr ""' | |||||
11992 | msgid "mark a branch as closed, hiding it from the branch list" |
|
12111 | msgid "mark a branch as closed, hiding it from the branch list" | |
11993 | msgstr "marca um ramo como fechado, escondendo-o da lista de ramos" |
|
12112 | msgstr "marca um ramo como fechado, escondendo-o da lista de ramos" | |
11994 |
|
12113 | |||
11995 | msgid "amend the parent of the working dir" |
|
12114 | msgid "amend the parent of the working directory" | |
11996 | msgstr "emenda o pai do diretório de trabalho" |
|
12115 | msgstr "emenda o pai do diretório de trabalho" | |
11997 |
|
12116 | |||
11998 | msgid "use the secret phase for committing" |
|
12117 | msgid "use the secret phase for committing" | |
11999 | msgstr "consolida a revisão na fase \"secret\"" |
|
12118 | msgstr "consolida a revisão na fase \"secret\"" | |
12000 |
|
12119 | |||
|
12120 | msgid "use interactive mode" | |||
|
12121 | msgstr "use o modo interativo" | |||
|
12122 | ||||
12001 | msgid "commit the specified files or all outstanding changes" |
|
12123 | msgid "commit the specified files or all outstanding changes" | |
12002 | msgstr "consolida os arquivos pedidos ou todas as mudanças por gravar" |
|
12124 | msgstr "consolida os arquivos pedidos ou todas as mudanças por gravar" | |
12003 |
|
12125 | |||
@@ -12160,6 +12282,9 b' msgstr "n\xc3\xa3o se pode usar --local e --global ao mesmo tempo"' | |||||
12160 | msgid "can't use --local outside a repository" |
|
12282 | msgid "can't use --local outside a repository" | |
12161 | msgstr "não se pode usar --local fora de um repositório" |
|
12283 | msgstr "não se pode usar --local fora de um repositório" | |
12162 |
|
12284 | |||
|
12285 | msgid "edit failed" | |||
|
12286 | msgstr "falha ao editar" | |||
|
12287 | ||||
12163 | msgid "only one config item permitted" |
|
12288 | msgid "only one config item permitted" | |
12164 | msgstr "apenas um item de configuração permitido" |
|
12289 | msgstr "apenas um item de configuração permitido" | |
12165 |
|
12290 | |||
@@ -12401,10 +12526,6 b' msgstr "-c|-m|ARQUIVO REV"' | |||||
12401 | msgid "dump the contents of a data file revision" |
|
12526 | msgid "dump the contents of a data file revision" | |
12402 | msgstr "exibe o conteúdo de uma revisão de dados de arquivo" |
|
12527 | msgstr "exibe o conteúdo de uma revisão de dados de arquivo" | |
12403 |
|
12528 | |||
12404 | #, python-format |
|
|||
12405 | msgid "invalid revision identifier %s" |
|
|||
12406 | msgstr "identificador de revisão inválido %s" |
|
|||
12407 |
|
||||
12408 | msgid "try extended date formats" |
|
12529 | msgid "try extended date formats" | |
12409 | msgstr "tenta formatos de data estendidos" |
|
12530 | msgstr "tenta formatos de data estendidos" | |
12410 |
|
12531 | |||
@@ -12812,10 +12933,14 b' msgstr "muda manualmente os pais do diret\xc3\xb3rio de trabalho atual"' | |||||
12812 |
|
12933 | |||
12813 | msgid "" |
|
12934 | msgid "" | |
12814 | " This is useful for writing repository conversion tools, but should\n" |
|
12935 | " This is useful for writing repository conversion tools, but should\n" | |
12815 | " be used with care." |
|
12936 | " be used with care. For example, neither the working directory nor the\n" | |
12816 | msgstr "" |
|
12937 | " dirstate is updated, so file status may be incorrect after running this\n" | |
12817 | " Isto é útil para escrever utilitários de conversão de repositórios, mas\n" |
|
12938 | " command." | |
12818 | " deve ser usado com cuidado." |
|
12939 | msgstr "" | |
|
12940 | " Isto é útil para escrever utilitários de conversão de repositórios,\n" | |||
|
12941 | " mas deve ser usado com cuidado. Por exemplo, nem o diretório de\n" | |||
|
12942 | " trabalho nem o dirstate são atualizados, de modo que o status dos\n" | |||
|
12943 | " arquivos pode ficar incorreto após a execução deste comando." | |||
12819 |
|
12944 | |||
12820 | msgid "do not display the saved mtime" |
|
12945 | msgid "do not display the saved mtime" | |
12821 | msgstr "não exibe o mtime armazenado" |
|
12946 | msgstr "não exibe o mtime armazenado" | |
@@ -13157,11 +13282,11 b' msgstr ""' | |||||
13157 |
|
13282 | |||
13158 | msgid "" |
|
13283 | msgid "" | |
13159 | " If no patterns are given to match, this command prints the names\n" |
|
13284 | " If no patterns are given to match, this command prints the names\n" | |
13160 |
" of all files under Mercurial control in the working |
|
13285 | " of all files under Mercurial control in the working directory." | |
13161 | msgstr "" |
|
13286 | msgstr "" | |
13162 | " Se não forem passados padrões, este comando imprime os nomes\n" |
|
13287 | " Se não forem passados padrões, este comando imprime os nomes\n" | |
13163 |
" de todos os arquivos sob o controle do Mercurial n |
|
13288 | " de todos os arquivos sob o controle do Mercurial no diretório\n" | |
13164 | " trabalho." |
|
13289 | " de trabalho." | |
13165 |
|
13290 | |||
13166 | msgid " - list all files under the current directory::" |
|
13291 | msgid " - list all files under the current directory::" | |
13167 | msgstr " - lista todos os arquivos sob o diretório atual::" |
|
13292 | msgstr " - lista todos os arquivos sob o diretório atual::" | |
@@ -13622,8 +13747,8 b' msgstr "exibe marcadores"' | |||||
13622 | msgid "[-nibtB] [-r REV] [SOURCE]" |
|
13747 | msgid "[-nibtB] [-r REV] [SOURCE]" | |
13623 | msgstr "[-nibtB] [-r REV] [ORIGEM]" |
|
13748 | msgstr "[-nibtB] [-r REV] [ORIGEM]" | |
13624 |
|
13749 | |||
13625 |
msgid "identify the working |
|
13750 | msgid "identify the working directory or specified revision" | |
13626 |
msgstr "identifica |
|
13751 | msgstr "identifica o diretório de trabalho ou a revisão especificada" | |
13627 |
|
13752 | |||
13628 | msgid "" |
|
13753 | msgid "" | |
13629 | " Print a summary identifying the repository state at REV using one or\n" |
|
13754 | " Print a summary identifying the repository state at REV using one or\n" | |
@@ -13702,6 +13827,9 b' msgstr "consolida mesmo que alguns trech' | |||||
13702 | msgid "apply patch to the nodes from which it was generated" |
|
13827 | msgid "apply patch to the nodes from which it was generated" | |
13703 | msgstr "aplica o patch aos nós a partir dos quais ele foi gerado" |
|
13828 | msgstr "aplica o patch aos nós a partir dos quais ele foi gerado" | |
13704 |
|
13829 | |||
|
13830 | msgid "apply patch to subdirectory" | |||
|
13831 | msgstr "aplica o patch em um subdiretório" | |||
|
13832 | ||||
13705 | msgid "use any branch information in patch (implied by --exact)" |
|
13833 | msgid "use any branch information in patch (implied by --exact)" | |
13706 | msgstr "usa qualquer informação de ramo no patch (implicada por --exact)" |
|
13834 | msgstr "usa qualquer informação de ramo no patch (implicada por --exact)" | |
13707 |
|
13835 | |||
@@ -13866,6 +13994,9 b' msgstr "n\xc3\xa3o se pode usar --similarity com --bypass"' | |||||
13866 | msgid "cannot use --exact with --edit" |
|
13994 | msgid "cannot use --exact with --edit" | |
13867 | msgstr "não é possível usar --exact com --edit" |
|
13995 | msgstr "não é possível usar --exact com --edit" | |
13868 |
|
13996 | |||
|
13997 | msgid "cannot use --exact with --prefix" | |||
|
13998 | msgstr "não é possível usar --exact com --prefix" | |||
|
13999 | ||||
13869 | msgid "applying patch from stdin\n" |
|
14000 | msgid "applying patch from stdin\n" | |
13870 | msgstr "aplicando patch da entrada padrão\n" |
|
14001 | msgstr "aplicando patch da entrada padrão\n" | |
13871 |
|
14002 | |||
@@ -13912,17 +14043,65 b' msgstr ""' | |||||
13912 | " ou na localização de pull padrão. Estas são as revisões que\n" |
|
14043 | " ou na localização de pull padrão. Estas são as revisões que\n" | |
13913 | " seriam trazidas se um pull fosse executado." |
|
14044 | " seriam trazidas se um pull fosse executado." | |
13914 |
|
14045 | |||
13915 | msgid "" |
|
|||
13916 | " For remote repository, using --bundle avoids downloading the\n" |
|
|||
13917 | " changesets twice if the incoming is followed by a pull." |
|
|||
13918 | msgstr "" |
|
|||
13919 | " Para repositórios remotos, a opção --bundle evita baixar as\n" |
|
|||
13920 | " revisões duas vezes se o comando incoming for seguido por um\n" |
|
|||
13921 | " pull." |
|
|||
13922 |
|
||||
13923 | msgid " See pull for valid source format details." |
|
14046 | msgid " See pull for valid source format details." | |
13924 | msgstr " Veja pull para detalhes sobre formatos válidos da origem." |
|
14047 | msgstr " Veja pull para detalhes sobre formatos válidos da origem." | |
13925 |
|
14048 | |||
|
14049 | msgid "" | |||
|
14050 | " With -B/--bookmarks, the result of bookmark comparison between\n" | |||
|
14051 | " local and remote repositories is displayed. With -v/--verbose,\n" | |||
|
14052 | " status is also displayed for each bookmark like below::" | |||
|
14053 | msgstr "" | |||
|
14054 | " Com -B/--bookmarks, é exibido o resultado da comparação de\n" | |||
|
14055 | " marcadores entre o repositório local e o remoto.\n" | |||
|
14056 | " Com -v/--verbose, também é exibido o estado de cada\n" | |||
|
14057 | " marcador, como abaixo::" | |||
|
14058 | ||||
|
14059 | msgid "" | |||
|
14060 | " BM1 01234567890a added\n" | |||
|
14061 | " BM2 1234567890ab advanced\n" | |||
|
14062 | " BM3 234567890abc diverged\n" | |||
|
14063 | " BM4 34567890abcd changed" | |||
|
14064 | msgstr "" | |||
|
14065 | " BM1 01234567890a adicionado\n" | |||
|
14066 | " BM2 1234567890ab avançado\n" | |||
|
14067 | " BM3 234567890abc divergente\n" | |||
|
14068 | " BM4 34567890abcd modificado" | |||
|
14069 | ||||
|
14070 | msgid "" | |||
|
14071 | " The action taken locally when pulling depends on the\n" | |||
|
14072 | " status of each bookmark:" | |||
|
14073 | msgstr "" | |||
|
14074 | " A ação tomada localmente ao executar pull depende do\n" | |||
|
14075 | " estado de cada marcador:" | |||
|
14076 | ||||
|
14077 | msgid "" | |||
|
14078 | " :``added``: pull will create it\n" | |||
|
14079 | " :``advanced``: pull will update it\n" | |||
|
14080 | " :``diverged``: pull will create a divergent bookmark\n" | |||
|
14081 | " :``changed``: result depends on remote changesets" | |||
|
14082 | msgstr "" | |||
|
14083 | " :``adicionado``: o pull criará o marcador\n" | |||
|
14084 | " :``avançado``: o pull atualizará o marcador\n" | |||
|
14085 | " :``divergente``: o pull criará um marcador divergente\n" | |||
|
14086 | " :``modificado``: o resultado depende das revisões remotas" | |||
|
14087 | ||||
|
14088 | msgid "" | |||
|
14089 | " From the point of view of pulling behavior, bookmark\n" | |||
|
14090 | " existing only in the remote repository are treated as ``added``,\n" | |||
|
14091 | " even if it is in fact locally deleted." | |||
|
14092 | msgstr "" | |||
|
14093 | " Do ponto de vista do pull, um marcador presente apenas\n" | |||
|
14094 | " no repositório remoto será tratado como ``adicionado``,\n" | |||
|
14095 | " mesmo que na verdade ele tenha sido apagado localmente." | |||
|
14096 | ||||
|
14097 | msgid "" | |||
|
14098 | " For remote repository, using --bundle avoids downloading the\n" | |||
|
14099 | " changesets twice if the incoming is followed by a pull." | |||
|
14100 | msgstr "" | |||
|
14101 | " Para repositórios remotos, a opção --bundle evita baixar as\n" | |||
|
14102 | " revisões duas vezes se o comando incoming for seguido por um\n" | |||
|
14103 | " pull." | |||
|
14104 | ||||
13926 | msgid " - show incoming changes with patches and full description::" |
|
14105 | msgid " - show incoming changes with patches and full description::" | |
13927 | msgstr " - mostra novas mudanças com patches e descrições completas::" |
|
14106 | msgstr " - mostra novas mudanças com patches e descrições completas::" | |
13928 |
|
14107 | |||
@@ -14007,14 +14186,6 b' msgstr ""' | |||||
14007 | " atual e subdiretórios, use \"--include .\"." |
|
14186 | " atual e subdiretórios, use \"--include .\"." | |
14008 |
|
14187 | |||
14009 | msgid "" |
|
14188 | msgid "" | |
14010 | " If no patterns are given to match, this command prints the names\n" |
|
|||
14011 | " of all files under Mercurial control in the working directory." |
|
|||
14012 | msgstr "" |
|
|||
14013 | " Se não forem passados padrões, este comando imprime os nomes\n" |
|
|||
14014 | " de todos os arquivos sob o controle do Mercurial no diretório\n" |
|
|||
14015 | " de trabalho." |
|
|||
14016 |
|
||||
14017 | msgid "" |
|
|||
14018 | " If you want to feed the output of this command into the \"xargs\"\n" |
|
14189 | " If you want to feed the output of this command into the \"xargs\"\n" | |
14019 | " command, use the -0 option to both this command and \"xargs\". This\n" |
|
14190 | " command, use the -0 option to both this command and \"xargs\". This\n" | |
14020 | " will avoid the problem of \"xargs\" treating single filenames that\n" |
|
14191 | " will avoid the problem of \"xargs\" treating single filenames that\n" | |
@@ -14370,6 +14541,48 b' msgid " See pull for details of valid' | |||||
14370 | msgstr " Veja pull para detalhes do formato do destino." |
|
14541 | msgstr " Veja pull para detalhes do formato do destino." | |
14371 |
|
14542 | |||
14372 | msgid "" |
|
14543 | msgid "" | |
|
14544 | " BM1 01234567890a added\n" | |||
|
14545 | " BM2 deleted\n" | |||
|
14546 | " BM3 234567890abc advanced\n" | |||
|
14547 | " BM4 34567890abcd diverged\n" | |||
|
14548 | " BM5 4567890abcde changed" | |||
|
14549 | msgstr "" | |||
|
14550 | " BM1 01234567890a adicionado\n" | |||
|
14551 | " BM2 apagado\n" | |||
|
14552 | " BM3 234567890abc avançado\n" | |||
|
14553 | " BM4 34567890abcd divergente\n" | |||
|
14554 | " BM5 4567890abcde modificado" | |||
|
14555 | ||||
|
14556 | msgid "" | |||
|
14557 | " The action taken when pushing depends on the\n" | |||
|
14558 | " status of each bookmark:" | |||
|
14559 | msgstr "" | |||
|
14560 | " A ação realizada com o push depende do estado de cada\n" | |||
|
14561 | " marcador:" | |||
|
14562 | ||||
|
14563 | msgid "" | |||
|
14564 | " :``added``: push with ``-B`` will create it\n" | |||
|
14565 | " :``deleted``: push with ``-B`` will delete it\n" | |||
|
14566 | " :``advanced``: push will update it\n" | |||
|
14567 | " :``diverged``: push with ``-B`` will update it\n" | |||
|
14568 | " :``changed``: push with ``-B`` will update it" | |||
|
14569 | msgstr "" | |||
|
14570 | " :``adicionado``: o push com ``-B`` criará o marcador\n" | |||
|
14571 | " :``apagado``: o push com ``-B`` apagará o marcador\n" | |||
|
14572 | " :``avançado``: o push atualizará o marcador\n" | |||
|
14573 | " :``divergente``: o push com ``-B`` atualizará o marcador\n" | |||
|
14574 | " :``modificado``: o push com ``-B`` atualizará o marcador" | |||
|
14575 | ||||
|
14576 | msgid "" | |||
|
14577 | " From the point of view of pushing behavior, bookmarks\n" | |||
|
14578 | " existing only in the remote repository are treated as\n" | |||
|
14579 | " ``deleted``, even if it is in fact added remotely." | |||
|
14580 | msgstr "" | |||
|
14581 | " Do ponto de vista do push, um marcador presente apenas\n" | |||
|
14582 | " no repositório remoto será tratado como ``apagado``,\n" | |||
|
14583 | " mesmo que na verdade ele tenha sido adicionado remotamente." | |||
|
14584 | ||||
|
14585 | msgid "" | |||
14373 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" |
|
14586 | " Returns 0 if there are outgoing changes, 1 otherwise.\n" | |
14374 | " " |
|
14587 | " " | |
14375 | msgstr "" |
|
14588 | msgstr "" | |
@@ -14707,6 +14920,12 b' msgstr "o caminho default do reposit\xc3\xb3rio n\xc3\xa3o foi configurado!"' | |||||
14707 | msgid "see the \"path\" section in \"hg help config\"" |
|
14920 | msgid "see the \"path\" section in \"hg help config\"" | |
14708 | msgstr "veja a seção \"path\" em \"hg help config\"" |
|
14921 | msgstr "veja a seção \"path\" em \"hg help config\"" | |
14709 |
|
14922 | |||
|
14923 | msgid "specified revisions evaluate to an empty set" | |||
|
14924 | msgstr "as revisões especificadas resultam em um conjunto vazio" | |||
|
14925 | ||||
|
14926 | msgid "use different revision arguments" | |||
|
14927 | msgstr "use argumentos de revisão diferentes" | |||
|
14928 | ||||
14710 | msgid "roll back an interrupted transaction" |
|
14929 | msgid "roll back an interrupted transaction" | |
14711 | msgstr "desfaz uma transação interrompida" |
|
14930 | msgstr "desfaz uma transação interrompida" | |
14712 |
|
14931 | |||
@@ -14966,6 +15185,9 b' msgstr "revis\xc3\xa3o mais recente que casa com a data"' | |||||
14966 | msgid "revert to the specified revision" |
|
15185 | msgid "revert to the specified revision" | |
14967 | msgstr "reverte para a revisão especificada" |
|
15186 | msgstr "reverte para a revisão especificada" | |
14968 |
|
15187 | |||
|
15188 | msgid "interactively select the changes (EXPERIMENTAL)" | |||
|
15189 | msgstr "seleção interativa de alterações (EXPERIMENTAL)" | |||
|
15190 | ||||
14969 | msgid "[OPTION]... [-r REV] [NAME]..." |
|
15191 | msgid "[OPTION]... [-r REV] [NAME]..." | |
14970 | msgstr "[OPÇÃO]... [-r REV] [NOME]..." |
|
15192 | msgstr "[OPÇÃO]... [-r REV] [NOME]..." | |
14971 |
|
15193 | |||
@@ -15366,6 +15588,17 b' msgstr ""' | |||||
15366 | msgid " hg status --rev 9353" |
|
15588 | msgid " hg status --rev 9353" | |
15367 | msgstr " hg status --rev 9353" |
|
15589 | msgstr " hg status --rev 9353" | |
15368 |
|
15590 | |||
|
15591 | msgid "" | |||
|
15592 | " - show changes in the working directory relative to the\n" | |||
|
15593 | " current directory (see :hg:`help patterns` for more information)::" | |||
|
15594 | msgstr "" | |||
|
15595 | " - mostra mudanças no diretório de trabalho relativas ao\n" | |||
|
15596 | " diretório atual (veja :hg:`help patterns` para mais\n" | |||
|
15597 | " informações)::" | |||
|
15598 | ||||
|
15599 | msgid " hg status re:" | |||
|
15600 | msgstr " hg status re:" | |||
|
15601 | ||||
15369 | msgid " - show all changes including copies in an existing changeset::" |
|
15602 | msgid " - show all changes including copies in an existing changeset::" | |
15370 | msgstr "" |
|
15603 | msgstr "" | |
15371 | " - mostra todas as mudanças incluindo cópias em uma revisão existente::" |
|
15604 | " - mostra todas as mudanças incluindo cópias em uma revisão existente::" | |
@@ -15847,11 +16080,11 b' msgid "(see http://mercurial.selenic.com' | |||||
15847 | msgstr "(veja http://mercurial.selenic.com para mais informações)" |
|
16080 | msgstr "(veja http://mercurial.selenic.com para mais informações)" | |
15848 |
|
16081 | |||
15849 | msgid "" |
|
16082 | msgid "" | |
15850 |
"Copyright (C) 2005-201 |
|
16083 | "Copyright (C) 2005-2015 Matt Mackall and others\n" | |
15851 | "This is free software; see the source for copying conditions. There is NO\n" |
|
16084 | "This is free software; see the source for copying conditions. There is NO\n" | |
15852 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
16085 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
15853 | msgstr "" |
|
16086 | msgstr "" | |
15854 |
"Copyright (C) 2005-201 |
|
16087 | "Copyright (C) 2005-2015 Matt Mackall e outros\n" | |
15855 | "Este software é livre; veja os fontes para condições de cópia. Não\n" |
|
16088 | "Este software é livre; veja os fontes para condições de cópia. Não\n" | |
15856 | "há garantias, nem mesmo de adequação para qualquer propósito em\n" |
|
16089 | "há garantias, nem mesmo de adequação para qualquer propósito em\n" | |
15857 | "particular.\n" |
|
16090 | "particular.\n" | |
@@ -15967,6 +16200,47 b' msgstr "%s n\xc3\xa3o removido!\\n"' | |||||
15967 | msgid "copy failed: %s is not a file or a symbolic link\n" |
|
16200 | msgid "copy failed: %s is not a file or a symbolic link\n" | |
15968 | msgstr "cópia falhou: %s não é um arquivo ou um link simbólico\n" |
|
16201 | msgstr "cópia falhou: %s não é um arquivo ou um link simbólico\n" | |
15969 |
|
16202 | |||
|
16203 | msgid "the python curses/wcurses module is not available/installed" | |||
|
16204 | msgstr "o módulo curses/wcurses do Python não está disponível" | |||
|
16205 | ||||
|
16206 | msgid "starting interactive selection\n" | |||
|
16207 | msgstr "iniciando seleção interativa\n" | |||
|
16208 | ||||
|
16209 | msgid "cannot edit patch for whole file" | |||
|
16210 | msgstr "não é possível editar um patch para o arquivo inteiro" | |||
|
16211 | ||||
|
16212 | msgid "cannot edit patch for binary file" | |||
|
16213 | msgstr "não é possível editar um patch para um arquivo binário" | |||
|
16214 | ||||
|
16215 | msgid "" | |||
|
16216 | "\n" | |||
|
16217 | " to remove '-' lines, make them ' ' lines (context).\n" | |||
|
16218 | " to remove '+' lines, delete them.\n" | |||
|
16219 | " lines starting with # will be removed from the patch." | |||
|
16220 | msgstr "" | |||
|
16221 | "\n" | |||
|
16222 | " para remover linhas '-', marque-as como linhas ' ' (contexto).\n" | |||
|
16223 | " para remover linhas '+', apague-as.\n" | |||
|
16224 | " linhas iniciadas por '#' serão removidas do patch." | |||
|
16225 | ||||
|
16226 | msgid "" | |||
|
16227 | " if the patch applies cleanly, the edited hunk will immediately be\n" | |||
|
16228 | " added to the record list. if it does not apply cleanly, a rejects\n" | |||
|
16229 | " file will be generated: you can use that when you try again. if\n" | |||
|
16230 | " all lines of the hunk are removed, then the edit is aborted and\n" | |||
|
16231 | " the hunk is left unchanged.\n" | |||
|
16232 | " " | |||
|
16233 | msgstr "" | |||
|
16234 | " Se o patch aplicar de forma limpa, o trecho editado será adicionado\n" | |||
|
16235 | " imediatamente à lista de gravação. Se o patch não aplicar de forma\n" | |||
|
16236 | " limpa, um arquivo de rejeitos será gerado: você poderá usar esse\n" | |||
|
16237 | " arquivo ao tentar novamente. Se todas as linhas do trecho forem\n" | |||
|
16238 | " removidas, a edição será abortada e o trecho não será modificado.\n" | |||
|
16239 | " " | |||
|
16240 | ||||
|
16241 | msgid "user quit" | |||
|
16242 | msgstr "usuário encerrou" | |||
|
16243 | ||||
15970 | #, python-format |
|
16244 | #, python-format | |
15971 | msgid "invalid character in dag description: %s..." |
|
16245 | msgid "invalid character in dag description: %s..." | |
15972 | msgstr "caractere inválido na descrição do dag: %s..." |
|
16246 | msgstr "caractere inválido na descrição do dag: %s..." | |
@@ -16092,6 +16366,14 b' msgstr "espa\xc3\xa7o em branco \xc3\xa0 esquerda inesperado\\n"' | |||||
16092 | msgid "hg: parse error: %s\n" |
|
16366 | msgid "hg: parse error: %s\n" | |
16093 | msgstr "hg: erro de análise da entrada: %s\n" |
|
16367 | msgstr "hg: erro de análise da entrada: %s\n" | |
16094 |
|
16368 | |||
|
16369 | #, python-format | |||
|
16370 | msgid "(did you mean %r?)\n" | |||
|
16371 | msgstr "(você quis dizer %r?)\n" | |||
|
16372 | ||||
|
16373 | #, python-format | |||
|
16374 | msgid "(did you mean one of %s?)\n" | |||
|
16375 | msgstr "(você quis dizer: %s?)\n" | |||
|
16376 | ||||
16095 | msgid "entering debugger - type c to continue starting hg or h for help\n" |
|
16377 | msgid "entering debugger - type c to continue starting hg or h for help\n" | |
16096 | msgstr "" |
|
16378 | msgstr "" | |
16097 | "entrando no depurador - digite c para continuar iniciando o hg ou h para " |
|
16379 | "entrando no depurador - digite c para continuar iniciando o hg ou h para " | |
@@ -16316,6 +16598,10 b' msgid "unrecognized profiler \'%s\' - igno' | |||||
16316 | msgstr "profiler '%s' não reconhecido - ignorado\n" |
|
16598 | msgstr "profiler '%s' não reconhecido - ignorado\n" | |
16317 |
|
16599 | |||
16318 | #, python-format |
|
16600 | #, python-format | |
|
16601 | msgid "unknown identifier: %s" | |||
|
16602 | msgstr "identificador desconhecido: %s" | |||
|
16603 | ||||
|
16604 | #, python-format | |||
16319 | msgid "%s: not a Mercurial bundle" |
|
16605 | msgid "%s: not a Mercurial bundle" | |
16320 | msgstr "%s: não é um arquivo de bundle do Mercurial" |
|
16606 | msgstr "%s: não é um arquivo de bundle do Mercurial" | |
16321 |
|
16607 | |||
@@ -16674,10 +16960,6 b' msgstr ""' | |||||
16674 | msgid "clean takes no arguments" |
|
16960 | msgid "clean takes no arguments" | |
16675 | msgstr "clean não tem argumentos" |
|
16961 | msgstr "clean não tem argumentos" | |
16676 |
|
16962 | |||
16677 | #, python-format |
|
|||
16678 | msgid "not a function: %s" |
|
|||
16679 | msgstr "não é uma função: %s" |
|
|||
16680 |
|
||||
16681 | msgid "" |
|
16963 | msgid "" | |
16682 | "``binary()``\n" |
|
16964 | "``binary()``\n" | |
16683 | " File that appears to be binary (contains NUL bytes)." |
|
16965 | " File that appears to be binary (contains NUL bytes)." | |
@@ -16747,6 +17029,19 b' msgid "hgignore takes no arguments"' | |||||
16747 | msgstr "hgignore não tem argumentos" |
|
17029 | msgstr "hgignore não tem argumentos" | |
16748 |
|
17030 | |||
16749 | msgid "" |
|
17031 | msgid "" | |
|
17032 | "``portable()``\n" | |||
|
17033 | " File that has a portable name. (This doesn't include filenames with case\n" | |||
|
17034 | " collisions.)" | |||
|
17035 | msgstr "" | |||
|
17036 | "``portable()``\n" | |||
|
17037 | " Arquivos que possuem um nome portável. (Isto não inclui\n" | |||
|
17038 | " arquivos com colisões de maiúsculas e minúsculas.)" | |||
|
17039 | ||||
|
17040 | #. i18n: "portable" is a keyword | |||
|
17041 | msgid "portable takes no arguments" | |||
|
17042 | msgstr "portable não tem argumentos" | |||
|
17043 | ||||
|
17044 | msgid "" | |||
16750 | "``grep(regex)``\n" |
|
17045 | "``grep(regex)``\n" | |
16751 | " File contains the given regular expression." |
|
17046 | " File contains the given regular expression." | |
16752 | msgstr "" |
|
17047 | msgstr "" | |
@@ -16881,6 +17176,10 b' msgid "untested"' | |||||
16881 | msgstr "não testada" |
|
17176 | msgstr "não testada" | |
16882 |
|
17177 | |||
16883 | #. i18n: bisect changeset status |
|
17178 | #. i18n: bisect changeset status | |
|
17179 | msgid "ignored" | |||
|
17180 | msgstr "ignorado" | |||
|
17181 | ||||
|
17182 | #. i18n: bisect changeset status | |||
16884 | msgid "good (implicit)" |
|
17183 | msgid "good (implicit)" | |
16885 | msgstr "boa (implicitamente)" |
|
17184 | msgstr "boa (implicitamente)" | |
16886 |
|
17185 | |||
@@ -16897,6 +17196,9 b' msgstr "extens\xc3\xb5es desabilitadas:"' | |||||
16897 | msgid "DEPRECATED" |
|
17196 | msgid "DEPRECATED" | |
16898 | msgstr "OBSOLETO" |
|
17197 | msgstr "OBSOLETO" | |
16899 |
|
17198 | |||
|
17199 | msgid "EXPERIMENTAL" | |||
|
17200 | msgstr "EXPERIMENTAL" | |||
|
17201 | ||||
16900 | msgid " ([+] can be repeated)" |
|
17202 | msgid " ([+] can be repeated)" | |
16901 | msgstr " ([+] pode ser repetido)" |
|
17203 | msgstr " ([+] pode ser repetido)" | |
16902 |
|
17204 | |||
@@ -18870,6 +19172,72 b' msgstr ""' | |||||
18870 | " ``$HG_LOCAL=0``." |
|
19172 | " ``$HG_LOCAL=0``." | |
18871 |
|
19173 | |||
18872 | msgid "" |
|
19174 | msgid "" | |
|
19175 | "``pretxnopen``\n" | |||
|
19176 | " Run before any new repository transaction is open. The reason for the\n" | |||
|
19177 | " transaction will be in ``$HG_TXNNAME`` and a unique identifier for the\n" | |||
|
19178 | " transaction will be in ``HG_TXNID``. A non-zero status will prevent the\n" | |||
|
19179 | " transaction from being opened." | |||
|
19180 | msgstr "" | |||
|
19181 | "``pretxnopen``\n" | |||
|
19182 | " Executado antes da abertura de qualquer transação no repositório.\n" | |||
|
19183 | " A razão da transação será passada em ``$HG_TXNNAME`` e um\n" | |||
|
19184 | " identificador único para a transação será passado em ``HG_TXNID``.\n" | |||
|
19185 | " Um status de saída diferente de zero impedirá a abertura da\n" | |||
|
19186 | " transação." | |||
|
19187 | ||||
|
19188 | msgid "" | |||
|
19189 | "``pretxnclose``\n" | |||
|
19190 | " Run right before the transaction is actually finalized. Any\n" | |||
|
19191 | " repository change will be visible to the hook program. This lets you\n" | |||
|
19192 | " validate the transaction content or change it. Exit status 0 allows\n" | |||
|
19193 | " the commit to proceed. Non-zero status will cause the transaction to\n" | |||
|
19194 | " be rolled back. The reason for the transaction opening will be in\n" | |||
|
19195 | " ``$HG_TXNNAME`` and a unique identifier for the transaction will be in\n" | |||
|
19196 | " ``HG_TXNID``. The rest of the available data will vary according the\n" | |||
|
19197 | " transaction type. New changesets will add ``$HG_NODE`` (id of the\n" | |||
|
19198 | " first added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables,\n" | |||
|
19199 | " bookmarks and phases changes will set ``HG_BOOKMARK_MOVED`` and\n" | |||
|
19200 | " ``HG_PHASES_MOVED`` to ``1``, etc." | |||
|
19201 | msgstr "" | |||
|
19202 | "``pretxnclose``\n" | |||
|
19203 | " Executado imediatamente antes de a transação ser finalizada.\n" | |||
|
19204 | " Qualquer mudança do repositório será visível para o gancho.\n" | |||
|
19205 | " Isto permite que o conteúdo da transação seja validado ou alterado.\n" | |||
|
19206 | " O status de saída 0 permite que a consolidação prossiga. Um status\n" | |||
|
19207 | " de saída diferente de zero fará com que a transação seja desfeita.\n" | |||
|
19208 | " A razão da transação será passada em ``$HG_TXNNAME`` e um\n" | |||
|
19209 | " identificador único para a transação será passado em ``HG_TXNID``.\n" | |||
|
19210 | " Outros dados estarão disponíveis dependendo do tipo da transação.\n" | |||
|
19211 | " Novas revisões adicionarão ``$HG_NODE`` (id da primeira revisão\n" | |||
|
19212 | " adicionada), ``$HG_URL`` e ``$HG_SOURCE``, mudanças de marcadores\n" | |||
|
19213 | " e fases definirão ``HG_BOOKMARK_MOVED`` e ``HG_PHASES_MOVED`` como\n" | |||
|
19214 | " ``1``, etc." | |||
|
19215 | ||||
|
19216 | msgid "" | |||
|
19217 | "``txnclose``\n" | |||
|
19218 | " Run after any repository transaction has been committed. At this\n" | |||
|
19219 | " point, the transaction can no longer be rolled back. The hook will run\n" | |||
|
19220 | " after the lock is released. See ``pretxnclose`` docs for details about\n" | |||
|
19221 | " available variables." | |||
|
19222 | msgstr "" | |||
|
19223 | "``txnclose``\n" | |||
|
19224 | " Executado após qualquer transação do repositório ter sido\n" | |||
|
19225 | " consolidada. Neste ponto, a transação não pode mais ser desfeita.\n" | |||
|
19226 | " O gancho será executado após o lock ser liberado.\n" | |||
|
19227 | " Veja a documentação de ``pretxnclose`` para detalhes sobre variáveis\n" | |||
|
19228 | " disponíveis." | |||
|
19229 | ||||
|
19230 | msgid "" | |||
|
19231 | "``txnabort``\n" | |||
|
19232 | " Run when a transaction is aborted. See ``pretxnclose`` docs for details about\n" | |||
|
19233 | " available variables." | |||
|
19234 | msgstr "" | |||
|
19235 | "``txnabort``\n" | |||
|
19236 | " Executado quando uma transação for abortada.\n" | |||
|
19237 | " Veja a documentação de ``pretxnclose`` para detalhes sobre variáveis\n" | |||
|
19238 | " disponíveis." | |||
|
19239 | ||||
|
19240 | msgid "" | |||
18873 | "``pretxnchangegroup``\n" |
|
19241 | "``pretxnchangegroup``\n" | |
18874 | " Run after a changegroup has been added via push, pull or unbundle,\n" |
|
19242 | " Run after a changegroup has been added via push, pull or unbundle,\n" | |
18875 | " but before the transaction has been committed. Changegroup is\n" |
|
19243 | " but before the transaction has been committed. Changegroup is\n" | |
@@ -20211,6 +20579,13 b' msgstr ""' | |||||
20211 | " O padrão é False." |
|
20579 | " O padrão é False." | |
20212 |
|
20580 | |||
20213 | msgid "" |
|
20581 | msgid "" | |
|
20582 | "``statuscopies``\n" | |||
|
20583 | " Display copies in the status command." | |||
|
20584 | msgstr "" | |||
|
20585 | "``statuscopies``\n" | |||
|
20586 | " Mostra cópias no comando status." | |||
|
20587 | ||||
|
20588 | msgid "" | |||
20214 | "``ssh``\n" |
|
20589 | "``ssh``\n" | |
20215 | " command to use for SSH connections. Default is ``ssh``." |
|
20590 | " command to use for SSH connections. Default is ``ssh``." | |
20216 | msgstr "" |
|
20591 | msgstr "" | |
@@ -22289,7 +22664,7 b' msgstr ""' | |||||
22289 | " local que não estão em um repositório remoto são enviadas para esse\n" |
|
22664 | " local que não estão em um repositório remoto são enviadas para esse\n" | |
22290 | " repositório remoto.\n" |
|
22665 | " repositório remoto.\n" | |
22291 | " Note que essa operação apenas adiciona ao repositório remoto revisões\n" |
|
22666 | " Note que essa operação apenas adiciona ao repositório remoto revisões\n" | |
22292 |
" já consolidadas localmente; mudanças não consolidadas |
|
22667 | " já consolidadas localmente; mudanças não consolidadas da cópia de\n" | |
22293 | " trabalho não são enviadas. Veja :hg:`help push`." |
|
22668 | " trabalho não são enviadas. Veja :hg:`help push`." | |
22294 |
|
22669 | |||
22295 | msgid "" |
|
22670 | msgid "" | |
@@ -22710,13 +23085,13 b' msgstr "Lista de discuss\xc3\xa3o: http://selenic.com/mailman/listinfo/mercurial"' | |||||
22710 | msgid "" |
|
23085 | msgid "" | |
22711 | "Copying\n" |
|
23086 | "Copying\n" | |
22712 | "\"\"\"\"\"\"\"\n" |
|
23087 | "\"\"\"\"\"\"\"\n" | |
22713 |
"Copyright (C) 2005-201 |
|
23088 | "Copyright (C) 2005-2015 Matt Mackall.\n" | |
22714 | "Free use of this software is granted under the terms of the GNU General\n" |
|
23089 | "Free use of this software is granted under the terms of the GNU General\n" | |
22715 | "Public License version 2 or any later version." |
|
23090 | "Public License version 2 or any later version." | |
22716 | msgstr "" |
|
23091 | msgstr "" | |
22717 | "Cópia\n" |
|
23092 | "Cópia\n" | |
22718 | "\"\"\"\"\"\n" |
|
23093 | "\"\"\"\"\"\n" | |
22719 |
"Copyright (C) 2005-201 |
|
23094 | "Copyright (C) 2005-2015 Matt Mackall.\n" | |
22720 | "Garante-se livre uso deste software nos termos da licença\n" |
|
23095 | "Garante-se livre uso deste software nos termos da licença\n" | |
22721 | "GNU General Public License, versão 2 ou qualquer versão posterior." |
|
23096 | "GNU General Public License, versão 2 ou qualquer versão posterior." | |
22722 |
|
23097 | |||
@@ -22774,14 +23149,14 b' msgid ""' | |||||
22774 | "Copying\n" |
|
23149 | "Copying\n" | |
22775 | "=======\n" |
|
23150 | "=======\n" | |
22776 | "This manual page is copyright 2006 Vadim Gelfer.\n" |
|
23151 | "This manual page is copyright 2006 Vadim Gelfer.\n" | |
22777 |
"Mercurial is copyright 2005-201 |
|
23152 | "Mercurial is copyright 2005-2015 Matt Mackall.\n" | |
22778 | "Free use of this software is granted under the terms of the GNU General\n" |
|
23153 | "Free use of this software is granted under the terms of the GNU General\n" | |
22779 | "Public License version 2 or any later version." |
|
23154 | "Public License version 2 or any later version." | |
22780 | msgstr "" |
|
23155 | msgstr "" | |
22781 | "Cópia\n" |
|
23156 | "Cópia\n" | |
22782 | "=====\n" |
|
23157 | "=====\n" | |
22783 | "Esta página de manual: copyright 2006 Vadim Gelfer.\n" |
|
23158 | "Esta página de manual: copyright 2006 Vadim Gelfer.\n" | |
22784 |
"Mercurial: copyright 2005-201 |
|
23159 | "Mercurial: copyright 2005-2015 Matt Mackall.\n" | |
22785 | "Garante-se livre uso deste software nos termos da licença\n" |
|
23160 | "Garante-se livre uso deste software nos termos da licença\n" | |
22786 | "GNU General Public License, versão 2 ou qualquer versão posterior." |
|
23161 | "GNU General Public License, versão 2 ou qualquer versão posterior." | |
22787 |
|
23162 | |||
@@ -23046,14 +23421,14 b' msgid ""' | |||||
23046 | "Copying\n" |
|
23421 | "Copying\n" | |
23047 | "=======\n" |
|
23422 | "=======\n" | |
23048 | "This manual page is copyright 2005 Bryan O'Sullivan.\n" |
|
23423 | "This manual page is copyright 2005 Bryan O'Sullivan.\n" | |
23049 |
"Mercurial is copyright 2005-201 |
|
23424 | "Mercurial is copyright 2005-2015 Matt Mackall.\n" | |
23050 | "Free use of this software is granted under the terms of the GNU General\n" |
|
23425 | "Free use of this software is granted under the terms of the GNU General\n" | |
23051 | "Public License version 2 or any later version." |
|
23426 | "Public License version 2 or any later version." | |
23052 | msgstr "" |
|
23427 | msgstr "" | |
23053 | "Cópia\n" |
|
23428 | "Cópia\n" | |
23054 | "=====\n" |
|
23429 | "=====\n" | |
23055 | "Esta página de manual: copyright 2005 Bryan O'Sullivan.\n" |
|
23430 | "Esta página de manual: copyright 2005 Bryan O'Sullivan.\n" | |
23056 |
"Mercurial: copyright 2005-201 |
|
23431 | "Mercurial: copyright 2005-2015 Matt Mackall.\n" | |
23057 | "Garante-se livre uso deste software nos termos da licença\n" |
|
23432 | "Garante-se livre uso deste software nos termos da licença\n" | |
23058 | "GNU General Public License, versão 2 ou qualquer versão posterior." |
|
23433 | "GNU General Public License, versão 2 ou qualquer versão posterior." | |
23059 |
|
23434 | |||
@@ -23163,10 +23538,88 b' msgstr ""' | |||||
23163 |
|
23538 | |||
23164 | msgid "" |
|
23539 | msgid "" | |
23165 | "The ``collections`` section is deprecated and has been superseded by\n" |
|
23540 | "The ``collections`` section is deprecated and has been superseded by\n" | |
23166 |
"``paths``. |
|
23541 | "``paths``." | |
23167 | msgstr "" |
|
23542 | msgstr "" | |
23168 | "A seção ``collections`` é obsoleta e foi completamente substituída\n" |
|
23543 | "A seção ``collections`` é obsoleta e foi completamente substituída\n" | |
23169 |
"pela seção ``paths``. |
|
23544 | "pela seção ``paths``." | |
|
23545 | ||||
|
23546 | msgid "" | |||
|
23547 | "URLs and Common Arguments\n" | |||
|
23548 | "=========================" | |||
|
23549 | msgstr "" | |||
|
23550 | "URLs e Argumentos Comuns\n" | |||
|
23551 | "========================" | |||
|
23552 | ||||
|
23553 | msgid "" | |||
|
23554 | "URLs under each repository have the form ``/{command}[/{arguments}]``\n" | |||
|
23555 | "where ``{command}`` represents the name of a command or handler and\n" | |||
|
23556 | "``{arguments}`` represents any number of additional URL parameters\n" | |||
|
23557 | "to that command." | |||
|
23558 | msgstr "" | |||
|
23559 | "URLs sob cada repositório têm a forma ``/{comando}[/{argumentos}]``\n" | |||
|
23560 | "onde ``{comando}`` representa o nome de um comando ou manipulador e\n" | |||
|
23561 | "``{argumentos}`` representa qualquer número de parâmetros de URL\n" | |||
|
23562 | "adicionais para tal comando." | |||
|
23563 | ||||
|
23564 | msgid "" | |||
|
23565 | "The web server has a default style associated with it. Styles map to\n" | |||
|
23566 | "a collection of named templates. Each template is used to render a\n" | |||
|
23567 | "specific piece of data, such as a changeset or diff." | |||
|
23568 | msgstr "" | |||
|
23569 | "O servidor web possui um estilo padrão associado. Estilos são\n" | |||
|
23570 | "mapeados para uma coleção de modelos nomeados. Cada modelo\n" | |||
|
23571 | "é usado para renderizar um trecho de dados específico, como\n" | |||
|
23572 | "uma revisão ou diff." | |||
|
23573 | ||||
|
23574 | msgid "" | |||
|
23575 | "The style for the current request can be overwritten two ways. First,\n" | |||
|
23576 | "if ``{command}`` contains a hyphen (``-``), the text before the hyphen\n" | |||
|
23577 | "defines the style. For example, ``/atom-log`` will render the ``log``\n" | |||
|
23578 | "command handler with the ``atom`` style. The second way to set the\n" | |||
|
23579 | "style is with the ``style`` query string argument. For example,\n" | |||
|
23580 | "``/log?style=atom``. The hyphenated URL parameter is preferred." | |||
|
23581 | msgstr "" | |||
|
23582 | "O estilo para o pedido atual pode ser sobreposto de duas formas.\n" | |||
|
23583 | "Na primeira, se ``{comando}`` contiver um hífen (``-``), o texto\n" | |||
|
23584 | "antes do hífen definirá o estilo. Por exemplo, ``/atom-log`` irá\n" | |||
|
23585 | "renderizar o comando ``log`` com o estilo ``atom``. A segunda\n" | |||
|
23586 | "forma usa o argumento ``style``. Por exemplo, ``/log?style=atom``.\n" | |||
|
23587 | "A primeira forma é preferida." | |||
|
23588 | ||||
|
23589 | msgid "" | |||
|
23590 | "Not all templates are available for all styles. Attempting to use\n" | |||
|
23591 | "a style that doesn't have all templates defined may result in an error\n" | |||
|
23592 | "rendering the page." | |||
|
23593 | msgstr "" | |||
|
23594 | "Nem todos os modelos estão disponíveis para todos os estilos.\n" | |||
|
23595 | "Tentar usar um estilo que não possui todos os modelos definidos\n" | |||
|
23596 | "pode resultar em erros ao renderizar a página." | |||
|
23597 | ||||
|
23598 | msgid "" | |||
|
23599 | "Many commands take a ``{revision}`` URL parameter. This defines the\n" | |||
|
23600 | "changeset to operate on. This is commonly specified as the short,\n" | |||
|
23601 | "12 digit hexidecimal abbreviation for the full 40 character unique\n" | |||
|
23602 | "revision identifier. However, any value described by\n" | |||
|
23603 | ":hg:`help revisions` typically works." | |||
|
23604 | msgstr "" | |||
|
23605 | "Muitos comandos recebem um parâmetro de URL ``{revision}``.\n" | |||
|
23606 | "Isto define a revisão a ser tratada. É comumente especificado\n" | |||
|
23607 | "como a abreviação de 12 dígitos hexadecimais do identificador\n" | |||
|
23608 | "único completo de 40 caracteres. No entanto, tipicamente será\n" | |||
|
23609 | "aceito qualquer valor descrito por :hg:`help revisions`." | |||
|
23610 | ||||
|
23611 | msgid "" | |||
|
23612 | "Commands and URLs\n" | |||
|
23613 | "=================" | |||
|
23614 | msgstr "" | |||
|
23615 | "Comandos e URLs\n" | |||
|
23616 | "===============" | |||
|
23617 | ||||
|
23618 | msgid "The following web commands and their URLs are available:" | |||
|
23619 | msgstr "Os seguintes comandos web e suas URLs estão disponíveis:" | |||
|
23620 | ||||
|
23621 | msgid " .. webcommandsmarker\n" | |||
|
23622 | msgstr " .. webcommandsmarker\n" | |||
23170 |
|
23623 | |||
23171 | msgid "To merge files Mercurial uses merge tools." |
|
23624 | msgid "To merge files Mercurial uses merge tools." | |
23172 | msgstr "Para mesclar arquivos o Mercurial usa utilitários de mesclagem." |
|
23625 | msgstr "Para mesclar arquivos o Mercurial usa utilitários de mesclagem." | |
@@ -24239,14 +24692,14 b' msgid ""' | |||||
24239 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" |
|
24692 | ":add: add does not recurse in subrepos unless -S/--subrepos is\n" | |
24240 | " specified. However, if you specify the full path of a file in a\n" |
|
24693 | " specified. However, if you specify the full path of a file in a\n" | |
24241 | " subrepo, it will be added even without -S/--subrepos specified.\n" |
|
24694 | " subrepo, it will be added even without -S/--subrepos specified.\n" | |
24242 |
" |
|
24695 | " Subversion subrepositories are currently silently\n" | |
24243 | " ignored." |
|
24696 | " ignored." | |
24244 | msgstr "" |
|
24697 | msgstr "" | |
24245 | ":add: add não é executado recursivamente em sub-repositórios, a não\n" |
|
24698 | ":add: add não é executado recursivamente em sub-repositórios, a não\n" | |
24246 | " ser que -S/--subrepos seja especificado. No entanto, se for\n" |
|
24699 | " ser que -S/--subrepos seja especificado. No entanto, se for\n" | |
24247 | " especificado o caminho completo de um arquivo em um sub-repositório,\n" |
|
24700 | " especificado o caminho completo de um arquivo em um sub-repositório,\n" | |
24248 | " ele será adicionado mesmo que -S/--subrepos não seja passado.\n" |
|
24701 | " ele será adicionado mesmo que -S/--subrepos não seja passado.\n" | |
24249 |
" Sub-repositórios do Subversion |
|
24702 | " Sub-repositórios do Subversion são no momento\n" | |
24250 | " silenciosamente ignorados." |
|
24703 | " silenciosamente ignorados." | |
24251 |
|
24704 | |||
24252 | msgid "" |
|
24705 | msgid "" | |
@@ -24274,11 +24727,11 b' msgstr ""' | |||||
24274 |
|
24727 | |||
24275 | msgid "" |
|
24728 | msgid "" | |
24276 | ":cat: cat currently only handles exact file matches in subrepos.\n" |
|
24729 | ":cat: cat currently only handles exact file matches in subrepos.\n" | |
24277 |
" |
|
24730 | " Subversion subrepositories are currently ignored." | |
24278 | msgstr "" |
|
24731 | msgstr "" | |
24279 | ":cat: cat no momento considera apenas especificações exatas de\n" |
|
24732 | ":cat: cat no momento considera apenas especificações exatas de\n" | |
24280 | " arquivos em sub-repositórios.\n" |
|
24733 | " arquivos em sub-repositórios.\n" | |
24281 |
" Sub-repositórios do Subversion |
|
24734 | " Sub-repositórios do Subversion são no momento\n" | |
24282 | " ignorados." |
|
24735 | " ignorados." | |
24283 |
|
24736 | |||
24284 | msgid "" |
|
24737 | msgid "" | |
@@ -24311,17 +24764,26 b' msgstr ""' | |||||
24311 | msgid "" |
|
24764 | msgid "" | |
24312 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" |
|
24765 | ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" | |
24313 | " specified. Changes are displayed as usual, on the subrepositories\n" |
|
24766 | " specified. Changes are displayed as usual, on the subrepositories\n" | |
24314 | " elements. Git subrepositories do not support --include/--exclude.\n" |
|
24767 | " elements. Subversion subrepositories are currently silently ignored." | |
24315 | " Subversion subrepositories are currently silently ignored." |
|
|||
24316 | msgstr "" |
|
24768 | msgstr "" | |
24317 | ":diff: diff não é executado recursivamente em sub-repositórios, a não\n" |
|
24769 | ":diff: diff não é executado recursivamente em sub-repositórios, a não\n" | |
24318 | " ser que -S/--subrepos seja especificado. As mudanças são exibidas\n" |
|
24770 | " ser que -S/--subrepos seja especificado. As mudanças são exibidas\n" | |
24319 |
" normalmente nos |
|
24771 | " normalmente nos elementos em sub-repositórios.\n" | |
24320 | " Git não suportam --include/--exclude.\n" |
|
|||
24321 | " Sub-repositórios do Subversion são no momento silenciosamente\n" |
|
24772 | " Sub-repositórios do Subversion são no momento silenciosamente\n" | |
24322 | " ignorados." |
|
24773 | " ignorados." | |
24323 |
|
24774 | |||
24324 | msgid "" |
|
24775 | msgid "" | |
|
24776 | ":files: files does not recurse into subrepos unless -S/--subrepos is\n" | |||
|
24777 | " specified. Git and Subversion subrepositories are currently\n" | |||
|
24778 | " silently ignored." | |||
|
24779 | msgstr "" | |||
|
24780 | ":files: files não é executado recursivamente em\n" | |||
|
24781 | " sub-repositórios, a não ser que -S/--subrepos seja\n" | |||
|
24782 | " especificado.\n" | |||
|
24783 | " Sub-repositórios do Subversion e do Git são no momento\n" | |||
|
24784 | " silenciosamente ignorados." | |||
|
24785 | ||||
|
24786 | msgid "" | |||
24325 | ":forget: forget currently only handles exact file matches in subrepos.\n" |
|
24787 | ":forget: forget currently only handles exact file matches in subrepos.\n" | |
24326 | " Git and Subversion subrepositories are currently silently ignored." |
|
24788 | " Git and Subversion subrepositories are currently silently ignored." | |
24327 | msgstr "" |
|
24789 | msgstr "" | |
@@ -24538,56 +25000,8 b' msgstr ""' | |||||
24538 | msgid "In addition to filters, there are some basic built-in functions:" |
|
25000 | msgid "In addition to filters, there are some basic built-in functions:" | |
24539 | msgstr "Além de filtros, há algumas funções básicas disponíveis:" |
|
25001 | msgstr "Além de filtros, há algumas funções básicas disponíveis:" | |
24540 |
|
25002 | |||
24541 | msgid "- date(date[, fmt])" |
|
25003 | msgid ".. functionsmarker" | |
24542 | msgstr "- date(data[, formato])" |
|
25004 | msgstr ".. functionsmarker" | |
24543 |
|
||||
24544 | msgid "- diff([includepattern [, excludepattern]])" |
|
|||
24545 | msgstr "- diff([padrãodeinclusão [, padrãodeexclusão]])" |
|
|||
24546 |
|
||||
24547 | msgid "- fill(text[, width])" |
|
|||
24548 | msgstr "- fill(texto[, comprimento])" |
|
|||
24549 |
|
||||
24550 | msgid "- get(dict, key)" |
|
|||
24551 | msgstr "- get(dicionário, chave)" |
|
|||
24552 |
|
||||
24553 | msgid "- if(expr, then[, else])" |
|
|||
24554 | msgstr "- if(expr, então[, senão])" |
|
|||
24555 |
|
||||
24556 | msgid "- ifcontains(expr, expr, then[, else])" |
|
|||
24557 | msgstr "- ifcontains(expr, expr, então[, senão])" |
|
|||
24558 |
|
||||
24559 | msgid "- ifeq(expr, expr, then[, else])" |
|
|||
24560 | msgstr "- ifeq(expr, expr, então[, senão])" |
|
|||
24561 |
|
||||
24562 | msgid "- join(list, sep)" |
|
|||
24563 | msgstr "- join(lista, separador)" |
|
|||
24564 |
|
||||
24565 | msgid "- label(label, expr)" |
|
|||
24566 | msgstr "- label(label, expr)" |
|
|||
24567 |
|
||||
24568 | msgid "- pad(text, width[, fillchar, right])" |
|
|||
24569 | msgstr "- pad(texto, largura[, preenchimento, direita])" |
|
|||
24570 |
|
||||
24571 | msgid "- revset(query[, formatargs])" |
|
|||
24572 | msgstr "- revset(consulta[, formato])" |
|
|||
24573 |
|
||||
24574 | msgid "- rstdoc(text, style)" |
|
|||
24575 | msgstr "- rstdoc(texto, estilo)" |
|
|||
24576 |
|
||||
24577 | msgid "- shortest(node)" |
|
|||
24578 | msgstr "- shortest(nó)" |
|
|||
24579 |
|
||||
24580 | msgid "- startswith(string, text)" |
|
|||
24581 | msgstr "- startswith(string, texto)" |
|
|||
24582 |
|
||||
24583 | msgid "- strip(text[, chars])" |
|
|||
24584 | msgstr "- strip(texto[, caracteres])" |
|
|||
24585 |
|
||||
24586 | msgid "- sub(pat, repl, expr)" |
|
|||
24587 | msgstr "- sub(padrão, substituição, expressão)" |
|
|||
24588 |
|
||||
24589 | msgid "- word(number, text[, separator])" |
|
|||
24590 | msgstr "- word(número, texto[, separador])" |
|
|||
24591 |
|
25005 | |||
24592 | msgid "" |
|
25006 | msgid "" | |
24593 | "Also, for any expression that returns a list, there is a list operator:" |
|
25007 | "Also, for any expression that returns a list, there is a list operator:" | |
@@ -24946,10 +25360,491 b' msgstr "IPv6 indispon\xc3\xadvel nesse sistema"' | |||||
24946 | msgid "cannot start server at '%s:%d': %s" |
|
25360 | msgid "cannot start server at '%s:%d': %s" | |
24947 | msgstr "não é possível iniciar o servidor em '%s:%d': %s" |
|
25361 | msgstr "não é possível iniciar o servidor em '%s:%d': %s" | |
24948 |
|
25362 | |||
|
25363 | msgid "" | |||
|
25364 | "\n" | |||
|
25365 | " /log[/{revision}[/{path}]]\n" | |||
|
25366 | " --------------------------" | |||
|
25367 | msgstr "" | |||
|
25368 | "\n" | |||
|
25369 | " /log[/{revisão}[/{caminho}]]\n" | |||
|
25370 | " ----------------------------" | |||
|
25371 | ||||
|
25372 | msgid " Show repository or file history." | |||
|
25373 | msgstr " Exibe histórico do repositório ou de um arquivo." | |||
|
25374 | ||||
|
25375 | msgid "" | |||
|
25376 | " For URLs of the form ``/log/{revision}``, a list of changesets starting at\n" | |||
|
25377 | " the specified changeset identifier is shown. If ``{revision}`` is not\n" | |||
|
25378 | " defined, the default is ``tip``. This form is equivalent to the\n" | |||
|
25379 | " ``changelog`` handler." | |||
|
25380 | msgstr "" | |||
|
25381 | " Para URLs da forma ``/log/{revisão}``, é exibida uma lista de\n" | |||
|
25382 | " revisões começando no identificador de revisão especificado.\n" | |||
|
25383 | " Se ``{revisão}`` não for definida, o padrão é ``tip``.\n" | |||
|
25384 | " Esta forma é equivalente ao comando ``changelog``." | |||
|
25385 | ||||
|
25386 | msgid "" | |||
|
25387 | " For URLs of the form ``/log/{revision}/{file}``, the history for a specific\n" | |||
|
25388 | " file will be shown. This form is equivalent to the ``filelog`` handler." | |||
|
25389 | msgstr "" | |||
|
25390 | " Para URLs da forma ``/log/{revisão}/{arquivo}``, será exibido\n" | |||
|
25391 | " o histórico do arquivo especificado.\n" | |||
|
25392 | " Esta forma é equivalente ao comando ``filelog``." | |||
|
25393 | ||||
|
25394 | msgid "" | |||
|
25395 | "\n" | |||
|
25396 | " /file/{revision}[/{path}]\n" | |||
|
25397 | " -------------------------" | |||
|
25398 | msgstr "" | |||
|
25399 | "\n" | |||
|
25400 | " /file/{revisão}[/{caminho}]\n" | |||
|
25401 | " ---------------------------" | |||
|
25402 | ||||
|
25403 | msgid " Show information about a directory or file in the repository." | |||
|
25404 | msgstr "" | |||
|
25405 | " Mostra informações sobre um diretório ou arquivo no\n" | |||
|
25406 | " repositório." | |||
|
25407 | ||||
|
25408 | msgid " Info about the ``path`` given as a URL parameter will be rendered." | |||
|
25409 | msgstr "" | |||
|
25410 | " As informações serão relativas ao parâmetro ``arquivo``\n" | |||
|
25411 | " da URL." | |||
|
25412 | ||||
|
25413 | msgid "" | |||
|
25414 | " If ``path`` is a directory, information about the entries in that\n" | |||
|
25415 | " directory will be rendered. This form is equivalent to the ``manifest``\n" | |||
|
25416 | " handler." | |||
|
25417 | msgstr "" | |||
|
25418 | " Se ``caminho`` for um diretório, serão renderizadas informações\n" | |||
|
25419 | " sobre as entradas sob esse diretório. Esta forma é equivalente\n" | |||
|
25420 | " ao comando ``manifest``." | |||
|
25421 | ||||
|
25422 | msgid "" | |||
|
25423 | " If ``path`` is a file, information about that file will be shown via\n" | |||
|
25424 | " the ``filerevision`` template." | |||
|
25425 | msgstr "" | |||
|
25426 | " Se ``caminho`` for um arquivo, serão exibidas informações sobre\n" | |||
|
25427 | " esse arquivo através do modelo ``filerevision``." | |||
|
25428 | ||||
|
25429 | msgid "" | |||
|
25430 | " If ``path`` is not defined, information about the root directory will\n" | |||
|
25431 | " be rendered." | |||
|
25432 | msgstr "" | |||
|
25433 | " Se ``caminho`` não for definido, serão exibidas informações\n" | |||
|
25434 | " sobre o diretório raiz.." | |||
|
25435 | ||||
|
25436 | msgid "" | |||
|
25437 | "\n" | |||
|
25438 | " /changelog[/{revision}]\n" | |||
|
25439 | " -----------------------" | |||
|
25440 | msgstr "" | |||
|
25441 | "\n" | |||
|
25442 | " /changelog[/{revisão}]\n" | |||
|
25443 | " ----------------------" | |||
|
25444 | ||||
|
25445 | msgid " Show information about multiple changesets." | |||
|
25446 | msgstr " Mostra informações sobre múltiplas revisões." | |||
|
25447 | ||||
|
25448 | msgid "" | |||
|
25449 | " If the optional ``revision`` URL argument is absent, information about\n" | |||
|
25450 | " all changesets starting at ``tip`` will be rendered. If the ``revision``\n" | |||
|
25451 | " argument is present, changesets will be shown starting from the specified\n" | |||
|
25452 | " revision." | |||
|
25453 | msgstr "" | |||
|
25454 | " Se o parâmetro opcional ``revisão`` estiver ausente, serão\n" | |||
|
25455 | " exibidas informações sobre todas as revisões a partir da\n" | |||
|
25456 | " ``tip``. Se ``revisão`` estiver presente, serão mostradas\n" | |||
|
25457 | " as revisões a partir da revisão pedida." | |||
|
25458 | ||||
|
25459 | msgid "" | |||
|
25460 | " If ``revision`` is absent, the ``rev`` query string argument may be\n" | |||
|
25461 | " defined. This will perform a search for changesets." | |||
|
25462 | msgstr "" | |||
|
25463 | " Se ``revisão`` estiver ausente, o argumento da string de consulta\n" | |||
|
25464 | " ``rev`` poderá ser definido. Isto realizará uma busca por revisões." | |||
|
25465 | ||||
|
25466 | msgid "" | |||
|
25467 | " The argument for ``rev`` can be a single revision, a revision set,\n" | |||
|
25468 | " or a literal keyword to search for in changeset data (equivalent to\n" | |||
|
25469 | " :hg:`log -k`)." | |||
|
25470 | msgstr "" | |||
|
25471 | " O argumento para ``rev`` pode ser uma única revisão, um revset\n" | |||
|
25472 | " ou uma palavra chave literal a ser localizada nos dados das\n" | |||
|
25473 | " revisões (equivalente a :hg:`log -k`)." | |||
|
25474 | ||||
|
25475 | msgid "" | |||
|
25476 | " The ``revcount`` query string argument defines the maximum numbers of\n" | |||
|
25477 | " changesets to render." | |||
|
25478 | msgstr "" | |||
|
25479 | " O argumento da string de consulta ``revcount`` define o número\n" | |||
|
25480 | " máximo de revisões a serem exibidas." | |||
|
25481 | ||||
|
25482 | msgid " For non-searches, the ``changelog`` template will be rendered." | |||
|
25483 | msgstr "" | |||
|
25484 | " Caso não seja especificada uma busca, será renderizado o modelo\n" | |||
|
25485 | " ``changelog``." | |||
|
25486 | ||||
|
25487 | msgid "" | |||
|
25488 | "\n" | |||
|
25489 | " /shortlog\n" | |||
|
25490 | " ---------" | |||
|
25491 | msgstr "" | |||
|
25492 | "\n" | |||
|
25493 | " /shortlog\n" | |||
|
25494 | " ---------" | |||
|
25495 | ||||
|
25496 | msgid " Show basic information about a set of changesets." | |||
|
25497 | msgstr " Mostra informações básicas sobre um conjunto de revisões." | |||
|
25498 | ||||
|
25499 | msgid "" | |||
|
25500 | " This accepts the same parameters as the ``changelog`` handler. The only\n" | |||
|
25501 | " difference is the ``shortlog`` template will be rendered instead of the\n" | |||
|
25502 | " ``changelog`` template." | |||
|
25503 | msgstr "" | |||
|
25504 | " Aceita os mesmos parâmetros do comando ``changelog``.\n" | |||
|
25505 | " A única diferença é que a renderização usará o modelo\n" | |||
|
25506 | " ``shortlog`` ao invés do ``changelog``." | |||
|
25507 | ||||
|
25508 | msgid "" | |||
|
25509 | "\n" | |||
|
25510 | " /changeset[/{revision}]\n" | |||
|
25511 | " -----------------------" | |||
|
25512 | msgstr "" | |||
|
25513 | "\n" | |||
|
25514 | " /changeset[/{revisão}]\n" | |||
|
25515 | " ----------------------" | |||
|
25516 | ||||
|
25517 | msgid " Show information about a single changeset." | |||
|
25518 | msgstr " Mostra informações sobre uma única revisão." | |||
|
25519 | ||||
|
25520 | msgid "" | |||
|
25521 | " A URL path argument is the changeset identifier to show. See ``hg help\n" | |||
|
25522 | " revisions`` for possible values. If not defined, the ``tip`` changeset\n" | |||
|
25523 | " will be shown." | |||
|
25524 | msgstr "" | |||
|
25525 | " O argumento ``revisão`` especifica o identificador da revisão a\n" | |||
|
25526 | " ser exibida. Veja ``hg help revisions`` para os valores aceitos.\n" | |||
|
25527 | " Se não for definida, a revisão ``tip`` será exibida." | |||
|
25528 | ||||
|
25529 | msgid "" | |||
|
25530 | " The ``changeset`` template is rendered. Contents of the ``changesettag``,\n" | |||
|
25531 | " ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many\n" | |||
|
25532 | " templates related to diffs may all be used to produce the output." | |||
|
25533 | msgstr "" | |||
|
25534 | " Usa o modelo ``changeset``. Os modelos ``changesettag``,\n" | |||
|
25535 | " ``changesetbookmark``, ``filenodelink``, ``filenolink``\n" | |||
|
25536 | " e os diversos modelos relacionados a diffs podem ser\n" | |||
|
25537 | " usados para a exibição." | |||
|
25538 | ||||
|
25539 | msgid "" | |||
|
25540 | "\n" | |||
|
25541 | " /manifest[/{revision}[/{path}]]\n" | |||
|
25542 | " -------------------------------" | |||
|
25543 | msgstr "" | |||
|
25544 | "\n" | |||
|
25545 | " /manifest[/{revisão}[/{caminho}]]\n" | |||
|
25546 | " ---------------------------------" | |||
|
25547 | ||||
|
25548 | msgid " Show information about a directory." | |||
|
25549 | msgstr " Mostra informações sobre um diretório." | |||
|
25550 | ||||
|
25551 | msgid "" | |||
|
25552 | " If the URL path arguments are omitted, information about the root\n" | |||
|
25553 | " directory for the ``tip`` changeset will be shown." | |||
|
25554 | msgstr "" | |||
|
25555 | " Se os argumentos da URL forem omitidos, serão exibidas informações\n" | |||
|
25556 | " sobre o diretório raiz na revisão ``tip``." | |||
|
25557 | ||||
|
25558 | msgid "" | |||
|
25559 | " Because this handler can only show information for directories, it\n" | |||
|
25560 | " is recommended to use the ``file`` handler instead, as it can handle both\n" | |||
|
25561 | " directories and files." | |||
|
25562 | msgstr "" | |||
|
25563 | " Como este comando só pode mostrar informações sobre diretórios,\n" | |||
|
25564 | " recomenda-se usar o comando ``file``, que é capaz de mostrar\n" | |||
|
25565 | " tanto diretórios como arquivos." | |||
|
25566 | ||||
|
25567 | msgid " The ``manifest`` template will be rendered for this handler." | |||
|
25568 | msgstr " Renderiza usando o modelo ``manifest``." | |||
|
25569 | ||||
|
25570 | msgid "" | |||
|
25571 | "\n" | |||
|
25572 | " /tags\n" | |||
|
25573 | " -----" | |||
|
25574 | msgstr "" | |||
|
25575 | "\n" | |||
|
25576 | " /tags\n" | |||
|
25577 | " -----" | |||
|
25578 | ||||
|
25579 | msgid " Show information about tags." | |||
|
25580 | msgstr " Mostra informações sobre etiquetas." | |||
|
25581 | ||||
|
25582 | msgid " No arguments are accepted." | |||
|
25583 | msgstr " Este comando não recebe argumentos." | |||
|
25584 | ||||
|
25585 | msgid " The ``tags`` template is rendered." | |||
|
25586 | msgstr " Renderiza usando o modelo ``tags``." | |||
|
25587 | ||||
|
25588 | msgid "" | |||
|
25589 | "\n" | |||
|
25590 | " /bookmarks\n" | |||
|
25591 | " ----------" | |||
|
25592 | msgstr "" | |||
|
25593 | "\n" | |||
|
25594 | " /bookmarks\n" | |||
|
25595 | " ----------" | |||
|
25596 | ||||
|
25597 | msgid " Show information about bookmarks." | |||
|
25598 | msgstr " Mostra informações sobre marcadores." | |||
|
25599 | ||||
|
25600 | msgid " The ``bookmarks`` template is rendered." | |||
|
25601 | msgstr " Renderiza usando o modelo ``bookmarks``." | |||
|
25602 | ||||
|
25603 | msgid "" | |||
|
25604 | "\n" | |||
|
25605 | " /branches\n" | |||
|
25606 | " ---------" | |||
|
25607 | msgstr "" | |||
|
25608 | "\n" | |||
|
25609 | " /branches\n" | |||
|
25610 | " ---------" | |||
|
25611 | ||||
|
25612 | msgid " Show information about branches." | |||
|
25613 | msgstr " Mostra informações sobre ramos." | |||
|
25614 | ||||
|
25615 | msgid "" | |||
|
25616 | " All known branches are contained in the output, even closed branches." | |||
|
25617 | msgstr "" | |||
|
25618 | " São exibidas informações sobre todos os ramos conhecidos,\n" | |||
|
25619 | " inclusive ramos fechados." | |||
|
25620 | ||||
|
25621 | msgid " The ``branches`` template is rendered." | |||
|
25622 | msgstr " Renderiza usando o modelo ``branches``." | |||
|
25623 | ||||
|
25624 | msgid "" | |||
|
25625 | "\n" | |||
|
25626 | " /summary\n" | |||
|
25627 | " --------" | |||
|
25628 | msgstr "" | |||
|
25629 | "\n" | |||
|
25630 | " /summary\n" | |||
|
25631 | " --------" | |||
|
25632 | ||||
|
25633 | msgid " Show a summary of repository state." | |||
|
25634 | msgstr " Mostra um resumo do restado do repositório." | |||
|
25635 | ||||
|
25636 | msgid "" | |||
|
25637 | " Information about the latest changesets, bookmarks, tags, and branches\n" | |||
|
25638 | " is captured by this handler." | |||
|
25639 | msgstr "" | |||
|
25640 | " Exibe informações sobre as últimas revisões, marcadores,\n" | |||
|
25641 | " etiquetas e ramos." | |||
|
25642 | ||||
|
25643 | msgid " The ``summary`` template is rendered." | |||
|
25644 | msgstr " Renderiza usando o modelo ``summary``." | |||
|
25645 | ||||
|
25646 | msgid "" | |||
|
25647 | "\n" | |||
|
25648 | " /diff/{revision}/{path}\n" | |||
|
25649 | " -----------------------" | |||
|
25650 | msgstr "" | |||
|
25651 | "\n" | |||
|
25652 | " /diff/{revisão}/{caminho}\n" | |||
|
25653 | " -------------------------" | |||
|
25654 | ||||
|
25655 | msgid " Show how a file changed in a particular commit." | |||
|
25656 | msgstr "" | |||
|
25657 | " Mostra de que forma um arquivo mudou em uma revisão em particular." | |||
|
25658 | ||||
|
25659 | msgid " The ``filediff`` template is rendered." | |||
|
25660 | msgstr " Renderiza usando o modelo ``filediff``." | |||
|
25661 | ||||
|
25662 | msgid "" | |||
|
25663 | " This hander is registered under both the ``/diff`` and ``/filediff``\n" | |||
|
25664 | " paths. ``/diff`` is used in modern code." | |||
|
25665 | msgstr "" | |||
|
25666 | " Tanto ``/diff`` como ``/filediff`` executam este comando.\n" | |||
|
25667 | " ``/diff`` é usado em código mais recente." | |||
|
25668 | ||||
|
25669 | msgid "" | |||
|
25670 | "\n" | |||
|
25671 | " /comparison/{revision}/{path}\n" | |||
|
25672 | " -----------------------------" | |||
|
25673 | msgstr "" | |||
|
25674 | "\n" | |||
|
25675 | " /comparison/{revisão}/{caminho}\n" | |||
|
25676 | " -------------------------------" | |||
|
25677 | ||||
|
25678 | msgid "" | |||
|
25679 | " Show a comparison between the old and new versions of a file from changes\n" | |||
|
25680 | " made on a particular revision." | |||
|
25681 | msgstr "" | |||
|
25682 | " Mostra uma comparação entre a versão antiga e a nova de\n" | |||
|
25683 | " um arquivo a partir das mudanças feitas em uma revisão em\n" | |||
|
25684 | " particular." | |||
|
25685 | ||||
|
25686 | msgid "" | |||
|
25687 | " This is similar to the ``diff`` handler. However, this form features\n" | |||
|
25688 | " a split or side-by-side diff rather than a unified diff." | |||
|
25689 | msgstr "" | |||
|
25690 | " Similar ao comando ``diff``, mas exibe uma comparação\n" | |||
|
25691 | " dividida ou lado-a-lado ao invés de um diff unificado." | |||
|
25692 | ||||
|
25693 | msgid "" | |||
|
25694 | " The ``context`` query string argument can be used to control the lines of\n" | |||
|
25695 | " context in the diff." | |||
|
25696 | msgstr "" | |||
|
25697 | " O argumento da string de consulta ``context`` pode ser usado\n" | |||
|
25698 | " para controlar as linhas de contexto no diff." | |||
|
25699 | ||||
|
25700 | msgid " The ``filecomparison`` template is rendered." | |||
|
25701 | msgstr " Renderiza usando o modelo ``filecomparison``." | |||
|
25702 | ||||
24949 | #, python-format |
|
25703 | #, python-format | |
24950 | msgid "(binary file %s, hash: %s)" |
|
25704 | msgid "(binary file %s, hash: %s)" | |
24951 | msgstr "(arquivo binário %s, hash: %s)" |
|
25705 | msgstr "(arquivo binário %s, hash: %s)" | |
24952 |
|
25706 | |||
|
25707 | msgid "" | |||
|
25708 | "\n" | |||
|
25709 | " /annotate/{revision}/{path}\n" | |||
|
25710 | " ---------------------------" | |||
|
25711 | msgstr "" | |||
|
25712 | "\n" | |||
|
25713 | " /annotate/{revisão}/{caminho}\n" | |||
|
25714 | " -----------------------------" | |||
|
25715 | ||||
|
25716 | msgid " Show changeset information for each line in a file." | |||
|
25717 | msgstr " Mostra informações de revisão para cada linha de um arquivo." | |||
|
25718 | ||||
|
25719 | msgid " The ``fileannotate`` template is rendered." | |||
|
25720 | msgstr " Renderiza usando o modelo ``fileannotate``." | |||
|
25721 | ||||
|
25722 | msgid "" | |||
|
25723 | "\n" | |||
|
25724 | " /filelog/{revision}/{path}\n" | |||
|
25725 | " --------------------------" | |||
|
25726 | msgstr "" | |||
|
25727 | "\n" | |||
|
25728 | " /filelog/{revisão}/{caminho}\n" | |||
|
25729 | " ----------------------------" | |||
|
25730 | ||||
|
25731 | msgid " Show information about the history of a file in the repository." | |||
|
25732 | msgstr "" | |||
|
25733 | " Mostra informações sobre o histórico de um arquivo\n" | |||
|
25734 | " no repositório." | |||
|
25735 | ||||
|
25736 | msgid "" | |||
|
25737 | " The ``revcount`` query string argument can be defined to control the\n" | |||
|
25738 | " maximum number of entries to show." | |||
|
25739 | msgstr "" | |||
|
25740 | " O argumento da string de consulta ``revcount`` pode ser definido\n" | |||
|
25741 | " para controlar o número máximo de entradas exibidas." | |||
|
25742 | ||||
|
25743 | msgid " The ``filelog`` template will be rendered." | |||
|
25744 | msgstr " Renderiza usando o modelo ``filelog``." | |||
|
25745 | ||||
|
25746 | msgid "" | |||
|
25747 | "\n" | |||
|
25748 | " /archive/{revision}.{format}[/{path}]\n" | |||
|
25749 | " -------------------------------------" | |||
|
25750 | msgstr "" | |||
|
25751 | "\n" | |||
|
25752 | " /archive/{revisão}.{formato}[/{caminho}]\n" | |||
|
25753 | " ----------------------------------------" | |||
|
25754 | ||||
|
25755 | msgid " Obtain an archive of repository content." | |||
|
25756 | msgstr " Obtém um pacote não versionado do conteúdo do repositório." | |||
|
25757 | ||||
|
25758 | msgid "" | |||
|
25759 | " The content and type of the archive is defined by a URL path parameter.\n" | |||
|
25760 | " ``format`` is the file extension of the archive type to be generated. e.g.\n" | |||
|
25761 | " ``zip`` or ``tar.bz2``. Not all archive types may be allowed by your\n" | |||
|
25762 | " server configuration." | |||
|
25763 | msgstr "" | |||
|
25764 | " O conteúdo e tipo do arquivo são definidos por um parâmetro\n" | |||
|
25765 | " no caminho da URL. ``formato`` é a extensão de arquivo do\n" | |||
|
25766 | " tipo de pacote a ser gerado, por exemplo ``zip`` ou ``tar.bz2``.\n" | |||
|
25767 | " Nem todos os tipos de arquivo podem ser permitidos pela\n" | |||
|
25768 | " configuração do servidor." | |||
|
25769 | ||||
|
25770 | msgid "" | |||
|
25771 | " The optional ``path`` URL parameter controls content to include in the\n" | |||
|
25772 | " archive. If omitted, every file in the specified revision is present in the\n" | |||
|
25773 | " archive. If included, only the specified file or contents of the specified\n" | |||
|
25774 | " directory will be included in the archive." | |||
|
25775 | msgstr "" | |||
|
25776 | " O parâmetro opcional ``caminho`` controla o conteúdo a ser\n" | |||
|
25777 | " incluído no pacote. Se omitido, serão incluídos todos os\n" | |||
|
25778 | " arquivos presentes na revisão pedida. Se definido, apenas\n" | |||
|
25779 | " o arquivo ou o conteúdo sob o diretório especificado será\n" | |||
|
25780 | " incluído no pacote." | |||
|
25781 | ||||
|
25782 | msgid "" | |||
|
25783 | " No template is used for this handler. Raw, binary content is generated." | |||
|
25784 | msgstr " Este comando não usa modelos, e gera conteúdo binário." | |||
|
25785 | ||||
|
25786 | msgid "" | |||
|
25787 | "\n" | |||
|
25788 | " /graph[/{revision}]\n" | |||
|
25789 | " -------------------" | |||
|
25790 | msgstr "" | |||
|
25791 | "\n" | |||
|
25792 | " /graph[/{revisão}]\n" | |||
|
25793 | " ------------------" | |||
|
25794 | ||||
|
25795 | msgid " Show information about the graphical topology of the repository." | |||
|
25796 | msgstr " Mostra uma representação gráfica da topologia do repositório." | |||
|
25797 | ||||
|
25798 | msgid "" | |||
|
25799 | " Information rendered by this handler can be used to create visual\n" | |||
|
25800 | " representations of repository topology." | |||
|
25801 | msgstr "" | |||
|
25802 | " As informações renderizadas por este comando podem ser\n" | |||
|
25803 | " usadas para criar representações visuais da topologia\n" | |||
|
25804 | " do repositório." | |||
|
25805 | ||||
|
25806 | msgid " The ``revision`` URL parameter controls the starting changeset." | |||
|
25807 | msgstr " O parâmetro URL ``revisão`` controla a revisão inicial." | |||
|
25808 | ||||
|
25809 | msgid "" | |||
|
25810 | " The ``revcount`` query string argument can define the number of changesets\n" | |||
|
25811 | " to show information for." | |||
|
25812 | msgstr "" | |||
|
25813 | " O argumento da string de consulta ``revcount`` pode ser usado\n" | |||
|
25814 | " para definir o número de revisões exibidas." | |||
|
25815 | ||||
|
25816 | msgid " This handler will render the ``graph`` template." | |||
|
25817 | msgstr " Renderiza usando o modelo ``graph``." | |||
|
25818 | ||||
|
25819 | msgid "" | |||
|
25820 | "\n" | |||
|
25821 | " /help[/{topic}]\n" | |||
|
25822 | " ---------------" | |||
|
25823 | msgstr "" | |||
|
25824 | "\n" | |||
|
25825 | " /help[/{tópico}]\n" | |||
|
25826 | " ----------------" | |||
|
25827 | ||||
|
25828 | msgid " Render help documentation." | |||
|
25829 | msgstr " Renderiza documentação de ajuda." | |||
|
25830 | ||||
|
25831 | msgid "" | |||
|
25832 | " This web command is roughly equivalent to :hg:`help`. If a ``topic``\n" | |||
|
25833 | " is defined, that help topic will be rendered. If not, an index of\n" | |||
|
25834 | " available help topics will be rendered." | |||
|
25835 | msgstr "" | |||
|
25836 | " Este comando web é aproximadamente equivalente a :hg:`help`.\n" | |||
|
25837 | " Se um ``tópico`` for definido, serão exibidas informações sobre\n" | |||
|
25838 | " esse tópico. Se não, será exibido um índice contendo os tópicos\n" | |||
|
25839 | " de ajuda disponíveis." | |||
|
25840 | ||||
|
25841 | msgid "" | |||
|
25842 | " The ``help`` template will be rendered when requesting help for a topic.\n" | |||
|
25843 | " ``helptopics`` will be rendered for the index of help topics." | |||
|
25844 | msgstr "" | |||
|
25845 | " Renderiza tópicos específicos usando o modelo ``help``.\n" | |||
|
25846 | " O modelo ``helptopics`` é usado para gerar o índice de tópicos." | |||
|
25847 | ||||
24953 | #, python-format |
|
25848 | #, python-format | |
24954 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" |
|
25849 | msgid " %d files changed, %d insertions(+), %d deletions(-)\n" | |
24955 | msgstr " %d arquivos modificados, %d inserções(+), %d remoções(-)\n" |
|
25850 | msgstr " %d arquivos modificados, %d inserções(+), %d remoções(-)\n" | |
@@ -25090,6 +25985,12 b' msgid ".hg/sharedpath points to nonexist' | |||||
25090 | msgstr ".hg/sharedpath aponta para diretório %s inexistente" |
|
25985 | msgstr ".hg/sharedpath aponta para diretório %s inexistente" | |
25091 |
|
25986 | |||
25092 | #, python-format |
|
25987 | #, python-format | |
|
25988 | msgid "obsolete feature not enabled but %i markers found!\n" | |||
|
25989 | msgstr "" | |||
|
25990 | "a funcionalidade obsolete não está habilitada, mas foram encontradas %i " | |||
|
25991 | "marcações!\n" | |||
|
25992 | ||||
|
25993 | #, python-format | |||
25093 | msgid "warning: ignoring unknown working parent %s!\n" |
|
25994 | msgid "warning: ignoring unknown working parent %s!\n" | |
25094 | msgstr "aviso: ignorando pai desconhecido do diretório de trabalho '%s'!\n" |
|
25995 | msgstr "aviso: ignorando pai desconhecido do diretório de trabalho '%s'!\n" | |
25095 |
|
25996 | |||
@@ -25320,6 +26221,10 b' msgid "\'\\\\n\' and \'\\\\r\' disallowed in fil' | |||||
25320 | msgstr "'\\n' e '\\r' proibidos em nomes de arquivos: %r" |
|
26221 | msgstr "'\\n' e '\\r' proibidos em nomes de arquivos: %r" | |
25321 |
|
26222 | |||
25322 | #, python-format |
|
26223 | #, python-format | |
|
26224 | msgid "unable to read file list (%s)" | |||
|
26225 | msgstr "incapaz de ler lista de arquivos (%s)" | |||
|
26226 | ||||
|
26227 | #, python-format | |||
25323 | msgid "invalid pattern (%s): %s" |
|
26228 | msgid "invalid pattern (%s): %s" | |
25324 | msgstr "padrão inválido (%s): %s" |
|
26229 | msgstr "padrão inválido (%s): %s" | |
25325 |
|
26230 | |||
@@ -25327,10 +26232,6 b' msgid "invalid pattern"' | |||||
25327 | msgstr "padrão inválido" |
|
26232 | msgstr "padrão inválido" | |
25328 |
|
26233 | |||
25329 | #, python-format |
|
26234 | #, python-format | |
25330 | msgid "unable to read file list (%s)" |
|
|||
25331 | msgstr "incapaz de ler lista de arquivos (%s)" |
|
|||
25332 |
|
||||
25333 | #, python-format |
|
|||
25334 | msgid "diff context lines count must be an integer, not %r" |
|
26235 | msgid "diff context lines count must be an integer, not %r" | |
25335 | msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r" |
|
26236 | msgstr "o número de linhas de contexto de diff deve ser um inteiro, e não %r" | |
25336 |
|
26237 | |||
@@ -25363,6 +26264,9 b' msgstr "examinando manifestos\\n"' | |||||
25363 | msgid "note: merging %s and %s using bids from ancestors %s\n" |
|
26264 | msgid "note: merging %s and %s using bids from ancestors %s\n" | |
25364 | msgstr "nota: mesclando %s e %s usando lances dos ancestrais %s\n" |
|
26265 | msgstr "nota: mesclando %s e %s usando lances dos ancestrais %s\n" | |
25365 |
|
26266 | |||
|
26267 | msgid " and " | |||
|
26268 | msgstr " e " | |||
|
26269 | ||||
25366 | #, python-format |
|
26270 | #, python-format | |
25367 | msgid "" |
|
26271 | msgid "" | |
25368 | "\n" |
|
26272 | "\n" | |
@@ -25414,10 +26318,6 b' msgstr "use \'hg update\' ou verifique \'hg' | |||||
25414 | msgid "use 'hg status' to list changes" |
|
26318 | msgid "use 'hg status' to list changes" | |
25415 | msgstr "use 'hg status' para listar as mudanças" |
|
26319 | msgstr "use 'hg status' para listar as mudanças" | |
25416 |
|
26320 | |||
25417 | #, python-format |
|
|||
25418 | msgid "uncommitted changes in subrepository '%s'" |
|
|||
25419 | msgstr "mudanças não consolidadas no sub-repositório '%s'" |
|
|||
25420 |
|
||||
25421 | msgid "commit and merge, or update --clean to discard changes" |
|
26321 | msgid "commit and merge, or update --clean to discard changes" | |
25422 | msgstr "execute commit e merge, ou update --clean para descartar mudanças" |
|
26322 | msgstr "execute commit e merge, ou update --clean para descartar mudanças" | |
25423 |
|
26323 | |||
@@ -25586,6 +26486,66 b' msgstr "Trecho #%d aplicado com sucesso em %d (dist\xc3\xa2ncia %d linhas).\\n"' | |||||
25586 | msgid "Hunk #%d FAILED at %d\n" |
|
26486 | msgid "Hunk #%d FAILED at %d\n" | |
25587 | msgstr "Trecho #%d FALHOU em %d\n" |
|
26487 | msgstr "Trecho #%d FALHOU em %d\n" | |
25588 |
|
26488 | |||
|
26489 | msgid "this modifies a binary file (all or nothing)\n" | |||
|
26490 | msgstr "isto modifica um arquivo binário (tudo ou nada)\n" | |||
|
26491 | ||||
|
26492 | msgid "this is a binary file\n" | |||
|
26493 | msgstr "este é um arquivo binário\n" | |||
|
26494 | ||||
|
26495 | #, python-format | |||
|
26496 | msgid "%d hunks, %d lines changed\n" | |||
|
26497 | msgstr "%d trechos, %d linhas modificadas\n" | |||
|
26498 | ||||
|
26499 | msgid "" | |||
|
26500 | "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " | |||
|
26501 | "change manually$$ &Skip remaining changes to this file$$ Record remaining " | |||
|
26502 | "changes to this &file$$ &Done, skip remaining changes and files$$ Record " | |||
|
26503 | "&all changes to all remaining files$$ &Quit, recording no changes$$ &? " | |||
|
26504 | "(display help)" | |||
|
26505 | msgstr "" | |||
|
26506 | "[Ynesfdaq?]$$ (&Y) sim, grave esta mudança$$ &Não, descarte esta mudança$$ " | |||
|
26507 | "&Edite esta mudança manualmente$$ De&Scarte as mudanças restantes neste " | |||
|
26508 | "arquivo$$ (&F) grave as mudanças restantes deste arquivo$$ Termina&Do, " | |||
|
26509 | "descarte as mudanças e arquivos restantes$$ Grave tod&As as mudanças de " | |||
|
26510 | "todos os arquivos restantes$$ (&Q) encerra, sem gravar nenhuma mudança$$ &? " | |||
|
26511 | "(exibe a ajuda)" | |||
|
26512 | ||||
|
26513 | msgid "" | |||
|
26514 | "\n" | |||
|
26515 | "To remove '-' lines, make them ' ' lines (context).\n" | |||
|
26516 | "To remove '+' lines, delete them.\n" | |||
|
26517 | "Lines starting with # will be removed from the patch." | |||
|
26518 | msgstr "" | |||
|
26519 | "\n" | |||
|
26520 | "Para remover linhas '-', marque-as como linhas ' ' (contexto).\n" | |||
|
26521 | "Para remover linhas '+', apague-as.\n" | |||
|
26522 | "Linhas iniciadas por '#' serão removidas do patch." | |||
|
26523 | ||||
|
26524 | msgid "" | |||
|
26525 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |||
|
26526 | "added to the record list. If it does not apply cleanly, a rejects\n" | |||
|
26527 | "file will be generated: you can use that when you try again. If\n" | |||
|
26528 | "all lines of the hunk are removed, then the edit is aborted and\n" | |||
|
26529 | "the hunk is left unchanged.\n" | |||
|
26530 | msgstr "" | |||
|
26531 | "Se o patch aplicar de forma limpa, o trecho editado será adicionado\n" | |||
|
26532 | "imediatamente à lista de gravação. Se o patch não aplicar de forma\n" | |||
|
26533 | "limpa, um arquivo de rejeitos será gerado: você poderá usar esse\n" | |||
|
26534 | "arquivo ao tentar novamente. Se todas as linhas do trecho forem\n" | |||
|
26535 | "removidas, a edição será abortada e o trecho não será modificado.\n" | |||
|
26536 | ||||
|
26537 | #, python-format | |||
|
26538 | msgid "examine changes to %s?" | |||
|
26539 | msgstr "examinar mudanças em %s?" | |||
|
26540 | ||||
|
26541 | #, python-format | |||
|
26542 | msgid "record this change to '%s'?" | |||
|
26543 | msgstr "gravar esta mudança em '%s'?" | |||
|
26544 | ||||
|
26545 | #, python-format | |||
|
26546 | msgid "record change %d/%d to '%s'?" | |||
|
26547 | msgstr "gravar mudança %d/%d em '%s'?" | |||
|
26548 | ||||
25589 | #, python-format |
|
26549 | #, python-format | |
25590 | msgid "bad hunk #%d" |
|
26550 | msgid "bad hunk #%d" | |
25591 | msgstr "trecho ruim #%d" |
|
26551 | msgstr "trecho ruim #%d" | |
@@ -25778,6 +26738,10 b' msgid "node %s is not censored"' | |||||
25778 | msgstr "o nó %s não é censurado" |
|
26738 | msgstr "o nó %s não é censurado" | |
25779 |
|
26739 | |||
25780 | #, python-format |
|
26740 | #, python-format | |
|
26741 | msgid "syntax error in revset '%s'" | |||
|
26742 | msgstr "erro de sintaxe no revset '%s'" | |||
|
26743 | ||||
|
26744 | #, python-format | |||
25781 | msgid "at %s: %s" |
|
26745 | msgid "at %s: %s" | |
25782 | msgstr "em %s: %s" |
|
26746 | msgstr "em %s: %s" | |
25783 |
|
26747 | |||
@@ -26154,12 +27118,13 b' msgstr "%s espera um nome de arquivo"' | |||||
26154 |
|
27118 | |||
26155 | msgid "" |
|
27119 | msgid "" | |
26156 | "``follow([file])``\n" |
|
27120 | "``follow([file])``\n" | |
26157 |
" An alias for ``::.`` (ancestors of the working |
|
27121 | " An alias for ``::.`` (ancestors of the working directory's first parent).\n" | |
26158 | " If a filename is specified, the history of the given file is followed,\n" |
|
27122 | " If a filename is specified, the history of the given file is followed,\n" | |
26159 | " including copies." |
|
27123 | " including copies." | |
26160 | msgstr "" |
|
27124 | msgstr "" | |
26161 | "``follow([arquivo])``\n" |
|
27125 | "``follow([arquivo])``\n" | |
26162 |
" Um apelido para ``::.`` (ancestrais do primeiro pai d |
|
27126 | " Um apelido para ``::.`` (ancestrais do primeiro pai do diretório\n" | |
|
27127 | " de trabalho).\n" | |||
26163 | " Se um nome de arquivo for especificado, o histórico do arquivo pedido será\n" |
|
27128 | " Se um nome de arquivo for especificado, o histórico do arquivo pedido será\n" | |
26164 | " seguido, incluindo cópias." |
|
27129 | " seguido, incluindo cópias." | |
26165 |
|
27130 | |||
@@ -26710,6 +27675,19 b' msgstr "especifica\xc3\xa7\xc3\xa3o do sort deve ser uma string"' | |||||
26710 | msgid "unknown sort key %r" |
|
27675 | msgid "unknown sort key %r" | |
26711 | msgstr "especificação de ordenação desconhecida: %r" |
|
27676 | msgstr "especificação de ordenação desconhecida: %r" | |
26712 |
|
27677 | |||
|
27678 | msgid "" | |||
|
27679 | "``subrepo([pattern])``\n" | |||
|
27680 | " Changesets that add, modify or remove the given subrepo. If no subrepo\n" | |||
|
27681 | " pattern is named, any subrepo changes are returned." | |||
|
27682 | msgstr "" | |||
|
27683 | "``subrepo([pattern])``\n" | |||
|
27684 | " Revisões que adicionam, modificam ou removem o sub-repositório\n" | |||
|
27685 | " pedido. Se não for especificado, informa revisões que alterem\n" | |||
|
27686 | " qualquer sub-repositório." | |||
|
27687 | ||||
|
27688 | msgid "subrepo requires a pattern" | |||
|
27689 | msgstr "subrepo requer um padrão" | |||
|
27690 | ||||
26713 | #, python-format |
|
27691 | #, python-format | |
26714 | msgid "invalid regular expression: %s" |
|
27692 | msgid "invalid regular expression: %s" | |
26715 | msgstr "expressão regular inválida: %s" |
|
27693 | msgstr "expressão regular inválida: %s" | |
@@ -26768,6 +27746,10 b' msgstr ""' | |||||
26768 | " uma expressão regular. Para combinar com um usuário que contiver\n" |
|
27746 | " uma expressão regular. Para combinar com um usuário que contiver\n" | |
26769 | " `re:` literalmente, use o prefixo `literal:`." |
|
27747 | " `re:` literalmente, use o prefixo `literal:`." | |
26770 |
|
27748 | |||
|
27749 | #. i18n: "wdir" is a keyword | |||
|
27750 | msgid "wdir takes no arguments" | |||
|
27751 | msgstr "wdir não tem argumentos" | |||
|
27752 | ||||
26771 | msgid "can't negate that" |
|
27753 | msgid "can't negate that" | |
26772 | msgstr "não é possível negar essa expressão" |
|
27754 | msgstr "não é possível negar essa expressão" | |
26773 |
|
27755 | |||
@@ -27018,18 +28000,18 b' msgid "(in subrepo %s)"' | |||||
27018 | msgstr "(no sub-repositório %s)" |
|
28000 | msgstr "(no sub-repositório %s)" | |
27019 |
|
28001 | |||
27020 | #, python-format |
|
28002 | #, python-format | |
27021 | msgid "warning: subrepo spec file %s not found\n" |
|
28003 | msgid "warning: subrepo spec file '%s' not found\n" | |
27022 | msgstr "aviso: arquivo spec de sub-repositório %s não encontrado\n" |
|
28004 | msgstr "aviso: arquivo spec de sub-repositório '%s' não encontrado\n" | |
27023 |
|
28005 | |||
27024 | #, python-format |
|
28006 | #, python-format | |
27025 | msgid "subrepo spec file %s not found" |
|
28007 | msgid "subrepo spec file '%s' not found" | |
27026 | msgstr "arquivo spec de sub-repositório %s não encontrado" |
|
28008 | msgstr "arquivo spec de sub-repositório '%s' não encontrado" | |
27027 |
|
28009 | |||
27028 | #, python-format |
|
28010 | #, python-format | |
27029 |
msgid "invalid subrepository revision specifier in |
|
28011 | msgid "invalid subrepository revision specifier in '%s' line %d" | |
27030 | msgstr "" |
|
28012 | msgstr "" | |
27031 |
"especificador de revisão de sub-repositório inválido n |
|
28013 | "especificador de revisão de sub-repositório inválido no arquivo '%s' linha " | |
27032 | ".hgsubstate" |
|
28014 | "%d" | |
27033 |
|
28015 | |||
27034 | #, python-format |
|
28016 | #, python-format | |
27035 | msgid "bad subrepository pattern in %s: %s" |
|
28017 | msgid "bad subrepository pattern in %s: %s" | |
@@ -27103,6 +28085,10 b' msgstr ""' | |||||
27103 | msgid "warning: changes are committed in %s phase from subrepository %s\n" |
|
28085 | msgid "warning: changes are committed in %s phase from subrepository %s\n" | |
27104 | msgstr "aviso: mudanças consolidadas na fase \"%s\" do sub-repositório %s\n" |
|
28086 | msgstr "aviso: mudanças consolidadas na fase \"%s\" do sub-repositório %s\n" | |
27105 |
|
28087 | |||
|
28088 | #, python-format | |||
|
28089 | msgid "uncommitted changes in subrepository '%s'" | |||
|
28090 | msgstr "mudanças não consolidadas no sub-repositório '%s'" | |||
|
28091 | ||||
27106 | msgid "addremove is not supported" |
|
28092 | msgid "addremove is not supported" | |
27107 | msgstr "addremove não é suportado" |
|
28093 | msgstr "addremove não é suportado" | |
27108 |
|
28094 | |||
@@ -27224,9 +28210,6 b' msgstr "n\xc3\xa3o \xc3\xa9 poss\xc3\xadvel decodificar entrada"' | |||||
27224 | msgid "node '%s' is not well formed" |
|
28210 | msgid "node '%s' is not well formed" | |
27225 | msgstr "nó '%s' não é bem formado" |
|
28211 | msgstr "nó '%s' não é bem formado" | |
27226 |
|
28212 | |||
27227 | msgid ".hg/cache/tags is corrupt, rebuilding it\n" |
|
|||
27228 | msgstr ".hg/cache/tags está corrompido, reconstruindo\n" |
|
|||
27229 |
|
||||
27230 | msgid "" |
|
28213 | msgid "" | |
27231 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" |
|
28214 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |
27232 | " every line except the last." |
|
28215 | " every line except the last." | |
@@ -27337,6 +28320,9 b' msgstr ""' | |||||
27337 | msgid ":localdate: Date. Converts a date to local date." |
|
28320 | msgid ":localdate: Date. Converts a date to local date." | |
27338 | msgstr ":localdate: Data. Converte para data local." |
|
28321 | msgstr ":localdate: Data. Converte para data local." | |
27339 |
|
28322 | |||
|
28323 | msgid ":lower: Any text. Converts the text to lowercase." | |||
|
28324 | msgstr ":lower: Qualquer texto. Converte o texto para minúsculas." | |||
|
28325 | ||||
27340 | msgid ":nonempty: Any text. Returns '(none)' if the string is empty." |
|
28326 | msgid ":nonempty: Any text. Returns '(none)' if the string is empty." | |
27341 | msgstr ":nonempty: Qualquer texto. Devolve (none) se o texto for vazio." |
|
28327 | msgstr ":nonempty: Qualquer texto. Devolve (none) se o texto for vazio." | |
27342 |
|
28328 | |||
@@ -27453,6 +28439,9 b' msgstr ""' | |||||
27453 | ":tabindent: Qualquer texto. Insere um caractere de tabulação no\n" |
|
28439 | ":tabindent: Qualquer texto. Insere um caractere de tabulação no\n" | |
27454 | " início de cada linha não vazia do texto, exceto a primeira." |
|
28440 | " início de cada linha não vazia do texto, exceto a primeira." | |
27455 |
|
28441 | |||
|
28442 | msgid ":upper: Any text. Converts the text to uppercase." | |||
|
28443 | msgstr ":upper: Qualquer texto. Converte o texto para maiúsculas." | |||
|
28444 | ||||
27456 | msgid "" |
|
28445 | msgid "" | |
27457 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" |
|
28446 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" | |
27458 | " \"foo bar\" becomes \"foo%20bar\"." |
|
28447 | " \"foo bar\" becomes \"foo%20bar\"." | |
@@ -27646,14 +28635,37 b' msgstr "o filtro de modelo \'%s\' n\xc3\xa3o \xc3\xa9 compat\xc3\xadvel com a palavra chave \'%s\'"' | |||||
27646 | msgid "filter %s expects one argument" |
|
28635 | msgid "filter %s expects one argument" | |
27647 | msgstr "o filtro %s espera um argumento" |
|
28636 | msgstr "o filtro %s espera um argumento" | |
27648 |
|
28637 | |||
|
28638 | msgid "" | |||
|
28639 | ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n" | |||
|
28640 | " strings." | |||
|
28641 | msgstr "" | |||
|
28642 | ":date(date[, fmt]): Formata uma data. Veja :hg:`help dates` para\n" | |||
|
28643 | " strings de formatação." | |||
|
28644 | ||||
27649 | #. i18n: "date" is a keyword |
|
28645 | #. i18n: "date" is a keyword | |
27650 | msgid "date expects one or two arguments" |
|
28646 | msgid "date expects one or two arguments" | |
27651 | msgstr "date espera um ou dois argumentos" |
|
28647 | msgstr "date espera um ou dois argumentos" | |
27652 |
|
28648 | |||
|
28649 | msgid "" | |||
|
28650 | ":diff([includepattern [, excludepattern]]): Show a diff, optionally\n" | |||
|
28651 | " specifying files to include or exclude." | |||
|
28652 | msgstr "" | |||
|
28653 | ":diff([padrãodeinclusão [, padrãodeexclusão]]): Mostra um diff,\n" | |||
|
28654 | " opcionalmente especificando arquivos a serem excluídos\n" | |||
|
28655 | " ou incluídos." | |||
|
28656 | ||||
27653 | #. i18n: "diff" is a keyword |
|
28657 | #. i18n: "diff" is a keyword | |
27654 | msgid "diff expects one, two or no arguments" |
|
28658 | msgid "diff expects one, two or no arguments" | |
27655 | msgstr "diff espera um, dois ou nenhum argumento" |
|
28659 | msgstr "diff espera um, dois ou nenhum argumento" | |
27656 |
|
28660 | |||
|
28661 | msgid "" | |||
|
28662 | ":fill(text[, width[, initialident[, hangindent]]]): Fill many\n" | |||
|
28663 | " paragraphs with optional indentation. See the \"fill\" filter." | |||
|
28664 | msgstr "" | |||
|
28665 | ":fill(texto[, largura[, identaçãoinicial[, identação]]]): Preenche\n" | |||
|
28666 | " diversos parágrafos com identação opcional. Veja o filtro\n" | |||
|
28667 | " \"fill\"." | |||
|
28668 | ||||
27657 | #. i18n: "fill" is a keyword |
|
28669 | #. i18n: "fill" is a keyword | |
27658 | msgid "fill expects one to four arguments" |
|
28670 | msgid "fill expects one to four arguments" | |
27659 | msgstr "fill espera de um a quatro argumentos" |
|
28671 | msgstr "fill espera de um a quatro argumentos" | |
@@ -27662,10 +28674,26 b' msgstr "fill espera de um a quatro argum' | |||||
27662 | msgid "fill expects an integer width" |
|
28674 | msgid "fill expects an integer width" | |
27663 | msgstr "fill espera um número inteiro" |
|
28675 | msgstr "fill espera um número inteiro" | |
27664 |
|
28676 | |||
|
28677 | msgid "" | |||
|
28678 | ":pad(text, width[, fillchar=' '[, right=False]]): Pad text with a\n" | |||
|
28679 | " fill character." | |||
|
28680 | msgstr "" | |||
|
28681 | ":pad(texto, largura[, preenchimento=' '[, direita=False]]): Envolve\n" | |||
|
28682 | " o texto com um caractere de preenchimento." | |||
|
28683 | ||||
27665 | #. i18n: "pad" is a keyword |
|
28684 | #. i18n: "pad" is a keyword | |
27666 | msgid "pad() expects two to four arguments" |
|
28685 | msgid "pad() expects two to four arguments" | |
27667 | msgstr "pad() espera de dois a quatro argumentos" |
|
28686 | msgstr "pad() espera de dois a quatro argumentos" | |
27668 |
|
28687 | |||
|
28688 | msgid "" | |||
|
28689 | ":get(dict, key): Get an attribute/key from an object. Some keywords\n" | |||
|
28690 | " are complex types. This function allows you to obtain the value of an\n" | |||
|
28691 | " attribute on these type." | |||
|
28692 | msgstr "" | |||
|
28693 | ":get(dicionário, chave): Obtém um atributo ou chave de um objeto.\n" | |||
|
28694 | " Algumas chaves são tipos complexos. Esta função possibilita\n" | |||
|
28695 | " obter o valor de um atributo desses tipos." | |||
|
28696 | ||||
27669 | #. i18n: "get" is a keyword |
|
28697 | #. i18n: "get" is a keyword | |
27670 | msgid "get() expects two arguments" |
|
28698 | msgid "get() expects two arguments" | |
27671 | msgstr "get() espera dois argumentos" |
|
28699 | msgstr "get() espera dois argumentos" | |
@@ -27674,46 +28702,117 b' msgstr "get() espera dois argumentos"' | |||||
27674 | msgid "get() expects a dict as first argument" |
|
28702 | msgid "get() expects a dict as first argument" | |
27675 | msgstr "get() espera um dicionário como primeiro argumento" |
|
28703 | msgstr "get() espera um dicionário como primeiro argumento" | |
27676 |
|
28704 | |||
|
28705 | msgid "" | |||
|
28706 | ":if(expr, then[, else]): Conditionally execute based on the result of\n" | |||
|
28707 | " an expression." | |||
|
28708 | msgstr "" | |||
|
28709 | ":if(expressão, então[, senão]): Executa condicionalmente de acordo\n" | |||
|
28710 | " com o resultado de uma expressão." | |||
|
28711 | ||||
27677 | #. i18n: "if" is a keyword |
|
28712 | #. i18n: "if" is a keyword | |
27678 | msgid "if expects two or three arguments" |
|
28713 | msgid "if expects two or three arguments" | |
27679 | msgstr "if espera dois ou três argumentos" |
|
28714 | msgstr "if espera dois ou três argumentos" | |
27680 |
|
28715 | |||
|
28716 | msgid "" | |||
|
28717 | ":ifcontains(search, thing, then[, else]): Conditionally execute based\n" | |||
|
28718 | " on whether the item \"search\" is in \"thing\"." | |||
|
28719 | msgstr "" | |||
|
28720 | ":ifcontains(busca, coisa, então[, senão]): Executa se o item\n" | |||
|
28721 | " \"busca\" estiver em \"coisa\"." | |||
|
28722 | ||||
27681 | #. i18n: "ifcontains" is a keyword |
|
28723 | #. i18n: "ifcontains" is a keyword | |
27682 | msgid "ifcontains expects three or four arguments" |
|
28724 | msgid "ifcontains expects three or four arguments" | |
27683 | msgstr "ifcontains espera três ou quatro argumentos" |
|
28725 | msgstr "ifcontains espera três ou quatro argumentos" | |
27684 |
|
28726 | |||
|
28727 | msgid "" | |||
|
28728 | ":ifeq(expr1, expr2, then[, else]): Conditionally execute based on\n" | |||
|
28729 | " whether 2 items are equivalent." | |||
|
28730 | msgstr "" | |||
|
28731 | ":ifeq(expr1, expr2, então[, senão]): Executa se os dois itens\n" | |||
|
28732 | " forem equivalentes." | |||
|
28733 | ||||
27685 | #. i18n: "ifeq" is a keyword |
|
28734 | #. i18n: "ifeq" is a keyword | |
27686 | msgid "ifeq expects three or four arguments" |
|
28735 | msgid "ifeq expects three or four arguments" | |
27687 | msgstr "ifeq espera três ou quatro argumentos" |
|
28736 | msgstr "ifeq espera três ou quatro argumentos" | |
27688 |
|
28737 | |||
|
28738 | msgid ":join(list, sep): Join items in a list with a delimiter." | |||
|
28739 | msgstr ":join(lista, delim): Agrupa itens de uma lista usando um delimitador." | |||
|
28740 | ||||
27689 | #. i18n: "join" is a keyword |
|
28741 | #. i18n: "join" is a keyword | |
27690 | msgid "join expects one or two arguments" |
|
28742 | msgid "join expects one or two arguments" | |
27691 | msgstr "join espera um ou dois argumentos" |
|
28743 | msgstr "join espera um ou dois argumentos" | |
27692 |
|
28744 | |||
|
28745 | msgid "" | |||
|
28746 | ":label(label, expr): Apply a label to generated content. Content with\n" | |||
|
28747 | " a label applied can result in additional post-processing, such as\n" | |||
|
28748 | " automatic colorization." | |||
|
28749 | msgstr "" | |||
|
28750 | ":label(rótulo, expressão): Aplica um rótulo a um conteúdo gerado.\n" | |||
|
28751 | " O rótulo pode provocar pós-processamento adicional, por exemplo\n" | |||
|
28752 | " coloração automática." | |||
|
28753 | ||||
|
28754 | msgid "" | |||
|
28755 | ":revset(query[, formatargs...]): Execute a revision set query. See\n" | |||
|
28756 | " :hg:`help revset`." | |||
|
28757 | msgstr "" | |||
|
28758 | ":revset(consulta[, formato...]): Executa uma busca por revisões.\n" | |||
|
28759 | " Veja :hg:`help revset`." | |||
|
28760 | ||||
27693 | #. i18n: "revset" is a keyword |
|
28761 | #. i18n: "revset" is a keyword | |
27694 | msgid "revset expects one or more arguments" |
|
28762 | msgid "revset expects one or more arguments" | |
27695 | msgstr "revset espera um ou mais argumentos" |
|
28763 | msgstr "revset espera um ou mais argumentos" | |
27696 |
|
28764 | |||
|
28765 | msgid ":rstdoc(text, style): Format ReStructuredText." | |||
|
28766 | msgstr ":rstdoc(texto, estilo): Formata ReStructuredText." | |||
|
28767 | ||||
27697 | #. i18n: "rstdoc" is a keyword |
|
28768 | #. i18n: "rstdoc" is a keyword | |
27698 | msgid "rstdoc expects two arguments" |
|
28769 | msgid "rstdoc expects two arguments" | |
27699 | msgstr "rstdoc espera dois argumentos" |
|
28770 | msgstr "rstdoc espera dois argumentos" | |
27700 |
|
28771 | |||
|
28772 | msgid "" | |||
|
28773 | ":shortest(node, minlength=4): Obtain the shortest representation of\n" | |||
|
28774 | " a node." | |||
|
28775 | msgstr "" | |||
|
28776 | ":shortest(no, comprimentomínimo=4): Obtém a representação mais\n" | |||
|
28777 | " curta de um nó." | |||
|
28778 | ||||
27701 | #. i18n: "shortest" is a keyword |
|
28779 | #. i18n: "shortest" is a keyword | |
27702 | msgid "shortest() expects one or two arguments" |
|
28780 | msgid "shortest() expects one or two arguments" | |
27703 | msgstr "shortest() espera um ou dois argumentos" |
|
28781 | msgstr "shortest() espera um ou dois argumentos" | |
27704 |
|
28782 | |||
|
28783 | msgid ":strip(text[, chars]): Strip characters from a string." | |||
|
28784 | msgstr ":strip(texto[, caracteres]): Remove caracteres de uma string." | |||
|
28785 | ||||
27705 | #. i18n: "strip" is a keyword |
|
28786 | #. i18n: "strip" is a keyword | |
27706 | msgid "strip expects one or two arguments" |
|
28787 | msgid "strip expects one or two arguments" | |
27707 | msgstr "strip espera um ou dois argumentos" |
|
28788 | msgstr "strip espera um ou dois argumentos" | |
27708 |
|
28789 | |||
|
28790 | msgid "" | |||
|
28791 | ":sub(pattern, replacement, expression): Perform text substitution\n" | |||
|
28792 | " using regular expressions." | |||
|
28793 | msgstr "" | |||
|
28794 | ":sub(padrão, substituição, expressão): Realiza substituição de texto\n" | |||
|
28795 | " usando uma expressão regular." | |||
|
28796 | ||||
27709 | #. i18n: "sub" is a keyword |
|
28797 | #. i18n: "sub" is a keyword | |
27710 | msgid "sub expects three arguments" |
|
28798 | msgid "sub expects three arguments" | |
27711 | msgstr "sub espera três argumentos" |
|
28799 | msgstr "sub espera três argumentos" | |
27712 |
|
28800 | |||
|
28801 | msgid "" | |||
|
28802 | ":startswith(pattern, text): Returns the value from the \"text\" argument\n" | |||
|
28803 | " if it begins with the content from the \"pattern\" argument." | |||
|
28804 | msgstr "" | |||
|
28805 | ":startswith(padrão, texto): Devolve o argumento \"texto\" se ele\n" | |||
|
28806 | " começar com o argumento \"padrão\"." | |||
|
28807 | ||||
27713 | #. i18n: "startswith" is a keyword |
|
28808 | #. i18n: "startswith" is a keyword | |
27714 | msgid "startswith expects two arguments" |
|
28809 | msgid "startswith expects two arguments" | |
27715 | msgstr "startswith espera dois argumentos" |
|
28810 | msgstr "startswith espera dois argumentos" | |
27716 |
|
28811 | |||
|
28812 | msgid ":word(number, text[, separator]): Return the nth word from a string." | |||
|
28813 | msgstr "" | |||
|
28814 | "- word(número, texto[, separador]): Retorna a enésima palavra de uma string." | |||
|
28815 | ||||
27717 | #. i18n: "word" is a keyword |
|
28816 | #. i18n: "word" is a keyword | |
27718 | #, python-format |
|
28817 | #, python-format | |
27719 | msgid "word expects two or three arguments, got %d" |
|
28818 | msgid "word expects two or three arguments, got %d" | |
@@ -27770,8 +28869,8 b' msgstr "rollback falhou - por favor exec' | |||||
27770 | msgid "couldn't read journal entry %r!\n" |
|
28869 | msgid "couldn't read journal entry %r!\n" | |
27771 | msgstr "não foi possível ler a entrada do jornal %r!\n" |
|
28870 | msgstr "não foi possível ler a entrada do jornal %r!\n" | |
27772 |
|
28871 | |||
27773 | msgid "journal was created by a different version of Mercurial" |
|
28872 | msgid "journal was created by a different version of Mercurial\n" | |
27774 | msgstr "o journal foi criado por uma versão diferente do Mercurial" |
|
28873 | msgstr "o journal foi criado por uma versão diferente do Mercurial\n" | |
27775 |
|
28874 | |||
27776 | msgid "already have changeset " |
|
28875 | msgid "already have changeset " | |
27777 | msgstr "já possui a revisão " |
|
28876 | msgstr "já possui a revisão " | |
@@ -27869,6 +28968,12 b' msgstr "%s n\xc3\xa3o bate: esperado %s, obtido %s"' | |||||
27869 | msgid "command '%s' failed: %s" |
|
28968 | msgid "command '%s' failed: %s" | |
27870 | msgstr "falha ao executar o comando '%s' : %s" |
|
28969 | msgstr "falha ao executar o comando '%s' : %s" | |
27871 |
|
28970 | |||
|
28971 | msgid "linking" | |||
|
28972 | msgstr "lincando" | |||
|
28973 | ||||
|
28974 | msgid "copying" | |||
|
28975 | msgstr "copiando" | |||
|
28976 | ||||
27872 | msgid "filename ends with '\\', which is invalid on Windows" |
|
28977 | msgid "filename ends with '\\', which is invalid on Windows" | |
27873 | msgstr "o nome de arquivo termina em '\\', o que não é permitido em Windows" |
|
28978 | msgstr "o nome de arquivo termina em '\\', o que não é permitido em Windows" | |
27874 |
|
28979 | |||
@@ -28217,6 +29322,105 b' msgstr "procurar mudan\xc3\xa7as remotas"' | |||||
28217 | msgid "number of cpus must be an integer" |
|
29322 | msgid "number of cpus must be an integer" | |
28218 | msgstr "o número de cpus deve ser um inteiro" |
|
29323 | msgstr "o número de cpus deve ser um inteiro" | |
28219 |
|
29324 | |||
|
29325 | #~ msgid "hg debug-merge-base REV REV" | |||
|
29326 | #~ msgstr "hg debug-merge-base REV REV" | |||
|
29327 | ||||
|
29328 | #~ msgid "hg debug-cat-file [OPTION]... TYPE FILE" | |||
|
29329 | #~ msgstr "hg debug-cat-file [OPÇÃO]... TIPO ARQUIVO" | |||
|
29330 | ||||
|
29331 | #~ msgid "hg debug-rev-parse REV" | |||
|
29332 | #~ msgstr "hg debug-rev-parse REV" | |||
|
29333 | ||||
|
29334 | #~ msgid "parse given revisions" | |||
|
29335 | #~ msgstr "decodifica as revisões dadas" | |||
|
29336 | ||||
|
29337 | #~ msgid "hg debug-config" | |||
|
29338 | #~ msgstr "hg debug-config" | |||
|
29339 | ||||
|
29340 | #~ msgid "print extension options" | |||
|
29341 | #~ msgstr "imprime opções da extensão" | |||
|
29342 | ||||
|
29343 | #~ msgid "%s: empty changeset" | |||
|
29344 | #~ msgstr "%s: revisão vazia" | |||
|
29345 | ||||
|
29346 | #~ msgid "use \"histedit --abort\" to clear broken state" | |||
|
29347 | #~ msgstr "use \"histedit --abort\" para limpar o estado quebrado" | |||
|
29348 | ||||
|
29349 | #~ msgid "uncommitted changes in subrepository %s" | |||
|
29350 | #~ msgstr "mudanças não consolidadas no sub-repositório %s" | |||
|
29351 | ||||
|
29352 | #~ msgid "uncommitted changes in subrepo %s" | |||
|
29353 | #~ msgstr "mudanças não consolidadas no sub-repositório %s" | |||
|
29354 | ||||
|
29355 | #~ msgid "" | |||
|
29356 | #~ " This is useful for writing repository conversion tools, but should\n" | |||
|
29357 | #~ " be used with care." | |||
|
29358 | #~ msgstr "" | |||
|
29359 | #~ " Isto é útil para escrever utilitários de conversão de repositórios, mas\n" | |||
|
29360 | #~ " deve ser usado com cuidado." | |||
|
29361 | ||||
|
29362 | #~ msgid "" | |||
|
29363 | #~ " If no patterns are given to match, this command prints the names\n" | |||
|
29364 | #~ " of all files under Mercurial control in the working copy." | |||
|
29365 | #~ msgstr "" | |||
|
29366 | #~ " Se não forem passados padrões, este comando imprime os nomes\n" | |||
|
29367 | #~ " de todos os arquivos sob o controle do Mercurial na cópia de\n" | |||
|
29368 | #~ " trabalho." | |||
|
29369 | ||||
|
29370 | #~ msgid "not a function: %s" | |||
|
29371 | #~ msgstr "não é uma função: %s" | |||
|
29372 | ||||
|
29373 | #~ msgid "- date(date[, fmt])" | |||
|
29374 | #~ msgstr "- date(data[, formato])" | |||
|
29375 | ||||
|
29376 | #~ msgid "- diff([includepattern [, excludepattern]])" | |||
|
29377 | #~ msgstr "- diff([padrãodeinclusão [, padrãodeexclusão]])" | |||
|
29378 | ||||
|
29379 | #~ msgid "- fill(text[, width])" | |||
|
29380 | #~ msgstr "- fill(texto[, comprimento])" | |||
|
29381 | ||||
|
29382 | #~ msgid "- get(dict, key)" | |||
|
29383 | #~ msgstr "- get(dicionário, chave)" | |||
|
29384 | ||||
|
29385 | #~ msgid "- if(expr, then[, else])" | |||
|
29386 | #~ msgstr "- if(expr, então[, senão])" | |||
|
29387 | ||||
|
29388 | #~ msgid "- ifcontains(expr, expr, then[, else])" | |||
|
29389 | #~ msgstr "- ifcontains(expr, expr, então[, senão])" | |||
|
29390 | ||||
|
29391 | #~ msgid "- ifeq(expr, expr, then[, else])" | |||
|
29392 | #~ msgstr "- ifeq(expr, expr, então[, senão])" | |||
|
29393 | ||||
|
29394 | #~ msgid "- join(list, sep)" | |||
|
29395 | #~ msgstr "- join(lista, separador)" | |||
|
29396 | ||||
|
29397 | #~ msgid "- label(label, expr)" | |||
|
29398 | #~ msgstr "- label(label, expr)" | |||
|
29399 | ||||
|
29400 | #~ msgid "- pad(text, width[, fillchar, right])" | |||
|
29401 | #~ msgstr "- pad(texto, largura[, preenchimento, direita])" | |||
|
29402 | ||||
|
29403 | #~ msgid "- revset(query[, formatargs])" | |||
|
29404 | #~ msgstr "- revset(consulta[, formato])" | |||
|
29405 | ||||
|
29406 | #~ msgid "- rstdoc(text, style)" | |||
|
29407 | #~ msgstr "- rstdoc(texto, estilo)" | |||
|
29408 | ||||
|
29409 | #~ msgid "- shortest(node)" | |||
|
29410 | #~ msgstr "- shortest(nó)" | |||
|
29411 | ||||
|
29412 | #~ msgid "- startswith(string, text)" | |||
|
29413 | #~ msgstr "- startswith(string, texto)" | |||
|
29414 | ||||
|
29415 | #~ msgid "- strip(text[, chars])" | |||
|
29416 | #~ msgstr "- strip(texto[, caracteres])" | |||
|
29417 | ||||
|
29418 | #~ msgid "- sub(pat, repl, expr)" | |||
|
29419 | #~ msgstr "- sub(padrão, substituição, expressão)" | |||
|
29420 | ||||
|
29421 | #~ msgid ".hg/cache/tags is corrupt, rebuilding it\n" | |||
|
29422 | #~ msgstr ".hg/cache/tags está corrompido, reconstruindo\n" | |||
|
29423 | ||||
28220 | #~ msgid "%s\n" |
|
29424 | #~ msgid "%s\n" | |
28221 | #~ msgstr "%s\n" |
|
29425 | #~ msgstr "%s\n" | |
28222 |
|
29426 |
@@ -463,12 +463,16 b' def incoming(ui, repo, other):' | |||||
463 | def add(b, id, st): |
|
463 | def add(b, id, st): | |
464 | incomings.append(" %-25s %s\n" % (b, getid(id))) |
|
464 | incomings.append(" %-25s %s\n" % (b, getid(id))) | |
465 | for b, scid, dcid in addsrc: |
|
465 | for b, scid, dcid in addsrc: | |
|
466 | # i18n: "added" refers to a bookmark | |||
466 | add(b, scid, _('added')) |
|
467 | add(b, scid, _('added')) | |
467 | for b, scid, dcid in advsrc: |
|
468 | for b, scid, dcid in advsrc: | |
|
469 | # i18n: "advanced" refers to a bookmark | |||
468 | add(b, scid, _('advanced')) |
|
470 | add(b, scid, _('advanced')) | |
469 | for b, scid, dcid in diverge: |
|
471 | for b, scid, dcid in diverge: | |
|
472 | # i18n: "diverged" refers to a bookmark | |||
470 | add(b, scid, _('diverged')) |
|
473 | add(b, scid, _('diverged')) | |
471 | for b, scid, dcid in differ: |
|
474 | for b, scid, dcid in differ: | |
|
475 | # i18n: "changed" refers to a bookmark | |||
472 | add(b, scid, _('changed')) |
|
476 | add(b, scid, _('changed')) | |
473 |
|
477 | |||
474 | if not incomings: |
|
478 | if not incomings: | |
@@ -501,14 +505,19 b' def outgoing(ui, repo, other):' | |||||
501 | def add(b, id, st): |
|
505 | def add(b, id, st): | |
502 | outgoings.append(" %-25s %s\n" % (b, getid(id))) |
|
506 | outgoings.append(" %-25s %s\n" % (b, getid(id))) | |
503 | for b, scid, dcid in addsrc: |
|
507 | for b, scid, dcid in addsrc: | |
|
508 | # i18n: "added refers to a bookmark | |||
504 | add(b, scid, _('added')) |
|
509 | add(b, scid, _('added')) | |
505 | for b, scid, dcid in adddst: |
|
510 | for b, scid, dcid in adddst: | |
|
511 | # i18n: "deleted" refers to a bookmark | |||
506 | add(b, ' ' * 40, _('deleted')) |
|
512 | add(b, ' ' * 40, _('deleted')) | |
507 | for b, scid, dcid in advsrc: |
|
513 | for b, scid, dcid in advsrc: | |
|
514 | # i18n: "advanced" refers to a bookmark | |||
508 | add(b, scid, _('advanced')) |
|
515 | add(b, scid, _('advanced')) | |
509 | for b, scid, dcid in diverge: |
|
516 | for b, scid, dcid in diverge: | |
|
517 | # i18n: "diverged" refers to a bookmark | |||
510 | add(b, scid, _('diverged')) |
|
518 | add(b, scid, _('diverged')) | |
511 | for b, scid, dcid in differ: |
|
519 | for b, scid, dcid in differ: | |
|
520 | # i18n: "changed" refers to a bookmark | |||
512 | add(b, scid, _('changed')) |
|
521 | add(b, scid, _('changed')) | |
513 |
|
522 | |||
514 | if not outgoings: |
|
523 | if not outgoings: |
@@ -268,12 +268,13 b' class bundleoperation(object):' | |||||
268 | * a way to construct a bundle response when applicable. |
|
268 | * a way to construct a bundle response when applicable. | |
269 | """ |
|
269 | """ | |
270 |
|
270 | |||
271 | def __init__(self, repo, transactiongetter): |
|
271 | def __init__(self, repo, transactiongetter, captureoutput=True): | |
272 | self.repo = repo |
|
272 | self.repo = repo | |
273 | self.ui = repo.ui |
|
273 | self.ui = repo.ui | |
274 | self.records = unbundlerecords() |
|
274 | self.records = unbundlerecords() | |
275 | self.gettransaction = transactiongetter |
|
275 | self.gettransaction = transactiongetter | |
276 | self.reply = None |
|
276 | self.reply = None | |
|
277 | self.captureoutput = captureoutput | |||
277 |
|
278 | |||
278 | class TransactionUnavailable(RuntimeError): |
|
279 | class TransactionUnavailable(RuntimeError): | |
279 | pass |
|
280 | pass | |
@@ -285,7 +286,7 b' def _notransaction():' | |||||
285 | to be created""" |
|
286 | to be created""" | |
286 | raise TransactionUnavailable() |
|
287 | raise TransactionUnavailable() | |
287 |
|
288 | |||
288 | def processbundle(repo, unbundler, transactiongetter=None): |
|
289 | def processbundle(repo, unbundler, transactiongetter=None, op=None): | |
289 | """This function process a bundle, apply effect to/from a repo |
|
290 | """This function process a bundle, apply effect to/from a repo | |
290 |
|
291 | |||
291 | It iterates over each part then searches for and uses the proper handling |
|
292 | It iterates over each part then searches for and uses the proper handling | |
@@ -295,10 +296,16 b' def processbundle(repo, unbundler, trans' | |||||
295 | before final usage. |
|
296 | before final usage. | |
296 |
|
297 | |||
297 | Unknown Mandatory part will abort the process. |
|
298 | Unknown Mandatory part will abort the process. | |
|
299 | ||||
|
300 | It is temporarily possible to provide a prebuilt bundleoperation to the | |||
|
301 | function. This is used to ensure output is properly propagated in case of | |||
|
302 | an error during the unbundling. This output capturing part will likely be | |||
|
303 | reworked and this ability will probably go away in the process. | |||
298 | """ |
|
304 | """ | |
299 |
if |
|
305 | if op is None: | |
300 |
transactiongetter |
|
306 | if transactiongetter is None: | |
301 | op = bundleoperation(repo, transactiongetter) |
|
307 | transactiongetter = _notransaction | |
|
308 | op = bundleoperation(repo, transactiongetter) | |||
302 | # todo: |
|
309 | # todo: | |
303 | # - replace this is a init function soon. |
|
310 | # - replace this is a init function soon. | |
304 | # - exception catching |
|
311 | # - exception catching | |
@@ -353,8 +360,8 b' def _processpart(op, part):' | |||||
353 | # parthandlermapping lookup (any KeyError raised by handler() |
|
360 | # parthandlermapping lookup (any KeyError raised by handler() | |
354 | # itself represents a defect of a different variety). |
|
361 | # itself represents a defect of a different variety). | |
355 | output = None |
|
362 | output = None | |
356 | if op.reply is not None: |
|
363 | if op.captureoutput and op.reply is not None: | |
357 | op.ui.pushbuffer(error=True) |
|
364 | op.ui.pushbuffer(error=True, subproc=True) | |
358 | output = '' |
|
365 | output = '' | |
359 | try: |
|
366 | try: | |
360 | handler(op, part) |
|
367 | handler(op, part) | |
@@ -834,6 +841,7 b' class interruptoperation(object):' | |||||
834 | def __init__(self, ui): |
|
841 | def __init__(self, ui): | |
835 | self.ui = ui |
|
842 | self.ui = ui | |
836 | self.reply = None |
|
843 | self.reply = None | |
|
844 | self.captureoutput = False | |||
837 |
|
845 | |||
838 | @property |
|
846 | @property | |
839 | def repo(self): |
|
847 | def repo(self): | |
@@ -1171,7 +1179,7 b' def handlecheckheads(op, inpart):' | |||||
1171 | def handleoutput(op, inpart): |
|
1179 | def handleoutput(op, inpart): | |
1172 | """forward output captured on the server to the client""" |
|
1180 | """forward output captured on the server to the client""" | |
1173 | for line in inpart.read().splitlines(): |
|
1181 | for line in inpart.read().splitlines(): | |
1174 |
op.ui. |
|
1182 | op.ui.status(('remote: %s\n' % line)) | |
1175 |
|
1183 | |||
1176 | @parthandler('replycaps') |
|
1184 | @parthandler('replycaps') | |
1177 | def handlereplycaps(op, inpart): |
|
1185 | def handlereplycaps(op, inpart): |
@@ -16,6 +16,7 b' from i18n import _' | |||||
16 | import os, tempfile, shutil |
|
16 | import os, tempfile, shutil | |
17 | import changegroup, util, mdiff, discovery, cmdutil, scmutil, exchange |
|
17 | import changegroup, util, mdiff, discovery, cmdutil, scmutil, exchange | |
18 | import localrepo, changelog, manifest, filelog, revlog, error, phases, bundle2 |
|
18 | import localrepo, changelog, manifest, filelog, revlog, error, phases, bundle2 | |
|
19 | import pathutil | |||
19 |
|
20 | |||
20 | class bundlerevlog(revlog.revlog): |
|
21 | class bundlerevlog(revlog.revlog): | |
21 | def __init__(self, opener, indexfile, bundle, linkmapper): |
|
22 | def __init__(self, opener, indexfile, bundle, linkmapper): | |
@@ -156,7 +157,15 b' class bundlechangelog(bundlerevlog, chan' | |||||
156 | # Although changelog doesn't override 'revision' method, some extensions |
|
157 | # Although changelog doesn't override 'revision' method, some extensions | |
157 | # may replace this class with another that does. Same story with |
|
158 | # may replace this class with another that does. Same story with | |
158 | # manifest and filelog classes. |
|
159 | # manifest and filelog classes. | |
159 | return changelog.changelog.revision(self, nodeorrev) |
|
160 | ||
|
161 | # This bypasses filtering on changelog.node() and rev() because we need | |||
|
162 | # revision text of the bundle base even if it is hidden. | |||
|
163 | oldfilter = self.filteredrevs | |||
|
164 | try: | |||
|
165 | self.filteredrevs = () | |||
|
166 | return changelog.changelog.revision(self, nodeorrev) | |||
|
167 | finally: | |||
|
168 | self.filteredrevs = oldfilter | |||
160 |
|
169 | |||
161 | class bundlemanifest(bundlerevlog, manifest.manifest): |
|
170 | class bundlemanifest(bundlerevlog, manifest.manifest): | |
162 | def __init__(self, opener, bundle, linkmapper): |
|
171 | def __init__(self, opener, bundle, linkmapper): | |
@@ -352,7 +361,7 b' def instance(ui, path, create):' | |||||
352 | if parentpath == cwd: |
|
361 | if parentpath == cwd: | |
353 | parentpath = '' |
|
362 | parentpath = '' | |
354 | else: |
|
363 | else: | |
355 |
cwd = |
|
364 | cwd = pathutil.normasprefix(cwd) | |
356 | if parentpath.startswith(cwd): |
|
365 | if parentpath.startswith(cwd): | |
357 | parentpath = parentpath[len(cwd):] |
|
366 | parentpath = parentpath[len(cwd):] | |
358 | u = util.url(path) |
|
367 | u = util.url(path) |
@@ -267,6 +267,8 b' class changelog(revlog.revlog):' | |||||
267 | self.checkinlinesize(tr) |
|
267 | self.checkinlinesize(tr) | |
268 |
|
268 | |||
269 | def readpending(self, file): |
|
269 | def readpending(self, file): | |
|
270 | if not self.opener.exists(file): | |||
|
271 | return # no pending data for changelog | |||
270 | r = revlog.revlog(self.opener, file) |
|
272 | r = revlog.revlog(self.opener, file) | |
271 | self.index = r.index |
|
273 | self.index = r.index | |
272 | self.nodemap = r.nodemap |
|
274 | self.nodemap = r.nodemap |
@@ -104,6 +104,14 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
104 | except patch.PatchError, err: |
|
104 | except patch.PatchError, err: | |
105 | raise util.Abort(_('error parsing patch: %s') % err) |
|
105 | raise util.Abort(_('error parsing patch: %s') % err) | |
106 |
|
106 | |||
|
107 | # We need to keep a backup of files that have been newly added and | |||
|
108 | # modified during the recording process because there is a previous | |||
|
109 | # version without the edit in the workdir | |||
|
110 | newlyaddedandmodifiedfiles = set() | |||
|
111 | for chunk in chunks: | |||
|
112 | if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ | |||
|
113 | originalchunks: | |||
|
114 | newlyaddedandmodifiedfiles.add(chunk.header.filename()) | |||
107 | contenders = set() |
|
115 | contenders = set() | |
108 | for h in chunks: |
|
116 | for h in chunks: | |
109 | try: |
|
117 | try: | |
@@ -117,12 +125,6 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
117 | ui.status(_('no changes to record\n')) |
|
125 | ui.status(_('no changes to record\n')) | |
118 | return 0 |
|
126 | return 0 | |
119 |
|
127 | |||
120 | newandmodifiedfiles = set() |
|
|||
121 | for h in chunks: |
|
|||
122 | isnew = h.filename() in status.added |
|
|||
123 | if ishunk(h) and isnew and not h in originalchunks: |
|
|||
124 | newandmodifiedfiles.add(h.filename()) |
|
|||
125 |
|
||||
126 | modified = set(status.modified) |
|
128 | modified = set(status.modified) | |
127 |
|
129 | |||
128 | # 2. backup changed files, so we can restore them in the end |
|
130 | # 2. backup changed files, so we can restore them in the end | |
@@ -130,9 +132,8 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
130 | if backupall: |
|
132 | if backupall: | |
131 | tobackup = changed |
|
133 | tobackup = changed | |
132 | else: |
|
134 | else: | |
133 | tobackup = [f for f in newfiles |
|
135 | tobackup = [f for f in newfiles if f in modified or f in \ | |
134 |
|
|
136 | newlyaddedandmodifiedfiles] | |
135 |
|
||||
136 | backups = {} |
|
137 | backups = {} | |
137 | if tobackup: |
|
138 | if tobackup: | |
138 | backupdir = repo.join('record-backups') |
|
139 | backupdir = repo.join('record-backups') | |
@@ -155,13 +156,12 b' def dorecord(ui, repo, commitfunc, cmdsu' | |||||
155 | fp = cStringIO.StringIO() |
|
156 | fp = cStringIO.StringIO() | |
156 | for c in chunks: |
|
157 | for c in chunks: | |
157 | fname = c.filename() |
|
158 | fname = c.filename() | |
158 |
if fname in backups |
|
159 | if fname in backups: | |
159 | c.write(fp) |
|
160 | c.write(fp) | |
160 | dopatch = fp.tell() |
|
161 | dopatch = fp.tell() | |
161 | fp.seek(0) |
|
162 | fp.seek(0) | |
162 |
|
163 | |||
163 | [os.unlink(c) for c in newandmodifiedfiles] |
|
164 | [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] | |
164 |
|
||||
165 | # 3a. apply filtered patch to clean repo (clean) |
|
165 | # 3a. apply filtered patch to clean repo (clean) | |
166 | if backups: |
|
166 | if backups: | |
167 | # Equivalent to hg.revert |
|
167 | # Equivalent to hg.revert | |
@@ -1142,7 +1142,7 b' class changeset_printer(object):' | |||||
1142 | label='log.%s' % ns.colorname) |
|
1142 | label='log.%s' % ns.colorname) | |
1143 | if self.ui.debugflag: |
|
1143 | if self.ui.debugflag: | |
1144 | # i18n: column positioning for "hg log" |
|
1144 | # i18n: column positioning for "hg log" | |
1145 |
self.ui.write(_("phase: %s\n") % |
|
1145 | self.ui.write(_("phase: %s\n") % ctx.phasestr(), | |
1146 | label='log.phase') |
|
1146 | label='log.phase') | |
1147 | for pctx in self._meaningful_parentrevs(ctx): |
|
1147 | for pctx in self._meaningful_parentrevs(ctx): | |
1148 | label = 'log.parent changeset.%s' % pctx.phasestr() |
|
1148 | label = 'log.parent changeset.%s' % pctx.phasestr() | |
@@ -3077,14 +3077,17 b' def _performrevert(repo, parents, ctx, a' | |||||
3077 | node = ctx.node() |
|
3077 | node = ctx.node() | |
3078 | def checkout(f): |
|
3078 | def checkout(f): | |
3079 | fc = ctx[f] |
|
3079 | fc = ctx[f] | |
3080 | repo.wwrite(f, fc.data(), fc.flags()) |
|
3080 | return repo.wwrite(f, fc.data(), fc.flags()) | |
3081 |
|
3081 | |||
3082 | audit_path = pathutil.pathauditor(repo.root) |
|
3082 | audit_path = pathutil.pathauditor(repo.root) | |
3083 | for f in actions['forget'][0]: |
|
3083 | for f in actions['forget'][0]: | |
3084 | repo.dirstate.drop(f) |
|
3084 | repo.dirstate.drop(f) | |
3085 | for f in actions['remove'][0]: |
|
3085 | for f in actions['remove'][0]: | |
3086 | audit_path(f) |
|
3086 | audit_path(f) | |
3087 | util.unlinkpath(repo.wjoin(f)) |
|
3087 | try: | |
|
3088 | util.unlinkpath(repo.wjoin(f)) | |||
|
3089 | except OSError: | |||
|
3090 | pass | |||
3088 | repo.dirstate.remove(f) |
|
3091 | repo.dirstate.remove(f) | |
3089 | for f in actions['drop'][0]: |
|
3092 | for f in actions['drop'][0]: | |
3090 | audit_path(f) |
|
3093 | audit_path(f) | |
@@ -3125,9 +3128,13 b' def _performrevert(repo, parents, ctx, a' | |||||
3125 | del fp |
|
3128 | del fp | |
3126 | else: |
|
3129 | else: | |
3127 | for f in actions['revert'][0]: |
|
3130 | for f in actions['revert'][0]: | |
3128 | checkout(f) |
|
3131 | wsize = checkout(f) | |
3129 | if normal: |
|
3132 | if normal: | |
3130 | normal(f) |
|
3133 | normal(f) | |
|
3134 | elif wsize == repo.dirstate._map[f][2]: | |||
|
3135 | # changes may be overlooked without normallookup, | |||
|
3136 | # if size isn't changed at reverting | |||
|
3137 | repo.dirstate.normallookup(f) | |||
3131 |
|
3138 | |||
3132 | for f in actions['add'][0]: |
|
3139 | for f in actions['add'][0]: | |
3133 | checkout(f) |
|
3140 | checkout(f) |
@@ -2370,6 +2370,7 b' def debuginstall(ui):' | |||||
2370 | # editor |
|
2370 | # editor | |
2371 | ui.status(_("checking commit editor...\n")) |
|
2371 | ui.status(_("checking commit editor...\n")) | |
2372 | editor = ui.geteditor() |
|
2372 | editor = ui.geteditor() | |
|
2373 | editor = util.expandpath(editor) | |||
2373 | cmdpath = util.findexe(shlex.split(editor)[0]) |
|
2374 | cmdpath = util.findexe(shlex.split(editor)[0]) | |
2374 | if not cmdpath: |
|
2375 | if not cmdpath: | |
2375 | if editor == 'vi': |
|
2376 | if editor == 'vi': | |
@@ -2484,7 +2485,7 b' def debuglocks(ui, repo, **opts):' | |||||
2484 | l.release() |
|
2485 | l.release() | |
2485 | else: |
|
2486 | else: | |
2486 | try: |
|
2487 | try: | |
2487 |
stat = |
|
2488 | stat = vfs.lstat(name) | |
2488 | age = now - stat.st_mtime |
|
2489 | age = now - stat.st_mtime | |
2489 | user = util.username(stat.st_uid) |
|
2490 | user = util.username(stat.st_uid) | |
2490 | locker = vfs.readlock(name) |
|
2491 | locker = vfs.readlock(name) | |
@@ -5464,7 +5465,8 b' def resolve(ui, repo, *pats, **opts):' | |||||
5464 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5465 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5465 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
5466 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
5466 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
5467 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
5467 |
('i', 'interactive', None, |
|
5468 | ('i', 'interactive', None, | |
|
5469 | _('interactively select the changes (EXPERIMENTAL)')), | |||
5468 | ] + walkopts + dryrunopts, |
|
5470 | ] + walkopts + dryrunopts, | |
5469 | _('[OPTION]... [-r REV] [NAME]...')) |
|
5471 | _('[OPTION]... [-r REV] [NAME]...')) | |
5470 | def revert(ui, repo, *pats, **opts): |
|
5472 | def revert(ui, repo, *pats, **opts): | |
@@ -5511,7 +5513,8 b' def revert(ui, repo, *pats, **opts):' | |||||
5511 |
|
5513 | |||
5512 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5514 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5513 |
|
5515 | |||
5514 |
if |
|
5516 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
|
5517 | opts.get('all') or opts.get('interactive'))): | |||
5515 | msg = _("no files or directories specified") |
|
5518 | msg = _("no files or directories specified") | |
5516 | if p2 != nullid: |
|
5519 | if p2 != nullid: | |
5517 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5520 | hint = _("uncommitted merge, use --all to discard all changes," | |
@@ -5837,14 +5840,15 b' def status(ui, repo, *pats, **opts):' | |||||
5837 | else: |
|
5840 | else: | |
5838 | show = states[:5] |
|
5841 | show = states[:5] | |
5839 |
|
5842 | |||
5840 |
|
|
5843 | m = scmutil.match(repo[node2], pats, opts) | |
|
5844 | stat = repo.status(node1, node2, m, | |||
5841 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
5845 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
5842 | opts.get('subrepos')) |
|
5846 | opts.get('subrepos')) | |
5843 | changestates = zip(states, 'MAR!?IC', stat) |
|
5847 | changestates = zip(states, 'MAR!?IC', stat) | |
5844 |
|
5848 | |||
5845 | if (opts.get('all') or opts.get('copies') |
|
5849 | if (opts.get('all') or opts.get('copies') | |
5846 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
5850 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |
5847 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5851 | copy = copies.pathcopies(repo[node1], repo[node2], m) | |
5848 |
|
5852 | |||
5849 | fm = ui.formatter('status', opts) |
|
5853 | fm = ui.formatter('status', opts) | |
5850 | fmt = '%s' + end |
|
5854 | fmt = '%s' + end |
@@ -806,6 +806,22 b' class basefilectx(object):' | |||||
806 | return self._adjustlinkrev(self._path, self._filelog, self._filenode, |
|
806 | return self._adjustlinkrev(self._path, self._filelog, self._filenode, | |
807 | self.rev(), inclusive=True) |
|
807 | self.rev(), inclusive=True) | |
808 |
|
808 | |||
|
809 | def _parentfilectx(self, path, fileid, filelog): | |||
|
810 | """create parent filectx keeping ancestry info for _adjustlinkrev()""" | |||
|
811 | fctx = filectx(self._repo, path, fileid=fileid, filelog=filelog) | |||
|
812 | if '_changeid' in vars(self) or '_changectx' in vars(self): | |||
|
813 | # If self is associated with a changeset (probably explicitly | |||
|
814 | # fed), ensure the created filectx is associated with a | |||
|
815 | # changeset that is an ancestor of self.changectx. | |||
|
816 | # This lets us later use _adjustlinkrev to get a correct link. | |||
|
817 | fctx._descendantrev = self.rev() | |||
|
818 | fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) | |||
|
819 | elif '_descendantrev' in vars(self): | |||
|
820 | # Otherwise propagate _descendantrev if we have one associated. | |||
|
821 | fctx._descendantrev = self._descendantrev | |||
|
822 | fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) | |||
|
823 | return fctx | |||
|
824 | ||||
809 | def parents(self): |
|
825 | def parents(self): | |
810 | _path = self._path |
|
826 | _path = self._path | |
811 | fl = self._filelog |
|
827 | fl = self._filelog | |
@@ -824,25 +840,7 b' class basefilectx(object):' | |||||
824 | # first nullid parent with rename information. |
|
840 | # first nullid parent with rename information. | |
825 | pl.insert(0, (r[0], r[1], self._repo.file(r[0]))) |
|
841 | pl.insert(0, (r[0], r[1], self._repo.file(r[0]))) | |
826 |
|
842 | |||
827 | ret = [] |
|
843 | return [self._parentfilectx(path, fnode, l) for path, fnode, l in pl] | |
828 | for path, fnode, l in pl: |
|
|||
829 | if '_changeid' in vars(self) or '_changectx' in vars(self): |
|
|||
830 | # If self is associated with a changeset (probably explicitly |
|
|||
831 | # fed), ensure the created filectx is associated with a |
|
|||
832 | # changeset that is an ancestor of self.changectx. |
|
|||
833 | # This lets us later use _adjustlinkrev to get a correct link. |
|
|||
834 | fctx = filectx(self._repo, path, fileid=fnode, filelog=l) |
|
|||
835 | fctx._descendantrev = self.rev() |
|
|||
836 | fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) |
|
|||
837 | elif '_descendantrev' in vars(self): |
|
|||
838 | # Otherwise propagate _descendantrev if we have one associated. |
|
|||
839 | fctx = filectx(self._repo, path, fileid=fnode, filelog=l) |
|
|||
840 | fctx._descendantrev = self._descendantrev |
|
|||
841 | fctx._ancestrycontext = getattr(self, '_ancestrycontext', None) |
|
|||
842 | else: |
|
|||
843 | fctx = filectx(self._repo, path, fileid=fnode, filelog=l) |
|
|||
844 | ret.append(fctx) |
|
|||
845 | return ret |
|
|||
846 |
|
844 | |||
847 | def p1(self): |
|
845 | def p1(self): | |
848 | return self.parents()[0] |
|
846 | return self.parents()[0] | |
@@ -889,6 +887,11 b' class basefilectx(object):' | |||||
889 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) |
|
887 | getlog = util.lrucachefunc(lambda x: self._repo.file(x)) | |
890 |
|
888 | |||
891 | def parents(f): |
|
889 | def parents(f): | |
|
890 | # Cut _descendantrev here to mitigate the penalty of lazy linkrev | |||
|
891 | # adjustment. Otherwise, p._adjustlinkrev() would walk changelog | |||
|
892 | # from the topmost introrev (= srcrev) down to p.linkrev() if it | |||
|
893 | # isn't an ancestor of the srcrev. | |||
|
894 | f._changeid | |||
892 | pl = f.parents() |
|
895 | pl = f.parents() | |
893 |
|
896 | |||
894 | # Don't return renamed parents if we aren't following. |
|
897 | # Don't return renamed parents if we aren't following. | |
@@ -908,8 +911,15 b' class basefilectx(object):' | |||||
908 | introrev = self.introrev() |
|
911 | introrev = self.introrev() | |
909 | if self.rev() != introrev: |
|
912 | if self.rev() != introrev: | |
910 | base = self.filectx(self.filenode(), changeid=introrev) |
|
913 | base = self.filectx(self.filenode(), changeid=introrev) | |
911 |
if |
|
914 | if getattr(base, '_ancestrycontext', None) is None: | |
912 |
|
|
915 | cl = self._repo.changelog | |
|
916 | if introrev is None: | |||
|
917 | # wctx is not inclusive, but works because _ancestrycontext | |||
|
918 | # is used to test filelog revisions | |||
|
919 | ac = cl.ancestors([p.rev() for p in base.parents()], | |||
|
920 | inclusive=True) | |||
|
921 | else: | |||
|
922 | ac = cl.ancestors([introrev], inclusive=True) | |||
913 | base._ancestrycontext = ac |
|
923 | base._ancestrycontext = ac | |
914 |
|
924 | |||
915 | # This algorithm would prefer to be recursive, but Python is a |
|
925 | # This algorithm would prefer to be recursive, but Python is a | |
@@ -1620,7 +1630,7 b' class committablefilectx(basefilectx):' | |||||
1620 | for pc in pcl[1:]: |
|
1630 | for pc in pcl[1:]: | |
1621 | pl.append((path, filenode(pc, path), fl)) |
|
1631 | pl.append((path, filenode(pc, path), fl)) | |
1622 |
|
1632 | |||
1623 |
return [ |
|
1633 | return [self._parentfilectx(p, fileid=n, filelog=l) | |
1624 | for p, n, l in pl if n != nullid] |
|
1634 | for p, n, l in pl if n != nullid] | |
1625 |
|
1635 | |||
1626 | def children(self): |
|
1636 | def children(self): |
@@ -978,7 +978,7 b' class curseschunkselector(object):' | |||||
978 | "(space/A) toggle hunk/all; (e)dit hunk;", |
|
978 | "(space/A) toggle hunk/all; (e)dit hunk;", | |
979 | pairname="legend") |
|
979 | pairname="legend") | |
980 | printstring(self.statuswin, |
|
980 | printstring(self.statuswin, | |
981 |
" (f)old/unfold; (c)om |
|
981 | " (f)old/unfold; (c)onfirm applied; (q)uit; (?) help " | |
982 | "| [X]=hunk applied **=folded", |
|
982 | "| [X]=hunk applied **=folded", | |
983 | pairname="legend") |
|
983 | pairname="legend") | |
984 | except curses.error: |
|
984 | except curses.error: | |
@@ -1319,7 +1319,8 b' class curseschunkselector(object):' | |||||
1319 | helptext = """ [press any key to return to the patch-display] |
|
1319 | helptext = """ [press any key to return to the patch-display] | |
1320 |
|
1320 | |||
1321 | crecord allows you to interactively choose among the changes you have made, |
|
1321 | crecord allows you to interactively choose among the changes you have made, | |
1322 |
and com |
|
1322 | and confirm only those changes you select for further processing by the command | |
|
1323 | you are running (commit/shelve/revert), after confirming the selected | |||
1323 | changes, the unselected changes are still present in your working copy, so you |
|
1324 | changes, the unselected changes are still present in your working copy, so you | |
1324 | can use crecord multiple times to split large changes into smaller changesets. |
|
1325 | can use crecord multiple times to split large changes into smaller changesets. | |
1325 | the following are valid keystrokes: |
|
1326 | the following are valid keystrokes: | |
@@ -1335,9 +1336,9 b' the following are valid keystrokes:' | |||||
1335 | m : edit / resume editing the commit message |
|
1336 | m : edit / resume editing the commit message | |
1336 | e : edit the currently selected hunk |
|
1337 | e : edit the currently selected hunk | |
1337 | a : toggle amend mode (hg rev >= 2.2) |
|
1338 | a : toggle amend mode (hg rev >= 2.2) | |
1338 |
c : com |
|
1339 | c : confirm selected changes | |
1339 |
r : review/edit and com |
|
1340 | r : review/edit and confirm selected changes | |
1340 |
q : quit without co |
|
1341 | q : quit without confirming (no changes will be made) | |
1341 | ? : help (what you're currently reading)""" |
|
1342 | ? : help (what you're currently reading)""" | |
1342 |
|
1343 | |||
1343 | helpwin = curses.newwin(self.yscreensize, 0, 0, 0) |
|
1344 | helpwin = curses.newwin(self.yscreensize, 0, 0, 0) | |
@@ -1375,7 +1376,8 b' the following are valid keystrokes:' | |||||
1375 | return response |
|
1376 | return response | |
1376 |
|
1377 | |||
1377 | def confirmcommit(self, review=False): |
|
1378 | def confirmcommit(self, review=False): | |
1378 |
"ask for 'y' to be pressed to confirm c |
|
1379 | """ask for 'y' to be pressed to confirm selected. return True if | |
|
1380 | confirmed.""" | |||
1379 | if review: |
|
1381 | if review: | |
1380 | confirmtext = ( |
|
1382 | confirmtext = ( | |
1381 | """if you answer yes to the following, the your currently chosen patch chunks |
|
1383 | """if you answer yes to the following, the your currently chosen patch chunks | |
@@ -1386,10 +1388,11 b' close the editor without saving to accep' | |||||
1386 | note: don't add/remove lines unless you also modify the range information. |
|
1388 | note: don't add/remove lines unless you also modify the range information. | |
1387 | failing to follow this rule will result in the commit aborting. |
|
1389 | failing to follow this rule will result in the commit aborting. | |
1388 |
|
1390 | |||
1389 |
are you sure you want to review/edit and com |
|
1391 | are you sure you want to review/edit and confirm the selected changes [yn]? | |
|
1392 | """) | |||
1390 | else: |
|
1393 | else: | |
1391 | confirmtext = ( |
|
1394 | confirmtext = ( | |
1392 |
"are you sure you want to com |
|
1395 | "are you sure you want to confirm the selected changes [yn]? ") | |
1393 |
|
1396 | |||
1394 | response = self.confirmationwindow(confirmtext) |
|
1397 | response = self.confirmationwindow(confirmtext) | |
1395 | if response is None: |
|
1398 | if response is None: |
@@ -40,10 +40,7 b' class dirstate(object):' | |||||
40 | self._root = root |
|
40 | self._root = root | |
41 | # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is |
|
41 | # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is | |
42 | # UNC path pointing to root share (issue4557) |
|
42 | # UNC path pointing to root share (issue4557) | |
43 | if root.endswith(os.sep): |
|
43 | self._rootdir = pathutil.normasprefix(root) | |
44 | self._rootdir = root |
|
|||
45 | else: |
|
|||
46 | self._rootdir = root + os.sep |
|
|||
47 | self._dirty = False |
|
44 | self._dirty = False | |
48 | self._dirtypl = False |
|
45 | self._dirtypl = False | |
49 | self._lastnormaltime = 0 |
|
46 | self._lastnormaltime = 0 |
@@ -1284,6 +1284,12 b' def unbundle(repo, cg, heads, source, ur' | |||||
1284 | r = 0 |
|
1284 | r = 0 | |
1285 | # need a transaction when processing a bundle2 stream |
|
1285 | # need a transaction when processing a bundle2 stream | |
1286 | wlock = lock = tr = None |
|
1286 | wlock = lock = tr = None | |
|
1287 | recordout = None | |||
|
1288 | # quick fix for output mismatch with bundle2 in 3.4 | |||
|
1289 | captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture', | |||
|
1290 | False) | |||
|
1291 | if url.startswith('remote:http:') or url.startswith('remote:https:'): | |||
|
1292 | captureoutput = True | |||
1287 | try: |
|
1293 | try: | |
1288 | check_heads(repo, heads, 'uploading changes') |
|
1294 | check_heads(repo, heads, 'uploading changes') | |
1289 | # push can proceed |
|
1295 | # push can proceed | |
@@ -1296,16 +1302,31 b' def unbundle(repo, cg, heads, source, ur' | |||||
1296 | tr.hookargs['source'] = source |
|
1302 | tr.hookargs['source'] = source | |
1297 | tr.hookargs['url'] = url |
|
1303 | tr.hookargs['url'] = url | |
1298 | tr.hookargs['bundle2'] = '1' |
|
1304 | tr.hookargs['bundle2'] = '1' | |
1299 |
|
|
1305 | op = bundle2.bundleoperation(repo, lambda: tr, | |
|
1306 | captureoutput=captureoutput) | |||
|
1307 | try: | |||
|
1308 | r = bundle2.processbundle(repo, cg, op=op) | |||
|
1309 | finally: | |||
|
1310 | r = op.reply | |||
|
1311 | if captureoutput and r is not None: | |||
|
1312 | repo.ui.pushbuffer(error=True, subproc=True) | |||
|
1313 | def recordout(output): | |||
|
1314 | r.newpart('output', data=output, mandatory=False) | |||
1300 | tr.close() |
|
1315 | tr.close() | |
1301 | except Exception, exc: |
|
1316 | except Exception, exc: | |
1302 | exc.duringunbundle2 = True |
|
1317 | exc.duringunbundle2 = True | |
1303 | if r is not None: |
|
1318 | if captureoutput and r is not None: | |
1304 | exc._bundle2salvagedoutput = r.salvageoutput() |
|
1319 | parts = exc._bundle2salvagedoutput = r.salvageoutput() | |
|
1320 | def recordout(output): | |||
|
1321 | part = bundle2.bundlepart('output', data=output, | |||
|
1322 | mandatory=False) | |||
|
1323 | parts.append(part) | |||
1305 | raise |
|
1324 | raise | |
1306 | else: |
|
1325 | else: | |
1307 | lock = repo.lock() |
|
1326 | lock = repo.lock() | |
1308 | r = changegroup.addchangegroup(repo, cg, source, url) |
|
1327 | r = changegroup.addchangegroup(repo, cg, source, url) | |
1309 | finally: |
|
1328 | finally: | |
1310 | lockmod.release(tr, lock, wlock) |
|
1329 | lockmod.release(tr, lock, wlock) | |
|
1330 | if recordout is not None: | |||
|
1331 | recordout(repo.ui.popbuffer()) | |||
1311 | return r |
|
1332 | return r |
@@ -43,7 +43,9 b' def optrst(header, options, verbose):' | |||||
43 | shortopt, longopt, default, desc = option |
|
43 | shortopt, longopt, default, desc = option | |
44 | optlabel = _("VALUE") # default label |
|
44 | optlabel = _("VALUE") # default label | |
45 |
|
45 | |||
46 |
if not verbose and ("DEPRECATED" in desc or _("DEPRECATED") in desc |
|
46 | if not verbose and ("DEPRECATED" in desc or _("DEPRECATED") in desc or | |
|
47 | "EXPERIMENTAL" in desc or | |||
|
48 | _("EXPERIMENTAL") in desc): | |||
47 | continue |
|
49 | continue | |
48 |
|
50 | |||
49 | so = '' |
|
51 | so = '' |
@@ -828,13 +828,13 b' variables it is passed are listed with n' | |||||
828 | ``HG_PHASES_MOVED`` to ``1``, etc. |
|
828 | ``HG_PHASES_MOVED`` to ``1``, etc. | |
829 |
|
829 | |||
830 | ``txnclose`` |
|
830 | ``txnclose`` | |
831 | Run after any repository transaction has been commited. At this |
|
831 | Run after any repository transaction has been committed. At this | |
832 | point, the transaction can no longer be rolled back. The hook will run |
|
832 | point, the transaction can no longer be rolled back. The hook will run | |
833 |
after the lock is released. |
|
833 | after the lock is released. See ``pretxnclose`` docs for details about | |
834 | available variables. |
|
834 | available variables. | |
835 |
|
835 | |||
836 | ``txnabort`` |
|
836 | ``txnabort`` | |
837 |
Run when a transaction is aborted. |
|
837 | Run when a transaction is aborted. See ``pretxnclose`` docs for details about | |
838 | available variables. |
|
838 | available variables. | |
839 |
|
839 | |||
840 | ``pretxnchangegroup`` |
|
840 | ``pretxnchangegroup`` |
@@ -106,8 +106,7 b' Interaction with Mercurial Commands' | |||||
106 |
|
106 | |||
107 | :diff: diff does not recurse in subrepos unless -S/--subrepos is |
|
107 | :diff: diff does not recurse in subrepos unless -S/--subrepos is | |
108 | specified. Changes are displayed as usual, on the subrepositories |
|
108 | specified. Changes are displayed as usual, on the subrepositories | |
109 | elements. Git subrepositories do not support --include/--exclude. |
|
109 | elements. Subversion subrepositories are currently silently ignored. | |
110 | Subversion subrepositories are currently silently ignored. |
|
|||
111 |
|
110 | |||
112 | :files: files does not recurse into subrepos unless -S/--subrepos is |
|
111 | :files: files does not recurse into subrepos unless -S/--subrepos is | |
113 | specified. Git and Subversion subrepositories are currently |
|
112 | specified. Git and Subversion subrepositories are currently |
@@ -338,7 +338,7 b' def changelog(web, req, tmpl, shortlog=F' | |||||
338 |
|
338 | |||
339 | The argument for ``rev`` can be a single revision, a revision set, |
|
339 | The argument for ``rev`` can be a single revision, a revision set, | |
340 | or a literal keyword to search for in changeset data (equivalent to |
|
340 | or a literal keyword to search for in changeset data (equivalent to | |
341 | :hg:`log -k`. |
|
341 | :hg:`log -k`). | |
342 |
|
342 | |||
343 | The ``revcount`` query string argument defines the maximum numbers of |
|
343 | The ``revcount`` query string argument defines the maximum numbers of | |
344 | changesets to render. |
|
344 | changesets to render. | |
@@ -459,7 +459,7 b' def manifest(web, req, tmpl):' | |||||
459 |
|
459 | |||
460 | Show information about a directory. |
|
460 | Show information about a directory. | |
461 |
|
461 | |||
462 |
If the URL path arguments are |
|
462 | If the URL path arguments are omitted, information about the root | |
463 | directory for the ``tip`` changeset will be shown. |
|
463 | directory for the ``tip`` changeset will be shown. | |
464 |
|
464 | |||
465 | Because this handler can only show information for directories, it |
|
465 | Because this handler can only show information for directories, it | |
@@ -1318,3 +1318,6 b' def help(web, req, tmpl):' | |||||
1318 | except error.UnknownCommand: |
|
1318 | except error.UnknownCommand: | |
1319 | raise ErrorResponse(HTTP_NOT_FOUND) |
|
1319 | raise ErrorResponse(HTTP_NOT_FOUND) | |
1320 | return tmpl('help', topic=topicname, doc=doc) |
|
1320 | return tmpl('help', topic=topicname, doc=doc) | |
|
1321 | ||||
|
1322 | # tell hggettext to extract docstrings from these functions: | |||
|
1323 | i18nfunctions = commands.values() |
@@ -917,6 +917,10 b' class localrepository(object):' | |||||
917 | return self._filter(self._encodefilterpats, filename, data) |
|
917 | return self._filter(self._encodefilterpats, filename, data) | |
918 |
|
918 | |||
919 | def wwrite(self, filename, data, flags): |
|
919 | def wwrite(self, filename, data, flags): | |
|
920 | """write ``data`` into ``filename`` in the working directory | |||
|
921 | ||||
|
922 | This returns length of written (maybe decoded) data. | |||
|
923 | """ | |||
920 | data = self._filter(self._decodefilterpats, filename, data) |
|
924 | data = self._filter(self._decodefilterpats, filename, data) | |
921 | if 'l' in flags: |
|
925 | if 'l' in flags: | |
922 | self.wvfs.symlink(data, filename) |
|
926 | self.wvfs.symlink(data, filename) | |
@@ -924,6 +928,7 b' class localrepository(object):' | |||||
924 | self.wvfs.write(filename, data) |
|
928 | self.wvfs.write(filename, data) | |
925 | if 'x' in flags: |
|
929 | if 'x' in flags: | |
926 | self.wvfs.setflags(filename, False, True) |
|
930 | self.wvfs.setflags(filename, False, True) | |
|
931 | return len(data) | |||
927 |
|
932 | |||
928 | def wwritedata(self, filename, data): |
|
933 | def wwritedata(self, filename, data): | |
929 | return self._filter(self._decodefilterpats, filename, data) |
|
934 | return self._filter(self._decodefilterpats, filename, data) | |
@@ -1194,13 +1199,16 b' class localrepository(object):' | |||||
1194 | return l |
|
1199 | return l | |
1195 |
|
1200 | |||
1196 | def _afterlock(self, callback): |
|
1201 | def _afterlock(self, callback): | |
1197 |
"""add a callback to |
|
1202 | """add a callback to be run when the repository is fully unlocked | |
1198 |
|
1203 | |||
1199 |
The callback will be executed |
|
1204 | The callback will be executed when the outermost lock is released | |
1200 | l = self._lockref and self._lockref() |
|
1205 | (with wlock being higher level than 'lock').""" | |
1201 | if l: |
|
1206 | for ref in (self._wlockref, self._lockref): | |
1202 | l.postrelease.append(callback) |
|
1207 | l = ref and ref() | |
1203 | else: |
|
1208 | if l and l.held: | |
|
1209 | l.postrelease.append(callback) | |||
|
1210 | break | |||
|
1211 | else: # no lock have been found. | |||
1204 | callback() |
|
1212 | callback() | |
1205 |
|
1213 | |||
1206 | def lock(self, wait=True): |
|
1214 | def lock(self, wait=True): | |
@@ -1898,8 +1906,17 b' class localrepository(object):' | |||||
1898 |
|
1906 | |||
1899 | def pushkey(self, namespace, key, old, new): |
|
1907 | def pushkey(self, namespace, key, old, new): | |
1900 | try: |
|
1908 | try: | |
1901 | self.hook('prepushkey', throw=True, namespace=namespace, key=key, |
|
1909 | tr = self.currenttransaction() | |
1902 | old=old, new=new) |
|
1910 | hookargs = {} | |
|
1911 | if tr is not None: | |||
|
1912 | hookargs.update(tr.hookargs) | |||
|
1913 | pending = lambda: tr.writepending() and self.root or "" | |||
|
1914 | hookargs['pending'] = pending | |||
|
1915 | hookargs['namespace'] = namespace | |||
|
1916 | hookargs['key'] = key | |||
|
1917 | hookargs['old'] = old | |||
|
1918 | hookargs['new'] = new | |||
|
1919 | self.hook('prepushkey', throw=True, **hookargs) | |||
1903 | except error.HookAbort, exc: |
|
1920 | except error.HookAbort, exc: | |
1904 | self.ui.write_err(_("pushkey-abort: %s\n") % exc) |
|
1921 | self.ui.write_err(_("pushkey-abort: %s\n") % exc) | |
1905 | if exc.hint: |
|
1922 | if exc.hint: |
@@ -1167,7 +1167,9 b' def update(repo, node, branchmerge, forc' | |||||
1167 | wlock.release() |
|
1167 | wlock.release() | |
1168 |
|
1168 | |||
1169 | if not partial: |
|
1169 | if not partial: | |
1170 |
|
|
1170 | def updatehook(parent1=xp1, parent2=xp2, error=stats[3]): | |
|
1171 | repo.hook('update', parent1=parent1, parent2=parent2, error=error) | |||
|
1172 | repo._afterlock(updatehook) | |||
1171 | return stats |
|
1173 | return stats | |
1172 |
|
1174 | |||
1173 | def graft(repo, ctx, pctx, labels): |
|
1175 | def graft(repo, ctx, pctx, labels): |
@@ -1312,7 +1312,7 b' static int nt_find(indexObject *self, co' | |||||
1312 | const char *n; |
|
1312 | const char *n; | |
1313 | Py_ssize_t i; |
|
1313 | Py_ssize_t i; | |
1314 |
|
1314 | |||
1315 |
v = -v |
|
1315 | v = -(v + 1); | |
1316 | n = index_node(self, v); |
|
1316 | n = index_node(self, v); | |
1317 | if (n == NULL) |
|
1317 | if (n == NULL) | |
1318 | return -2; |
|
1318 | return -2; | |
@@ -1368,7 +1368,7 b' static int nt_insert(indexObject *self, ' | |||||
1368 | return 0; |
|
1368 | return 0; | |
1369 | } |
|
1369 | } | |
1370 | if (v < 0) { |
|
1370 | if (v < 0) { | |
1371 |
const char *oldnode = index_node(self, -v |
|
1371 | const char *oldnode = index_node(self, -(v + 1)); | |
1372 | int noff; |
|
1372 | int noff; | |
1373 |
|
1373 | |||
1374 | if (!oldnode || !memcmp(oldnode, node, 20)) { |
|
1374 | if (!oldnode || !memcmp(oldnode, node, 20)) { |
@@ -822,7 +822,8 b' class header(object):' | |||||
822 | diff_re = re.compile('diff -r .* (.*)$') |
|
822 | diff_re = re.compile('diff -r .* (.*)$') | |
823 | allhunks_re = re.compile('(?:index|deleted file) ') |
|
823 | allhunks_re = re.compile('(?:index|deleted file) ') | |
824 | pretty_re = re.compile('(?:new file|deleted file) ') |
|
824 | pretty_re = re.compile('(?:new file|deleted file) ') | |
825 |
special_re = re.compile('(?:index| |
|
825 | special_re = re.compile('(?:index|deleted|copy|rename) ') | |
|
826 | newfile_re = re.compile('(?:new file)') | |||
826 |
|
827 | |||
827 | def __init__(self, header): |
|
828 | def __init__(self, header): | |
828 | self.header = header |
|
829 | self.header = header | |
@@ -870,8 +871,21 b' class header(object):' | |||||
870 | def __repr__(self): |
|
871 | def __repr__(self): | |
871 | return '<header %s>' % (' '.join(map(repr, self.files()))) |
|
872 | return '<header %s>' % (' '.join(map(repr, self.files()))) | |
872 |
|
873 | |||
|
874 | def isnewfile(self): | |||
|
875 | return util.any(self.newfile_re.match(h) for h in self.header) | |||
|
876 | ||||
873 | def special(self): |
|
877 | def special(self): | |
874 | return util.any(self.special_re.match(h) for h in self.header) |
|
878 | # Special files are shown only at the header level and not at the hunk | |
|
879 | # level for example a file that has been deleted is a special file. | |||
|
880 | # The user cannot change the content of the operation, in the case of | |||
|
881 | # the deleted file he has to take the deletion or not take it, he | |||
|
882 | # cannot take some of it. | |||
|
883 | # Newly added files are special if they are empty, they are not special | |||
|
884 | # if they have some content as we want to be able to change it | |||
|
885 | nocontent = len(self.header) == 2 | |||
|
886 | emptynewfile = self.isnewfile() and nocontent | |||
|
887 | return emptynewfile or \ | |||
|
888 | util.any(self.special_re.match(h) for h in self.header) | |||
875 |
|
889 | |||
876 | class recordhunk(object): |
|
890 | class recordhunk(object): | |
877 | """patch hunk |
|
891 | """patch hunk |
@@ -18,7 +18,7 b' def _bundle(repo, bases, heads, node, su' | |||||
18 | if usebundle2: |
|
18 | if usebundle2: | |
19 | cgversion = repo.ui.config('experimental', 'strip-bundle2-version') |
|
19 | cgversion = repo.ui.config('experimental', 'strip-bundle2-version') | |
20 | if cgversion not in changegroup.packermap: |
|
20 | if cgversion not in changegroup.packermap: | |
21 |
repo.ui.warn(_('unknown strip-bundle2-version value %r; ' |
|
21 | repo.ui.warn(_('unknown strip-bundle2-version value %r; ' | |
22 | 'should be one of %r\n') % |
|
22 | 'should be one of %r\n') % | |
23 | (cgversion, sorted(changegroup.packermap.keys()),)) |
|
23 | (cgversion, sorted(changegroup.packermap.keys()),)) | |
24 | cgversion = '01' |
|
24 | cgversion = '01' |
@@ -153,7 +153,8 b' def state(ctx, ui):' | |||||
153 |
|
153 | |||
154 | def writestate(repo, state): |
|
154 | def writestate(repo, state): | |
155 | """rewrite .hgsubstate in (outer) repo with these subrepo states""" |
|
155 | """rewrite .hgsubstate in (outer) repo with these subrepo states""" | |
156 |
lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state) |
|
156 | lines = ['%s %s\n' % (state[s][1], s) for s in sorted(state) | |
|
157 | if state[s][1] != nullstate[1]] | |||
157 | repo.wwrite('.hgsubstate', ''.join(lines), '') |
|
158 | repo.wwrite('.hgsubstate', ''.join(lines), '') | |
158 |
|
159 | |||
159 | def submerge(repo, wctx, mctx, actx, overwrite): |
|
160 | def submerge(repo, wctx, mctx, actx, overwrite): | |
@@ -568,6 +569,11 b' class hgsubrepo(abstractsubrepo):' | |||||
568 | root = r.wjoin(path) |
|
569 | root = r.wjoin(path) | |
569 | create = not r.wvfs.exists('%s/.hg' % path) |
|
570 | create = not r.wvfs.exists('%s/.hg' % path) | |
570 | self._repo = hg.repository(r.baseui, root, create=create) |
|
571 | self._repo = hg.repository(r.baseui, root, create=create) | |
|
572 | ||||
|
573 | # Propagate the parent's --hidden option | |||
|
574 | if r is r.unfiltered(): | |||
|
575 | self._repo = self._repo.unfiltered() | |||
|
576 | ||||
571 | self.ui = self._repo.ui |
|
577 | self.ui = self._repo.ui | |
572 | for s, k in [('ui', 'commitsubrepos')]: |
|
578 | for s, k in [('ui', 'commitsubrepos')]: | |
573 | v = r.ui.config(s, k) |
|
579 | v = r.ui.config(s, k) | |
@@ -872,10 +878,18 b' class hgsubrepo(abstractsubrepo):' | |||||
872 |
|
878 | |||
873 | @annotatesubrepoerror |
|
879 | @annotatesubrepoerror | |
874 | def outgoing(self, ui, dest, opts): |
|
880 | def outgoing(self, ui, dest, opts): | |
|
881 | if 'rev' in opts or 'branch' in opts: | |||
|
882 | opts = copy.copy(opts) | |||
|
883 | opts.pop('rev', None) | |||
|
884 | opts.pop('branch', None) | |||
875 | return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) |
|
885 | return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) | |
876 |
|
886 | |||
877 | @annotatesubrepoerror |
|
887 | @annotatesubrepoerror | |
878 | def incoming(self, ui, source, opts): |
|
888 | def incoming(self, ui, source, opts): | |
|
889 | if 'rev' in opts or 'branch' in opts: | |||
|
890 | opts = copy.copy(opts) | |||
|
891 | opts.pop('rev', None) | |||
|
892 | opts.pop('branch', None) | |||
879 | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) |
|
893 | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) | |
880 |
|
894 | |||
881 | @annotatesubrepoerror |
|
895 | @annotatesubrepoerror |
@@ -502,9 +502,9 b' class hgtagsfnodescache(object):' | |||||
502 |
|
502 | |||
503 | try: |
|
503 | try: | |
504 | lock = repo.wlock(wait=False) |
|
504 | lock = repo.wlock(wait=False) | |
505 |
except error.Lock |
|
505 | except error.LockError: | |
506 | repo.ui.log('tagscache', |
|
506 | repo.ui.log('tagscache', | |
507 |
'not writing .hg/%s because lock |
|
507 | 'not writing .hg/%s because lock cannot be acquired\n' % | |
508 | (_fnodescachefile)) |
|
508 | (_fnodescachefile)) | |
509 | return |
|
509 | return | |
510 |
|
510 |
@@ -539,7 +539,12 b' def word(context, mapping, args):' | |||||
539 | raise error.ParseError(_("word expects two or three arguments, got %d") |
|
539 | raise error.ParseError(_("word expects two or three arguments, got %d") | |
540 | % len(args)) |
|
540 | % len(args)) | |
541 |
|
541 | |||
542 | num = int(stringify(args[0][0](context, mapping, args[0][1]))) |
|
542 | try: | |
|
543 | num = int(stringify(args[0][0](context, mapping, args[0][1]))) | |||
|
544 | except ValueError: | |||
|
545 | # i18n: "word" is a keyword | |||
|
546 | raise error.ParseError( | |||
|
547 | _("Use strings like '3' for numbers passed to word function")) | |||
543 | text = stringify(args[1][0](context, mapping, args[1][1])) |
|
548 | text = stringify(args[1][0](context, mapping, args[1][1])) | |
544 | if len(args) == 3: |
|
549 | if len(args) == 3: | |
545 | splitter = stringify(args[2][0](context, mapping, args[2][1])) |
|
550 | splitter = stringify(args[2][0](context, mapping, args[2][1])) |
@@ -58,8 +58,8 b' bookmark = \'{label("log.bookmark",' | |||||
58 | user = '{label("log.user", |
|
58 | user = '{label("log.user", | |
59 | "user: {author}")}\n' |
|
59 | "user: {author}")}\n' | |
60 |
|
60 | |||
61 |
summary = '{label( |
|
61 | summary = '{if(desc|strip, "{label('log.summary', | |
62 |
|
|
62 | 'summary: {desc|firstline}')}\n")}' | |
63 |
|
63 | |||
64 | ldate = '{label("log.date", |
|
64 | ldate = '{label("log.date", | |
65 | "date: {date|date}")}\n' |
|
65 | "date: {date|date}")}\n' | |
@@ -67,7 +67,7 b' ldate = \'{label("log.date",' | |||||
67 | extra = '{label("ui.debug log.extra", |
|
67 | extra = '{label("ui.debug log.extra", | |
68 | "extra: {key}={value|stringescape}")}\n' |
|
68 | "extra: {key}={value|stringescape}")}\n' | |
69 |
|
69 | |||
70 |
description = '{label( |
|
70 | description = '{if(desc|strip, "{label('ui.note log.description', | |
71 |
|
|
71 | 'description:')} | |
72 |
{label( |
|
72 | {label('ui.note log.description', | |
73 |
|
|
73 | '{desc|strip}')}\n\n")}' |
@@ -76,7 +76,8 b' class ui(object):' | |||||
76 | def __init__(self, src=None): |
|
76 | def __init__(self, src=None): | |
77 | # _buffers: used for temporary capture of output |
|
77 | # _buffers: used for temporary capture of output | |
78 | self._buffers = [] |
|
78 | self._buffers = [] | |
79 | # _bufferstates: Should the temporary capture includes stderr |
|
79 | # _bufferstates: | |
|
80 | # should the temporary capture include stderr and subprocess output | |||
80 | self._bufferstates = [] |
|
81 | self._bufferstates = [] | |
81 | self.quiet = self.verbose = self.debugflag = self.tracebackflag = False |
|
82 | self.quiet = self.verbose = self.debugflag = self.tracebackflag = False | |
82 | self._reportuntrusted = True |
|
83 | self._reportuntrusted = True | |
@@ -168,6 +169,9 b' class ui(object):' | |||||
168 | if self.plain('alias'): |
|
169 | if self.plain('alias'): | |
169 | for k, v in cfg.items('alias'): |
|
170 | for k, v in cfg.items('alias'): | |
170 | del cfg['alias'][k] |
|
171 | del cfg['alias'][k] | |
|
172 | if self.plain('revsetalias'): | |||
|
173 | for k, v in cfg.items('revsetalias'): | |||
|
174 | del cfg['revsetalias'][k] | |||
171 |
|
175 | |||
172 | if trusted: |
|
176 | if trusted: | |
173 | self._tcfg.update(cfg) |
|
177 | self._tcfg.update(cfg) | |
@@ -540,12 +544,15 b' class ui(object):' | |||||
540 | def paths(self): |
|
544 | def paths(self): | |
541 | return paths(self) |
|
545 | return paths(self) | |
542 |
|
546 | |||
543 | def pushbuffer(self, error=False): |
|
547 | def pushbuffer(self, error=False, subproc=False): | |
544 | """install a buffer to capture standard output of the ui object |
|
548 | """install a buffer to capture standard output of the ui object | |
545 |
|
549 | |||
546 |
If error is True, the error output will be captured too. |
|
550 | If error is True, the error output will be captured too. | |
|
551 | ||||
|
552 | If subproc is True, output from subprocesses (typically hooks) will be | |||
|
553 | captured too.""" | |||
547 | self._buffers.append([]) |
|
554 | self._buffers.append([]) | |
548 | self._bufferstates.append(error) |
|
555 | self._bufferstates.append((error, subproc)) | |
549 |
|
556 | |||
550 | def popbuffer(self, labeled=False): |
|
557 | def popbuffer(self, labeled=False): | |
551 | '''pop the last buffer and return the buffered output |
|
558 | '''pop the last buffer and return the buffered output | |
@@ -585,7 +592,7 b' class ui(object):' | |||||
585 |
|
592 | |||
586 | def write_err(self, *args, **opts): |
|
593 | def write_err(self, *args, **opts): | |
587 | try: |
|
594 | try: | |
588 | if self._bufferstates and self._bufferstates[-1]: |
|
595 | if self._bufferstates and self._bufferstates[-1][0]: | |
589 | return self.write(*args, **opts) |
|
596 | return self.write(*args, **opts) | |
590 | if not getattr(self.fout, 'closed', False): |
|
597 | if not getattr(self.fout, 'closed', False): | |
591 | self.fout.flush() |
|
598 | self.fout.flush() | |
@@ -834,8 +841,11 b' class ui(object):' | |||||
834 | '''execute shell command with appropriate output stream. command |
|
841 | '''execute shell command with appropriate output stream. command | |
835 | output will be redirected if fout is not stdout. |
|
842 | output will be redirected if fout is not stdout. | |
836 | ''' |
|
843 | ''' | |
|
844 | out = self.fout | |||
|
845 | if util.any(s[1] for s in self._bufferstates): | |||
|
846 | out = self | |||
837 | return util.system(cmd, environ=environ, cwd=cwd, onerr=onerr, |
|
847 | return util.system(cmd, environ=environ, cwd=cwd, onerr=onerr, | |
838 |
errprefix=errprefix, out= |
|
848 | errprefix=errprefix, out=out) | |
839 |
|
849 | |||
840 | def traceback(self, exc=None, force=False): |
|
850 | def traceback(self, exc=None, force=False): | |
841 | '''print exception traceback if traceback printing enabled or forced. |
|
851 | '''print exception traceback if traceback printing enabled or forced. |
@@ -15,7 +15,7 b' from node import nullid' | |||||
15 | from i18n import _ |
|
15 | from i18n import _ | |
16 | import os |
|
16 | import os | |
17 | import util, mdiff, cmdutil, scmutil |
|
17 | import util, mdiff, cmdutil, scmutil | |
18 | import localrepo, changelog, manifest, filelog, revlog |
|
18 | import localrepo, changelog, manifest, filelog, revlog, pathutil | |
19 |
|
19 | |||
20 | class unionrevlog(revlog.revlog): |
|
20 | class unionrevlog(revlog.revlog): | |
21 | def __init__(self, opener, indexfile, revlog2, linkmapper): |
|
21 | def __init__(self, opener, indexfile, revlog2, linkmapper): | |
@@ -228,7 +228,7 b' def instance(ui, path, create):' | |||||
228 | if parentpath == cwd: |
|
228 | if parentpath == cwd: | |
229 | parentpath = '' |
|
229 | parentpath = '' | |
230 | else: |
|
230 | else: | |
231 |
cwd = |
|
231 | cwd = pathutil.normasprefix(cwd) | |
232 | if parentpath.startswith(cwd): |
|
232 | if parentpath.startswith(cwd): | |
233 | parentpath = parentpath[len(cwd):] |
|
233 | parentpath = parentpath[len(cwd):] | |
234 | if path.startswith('union:'): |
|
234 | if path.startswith('union:'): |
@@ -218,7 +218,7 b' enum normcase_spec {' | |||||
218 |
|
218 | |||
219 | #define MIN(a, b) (((a)<(b))?(a):(b)) |
|
219 | #define MIN(a, b) (((a)<(b))?(a):(b)) | |
220 | /* VC9 doesn't include bool and lacks stdbool.h based on my searching */ |
|
220 | /* VC9 doesn't include bool and lacks stdbool.h based on my searching */ | |
221 | #ifdef _MSC_VER |
|
221 | #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L | |
222 | #define true 1 |
|
222 | #define true 1 | |
223 | #define false 0 |
|
223 | #define false 0 | |
224 | typedef unsigned char bool; |
|
224 | typedef unsigned char bool; |
@@ -167,10 +167,12 b' def shellquote(s):' | |||||
167 | _quotere = re.compile(r'(\\*)("|\\$)') |
|
167 | _quotere = re.compile(r'(\\*)("|\\$)') | |
168 | global _needsshellquote |
|
168 | global _needsshellquote | |
169 | if _needsshellquote is None: |
|
169 | if _needsshellquote is None: | |
170 |
# ":" |
|
170 | # ":" is also treated as "safe character", because it is used as a part | |
171 | # they are used as a part of path name (and the latter doesn't |
|
171 | # of path name on Windows. "\" is also part of a path name, but isn't | |
172 | # work as "escape character", like one on posix) on Windows |
|
172 | # safe because shlex.split() (kind of) treats it as an escape char and | |
173 | _needsshellquote = re.compile(r'[^a-zA-Z0-9._:/\\-]').search |
|
173 | # drops it. It will leave the next character, even if it is another | |
|
174 | # "\". | |||
|
175 | _needsshellquote = re.compile(r'[^a-zA-Z0-9._:/-]').search | |||
174 | if s and not _needsshellquote(s) and not _quotere.search(s): |
|
176 | if s and not _needsshellquote(s) and not _quotere.search(s): | |
175 | # "s" shouldn't have to be quoted |
|
177 | # "s" shouldn't have to be quoted | |
176 | return s |
|
178 | return s |
@@ -1065,7 +1065,7 b' class TTest(Test):' | |||||
1065 | while i < n: |
|
1065 | while i < n: | |
1066 | c = el[i] |
|
1066 | c = el[i] | |
1067 | i += 1 |
|
1067 | i += 1 | |
1068 | if c == '\\' and el[i] in '*?\\/': |
|
1068 | if c == '\\' and i < n and el[i] in '*?\\/': | |
1069 | res += el[i - 1:i + 1] |
|
1069 | res += el[i - 1:i + 1] | |
1070 | i += 1 |
|
1070 | i += 1 | |
1071 | elif c == '*': |
|
1071 | elif c == '*': |
@@ -206,8 +206,10 b" Test that adding a directory doesn't req" | |||||
206 | $ hg revert -r '.^' capsdir1/capsdir |
|
206 | $ hg revert -r '.^' capsdir1/capsdir | |
207 | reverting CapsDir1/CapsDir/SubDir/Def.txt (glob) |
|
207 | reverting CapsDir1/CapsDir/SubDir/Def.txt (glob) | |
208 |
|
208 | |||
|
209 | The conditional tests above mean the hash on the diff line differs on Windows | |||
|
210 | and OS X | |||
209 | $ hg diff capsdir1/capsdir |
|
211 | $ hg diff capsdir1/capsdir | |
210 |
diff -r |
|
212 | diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob) | |
211 | --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 |
|
213 | --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 | |
212 | +++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob) |
|
214 | +++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob) | |
213 | @@ -1,1 +1,1 @@ |
|
215 | @@ -1,1 +1,1 @@ |
@@ -556,6 +556,7 b' create history with a filerev whose link' | |||||
556 | grafting 1:fd27c222e3e6 "contentB" |
|
556 | grafting 1:fd27c222e3e6 "contentB" | |
557 | $ echo C >> a |
|
557 | $ echo C >> a | |
558 | $ hg commit -m 'contentC' |
|
558 | $ hg commit -m 'contentC' | |
|
559 | $ echo W >> a | |||
559 | $ hg log -G |
|
560 | $ hg log -G | |
560 | @ changeset: 4:072f1e8df249 |
|
561 | @ changeset: 4:072f1e8df249 | |
561 | | tag: tip |
|
562 | | tag: tip | |
@@ -592,6 +593,12 b' Annotate should list ancestor of startin' | |||||
592 | 3: B |
|
593 | 3: B | |
593 | 4: C |
|
594 | 4: C | |
594 |
|
595 | |||
|
596 | $ hg annotate a -r 'wdir()' | |||
|
597 | 0 : A | |||
|
598 | 3 : B | |||
|
599 | 4 : C | |||
|
600 | 4+: W | |||
|
601 | ||||
595 | Even when the starting revision is the linkrev-shadowed one: |
|
602 | Even when the starting revision is the linkrev-shadowed one: | |
596 |
|
603 | |||
597 | $ hg annotate a -r 3 |
|
604 | $ hg annotate a -r 3 |
@@ -16,6 +16,7 b' enable obsolescence' | |||||
16 | > [experimental] |
|
16 | > [experimental] | |
17 | > evolution=createmarkers,exchange |
|
17 | > evolution=createmarkers,exchange | |
18 | > bundle2-exp=True |
|
18 | > bundle2-exp=True | |
|
19 | > bundle2-output-capture=True | |||
19 | > [ui] |
|
20 | > [ui] | |
20 | > ssh=python "$TESTDIR/dummyssh" |
|
21 | > ssh=python "$TESTDIR/dummyssh" | |
21 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
22 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
@@ -72,7 +73,7 b' Add more obsolescence information' | |||||
72 | clone --pull |
|
73 | clone --pull | |
73 |
|
74 | |||
74 | $ hg -R main phase --public cd010b8cd998 |
|
75 | $ hg -R main phase --public cd010b8cd998 | |
75 | pre-close-tip:000000000000 public |
|
76 | pre-close-tip:02de42196ebe draft | |
76 | postclose-tip:02de42196ebe draft |
|
77 | postclose-tip:02de42196ebe draft | |
77 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
78 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
78 | $ hg clone main other --pull --rev 9520eea781bc |
|
79 | $ hg clone main other --pull --rev 9520eea781bc | |
@@ -98,7 +99,7 b' clone --pull' | |||||
98 | pull |
|
99 | pull | |
99 |
|
100 | |||
100 | $ hg -R main phase --public 9520eea781bc |
|
101 | $ hg -R main phase --public 9520eea781bc | |
101 | pre-close-tip:000000000000 public |
|
102 | pre-close-tip:02de42196ebe draft | |
102 | postclose-tip:02de42196ebe draft |
|
103 | postclose-tip:02de42196ebe draft | |
103 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
104 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
104 | $ hg -R other pull -r 24b6387c8c8c |
|
105 | $ hg -R other pull -r 24b6387c8c8c | |
@@ -128,13 +129,13 b' pull' | |||||
128 | pull empty (with phase movement) |
|
129 | pull empty (with phase movement) | |
129 |
|
130 | |||
130 | $ hg -R main phase --public 24b6387c8c8c |
|
131 | $ hg -R main phase --public 24b6387c8c8c | |
131 | pre-close-tip:000000000000 public |
|
132 | pre-close-tip:02de42196ebe draft | |
132 | postclose-tip:02de42196ebe draft |
|
133 | postclose-tip:02de42196ebe draft | |
133 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
134 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
134 | $ hg -R other pull -r 24b6387c8c8c |
|
135 | $ hg -R other pull -r 24b6387c8c8c | |
135 | pulling from $TESTTMP/main (glob) |
|
136 | pulling from $TESTTMP/main (glob) | |
136 | no changes found |
|
137 | no changes found | |
137 |
pre-close-tip: |
|
138 | pre-close-tip:24b6387c8c8c public | |
138 | postclose-tip:24b6387c8c8c public |
|
139 | postclose-tip:24b6387c8c8c public | |
139 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
140 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
140 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
141 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
@@ -204,7 +205,7 b' add extra data to test their exchange du' | |||||
204 | $ hg -R other bookmark --rev cd010b8cd998 book_32af |
|
205 | $ hg -R other bookmark --rev cd010b8cd998 book_32af | |
205 |
|
206 | |||
206 | $ hg -R main phase --public eea13746799a |
|
207 | $ hg -R main phase --public eea13746799a | |
207 | pre-close-tip:000000000000 public |
|
208 | pre-close-tip:02de42196ebe draft book_02de | |
208 | postclose-tip:02de42196ebe draft book_02de |
|
209 | postclose-tip:02de42196ebe draft book_02de | |
209 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
210 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
210 |
|
211 | |||
@@ -212,20 +213,20 b' push' | |||||
212 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
|
213 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
213 | pushing to other |
|
214 | pushing to other | |
214 | searching for changes |
|
215 | searching for changes | |
215 | pre-close-tip:eea13746799a public book_eea1 |
|
|||
216 | pushkey: lock state after "phases" |
|
|||
217 | lock: free |
|
|||
218 | wlock: free |
|
|||
219 | pushkey: lock state after "bookmarks" |
|
|||
220 | lock: free |
|
|||
221 | wlock: free |
|
|||
222 | postclose-tip:eea13746799a public book_eea1 |
|
|||
223 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) |
|
|||
224 | remote: adding changesets |
|
216 | remote: adding changesets | |
225 | remote: adding manifests |
|
217 | remote: adding manifests | |
226 | remote: adding file changes |
|
218 | remote: adding file changes | |
227 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
|
219 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) | |
228 | remote: 1 new obsolescence markers |
|
220 | remote: 1 new obsolescence markers | |
|
221 | remote: pre-close-tip:eea13746799a public book_eea1 | |||
|
222 | remote: pushkey: lock state after "phases" | |||
|
223 | remote: lock: free | |||
|
224 | remote: wlock: free | |||
|
225 | remote: pushkey: lock state after "bookmarks" | |||
|
226 | remote: lock: free | |||
|
227 | remote: wlock: free | |||
|
228 | remote: postclose-tip:eea13746799a public book_eea1 | |||
|
229 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) | |||
229 | updating bookmark book_eea1 |
|
230 | updating bookmark book_eea1 | |
230 | pre-close-tip:02de42196ebe draft book_02de |
|
231 | pre-close-tip:02de42196ebe draft book_02de | |
231 | postclose-tip:02de42196ebe draft book_02de |
|
232 | postclose-tip:02de42196ebe draft book_02de | |
@@ -304,13 +305,13 b' push over ssh' | |||||
304 | remote: adding file changes |
|
305 | remote: adding file changes | |
305 | remote: added 1 changesets with 1 changes to 1 files |
|
306 | remote: added 1 changesets with 1 changes to 1 files | |
306 | remote: 1 new obsolescence markers |
|
307 | remote: 1 new obsolescence markers | |
307 | updating bookmark book_5fdd |
|
|||
308 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
|
308 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd | |
309 | remote: pushkey: lock state after "bookmarks" |
|
309 | remote: pushkey: lock state after "bookmarks" | |
310 | remote: lock: free |
|
310 | remote: lock: free | |
311 | remote: wlock: free |
|
311 | remote: wlock: free | |
312 | remote: postclose-tip:5fddd98957c8 draft book_5fdd |
|
312 | remote: postclose-tip:5fddd98957c8 draft book_5fdd | |
313 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob) |
|
313 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob) | |
|
314 | updating bookmark book_5fdd | |||
314 | pre-close-tip:02de42196ebe draft book_02de |
|
315 | pre-close-tip:02de42196ebe draft book_02de | |
315 | postclose-tip:02de42196ebe draft book_02de |
|
316 | postclose-tip:02de42196ebe draft book_02de | |
316 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
|
317 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | |
@@ -344,7 +345,7 b' push over http' | |||||
344 | $ cat other.pid >> $DAEMON_PIDS |
|
345 | $ cat other.pid >> $DAEMON_PIDS | |
345 |
|
346 | |||
346 | $ hg -R main phase --public 32af7686d403 |
|
347 | $ hg -R main phase --public 32af7686d403 | |
347 | pre-close-tip:000000000000 public |
|
348 | pre-close-tip:02de42196ebe draft book_02de | |
348 | postclose-tip:02de42196ebe draft book_02de |
|
349 | postclose-tip:02de42196ebe draft book_02de | |
349 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
350 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
350 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af |
|
351 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af | |
@@ -355,6 +356,15 b' push over http' | |||||
355 | remote: adding file changes |
|
356 | remote: adding file changes | |
356 | remote: added 1 changesets with 1 changes to 1 files |
|
357 | remote: added 1 changesets with 1 changes to 1 files | |
357 | remote: 1 new obsolescence markers |
|
358 | remote: 1 new obsolescence markers | |
|
359 | remote: pre-close-tip:32af7686d403 public book_32af | |||
|
360 | remote: pushkey: lock state after "phases" | |||
|
361 | remote: lock: free | |||
|
362 | remote: wlock: free | |||
|
363 | remote: pushkey: lock state after "bookmarks" | |||
|
364 | remote: lock: free | |||
|
365 | remote: wlock: free | |||
|
366 | remote: postclose-tip:32af7686d403 public book_32af | |||
|
367 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:127.0.0.1: (glob) | |||
358 | updating bookmark book_32af |
|
368 | updating bookmark book_32af | |
359 | pre-close-tip:02de42196ebe draft book_02de |
|
369 | pre-close-tip:02de42196ebe draft book_02de | |
360 | postclose-tip:02de42196ebe draft book_02de |
|
370 | postclose-tip:02de42196ebe draft book_02de | |
@@ -548,7 +558,8 b' Doing the actual push: hook abort' | |||||
548 | > [failpush] |
|
558 | > [failpush] | |
549 | > reason = |
|
559 | > reason = | |
550 | > [hooks] |
|
560 | > [hooks] | |
551 | > pretxnclose.failpush = false |
|
561 | > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" | |
|
562 | > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" | |||
552 | > EOF |
|
563 | > EOF | |
553 |
|
564 | |||
554 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
|
565 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |
@@ -558,13 +569,15 b' Doing the actual push: hook abort' | |||||
558 | $ hg -R main push other -r e7ec4e813ba6 |
|
569 | $ hg -R main push other -r e7ec4e813ba6 | |
559 | pushing to other |
|
570 | pushing to other | |
560 | searching for changes |
|
571 | searching for changes | |
561 | pre-close-tip:e7ec4e813ba6 draft |
|
|||
562 | transaction abort! |
|
|||
563 | rollback completed |
|
|||
564 | remote: adding changesets |
|
572 | remote: adding changesets | |
565 | remote: adding manifests |
|
573 | remote: adding manifests | |
566 | remote: adding file changes |
|
574 | remote: adding file changes | |
567 | remote: added 1 changesets with 1 changes to 1 files |
|
575 | remote: added 1 changesets with 1 changes to 1 files | |
|
576 | remote: pre-close-tip:e7ec4e813ba6 draft | |||
|
577 | remote: You shall not pass! | |||
|
578 | remote: transaction abort! | |||
|
579 | remote: Cleaning up the mess... | |||
|
580 | remote: rollback completed | |||
568 | abort: pretxnclose.failpush hook exited with status 1 |
|
581 | abort: pretxnclose.failpush hook exited with status 1 | |
569 | [255] |
|
582 | [255] | |
570 |
|
583 | |||
@@ -575,10 +588,12 b' Doing the actual push: hook abort' | |||||
575 | remote: adding manifests |
|
588 | remote: adding manifests | |
576 | remote: adding file changes |
|
589 | remote: adding file changes | |
577 | remote: added 1 changesets with 1 changes to 1 files |
|
590 | remote: added 1 changesets with 1 changes to 1 files | |
|
591 | remote: pre-close-tip:e7ec4e813ba6 draft | |||
|
592 | remote: You shall not pass! | |||
|
593 | remote: transaction abort! | |||
|
594 | remote: Cleaning up the mess... | |||
|
595 | remote: rollback completed | |||
578 | abort: pretxnclose.failpush hook exited with status 1 |
|
596 | abort: pretxnclose.failpush hook exited with status 1 | |
579 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
|||
580 | remote: transaction abort! |
|
|||
581 | remote: rollback completed |
|
|||
582 | [255] |
|
597 | [255] | |
583 |
|
598 | |||
584 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
599 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
@@ -588,6 +603,11 b' Doing the actual push: hook abort' | |||||
588 | remote: adding manifests |
|
603 | remote: adding manifests | |
589 | remote: adding file changes |
|
604 | remote: adding file changes | |
590 | remote: added 1 changesets with 1 changes to 1 files |
|
605 | remote: added 1 changesets with 1 changes to 1 files | |
|
606 | remote: pre-close-tip:e7ec4e813ba6 draft | |||
|
607 | remote: You shall not pass! | |||
|
608 | remote: transaction abort! | |||
|
609 | remote: Cleaning up the mess... | |||
|
610 | remote: rollback completed | |||
591 | abort: pretxnclose.failpush hook exited with status 1 |
|
611 | abort: pretxnclose.failpush hook exited with status 1 | |
592 | [255] |
|
612 | [255] | |
593 |
|
613 | |||
@@ -600,3 +620,100 b' Doing the actual push: hook abort' | |||||
600 | $ ls -1 other/.hg/store/00changelog.i* |
|
620 | $ ls -1 other/.hg/store/00changelog.i* | |
601 | other/.hg/store/00changelog.i |
|
621 | other/.hg/store/00changelog.i | |
602 |
|
622 | |||
|
623 | Check error from hook during the unbundling process itself | |||
|
624 | ||||
|
625 | $ cat << EOF >> $HGRCPATH | |||
|
626 | > pretxnchangegroup = sh -c "echo 'Fail early!'; false" | |||
|
627 | > EOF | |||
|
628 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config | |||
|
629 | $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |||
|
630 | $ cat other.pid >> $DAEMON_PIDS | |||
|
631 | ||||
|
632 | $ hg -R main push other -r e7ec4e813ba6 | |||
|
633 | pushing to other | |||
|
634 | searching for changes | |||
|
635 | remote: adding changesets | |||
|
636 | remote: adding manifests | |||
|
637 | remote: adding file changes | |||
|
638 | remote: added 1 changesets with 1 changes to 1 files | |||
|
639 | remote: Fail early! | |||
|
640 | remote: transaction abort! | |||
|
641 | remote: Cleaning up the mess... | |||
|
642 | remote: rollback completed | |||
|
643 | abort: pretxnchangegroup hook exited with status 1 | |||
|
644 | [255] | |||
|
645 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |||
|
646 | pushing to ssh://user@dummy/other | |||
|
647 | searching for changes | |||
|
648 | remote: adding changesets | |||
|
649 | remote: adding manifests | |||
|
650 | remote: adding file changes | |||
|
651 | remote: added 1 changesets with 1 changes to 1 files | |||
|
652 | remote: Fail early! | |||
|
653 | remote: transaction abort! | |||
|
654 | remote: Cleaning up the mess... | |||
|
655 | remote: rollback completed | |||
|
656 | abort: pretxnchangegroup hook exited with status 1 | |||
|
657 | [255] | |||
|
658 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |||
|
659 | pushing to http://localhost:$HGPORT2/ | |||
|
660 | searching for changes | |||
|
661 | remote: adding changesets | |||
|
662 | remote: adding manifests | |||
|
663 | remote: adding file changes | |||
|
664 | remote: added 1 changesets with 1 changes to 1 files | |||
|
665 | remote: Fail early! | |||
|
666 | remote: transaction abort! | |||
|
667 | remote: Cleaning up the mess... | |||
|
668 | remote: rollback completed | |||
|
669 | abort: pretxnchangegroup hook exited with status 1 | |||
|
670 | [255] | |||
|
671 | ||||
|
672 | Check output capture control. | |||
|
673 | ||||
|
674 | (should be still forced for http, disabled for local and ssh) | |||
|
675 | ||||
|
676 | $ cat >> $HGRCPATH << EOF | |||
|
677 | > [experimental] | |||
|
678 | > bundle2-output-capture=False | |||
|
679 | > EOF | |||
|
680 | ||||
|
681 | $ hg -R main push other -r e7ec4e813ba6 | |||
|
682 | pushing to other | |||
|
683 | searching for changes | |||
|
684 | adding changesets | |||
|
685 | adding manifests | |||
|
686 | adding file changes | |||
|
687 | added 1 changesets with 1 changes to 1 files | |||
|
688 | Fail early! | |||
|
689 | transaction abort! | |||
|
690 | Cleaning up the mess... | |||
|
691 | rollback completed | |||
|
692 | abort: pretxnchangegroup hook exited with status 1 | |||
|
693 | [255] | |||
|
694 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |||
|
695 | pushing to ssh://user@dummy/other | |||
|
696 | searching for changes | |||
|
697 | abort: pretxnchangegroup hook exited with status 1 | |||
|
698 | remote: adding changesets | |||
|
699 | remote: adding manifests | |||
|
700 | remote: adding file changes | |||
|
701 | remote: added 1 changesets with 1 changes to 1 files | |||
|
702 | remote: Fail early! | |||
|
703 | remote: transaction abort! | |||
|
704 | remote: Cleaning up the mess... | |||
|
705 | remote: rollback completed | |||
|
706 | [255] | |||
|
707 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |||
|
708 | pushing to http://localhost:$HGPORT2/ | |||
|
709 | searching for changes | |||
|
710 | remote: adding changesets | |||
|
711 | remote: adding manifests | |||
|
712 | remote: adding file changes | |||
|
713 | remote: added 1 changesets with 1 changes to 1 files | |||
|
714 | remote: Fail early! | |||
|
715 | remote: transaction abort! | |||
|
716 | remote: Cleaning up the mess... | |||
|
717 | remote: rollback completed | |||
|
718 | abort: pretxnchangegroup hook exited with status 1 | |||
|
719 | [255] |
@@ -153,6 +153,23 b' issue 3342: file in nested directory cau' | |||||
153 | $ mkdir -p a/B/c/D |
|
153 | $ mkdir -p a/B/c/D | |
154 | $ echo e > a/B/c/D/e |
|
154 | $ echo e > a/B/c/D/e | |
155 | $ hg add a/B/c/D/e |
|
155 | $ hg add a/B/c/D/e | |
|
156 | $ hg ci -m 'add e' | |||
|
157 | ||||
|
158 | issue 4481: revert across case only renames | |||
|
159 | $ hg mv a/B/c/D/e a/B/c/d/E | |||
|
160 | $ hg ci -m "uppercase E" | |||
|
161 | $ echo 'foo' > a/B/c/D/E | |||
|
162 | $ hg ci -m 'e content change' | |||
|
163 | $ hg revert --all -r 0 | |||
|
164 | removing a/B/c/D/E (glob) | |||
|
165 | adding a/B/c/D/e (glob) | |||
|
166 | $ find * | sort | |||
|
167 | a | |||
|
168 | a/B | |||
|
169 | a/B/c | |||
|
170 | a/B/c/D | |||
|
171 | a/B/c/D/e | |||
|
172 | a/B/c/D/e.orig | |||
156 |
|
173 | |||
157 | $ cd .. |
|
174 | $ cd .. | |
158 |
|
175 |
@@ -16,7 +16,7 b' Add a hook to wait 5 seconds and then ab' | |||||
16 |
|
16 | |||
17 | $ cd ../corrupted |
|
17 | $ cd ../corrupted | |
18 | $ echo "[hooks]" >> .hg/hgrc |
|
18 | $ echo "[hooks]" >> .hg/hgrc | |
19 |
$ echo |
|
19 | $ echo 'pretxncommit = sh -c "sleep 5; exit 1"' >> .hg/hgrc | |
20 |
|
20 | |||
21 | start a commit... |
|
21 | start a commit... | |
22 |
|
22 |
@@ -94,27 +94,59 b' Template should precede style option' | |||||
94 | $ hg log -l1 --style default -T '{rev}\n' |
|
94 | $ hg log -l1 --style default -T '{rev}\n' | |
95 | 8 |
|
95 | 8 | |
96 |
|
96 | |||
97 | Default style is like normal output: |
|
97 | Add a commit with empty description, to ensure that the templates | |
|
98 | following below omit it properly. | |||
98 |
|
99 | |||
99 | $ echo c >> c |
|
100 | $ echo c >> c | |
100 | $ hg add c |
|
101 | $ hg add c | |
101 | $ hg commit -qm ' ' |
|
102 | $ hg commit -qm ' ' | |
102 |
|
103 | |||
|
104 | Default style is like normal output. Phases style should be the same | |||
|
105 | as default style, except for extra phase lines. | |||
|
106 | ||||
103 | $ hg log > log.out |
|
107 | $ hg log > log.out | |
104 | $ hg log --style default > style.out |
|
108 | $ hg log --style default > style.out | |
105 | $ cmp log.out style.out || diff -u log.out style.out |
|
109 | $ cmp log.out style.out || diff -u log.out style.out | |
|
110 | $ hg log -T phases > phases.out | |||
|
111 | $ diff -u log.out phases.out | grep "phase:" | |||
|
112 | +phase: draft | |||
|
113 | +phase: draft | |||
|
114 | +phase: draft | |||
|
115 | +phase: draft | |||
|
116 | +phase: draft | |||
|
117 | +phase: draft | |||
|
118 | +phase: draft | |||
|
119 | +phase: draft | |||
|
120 | +phase: draft | |||
|
121 | +phase: draft | |||
106 |
|
122 | |||
107 | $ hg log -v > log.out |
|
123 | $ hg log -v > log.out | |
108 | $ hg log -v --style default > style.out |
|
124 | $ hg log -v --style default > style.out | |
109 | $ cmp log.out style.out || diff -u log.out style.out |
|
125 | $ cmp log.out style.out || diff -u log.out style.out | |
|
126 | $ hg log -v -T phases > phases.out | |||
|
127 | $ diff -u log.out phases.out | grep phase: | |||
|
128 | +phase: draft | |||
|
129 | +phase: draft | |||
|
130 | +phase: draft | |||
|
131 | +phase: draft | |||
|
132 | +phase: draft | |||
|
133 | +phase: draft | |||
|
134 | +phase: draft | |||
|
135 | +phase: draft | |||
|
136 | +phase: draft | |||
|
137 | +phase: draft | |||
110 |
|
138 | |||
111 | $ hg log -q > log.out |
|
139 | $ hg log -q > log.out | |
112 | $ hg log -q --style default > style.out |
|
140 | $ hg log -q --style default > style.out | |
113 | $ cmp log.out style.out || diff -u log.out style.out |
|
141 | $ cmp log.out style.out || diff -u log.out style.out | |
|
142 | $ hg log -q -T phases > phases.out | |||
|
143 | $ cmp log.out phases.out || diff -u log.out phases.out | |||
114 |
|
144 | |||
115 | $ hg log --debug > log.out |
|
145 | $ hg log --debug > log.out | |
116 | $ hg log --debug --style default > style.out |
|
146 | $ hg log --debug --style default > style.out | |
117 | $ cmp log.out style.out || diff -u log.out style.out |
|
147 | $ cmp log.out style.out || diff -u log.out style.out | |
|
148 | $ hg log --debug -T phases > phases.out | |||
|
149 | $ cmp log.out phases.out || diff -u log.out phases.out | |||
118 |
|
150 | |||
119 | Default style should also preserve color information (issue2866): |
|
151 | Default style should also preserve color information (issue2866): | |
120 |
|
152 | |||
@@ -127,18 +159,52 b' Default style should also preserve color' | |||||
127 | $ hg --color=debug log > log.out |
|
159 | $ hg --color=debug log > log.out | |
128 | $ hg --color=debug log --style default > style.out |
|
160 | $ hg --color=debug log --style default > style.out | |
129 | $ cmp log.out style.out || diff -u log.out style.out |
|
161 | $ cmp log.out style.out || diff -u log.out style.out | |
|
162 | $ hg --color=debug log -T phases > phases.out | |||
|
163 | $ diff -u log.out phases.out | grep phase: | |||
|
164 | +[log.phase|phase: draft] | |||
|
165 | +[log.phase|phase: draft] | |||
|
166 | +[log.phase|phase: draft] | |||
|
167 | +[log.phase|phase: draft] | |||
|
168 | +[log.phase|phase: draft] | |||
|
169 | +[log.phase|phase: draft] | |||
|
170 | +[log.phase|phase: draft] | |||
|
171 | +[log.phase|phase: draft] | |||
|
172 | +[log.phase|phase: draft] | |||
|
173 | +[log.phase|phase: draft] | |||
|
174 | ||||
130 | $ hg --color=debug -v log > log.out |
|
175 | $ hg --color=debug -v log > log.out | |
131 | $ hg --color=debug -v log --style default > style.out |
|
176 | $ hg --color=debug -v log --style default > style.out | |
132 | $ cmp log.out style.out || diff -u log.out style.out |
|
177 | $ cmp log.out style.out || diff -u log.out style.out | |
|
178 | $ hg --color=debug -v log -T phases > phases.out | |||
|
179 | $ diff -u log.out phases.out | grep phase: | |||
|
180 | +[log.phase|phase: draft] | |||
|
181 | +[log.phase|phase: draft] | |||
|
182 | +[log.phase|phase: draft] | |||
|
183 | +[log.phase|phase: draft] | |||
|
184 | +[log.phase|phase: draft] | |||
|
185 | +[log.phase|phase: draft] | |||
|
186 | +[log.phase|phase: draft] | |||
|
187 | +[log.phase|phase: draft] | |||
|
188 | +[log.phase|phase: draft] | |||
|
189 | +[log.phase|phase: draft] | |||
|
190 | ||||
133 | $ hg --color=debug -q log > log.out |
|
191 | $ hg --color=debug -q log > log.out | |
134 | $ hg --color=debug -q log --style default > style.out |
|
192 | $ hg --color=debug -q log --style default > style.out | |
135 | $ cmp log.out style.out || diff -u log.out style.out |
|
193 | $ cmp log.out style.out || diff -u log.out style.out | |
|
194 | $ hg --color=debug -q log -T phases > phases.out | |||
|
195 | $ cmp log.out phases.out || diff -u log.out phases.out | |||
|
196 | ||||
136 | $ hg --color=debug --debug log > log.out |
|
197 | $ hg --color=debug --debug log > log.out | |
137 | $ hg --color=debug --debug log --style default > style.out |
|
198 | $ hg --color=debug --debug log --style default > style.out | |
138 | $ cmp log.out style.out || diff -u log.out style.out |
|
199 | $ cmp log.out style.out || diff -u log.out style.out | |
|
200 | $ hg --color=debug --debug log -T phases > phases.out | |||
|
201 | $ cmp log.out phases.out || diff -u log.out phases.out | |||
139 |
|
202 | |||
140 | $ mv $HGRCPATH-bak $HGRCPATH |
|
203 | $ mv $HGRCPATH-bak $HGRCPATH | |
141 |
|
204 | |||
|
205 | Remove commit with empty commit message, so as to not pollute further | |||
|
206 | tests. | |||
|
207 | ||||
142 | $ hg --config extensions.strip= strip -q . |
|
208 | $ hg --config extensions.strip= strip -q . | |
143 |
|
209 | |||
144 | Revision with no copies (used to print a traceback): |
|
210 | Revision with no copies (used to print a traceback): | |
@@ -2554,3 +2620,9 b' Test word error messages for not enough ' | |||||
2554 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" |
|
2620 | $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}" | |
2555 | hg: parse error: word expects two or three arguments, got 7 |
|
2621 | hg: parse error: word expects two or three arguments, got 7 | |
2556 | [255] |
|
2622 | [255] | |
|
2623 | ||||
|
2624 | Test word for invalid numbers | |||
|
2625 | ||||
|
2626 | $ hg log -Gv -R a --template "{word(2, desc)}" | |||
|
2627 | hg: parse error: Use strings like '3' for numbers passed to word function | |||
|
2628 | [255] |
@@ -143,48 +143,10 b' Committing only one hunk' | |||||
143 | 10 |
|
143 | 10 | |
144 | y |
|
144 | y | |
145 |
|
145 | |||
146 | Editing patch of newly added file |
|
|||
147 |
|
||||
148 | $ cat > editor.sh << '__EOF__' |
|
|||
149 | > cat "$1" | sed "s/first/very/g" > tt |
|
|||
150 | > mv tt "$1" |
|
|||
151 | > __EOF__ |
|
|||
152 | $ cat > newfile << '__EOF__' |
|
|||
153 | > This is the first line |
|
|||
154 | > This is the second line |
|
|||
155 | > This is the third line |
|
|||
156 | > __EOF__ |
|
|||
157 | $ hg add newfile |
|
|||
158 | $ cat <<EOF >testModeCommands |
|
|||
159 | > f |
|
|||
160 | > KEY_DOWN |
|
|||
161 | > KEY_DOWN |
|
|||
162 | > KEY_DOWN |
|
|||
163 | > e |
|
|||
164 | > X |
|
|||
165 | > EOF |
|
|||
166 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new |
|
|||
167 | $ hg tip |
|
|||
168 | changeset: 4:6a0a43e9eff5 |
|
|||
169 | tag: tip |
|
|||
170 | user: test |
|
|||
171 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
|||
172 | summary: edit-patch-new |
|
|||
173 |
|
||||
174 | $ hg cat -r tip newfile |
|
|||
175 | This is the very line |
|
|||
176 | This is the second line |
|
|||
177 | This is the third line |
|
|||
178 |
|
||||
179 | $ cat newfile |
|
|||
180 | This is the first line |
|
|||
181 | This is the second line |
|
|||
182 | This is the third line |
|
|||
183 |
|
||||
184 | Newly added files can be selected with the curses interface |
|
146 | Newly added files can be selected with the curses interface | |
185 |
|
147 | |||
186 | $ hg update -C . |
|
148 | $ hg update -C . | |
187 |
|
|
149 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
188 | $ echo "hello" > x |
|
150 | $ echo "hello" > x | |
189 | $ hg add x |
|
151 | $ hg add x | |
190 | $ cat <<EOF >testModeCommands |
|
152 | $ cat <<EOF >testModeCommands | |
@@ -194,10 +156,8 b' Newly added files can be selected with t' | |||||
194 | > EOF |
|
156 | > EOF | |
195 | $ hg st |
|
157 | $ hg st | |
196 | A x |
|
158 | A x | |
197 | ? editor.sh |
|
|||
198 | ? testModeCommands |
|
159 | ? testModeCommands | |
199 | $ hg commit -i -m "newly added file" -d "0 0" |
|
160 | $ hg commit -i -m "newly added file" -d "0 0" | |
200 | $ hg st |
|
161 | $ hg st | |
201 | ? editor.sh |
|
|||
202 | ? testModeCommands |
|
162 | ? testModeCommands | |
203 |
|
163 |
@@ -1395,8 +1395,41 b' Test --user when ui.username not set' | |||||
1395 | $ export HGUSER |
|
1395 | $ export HGUSER | |
1396 |
|
1396 | |||
1397 |
|
1397 | |||
|
1398 | Moving files | |||
|
1399 | ||||
|
1400 | $ hg update -C . | |||
|
1401 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1402 | $ hg mv plain plain3 | |||
|
1403 | $ echo somechange >> plain3 | |||
|
1404 | $ hg commit -i -d '23 0' -mmoving_files << EOF | |||
|
1405 | > y | |||
|
1406 | > y | |||
|
1407 | > EOF | |||
|
1408 | diff --git a/plain b/plain3 | |||
|
1409 | rename from plain | |||
|
1410 | rename to plain3 | |||
|
1411 | 1 hunks, 1 lines changed | |||
|
1412 | examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y | |||
|
1413 | ||||
|
1414 | @@ -11,3 +11,4 @@ | |||
|
1415 | 9 | |||
|
1416 | 10 | |||
|
1417 | 11 | |||
|
1418 | +somechange | |||
|
1419 | record this change to 'plain3'? [Ynesfdaq?] y | |||
|
1420 | ||||
|
1421 | The #if execbit block above changes the hash here on some systems | |||
|
1422 | $ hg tip | |||
|
1423 | changeset: 30:* (glob) | |||
|
1424 | tag: tip | |||
|
1425 | user: test | |||
|
1426 | date: Thu Jan 01 00:00:23 1970 +0000 | |||
|
1427 | summary: moving_files | |||
|
1428 | ||||
1398 | Editing patch of newly added file |
|
1429 | Editing patch of newly added file | |
1399 |
|
1430 | |||
|
1431 | $ hg update -C . | |||
|
1432 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
1400 | $ cat > editor.sh << '__EOF__' |
|
1433 | $ cat > editor.sh << '__EOF__' | |
1401 | > cat "$1" | sed "s/first/very/g" > tt |
|
1434 | > cat "$1" | sed "s/first/very/g" > tt | |
1402 | > mv tt "$1" |
|
1435 | > mv tt "$1" | |
@@ -1431,4 +1464,37 b' Editing patch of newly added file' | |||||
1431 | This is the second line |
|
1464 | This is the second line | |
1432 | This is the third line |
|
1465 | This is the third line | |
1433 |
|
1466 | |||
|
1467 | Add new file from within a subdirectory | |||
|
1468 | $ hg update -C . | |||
|
1469 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1470 | $ mkdir folder | |||
|
1471 | $ cd folder | |||
|
1472 | $ echo "foo" > bar | |||
|
1473 | $ hg add bar | |||
|
1474 | $ hg commit -i -d '23 0' -mnewfilesubdir <<EOF | |||
|
1475 | > y | |||
|
1476 | > y | |||
|
1477 | > EOF | |||
|
1478 | diff --git a/folder/bar b/folder/bar | |||
|
1479 | new file mode 100644 | |||
|
1480 | examine changes to 'folder/bar'? [Ynesfdaq?] y | |||
|
1481 | ||||
|
1482 | @@ -0,0 +1,1 @@ | |||
|
1483 | +foo | |||
|
1484 | record this change to 'folder/bar'? [Ynesfdaq?] y | |||
|
1485 | ||||
|
1486 | The #if execbit block above changes the hashes here on some systems | |||
|
1487 | $ hg tip -p | |||
|
1488 | changeset: 32:* (glob) | |||
|
1489 | tag: tip | |||
|
1490 | user: test | |||
|
1491 | date: Thu Jan 01 00:00:23 1970 +0000 | |||
|
1492 | summary: newfilesubdir | |||
|
1493 | ||||
|
1494 | diff -r * -r * folder/bar (glob) | |||
|
1495 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
1496 | +++ b/folder/bar Thu Jan 01 00:00:23 1970 +0000 | |||
|
1497 | @@ -0,0 +1,1 @@ | |||
|
1498 | +foo | |||
|
1499 | ||||
1434 | $ cd .. |
|
1500 | $ cd .. |
@@ -58,9 +58,15 b' Should diff cloned directories:' | |||||
58 |
|
58 | |||
59 | Should diff cloned files directly: |
|
59 | Should diff cloned files directly: | |
60 |
|
60 | |||
|
61 | #if windows | |||
|
62 | $ hg falabala -r 0:1 | |||
|
63 | diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) | |||
|
64 | [1] | |||
|
65 | #else | |||
61 | $ hg falabala -r 0:1 |
|
66 | $ hg falabala -r 0:1 | |
62 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
|
67 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) | |
63 | [1] |
|
68 | [1] | |
|
69 | #endif | |||
64 |
|
70 | |||
65 | Test diff during merge: |
|
71 | Test diff during merge: | |
66 |
|
72 | |||
@@ -76,23 +82,41 b' Test diff during merge:' | |||||
76 |
|
82 | |||
77 | Should diff cloned file against wc file: |
|
83 | Should diff cloned file against wc file: | |
78 |
|
84 | |||
|
85 | #if windows | |||
|
86 | $ hg falabala | |||
|
87 | diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "*\\a\\a" (glob) | |||
|
88 | [1] | |||
|
89 | #else | |||
79 | $ hg falabala |
|
90 | $ hg falabala | |
80 | diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) |
|
91 | diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) | |
81 | [1] |
|
92 | [1] | |
|
93 | #endif | |||
82 |
|
94 | |||
83 |
|
95 | |||
84 | Test --change option: |
|
96 | Test --change option: | |
85 |
|
97 | |||
86 | $ hg ci -d '2 0' -mtest3 |
|
98 | $ hg ci -d '2 0' -mtest3 | |
|
99 | #if windows | |||
|
100 | $ hg falabala -c 1 | |||
|
101 | diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) | |||
|
102 | [1] | |||
|
103 | #else | |||
87 | $ hg falabala -c 1 |
|
104 | $ hg falabala -c 1 | |
88 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
|
105 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) | |
89 | [1] |
|
106 | [1] | |
|
107 | #endif | |||
90 |
|
108 | |||
91 | Check diff are made from the first parent: |
|
109 | Check diff are made from the first parent: | |
92 |
|
110 | |||
|
111 | #if windows | |||
|
112 | $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" | |||
|
113 | diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "a.46c0e4daeb72\\a" (glob) | |||
|
114 | diff-like tools yield a non-zero exit code | |||
|
115 | #else | |||
93 | $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" |
|
116 | $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" | |
94 | diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) |
|
117 | diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) | |
95 | diff-like tools yield a non-zero exit code |
|
118 | diff-like tools yield a non-zero exit code | |
|
119 | #endif | |||
96 |
|
120 | |||
97 | issue4463: usage of command line configuration without additional quoting |
|
121 | issue4463: usage of command line configuration without additional quoting | |
98 |
|
122 | |||
@@ -107,11 +131,11 b' issue4463: usage of command line configu' | |||||
107 | $ echo a >> a |
|
131 | $ echo a >> a | |
108 | #if windows |
|
132 | #if windows | |
109 | $ hg --debug 4463a | grep '^running' |
|
133 | $ hg --debug 4463a | grep '^running' | |
110 | running 'echo a-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
|
134 | running 'echo a-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
111 | $ hg --debug 4463b | grep '^running' |
|
135 | $ hg --debug 4463b | grep '^running' | |
112 | running 'echo b-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
|
136 | running 'echo b-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
113 | $ hg --debug echo | grep '^running' |
|
137 | $ hg --debug echo | grep '^running' | |
114 | running '*echo* *\\a *\\a' in */extdiff.* (glob) |
|
138 | running '*echo* "*\\a" "*\\a"' in */extdiff.* (glob) | |
115 | #else |
|
139 | #else | |
116 | $ hg --debug 4463a | grep '^running' |
|
140 | $ hg --debug 4463a | grep '^running' | |
117 | running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
|
141 | running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) | |
@@ -138,15 +162,15 b' issue4463: usage of command line configu' | |||||
138 | > EOF |
|
162 | > EOF | |
139 | #if windows |
|
163 | #if windows | |
140 | $ hg --debug 4463b2 | grep '^running' |
|
164 | $ hg --debug 4463b2 | grep '^running' | |
141 | running 'echo b2-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
|
165 | running 'echo b2-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
142 | $ hg --debug 4463b3 | grep '^running' |
|
166 | $ hg --debug 4463b3 | grep '^running' | |
143 | running 'echo b3-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
|
167 | running 'echo b3-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
144 | $ hg --debug 4463b4 | grep '^running' |
|
168 | $ hg --debug 4463b4 | grep '^running' | |
145 | running 'echo *\\a *\\a' in */extdiff.* (glob) |
|
169 | running 'echo "*\\a" "*\\a"' in */extdiff.* (glob) | |
146 | $ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running' |
|
170 | $ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running' | |
147 | running 'echo b4-naked "being quoted" *\\a *\\a' in */extdiff.* (glob) |
|
171 | running 'echo b4-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
148 | $ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running' |
|
172 | $ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running' | |
149 | running 'echo echo-naked "being quoted" *\\a *\\a' in */extdiff.* (glob) |
|
173 | running 'echo echo-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) | |
150 | #else |
|
174 | #else | |
151 | $ hg --debug 4463b2 | grep '^running' |
|
175 | $ hg --debug 4463b2 | grep '^running' | |
152 | running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
|
176 | running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
@@ -72,6 +72,20 b' Test log' | |||||
72 | content1_content2_content3-tracked | 1 + |
|
72 | content1_content2_content3-tracked | 1 + | |
73 | 3 files changed, 3 insertions(+), 0 deletions(-) |
|
73 | 3 files changed, 3 insertions(+), 0 deletions(-) | |
74 |
|
74 | |||
|
75 | Largefiles doesn't crash | |||
|
76 | $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles= | |||
|
77 | 1 | |||
|
78 | content1_content2_content1-tracked | 2 +- | |||
|
79 | content1_content2_content3-tracked | 2 +- | |||
|
80 | missing_content2_content3-tracked | 1 + | |||
|
81 | 3 files changed, 3 insertions(+), 2 deletions(-) | |||
|
82 | ||||
|
83 | 0 | |||
|
84 | content1_content1_content3-tracked | 1 + | |||
|
85 | content1_content2_content1-tracked | 1 + | |||
|
86 | content1_content2_content3-tracked | 1 + | |||
|
87 | 3 files changed, 3 insertions(+), 0 deletions(-) | |||
|
88 | ||||
75 | $ hg log -T '{rev}\n' --stat 'set:added()' |
|
89 | $ hg log -T '{rev}\n' --stat 'set:added()' | |
76 | 1 |
|
90 | 1 | |
77 | content1_missing_content1-tracked | 1 - |
|
91 | content1_missing_content1-tracked | 1 - |
@@ -629,6 +629,7 b' Test command without options' | |||||
629 | > 'hg nohelp', |
|
629 | > 'hg nohelp', | |
630 | > norepo=True) |
|
630 | > norepo=True) | |
631 | > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')]) |
|
631 | > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')]) | |
|
632 | > @command('debugoptEXP', [('', 'eopt', None, 'option is EXPERIMENTAL')]) | |||
632 | > def nohelp(ui, *args, **kwargs): |
|
633 | > def nohelp(ui, *args, **kwargs): | |
633 | > pass |
|
634 | > pass | |
634 | > |
|
635 | > | |
@@ -788,6 +789,7 b' Test list of internal help commands' | |||||
788 | debugobsolete |
|
789 | debugobsolete | |
789 | create arbitrary obsolete marker |
|
790 | create arbitrary obsolete marker | |
790 | debugoptDEP (no help text available) |
|
791 | debugoptDEP (no help text available) | |
|
792 | debugoptEXP (no help text available) | |||
791 | debugpathcomplete |
|
793 | debugpathcomplete | |
792 | complete part or all of a tracked path |
|
794 | complete part or all of a tracked path | |
793 | debugpushkey access the pushkey key/value protocol |
|
795 | debugpushkey access the pushkey key/value protocol | |
@@ -822,7 +824,7 b' Test list of commands with command with ' | |||||
822 | (use "hg help -v helpext" to show built-in aliases and global options) |
|
824 | (use "hg help -v helpext" to show built-in aliases and global options) | |
823 |
|
825 | |||
824 |
|
826 | |||
825 |
test deprecated |
|
827 | test deprecated and experimental options are hidden in command help | |
826 | $ hg help debugoptDEP |
|
828 | $ hg help debugoptDEP | |
827 | hg debugoptDEP |
|
829 | hg debugoptDEP | |
828 |
|
830 | |||
@@ -832,9 +834,20 b' test deprecated option is hidden in comm' | |||||
832 |
|
834 | |||
833 | (some details hidden, use --verbose to show complete help) |
|
835 | (some details hidden, use --verbose to show complete help) | |
834 |
|
836 | |||
835 | test deprecated option is shown with -v |
|
837 | $ hg help debugoptEXP | |
|
838 | hg debugoptEXP | |||
|
839 | ||||
|
840 | (no help text available) | |||
|
841 | ||||
|
842 | options: | |||
|
843 | ||||
|
844 | (some details hidden, use --verbose to show complete help) | |||
|
845 | ||||
|
846 | test deprecated and experimental options is shown with -v | |||
836 | $ hg help -v debugoptDEP | grep dopt |
|
847 | $ hg help -v debugoptDEP | grep dopt | |
837 | --dopt option is DEPRECATED |
|
848 | --dopt option is DEPRECATED | |
|
849 | $ hg help -v debugoptEXP | grep eopt | |||
|
850 | --eopt option is EXPERIMENTAL | |||
838 |
|
851 | |||
839 | #if gettext |
|
852 | #if gettext | |
840 | test deprecated option is hidden with translation with untranslated description |
|
853 | test deprecated option is hidden with translation with untranslated description |
@@ -107,6 +107,8 b' check histedit_source' | |||||
107 |
|
107 | |||
108 | rollup will fold without preserving the folded commit's message |
|
108 | rollup will fold without preserving the folded commit's message | |
109 |
|
109 | |||
|
110 | $ OLDHGEDITOR=$HGEDITOR | |||
|
111 | $ HGEDITOR=false | |||
110 | $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle |
|
112 | $ hg histedit d2ae7f538514 --commands - 2>&1 <<EOF | fixbundle | |
111 | > pick d2ae7f538514 b |
|
113 | > pick d2ae7f538514 b | |
112 | > roll ee283cb5f2d5 e |
|
114 | > roll ee283cb5f2d5 e | |
@@ -120,6 +122,8 b' rollup will fold without preserving the ' | |||||
120 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
121 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
123 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 |
|
124 | |||
|
125 | $ HGEDITOR=$OLDHGEDITOR | |||
|
126 | ||||
123 | log after edit |
|
127 | log after edit | |
124 | $ hg logt --graph |
|
128 | $ hg logt --graph | |
125 | @ 3:c4a9eb7989fc d |
|
129 | @ 3:c4a9eb7989fc d |
@@ -1,4 +1,5 b'' | |||||
1 | commit hooks can see env vars |
|
1 | commit hooks can see env vars | |
|
2 | (and post-transaction one are run unlocked) | |||
2 |
|
3 | |||
3 | $ hg init a |
|
4 | $ hg init a | |
4 | $ cd a |
|
5 | $ cd a | |
@@ -16,6 +17,7 b' commit hooks can see env vars' | |||||
16 | > pretxnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" pretxnclose" |
|
17 | > pretxnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" pretxnclose" | |
17 | > txnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnclose" |
|
18 | > txnclose = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnclose" | |
18 | > txnabort = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnabort" |
|
19 | > txnabort = sh -c "HG_LOCAL= HG_TAG= python \"$TESTDIR/printenv.py\" txnabort" | |
|
20 | > txnclose.checklock = sh -c "hg debuglock > /dev/null" | |||
19 | > EOF |
|
21 | > EOF | |
20 | $ echo a > a |
|
22 | $ echo a > a | |
21 | $ hg add a |
|
23 | $ hg add a | |
@@ -611,7 +613,9 b' make sure --traceback works on hook impo' | |||||
611 |
|
613 | |||
612 | Issue1827: Hooks Update & Commit not completely post operation |
|
614 | Issue1827: Hooks Update & Commit not completely post operation | |
613 |
|
615 | |||
614 | commit and update hooks should run after command completion |
|
616 | commit and update hooks should run after command completion. The largefiles | |
|
617 | use demonstrates a recursive wlock, showing the hook doesn't run until the | |||
|
618 | final release (and dirstate flush). | |||
615 |
|
619 | |||
616 | $ echo '[hooks]' > .hg/hgrc |
|
620 | $ echo '[hooks]' > .hg/hgrc | |
617 |
$ echo 'commit |
|
621 | $ echo 'commit = hg id' >> .hg/hgrc | |
@@ -619,7 +623,7 b' commit and update hooks should run after' | |||||
619 | $ echo bb > a |
|
623 | $ echo bb > a | |
620 | $ hg ci -ma |
|
624 | $ hg ci -ma | |
621 | 223eafe2750c tip |
|
625 | 223eafe2750c tip | |
622 | $ hg up 0 |
|
626 | $ hg up 0 --config extensions.largefiles= | |
623 | cb9a9f314b8b |
|
627 | cb9a9f314b8b | |
624 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
628 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
625 |
|
629 |
@@ -111,6 +111,14 b' clone to remote1' | |||||
111 | remote: adding file changes |
|
111 | remote: adding file changes | |
112 | remote: added 1 changesets with 1 changes to 1 files |
|
112 | remote: added 1 changesets with 1 changes to 1 files | |
113 |
|
113 | |||
|
114 | The largefiles extension doesn't crash | |||
|
115 | $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remotelf --config extensions.largefiles= | |||
|
116 | searching for changes | |||
|
117 | remote: adding changesets | |||
|
118 | remote: adding manifests | |||
|
119 | remote: adding file changes | |||
|
120 | remote: added 1 changesets with 1 changes to 1 files | |||
|
121 | ||||
114 | init to existing repo |
|
122 | init to existing repo | |
115 |
|
123 | |||
116 | $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1 |
|
124 | $ hg init -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1 | |
@@ -133,6 +141,8 b' output of dummyssh' | |||||
133 | Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio |
|
141 | Got arguments 1:user@dummy 2:hg -R remote2 serve --stdio | |
134 | Got arguments 1:user@dummy 2:hg init remote1 |
|
142 | Got arguments 1:user@dummy 2:hg init remote1 | |
135 | Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio |
|
143 | Got arguments 1:user@dummy 2:hg -R remote1 serve --stdio | |
|
144 | Got arguments 1:user@dummy 2:hg init remotelf | |||
|
145 | Got arguments 1:user@dummy 2:hg -R remotelf serve --stdio | |||
136 | Got arguments 1:user@dummy 2:hg init remote1 |
|
146 | Got arguments 1:user@dummy 2:hg init remote1 | |
137 | Got arguments 1:user@dummy 2:hg init remote1 |
|
147 | Got arguments 1:user@dummy 2:hg init remote1 | |
138 |
|
148 |
@@ -24,3 +24,20 b' hg debuginstall with no username' | |||||
24 | (specify a username in your configuration file) |
|
24 | (specify a username in your configuration file) | |
25 | 1 problems detected, please check your install! |
|
25 | 1 problems detected, please check your install! | |
26 | [1] |
|
26 | [1] | |
|
27 | ||||
|
28 | path variables are expanded (~ is the same as $TESTTMP) | |||
|
29 | $ mkdir tools | |||
|
30 | $ touch tools/testeditor.exe | |||
|
31 | #if execbit | |||
|
32 | $ chmod 755 tools/testeditor.exe | |||
|
33 | #endif | |||
|
34 | $ hg debuginstall --config ui.editor=~/tools/testeditor.exe | |||
|
35 | checking encoding (ascii)... | |||
|
36 | checking Python executable (*) (glob) | |||
|
37 | checking Python version (*) (glob) | |||
|
38 | checking Python lib (*lib*)... (glob) | |||
|
39 | checking installed modules (*mercurial)... (glob) | |||
|
40 | checking templates (*mercurial?templates)... (glob) | |||
|
41 | checking commit editor... | |||
|
42 | checking username... | |||
|
43 | no problems detected |
@@ -37,6 +37,13 b' Test copies and moves from a directory o' | |||||
37 | A dira/dirb/largefile |
|
37 | A dira/dirb/largefile | |
38 | $ cd dira |
|
38 | $ cd dira | |
39 | $ hg cp dirb/largefile foo/largefile |
|
39 | $ hg cp dirb/largefile foo/largefile | |
|
40 | ||||
|
41 | TODO: Ideally, this should mention the largefile, not the standin | |||
|
42 | $ hg log -T '{rev}\n' --stat 'set:clean()' | |||
|
43 | 0 | |||
|
44 | .hglf/dira/dirb/largefile | 1 + | |||
|
45 | 1 files changed, 1 insertions(+), 0 deletions(-) | |||
|
46 | ||||
40 | $ hg ci -m "deep copy" |
|
47 | $ hg ci -m "deep copy" | |
41 | Invoking status precommit hook |
|
48 | Invoking status precommit hook | |
42 | A dira/foo/largefile |
|
49 | A dira/foo/largefile |
@@ -105,9 +105,11 b' simplest hgrc using false for merge:' | |||||
105 | M f |
|
105 | M f | |
106 | ? f.orig |
|
106 | ? f.orig | |
107 |
|
107 | |||
|
108 | #if unix-permissions | |||
|
109 | ||||
108 | unexecutable file in $PATH shouldn't be found: |
|
110 | unexecutable file in $PATH shouldn't be found: | |
109 |
|
111 | |||
110 | $ touch false |
|
112 | $ echo "echo fail" > false | |
111 | $ hg up -qC 1 |
|
113 | $ hg up -qC 1 | |
112 | $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 |
|
114 | $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 | |
113 | merging f |
|
115 | merging f | |
@@ -118,6 +120,8 b" unexecutable file in $PATH shouldn't be " | |||||
118 | [1] |
|
120 | [1] | |
119 | $ rm false |
|
121 | $ rm false | |
120 |
|
122 | |||
|
123 | #endif | |||
|
124 | ||||
121 | executable directory in $PATH shouldn't be found: |
|
125 | executable directory in $PATH shouldn't be found: | |
122 |
|
126 | |||
123 | $ mkdir false |
|
127 | $ mkdir false | |
@@ -604,7 +608,16 b' update is a merge ...' | |||||
604 | true.executable=cat |
|
608 | true.executable=cat | |
605 | # hg update -C 1 |
|
609 | # hg update -C 1 | |
606 | $ hg update -q 0 |
|
610 | $ hg update -q 0 | |
|
611 | $ f -s f | |||
|
612 | f: size=17 | |||
|
613 | $ touch -t 200001010000 f | |||
|
614 | $ hg status f | |||
607 |
$ |
|
615 | $ hg revert -q -r 1 . | |
|
616 | $ f -s f | |||
|
617 | f: size=17 | |||
|
618 | $ touch -t 200001010000 f | |||
|
619 | $ hg status f | |||
|
620 | M f | |||
608 |
$ |
|
621 | $ hg update -r 2 | |
609 | merging f |
|
622 | merging f | |
610 | revision 1 |
|
623 | revision 1 | |
@@ -630,7 +643,16 b' update should also have --tool' | |||||
630 | true.executable=cat |
|
643 | true.executable=cat | |
631 | # hg update -C 1 |
|
644 | # hg update -C 1 | |
632 | $ hg update -q 0 |
|
645 | $ hg update -q 0 | |
|
646 | $ f -s f | |||
|
647 | f: size=17 | |||
|
648 | $ touch -t 200001010000 f | |||
|
649 | $ hg status f | |||
633 |
$ |
|
650 | $ hg revert -q -r 1 . | |
|
651 | $ f -s f | |||
|
652 | f: size=17 | |||
|
653 | $ touch -t 200001010000 f | |||
|
654 | $ hg status f | |||
|
655 | M f | |||
634 |
$ |
|
656 | $ hg update -r 2 --tool false | |
635 | merging f |
|
657 | merging f | |
636 | merging f failed! |
|
658 | merging f failed! |
@@ -344,25 +344,29 b' test qpush --keep-changes' | |||||
344 | $ echo b >> b |
|
344 | $ echo b >> b | |
345 | $ hg qpush --keep-changes |
|
345 | $ hg qpush --keep-changes | |
346 | applying p3 |
|
346 | applying p3 | |
347 | errors during apply, please fix and refresh p2 |
|
347 | abort: conflicting local changes found | |
348 | [2] |
|
348 | (did you forget to qrefresh?) | |
|
349 | [255] | |||
349 | $ rm b |
|
350 | $ rm b | |
350 | $ hg qpush --keep-changes |
|
351 | $ hg qpush --keep-changes | |
351 | applying p3 |
|
352 | applying p3 | |
352 | errors during apply, please fix and refresh p2 |
|
353 | abort: conflicting local changes found | |
353 | [2] |
|
354 | (did you forget to qrefresh?) | |
|
355 | [255] | |||
354 | $ hg rm -A b |
|
356 | $ hg rm -A b | |
355 | $ hg qpush --keep-changes |
|
357 | $ hg qpush --keep-changes | |
356 | applying p3 |
|
358 | applying p3 | |
357 | errors during apply, please fix and refresh p2 |
|
359 | abort: conflicting local changes found | |
358 | [2] |
|
360 | (did you forget to qrefresh?) | |
|
361 | [255] | |||
359 | $ hg revert -aq b |
|
362 | $ hg revert -aq b | |
360 | $ echo d > d |
|
363 | $ echo d > d | |
361 | $ hg add d |
|
364 | $ hg add d | |
362 | $ hg qpush --keep-changes |
|
365 | $ hg qpush --keep-changes | |
363 | applying p3 |
|
366 | applying p3 | |
364 | errors during apply, please fix and refresh p2 |
|
367 | abort: conflicting local changes found | |
365 | [2] |
|
368 | (did you forget to qrefresh?) | |
|
369 | [255] | |||
366 | $ hg forget d |
|
370 | $ hg forget d | |
367 | $ rm d |
|
371 | $ rm d | |
368 | $ hg qpop |
|
372 | $ hg qpop | |
@@ -372,8 +376,9 b' test qpush --keep-changes' | |||||
372 | $ hg qpush -a --keep-changes |
|
376 | $ hg qpush -a --keep-changes | |
373 | applying p2 |
|
377 | applying p2 | |
374 | applying p3 |
|
378 | applying p3 | |
375 | errors during apply, please fix and refresh p2 |
|
379 | abort: conflicting local changes found | |
376 | [2] |
|
380 | (did you forget to qrefresh?) | |
|
381 | [255] | |||
377 | $ hg qtop |
|
382 | $ hg qtop | |
378 | p2 |
|
383 | p2 | |
379 | $ hg parents --template "{rev} {desc}\n" |
|
384 | $ hg parents --template "{rev} {desc}\n" |
@@ -789,6 +789,62 b' Test that removing a local tag does not ' | |||||
789 | visible 0:193e9254ce7e |
|
789 | visible 0:193e9254ce7e | |
790 | tip 0:193e9254ce7e |
|
790 | tip 0:193e9254ce7e | |
791 |
|
791 | |||
|
792 | Test bundle overlay onto hidden revision | |||
|
793 | ||||
|
794 | $ cd .. | |||
|
795 | $ hg init repo-bundleoverlay | |||
|
796 | $ cd repo-bundleoverlay | |||
|
797 | $ echo "A" > foo | |||
|
798 | $ hg ci -Am "A" | |||
|
799 | adding foo | |||
|
800 | $ echo "B" >> foo | |||
|
801 | $ hg ci -m "B" | |||
|
802 | $ hg up 0 | |||
|
803 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
804 | $ echo "C" >> foo | |||
|
805 | $ hg ci -m "C" | |||
|
806 | created new head | |||
|
807 | $ hg log -G | |||
|
808 | @ 2:c186d7714947 (draft) [tip ] C | |||
|
809 | | | |||
|
810 | | o 1:44526ebb0f98 (draft) [ ] B | |||
|
811 | |/ | |||
|
812 | o 0:4b34ecfb0d56 (draft) [ ] A | |||
|
813 | ||||
|
814 | ||||
|
815 | $ hg clone -r1 . ../other-bundleoverlay | |||
|
816 | adding changesets | |||
|
817 | adding manifests | |||
|
818 | adding file changes | |||
|
819 | added 2 changesets with 2 changes to 1 files | |||
|
820 | updating to branch default | |||
|
821 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
822 | $ cd ../other-bundleoverlay | |||
|
823 | $ echo "B+" >> foo | |||
|
824 | $ hg ci --amend -m "B+" | |||
|
825 | $ hg log -G --hidden | |||
|
826 | @ 3:b7d587542d40 (draft) [tip ] B+ | |||
|
827 | | | |||
|
828 | | x 2:eb95e9297e18 (draft) [ ] temporary amend commit for 44526ebb0f98 | |||
|
829 | | | | |||
|
830 | | x 1:44526ebb0f98 (draft) [ ] B | |||
|
831 | |/ | |||
|
832 | o 0:4b34ecfb0d56 (draft) [ ] A | |||
|
833 | ||||
|
834 | ||||
|
835 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg | |||
|
836 | comparing with ../repo-bundleoverlay | |||
|
837 | searching for changes | |||
|
838 | 1:44526ebb0f98 (draft) [ ] B | |||
|
839 | 2:c186d7714947 (draft) [tip ] C | |||
|
840 | $ hg log -G -R ../bundleoverlay.hg | |||
|
841 | o 4:c186d7714947 (draft) [tip ] C | |||
|
842 | | | |||
|
843 | | @ 3:b7d587542d40 (draft) [ ] B+ | |||
|
844 | |/ | |||
|
845 | o 0:4b34ecfb0d56 (draft) [ ] A | |||
|
846 | ||||
|
847 | ||||
792 | #if serve |
|
848 | #if serve | |
793 |
|
849 | |||
794 | Test issue 4506 |
|
850 | Test issue 4506 |
@@ -113,3 +113,27 b' test external hook' | |||||
113 | rollback completed |
|
113 | rollback completed | |
114 | abort: pretxnchangegroup hook exited with status 1 |
|
114 | abort: pretxnchangegroup hook exited with status 1 | |
115 | pull 0000000000000000000000000000000000000000 |
|
115 | pull 0000000000000000000000000000000000000000 | |
|
116 | ||||
|
117 | Test that pending on transaction without changegroup see the normal changegroup( | |||
|
118 | (issue4609) | |||
|
119 | ||||
|
120 | $ cat <<EOF > parent/.hg/hgrc | |||
|
121 | > [hooks] | |||
|
122 | > pretxnchangegroup= | |||
|
123 | > pretxnclose = hg tip -T "tip: {node|short}\n" | |||
|
124 | > [phases] | |||
|
125 | > publishing=False | |||
|
126 | > EOF | |||
|
127 | ||||
|
128 | setup | |||
|
129 | ||||
|
130 | $ cd parent | |||
|
131 | $ echo a > a | |||
|
132 | $ hg add a | |||
|
133 | $ hg commit -m a | |||
|
134 | tip: cb9a9f314b8b | |||
|
135 | ||||
|
136 | actual test | |||
|
137 | ||||
|
138 | $ hg phase --public . | |||
|
139 | tip: cb9a9f314b8b |
@@ -100,7 +100,7 b' args:' | |||||
100 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
100 | picked tool 'python ../merge' for rev (binary False symlink False) | |
101 | merging rev |
|
101 | merging rev | |
102 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
102 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
103 |
launching merge tool: python ../merge $TESTTMP/t/t/rev |
|
103 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
104 | merge tool returned: 0 |
|
104 | merge tool returned: 0 | |
105 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
105 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
106 | (branch merge, don't forget to commit) |
|
106 | (branch merge, don't forget to commit) | |
@@ -140,7 +140,7 b' args:' | |||||
140 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
140 | picked tool 'python ../merge' for rev (binary False symlink False) | |
141 | merging rev |
|
141 | merging rev | |
142 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
142 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
143 | launching merge tool: python ../merge $TESTTMP/t/t/rev * (glob) |
|
143 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * (glob) | |
144 | merge tool returned: 0 |
|
144 | merge tool returned: 0 | |
145 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
145 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
146 | (branch merge, don't forget to commit) |
|
146 | (branch merge, don't forget to commit) | |
@@ -178,7 +178,7 b' args:' | |||||
178 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
178 | picked tool 'python ../merge' for rev (binary False symlink False) | |
179 | merging rev |
|
179 | merging rev | |
180 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
180 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | |
181 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
181 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
182 | merge tool returned: 0 |
|
182 | merge tool returned: 0 | |
183 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
183 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
184 | (branch merge, don't forget to commit) |
|
184 | (branch merge, don't forget to commit) | |
@@ -214,7 +214,7 b' args:' | |||||
214 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
214 | picked tool 'python ../merge' for rev (binary False symlink False) | |
215 | merging rev |
|
215 | merging rev | |
216 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
216 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
217 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
217 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
218 | merge tool returned: 0 |
|
218 | merge tool returned: 0 | |
219 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
219 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
220 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
@@ -246,7 +246,7 b' args:' | |||||
246 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
246 | picked tool 'python ../merge' for rev (binary False symlink False) | |
247 | merging rev |
|
247 | merging rev | |
248 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
248 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
249 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
249 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
250 | merge tool returned: 0 |
|
250 | merge tool returned: 0 | |
251 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
251 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
252 | (branch merge, don't forget to commit) |
|
252 | (branch merge, don't forget to commit) | |
@@ -275,7 +275,7 b' args:' | |||||
275 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
275 | picked tool 'python ../merge' for rev (binary False symlink False) | |
276 | merging rev |
|
276 | merging rev | |
277 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
277 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | |
278 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
278 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
279 | merge tool returned: 0 |
|
279 | merge tool returned: 0 | |
280 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
280 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
281 | (branch merge, don't forget to commit) |
|
281 | (branch merge, don't forget to commit) | |
@@ -310,7 +310,7 b' args:' | |||||
310 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
310 | picked tool 'python ../merge' for rev (binary False symlink False) | |
311 | merging rev |
|
311 | merging rev | |
312 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
312 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | |
313 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
313 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
314 | merge tool returned: 0 |
|
314 | merge tool returned: 0 | |
315 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
315 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
316 | (branch merge, don't forget to commit) |
|
316 | (branch merge, don't forget to commit) | |
@@ -338,7 +338,7 b' args:' | |||||
338 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
338 | picked tool 'python ../merge' for rev (binary False symlink False) | |
339 | merging rev |
|
339 | merging rev | |
340 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
340 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | |
341 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
341 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
342 | merge tool returned: 0 |
|
342 | merge tool returned: 0 | |
343 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
343 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
344 | (branch merge, don't forget to commit) |
|
344 | (branch merge, don't forget to commit) | |
@@ -364,14 +364,14 b' args:' | |||||
364 | picked tool 'python ../merge' for b (binary False symlink False) |
|
364 | picked tool 'python ../merge' for b (binary False symlink False) | |
365 | merging b |
|
365 | merging b | |
366 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
366 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | |
367 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
367 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
368 | merge tool returned: 0 |
|
368 | merge tool returned: 0 | |
369 | rev: versions differ -> m |
|
369 | rev: versions differ -> m | |
370 | updating: rev 2/2 files (100.00%) |
|
370 | updating: rev 2/2 files (100.00%) | |
371 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
371 | picked tool 'python ../merge' for rev (binary False symlink False) | |
372 | merging rev |
|
372 | merging rev | |
373 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
373 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
374 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
374 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
375 | merge tool returned: 0 |
|
375 | merge tool returned: 0 | |
376 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
376 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
377 | (branch merge, don't forget to commit) |
|
377 | (branch merge, don't forget to commit) | |
@@ -408,7 +408,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
408 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
408 | picked tool 'python ../merge' for rev (binary False symlink False) | |
409 | merging rev |
|
409 | merging rev | |
410 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
410 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
411 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
411 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
412 | merge tool returned: 0 |
|
412 | merge tool returned: 0 | |
413 | note: possible conflict - a was renamed multiple times to: |
|
413 | note: possible conflict - a was renamed multiple times to: | |
414 | b |
|
414 | b | |
@@ -438,14 +438,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
438 | picked tool 'python ../merge' for b (binary False symlink False) |
|
438 | picked tool 'python ../merge' for b (binary False symlink False) | |
439 | merging b |
|
439 | merging b | |
440 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
440 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | |
441 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
441 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
442 | merge tool returned: 0 |
|
442 | merge tool returned: 0 | |
443 | rev: versions differ -> m |
|
443 | rev: versions differ -> m | |
444 | updating: rev 2/2 files (100.00%) |
|
444 | updating: rev 2/2 files (100.00%) | |
445 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
445 | picked tool 'python ../merge' for rev (binary False symlink False) | |
446 | merging rev |
|
446 | merging rev | |
447 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
447 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
448 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
448 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
449 | merge tool returned: 0 |
|
449 | merge tool returned: 0 | |
450 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
450 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
451 | (branch merge, don't forget to commit) |
|
451 | (branch merge, don't forget to commit) | |
@@ -475,14 +475,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
475 | picked tool 'python ../merge' for b (binary False symlink False) |
|
475 | picked tool 'python ../merge' for b (binary False symlink False) | |
476 | merging b |
|
476 | merging b | |
477 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
477 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
478 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
478 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
479 | merge tool returned: 0 |
|
479 | merge tool returned: 0 | |
480 | rev: versions differ -> m |
|
480 | rev: versions differ -> m | |
481 | updating: rev 3/3 files (100.00%) |
|
481 | updating: rev 3/3 files (100.00%) | |
482 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
482 | picked tool 'python ../merge' for rev (binary False symlink False) | |
483 | merging rev |
|
483 | merging rev | |
484 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
484 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
485 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
485 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
486 | merge tool returned: 0 |
|
486 | merge tool returned: 0 | |
487 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
487 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
488 | (branch merge, don't forget to commit) |
|
488 | (branch merge, don't forget to commit) | |
@@ -511,14 +511,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
511 | picked tool 'python ../merge' for b (binary False symlink False) |
|
511 | picked tool 'python ../merge' for b (binary False symlink False) | |
512 | merging b |
|
512 | merging b | |
513 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
513 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
514 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
514 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
515 | merge tool returned: 0 |
|
515 | merge tool returned: 0 | |
516 | rev: versions differ -> m |
|
516 | rev: versions differ -> m | |
517 | updating: rev 3/3 files (100.00%) |
|
517 | updating: rev 3/3 files (100.00%) | |
518 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
518 | picked tool 'python ../merge' for rev (binary False symlink False) | |
519 | merging rev |
|
519 | merging rev | |
520 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
520 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
521 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
521 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
522 | merge tool returned: 0 |
|
522 | merge tool returned: 0 | |
523 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
523 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
524 | (branch merge, don't forget to commit) |
|
524 | (branch merge, don't forget to commit) | |
@@ -548,14 +548,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
548 | picked tool 'python ../merge' for b (binary False symlink False) |
|
548 | picked tool 'python ../merge' for b (binary False symlink False) | |
549 | merging b |
|
549 | merging b | |
550 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
550 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
551 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
551 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
552 | merge tool returned: 0 |
|
552 | merge tool returned: 0 | |
553 | rev: versions differ -> m |
|
553 | rev: versions differ -> m | |
554 | updating: rev 3/3 files (100.00%) |
|
554 | updating: rev 3/3 files (100.00%) | |
555 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
555 | picked tool 'python ../merge' for rev (binary False symlink False) | |
556 | merging rev |
|
556 | merging rev | |
557 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
557 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
558 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
558 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
559 | merge tool returned: 0 |
|
559 | merge tool returned: 0 | |
560 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
560 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
561 | (branch merge, don't forget to commit) |
|
561 | (branch merge, don't forget to commit) | |
@@ -584,14 +584,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
584 | picked tool 'python ../merge' for b (binary False symlink False) |
|
584 | picked tool 'python ../merge' for b (binary False symlink False) | |
585 | merging b |
|
585 | merging b | |
586 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
586 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
587 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
587 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
588 | merge tool returned: 0 |
|
588 | merge tool returned: 0 | |
589 | rev: versions differ -> m |
|
589 | rev: versions differ -> m | |
590 | updating: rev 3/3 files (100.00%) |
|
590 | updating: rev 3/3 files (100.00%) | |
591 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
591 | picked tool 'python ../merge' for rev (binary False symlink False) | |
592 | merging rev |
|
592 | merging rev | |
593 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
593 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
594 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
594 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
595 | merge tool returned: 0 |
|
595 | merge tool returned: 0 | |
596 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
596 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
597 | (branch merge, don't forget to commit) |
|
597 | (branch merge, don't forget to commit) | |
@@ -619,14 +619,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
619 | picked tool 'python ../merge' for b (binary False symlink False) |
|
619 | picked tool 'python ../merge' for b (binary False symlink False) | |
620 | merging b |
|
620 | merging b | |
621 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
621 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | |
622 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
622 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
623 | merge tool returned: 0 |
|
623 | merge tool returned: 0 | |
624 | rev: versions differ -> m |
|
624 | rev: versions differ -> m | |
625 | updating: rev 2/2 files (100.00%) |
|
625 | updating: rev 2/2 files (100.00%) | |
626 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
626 | picked tool 'python ../merge' for rev (binary False symlink False) | |
627 | merging rev |
|
627 | merging rev | |
628 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
628 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
629 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
629 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
630 | merge tool returned: 0 |
|
630 | merge tool returned: 0 | |
631 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
631 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
632 | (branch merge, don't forget to commit) |
|
632 | (branch merge, don't forget to commit) | |
@@ -658,14 +658,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
658 | picked tool 'python ../merge' for b (binary False symlink False) |
|
658 | picked tool 'python ../merge' for b (binary False symlink False) | |
659 | merging b |
|
659 | merging b | |
660 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
660 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | |
661 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
661 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
662 | merge tool returned: 0 |
|
662 | merge tool returned: 0 | |
663 | rev: versions differ -> m |
|
663 | rev: versions differ -> m | |
664 | updating: rev 3/3 files (100.00%) |
|
664 | updating: rev 3/3 files (100.00%) | |
665 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
665 | picked tool 'python ../merge' for rev (binary False symlink False) | |
666 | merging rev |
|
666 | merging rev | |
667 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
667 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
668 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
668 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
669 | merge tool returned: 0 |
|
669 | merge tool returned: 0 | |
670 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
670 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
671 | (branch merge, don't forget to commit) |
|
671 | (branch merge, don't forget to commit) | |
@@ -696,14 +696,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
696 | picked tool 'python ../merge' for b (binary False symlink False) |
|
696 | picked tool 'python ../merge' for b (binary False symlink False) | |
697 | merging b |
|
697 | merging b | |
698 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
698 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | |
699 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
699 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
700 | merge tool returned: 0 |
|
700 | merge tool returned: 0 | |
701 | rev: versions differ -> m |
|
701 | rev: versions differ -> m | |
702 | updating: rev 3/3 files (100.00%) |
|
702 | updating: rev 3/3 files (100.00%) | |
703 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
703 | picked tool 'python ../merge' for rev (binary False symlink False) | |
704 | merging rev |
|
704 | merging rev | |
705 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
705 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
706 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
706 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
707 | merge tool returned: 0 |
|
707 | merge tool returned: 0 | |
708 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
708 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
709 | (branch merge, don't forget to commit) |
|
709 | (branch merge, don't forget to commit) | |
@@ -734,14 +734,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
734 | picked tool 'python ../merge' for b (binary False symlink False) |
|
734 | picked tool 'python ../merge' for b (binary False symlink False) | |
735 | merging a and b to b |
|
735 | merging a and b to b | |
736 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
736 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | |
737 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
737 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
738 | merge tool returned: 0 |
|
738 | merge tool returned: 0 | |
739 | rev: versions differ -> m |
|
739 | rev: versions differ -> m | |
740 | updating: rev 2/2 files (100.00%) |
|
740 | updating: rev 2/2 files (100.00%) | |
741 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
741 | picked tool 'python ../merge' for rev (binary False symlink False) | |
742 | merging rev |
|
742 | merging rev | |
743 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
743 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
744 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
744 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
745 | merge tool returned: 0 |
|
745 | merge tool returned: 0 | |
746 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
746 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
747 | (branch merge, don't forget to commit) |
|
747 | (branch merge, don't forget to commit) | |
@@ -771,14 +771,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
771 | picked tool 'python ../merge' for b (binary False symlink False) |
|
771 | picked tool 'python ../merge' for b (binary False symlink False) | |
772 | merging b and a to b |
|
772 | merging b and a to b | |
773 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
773 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | |
774 | launching merge tool: python ../merge $TESTTMP/t/t/b * * (glob) |
|
774 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) | |
775 | merge tool returned: 0 |
|
775 | merge tool returned: 0 | |
776 | rev: versions differ -> m |
|
776 | rev: versions differ -> m | |
777 | updating: rev 2/2 files (100.00%) |
|
777 | updating: rev 2/2 files (100.00%) | |
778 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
778 | picked tool 'python ../merge' for rev (binary False symlink False) | |
779 | merging rev |
|
779 | merging rev | |
780 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
780 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
781 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
781 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
782 | merge tool returned: 0 |
|
782 | merge tool returned: 0 | |
783 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
783 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
784 | (branch merge, don't forget to commit) |
|
784 | (branch merge, don't forget to commit) | |
@@ -822,7 +822,7 b' m "nm a b" "um x a" " " "22 get a, ' | |||||
822 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
822 | picked tool 'python ../merge' for rev (binary False symlink False) | |
823 | merging rev |
|
823 | merging rev | |
824 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
824 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | |
825 | launching merge tool: python ../merge $TESTTMP/t/t/rev * * (glob) |
|
825 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
826 | merge tool returned: 0 |
|
826 | merge tool returned: 0 | |
827 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
827 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
828 | (branch merge, don't forget to commit) |
|
828 | (branch merge, don't forget to commit) |
@@ -201,12 +201,26 b' call `hg revert` with no file specified' | |||||
201 | (use --all to revert all files, or 'hg update 1' to update) |
|
201 | (use --all to revert all files, or 'hg update 1' to update) | |
202 | [255] |
|
202 | [255] | |
203 |
|
203 | |||
|
204 | call `hg revert` with -I | |||
|
205 | --------------------------- | |||
|
206 | ||||
|
207 | $ echo a >> a | |||
|
208 | $ hg revert -I a | |||
|
209 | reverting a | |||
|
210 | ||||
|
211 | call `hg revert` with -X | |||
|
212 | --------------------------- | |||
|
213 | ||||
|
214 | $ echo a >> a | |||
|
215 | $ hg revert -X d | |||
|
216 | reverting a | |||
|
217 | ||||
204 |
call ` |
|
218 | call `hg revert` with --all | |
205 | --------------------------- |
|
219 | --------------------------- | |
206 |
|
220 | |||
207 | $ hg revert --all -rtip |
|
221 | $ hg revert --all -rtip | |
208 | reverting a |
|
222 | reverting a | |
209 |
|
223 | $ rm *.orig | ||
210 |
|
224 | |||
211 | Issue332: confusing message when reverting directory |
|
225 | Issue332: confusing message when reverting directory | |
212 | ---------------------------------------------------- |
|
226 | ---------------------------------------------------- |
@@ -1049,6 +1049,8 b' aliases:' | |||||
1049 |
|
1049 | |||
1050 | $ echo '[revsetalias]' >> .hg/hgrc |
|
1050 | $ echo '[revsetalias]' >> .hg/hgrc | |
1051 | $ echo 'm = merge()' >> .hg/hgrc |
|
1051 | $ echo 'm = merge()' >> .hg/hgrc | |
|
1052 | (revset aliases can override builtin revsets) | |||
|
1053 | $ echo 'p2($1) = p1($1)' >> .hg/hgrc | |||
1052 | $ echo 'sincem = descendants(m)' >> .hg/hgrc |
|
1054 | $ echo 'sincem = descendants(m)' >> .hg/hgrc | |
1053 | $ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc |
|
1055 | $ echo 'd($1) = reverse(sort($1, date))' >> .hg/hgrc | |
1054 | $ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc |
|
1056 | $ echo 'rs(ARG1, ARG2) = reverse(sort(ARG1, ARG2))' >> .hg/hgrc | |
@@ -1064,6 +1066,64 b' aliases:' | |||||
1064 | <fullreposet+ 0:9>> |
|
1066 | <fullreposet+ 0:9>> | |
1065 | 6 |
|
1067 | 6 | |
1066 |
|
1068 | |||
|
1069 | $ HGPLAIN=1 | |||
|
1070 | $ export HGPLAIN | |||
|
1071 | $ try m | |||
|
1072 | ('symbol', 'm') | |||
|
1073 | abort: unknown revision 'm'! | |||
|
1074 | [255] | |||
|
1075 | ||||
|
1076 | $ HGPLAINEXCEPT=revsetalias | |||
|
1077 | $ export HGPLAINEXCEPT | |||
|
1078 | $ try m | |||
|
1079 | ('symbol', 'm') | |||
|
1080 | (func | |||
|
1081 | ('symbol', 'merge') | |||
|
1082 | None) | |||
|
1083 | * set: | |||
|
1084 | <filteredset | |||
|
1085 | <fullreposet+ 0:9>> | |||
|
1086 | 6 | |||
|
1087 | ||||
|
1088 | $ unset HGPLAIN | |||
|
1089 | $ unset HGPLAINEXCEPT | |||
|
1090 | ||||
|
1091 | $ try 'p2(.)' | |||
|
1092 | (func | |||
|
1093 | ('symbol', 'p2') | |||
|
1094 | ('symbol', '.')) | |||
|
1095 | (func | |||
|
1096 | ('symbol', 'p1') | |||
|
1097 | ('symbol', '.')) | |||
|
1098 | * set: | |||
|
1099 | <baseset+ [8]> | |||
|
1100 | 8 | |||
|
1101 | ||||
|
1102 | $ HGPLAIN=1 | |||
|
1103 | $ export HGPLAIN | |||
|
1104 | $ try 'p2(.)' | |||
|
1105 | (func | |||
|
1106 | ('symbol', 'p2') | |||
|
1107 | ('symbol', '.')) | |||
|
1108 | * set: | |||
|
1109 | <baseset+ []> | |||
|
1110 | ||||
|
1111 | $ HGPLAINEXCEPT=revsetalias | |||
|
1112 | $ export HGPLAINEXCEPT | |||
|
1113 | $ try 'p2(.)' | |||
|
1114 | (func | |||
|
1115 | ('symbol', 'p2') | |||
|
1116 | ('symbol', '.')) | |||
|
1117 | (func | |||
|
1118 | ('symbol', 'p1') | |||
|
1119 | ('symbol', '.')) | |||
|
1120 | * set: | |||
|
1121 | <baseset+ [8]> | |||
|
1122 | 8 | |||
|
1123 | ||||
|
1124 | $ unset HGPLAIN | |||
|
1125 | $ unset HGPLAINEXCEPT | |||
|
1126 | ||||
1067 | test alias recursion |
|
1127 | test alias recursion | |
1068 |
|
1128 | |||
1069 | $ try sincem |
|
1129 | $ try sincem |
@@ -491,3 +491,17 b' test for --json' | |||||
491 | } (no-eol) |
|
491 | } (no-eol) | |
492 |
|
492 | |||
493 | #endif |
|
493 | #endif | |
|
494 | ||||
|
495 | backslash on end of line with glob matching is handled properly | |||
|
496 | ||||
|
497 | $ cat > test-glob-backslash.t << EOF | |||
|
498 | > $ echo 'foo bar \\' | |||
|
499 | > foo * \ (glob) | |||
|
500 | > EOF | |||
|
501 | ||||
|
502 | $ $TESTDIR/run-tests.py --with-hg=`which hg` test-glob-backslash.t | |||
|
503 | . | |||
|
504 | # Ran 1 tests, 0 skipped, 0 warned, 0 failed. | |||
|
505 | ||||
|
506 | $ rm -f test-glob-backslash.t | |||
|
507 |
@@ -60,7 +60,6 b' shelve has a help message' | |||||
60 | -m --message TEXT use text as shelve message |
|
60 | -m --message TEXT use text as shelve message | |
61 | -n --name NAME use the given name for the shelved commit |
|
61 | -n --name NAME use the given name for the shelved commit | |
62 | -p --patch show patch |
|
62 | -p --patch show patch | |
63 | -i --interactive interactive mode, only works while creating a shelve |
|
|||
64 | --stat output diffstat-style summary of changes |
|
63 | --stat output diffstat-style summary of changes | |
65 | -I --include PATTERN [+] include names matching the given patterns |
|
64 | -I --include PATTERN [+] include names matching the given patterns | |
66 | -X --exclude PATTERN [+] exclude names matching the given patterns |
|
65 | -X --exclude PATTERN [+] exclude names matching the given patterns |
@@ -96,4 +96,14 b' check that we can update parent repo wit' | |||||
96 | revision 102a90ea7b4a in subrepo subrepo is hidden |
|
96 | revision 102a90ea7b4a in subrepo subrepo is hidden | |
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 |
|
98 | |||
|
99 | check that --hidden is propagated to the subrepo | |||
|
100 | ||||
|
101 | $ hg -R subrepo up tip | |||
|
102 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
103 | $ hg ci -m 'commit with amended subrepo' | |||
|
104 | $ echo bar > subrepo/a | |||
|
105 | $ hg -R subrepo ci --amend -m "amend a (again)" | |||
|
106 | $ hg --hidden cat subrepo/a | |||
|
107 | foo | |||
|
108 | ||||
99 | $ cd .. |
|
109 | $ cd .. |
@@ -598,6 +598,26 b' committing into a subrepo makes its stor' | |||||
598 |
|
598 | |||
599 | $ echo foo >> s/ss/a |
|
599 | $ echo foo >> s/ss/a | |
600 | $ hg -R s/ss commit -m 'test dirty store detection' |
|
600 | $ hg -R s/ss commit -m 'test dirty store detection' | |
|
601 | ||||
|
602 | $ hg out -S -r `hg log -r tip -T "{node|short}"` | |||
|
603 | comparing with $TESTTMP/t (glob) | |||
|
604 | searching for changes | |||
|
605 | no changes found | |||
|
606 | comparing with $TESTTMP/t/s | |||
|
607 | searching for changes | |||
|
608 | no changes found | |||
|
609 | comparing with $TESTTMP/t/s/ss | |||
|
610 | searching for changes | |||
|
611 | changeset: 1:79ea5566a333 | |||
|
612 | tag: tip | |||
|
613 | user: test | |||
|
614 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
615 | summary: test dirty store detection | |||
|
616 | ||||
|
617 | comparing with $TESTTMP/t/t | |||
|
618 | searching for changes | |||
|
619 | no changes found | |||
|
620 | ||||
601 | $ hg push |
|
621 | $ hg push | |
602 | pushing to $TESTTMP/t (glob) |
|
622 | pushing to $TESTTMP/t (glob) | |
603 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
|
623 | pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | |
@@ -669,6 +689,24 b' pull' | |||||
669 |
|
689 | |||
670 | should pull t |
|
690 | should pull t | |
671 |
|
691 | |||
|
692 | $ hg incoming -S -r `hg log -r tip -T "{node|short}"` | |||
|
693 | comparing with $TESTTMP/t (glob) | |||
|
694 | no changes found | |||
|
695 | comparing with $TESTTMP/t/s | |||
|
696 | searching for changes | |||
|
697 | no changes found | |||
|
698 | comparing with $TESTTMP/t/s/ss | |||
|
699 | searching for changes | |||
|
700 | no changes found | |||
|
701 | comparing with $TESTTMP/t/t | |||
|
702 | searching for changes | |||
|
703 | changeset: 5:52c0adc0515a | |||
|
704 | tag: tip | |||
|
705 | user: test | |||
|
706 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
707 | summary: 13 | |||
|
708 | ||||
|
709 | ||||
672 | $ hg up |
|
710 | $ hg up | |
673 | pulling subrepo t from $TESTTMP/t/t |
|
711 | pulling subrepo t from $TESTTMP/t/t | |
674 | searching for changes |
|
712 | searching for changes | |
@@ -1026,6 +1064,45 b' Incoming and outgoing should not use the' | |||||
1026 | no changes found |
|
1064 | no changes found | |
1027 | [1] |
|
1065 | [1] | |
1028 |
|
1066 | |||
|
1067 | Check that merge of a new subrepo doesn't write the uncommitted state to | |||
|
1068 | .hgsubstate (issue4622) | |||
|
1069 | ||||
|
1070 | $ hg init issue1852a/addedsub | |||
|
1071 | $ echo zzz > issue1852a/addedsub/zz.txt | |||
|
1072 | $ hg -R issue1852a/addedsub ci -Aqm "initial ZZ" | |||
|
1073 | ||||
|
1074 | $ hg clone issue1852a/addedsub issue1852d/addedsub | |||
|
1075 | updating to branch default | |||
|
1076 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1077 | ||||
|
1078 | $ echo def > issue1852a/sub/repo/foo | |||
|
1079 | $ hg -R issue1852a ci -SAm 'tweaked subrepo' | |||
|
1080 | adding tmp/sub/repo/foo_p | |||
|
1081 | committing subrepository sub/repo (glob) | |||
|
1082 | ||||
|
1083 | $ echo 'addedsub = addedsub' >> issue1852d/.hgsub | |||
|
1084 | $ echo xyz > issue1852d/sub/repo/foo | |||
|
1085 | $ hg -R issue1852d pull -u | |||
|
1086 | pulling from $TESTTMP/issue1852a (glob) | |||
|
1087 | searching for changes | |||
|
1088 | adding changesets | |||
|
1089 | adding manifests | |||
|
1090 | adding file changes | |||
|
1091 | added 1 changesets with 2 changes to 2 files | |||
|
1092 | subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) | |||
|
1093 | (M)erge, keep (l)ocal or keep (r)emote? m | |||
|
1094 | pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob) | |||
|
1095 | searching for changes | |||
|
1096 | adding changesets | |||
|
1097 | adding manifests | |||
|
1098 | adding file changes | |||
|
1099 | added 1 changesets with 1 changes to 1 files | |||
|
1100 | subrepository sources for sub/repo differ (glob) | |||
|
1101 | use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l | |||
|
1102 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
1103 | $ cat issue1852d/.hgsubstate | |||
|
1104 | f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo | |||
|
1105 | ||||
1029 | Check status of files when none of them belong to the first |
|
1106 | Check status of files when none of them belong to the first | |
1030 | subrepository: |
|
1107 | subrepository: | |
1031 |
|
1108 |
@@ -114,7 +114,7 b' Repeat with cold tag cache:' | |||||
114 | 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...| |
|
114 | 0010: ff ff ff ff ff ff ff ff b9 15 46 36 26 b7 b4 a7 |..........F6&...| | |
115 | 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y| |
|
115 | 0020: 73 e0 9e e3 c5 2f 51 0e 19 e0 5e 1f f9 66 d8 59 |s..../Q...^..f.Y| | |
116 |
|
116 | |||
117 | And again, but now unable to write tag cache: |
|
117 | And again, but now unable to write tag cache or lock file: | |
118 |
|
118 | |||
119 | #if unix-permissions |
|
119 | #if unix-permissions | |
120 | $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1 |
|
120 | $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1 | |
@@ -122,6 +122,11 b' And again, but now unable to write tag c' | |||||
122 | $ hg identify |
|
122 | $ hg identify | |
123 | b9154636be93 tip |
|
123 | b9154636be93 tip | |
124 | $ chmod 755 .hg/cache |
|
124 | $ chmod 755 .hg/cache | |
|
125 | ||||
|
126 | $ chmod 555 .hg | |||
|
127 | $ hg identify | |||
|
128 | b9154636be93 tip | |||
|
129 | $ chmod 755 .hg | |||
125 | #endif |
|
130 | #endif | |
126 |
|
131 | |||
127 | Tag cache debug info written to blackbox log |
|
132 | Tag cache debug info written to blackbox log | |
@@ -144,7 +149,7 b' Failure to acquire lock results in no wr' | |||||
144 | b9154636be93 tip |
|
149 | b9154636be93 tip | |
145 | $ hg blackbox -l 5 |
|
150 | $ hg blackbox -l 5 | |
146 | 1970/01/01 00:00:00 bob> identify |
|
151 | 1970/01/01 00:00:00 bob> identify | |
147 |
1970/01/01 00:00:00 bob> not writing .hg/cache/hgtagsfnodes1 because lock |
|
152 | 1970/01/01 00:00:00 bob> not writing .hg/cache/hgtagsfnodes1 because lock cannot be acquired | |
148 | 1970/01/01 00:00:00 bob> 0/1 cache hits/lookups in * seconds (glob) |
|
153 | 1970/01/01 00:00:00 bob> 0/1 cache hits/lookups in * seconds (glob) | |
149 | 1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags |
|
154 | 1970/01/01 00:00:00 bob> writing .hg/cache/tags2-visible with 1 tags | |
150 | 1970/01/01 00:00:00 bob> identify exited 0 after * seconds (glob) |
|
155 | 1970/01/01 00:00:00 bob> identify exited 0 after * seconds (glob) |
@@ -55,7 +55,7 b'' | |||||
55 | picked tool 'true' for a (binary False symlink False) |
|
55 | picked tool 'true' for a (binary False symlink False) | |
56 | merging a |
|
56 | merging a | |
57 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
57 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | |
58 | launching merge tool: true $TESTTMP/r2/a * (glob) |
|
58 | launching merge tool: true *$TESTTMP/r2/a* * (glob) | |
59 | merge tool returned: 0 |
|
59 | merge tool returned: 0 | |
60 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
61 | $ hg parents |
|
61 | $ hg parents | |
@@ -78,7 +78,7 b'' | |||||
78 | picked tool 'true' for a (binary False symlink False) |
|
78 | picked tool 'true' for a (binary False symlink False) | |
79 | merging a |
|
79 | merging a | |
80 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
80 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb | |
81 | launching merge tool: true $TESTTMP/r2/a * (glob) |
|
81 | launching merge tool: true *$TESTTMP/r2/a* * (glob) | |
82 | merge tool returned: 0 |
|
82 | merge tool returned: 0 | |
83 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
83 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
84 | $ hg parents |
|
84 | $ hg parents | |
@@ -109,7 +109,7 b'' | |||||
109 | picked tool 'true' for a (binary False symlink False) |
|
109 | picked tool 'true' for a (binary False symlink False) | |
110 | merging a |
|
110 | merging a | |
111 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
111 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a | |
112 | launching merge tool: true $TESTTMP/r2/a * (glob) |
|
112 | launching merge tool: true *$TESTTMP/r2/a* * (glob) | |
113 | merge tool returned: 0 |
|
113 | merge tool returned: 0 | |
114 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
114 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
115 | $ hg parents |
|
115 | $ hg parents |
General Comments 0
You need to be logged in to leave comments.
Login now