Show More
@@ -1,750 +1,751 b'' | |||||
1 | test-abort-checkin.t |
|
1 | test-abort-checkin.t | |
2 | test-absorb-edit-lines.t |
|
2 | test-absorb-edit-lines.t | |
3 | test-absorb-filefixupstate.py |
|
3 | test-absorb-filefixupstate.py | |
4 | test-absorb-phase.t |
|
4 | test-absorb-phase.t | |
5 | test-absorb-rename.t |
|
5 | test-absorb-rename.t | |
6 | test-absorb-strip.t |
|
6 | test-absorb-strip.t | |
7 | test-absorb.t |
|
7 | test-absorb.t | |
8 | test-add.t |
|
8 | test-add.t | |
9 | test-addremove-similar.t |
|
9 | test-addremove-similar.t | |
10 | test-addremove.t |
|
10 | test-addremove.t | |
11 | test-alias.t |
|
11 | test-alias.t | |
12 | test-amend-subrepo.t |
|
12 | test-amend-subrepo.t | |
13 | test-amend.t |
|
13 | test-amend.t | |
14 | test-ancestor.py |
|
14 | test-ancestor.py | |
15 | test-annotate.py |
|
15 | test-annotate.py | |
16 | test-annotate.t |
|
16 | test-annotate.t | |
17 | test-arbitraryfilectx.t |
|
17 | test-arbitraryfilectx.t | |
18 | test-archive-symlinks.t |
|
18 | test-archive-symlinks.t | |
19 | test-archive.t |
|
19 | test-archive.t | |
20 | test-atomictempfile.py |
|
20 | test-atomictempfile.py | |
21 | test-audit-path.t |
|
21 | test-audit-path.t | |
22 | test-audit-subrepo.t |
|
22 | test-audit-subrepo.t | |
23 | test-automv.t |
|
23 | test-automv.t | |
24 | test-backout.t |
|
24 | test-backout.t | |
25 | test-backwards-remove.t |
|
25 | test-backwards-remove.t | |
26 | test-bad-extension.t |
|
26 | test-bad-extension.t | |
27 | test-bad-pull.t |
|
27 | test-bad-pull.t | |
28 | test-basic.t |
|
28 | test-basic.t | |
29 | test-batching.py |
|
29 | test-batching.py | |
30 | test-bdiff.py |
|
30 | test-bdiff.py | |
31 | test-bheads.t |
|
31 | test-bheads.t | |
32 | test-bisect.t |
|
32 | test-bisect.t | |
33 | test-bisect2.t |
|
33 | test-bisect2.t | |
34 | test-bisect3.t |
|
34 | test-bisect3.t | |
35 | test-blackbox.t |
|
35 | test-blackbox.t | |
36 | test-bookflow.t |
|
36 | test-bookflow.t | |
37 | test-bookmarks-current.t |
|
37 | test-bookmarks-current.t | |
38 | test-bookmarks-merge.t |
|
38 | test-bookmarks-merge.t | |
39 | test-bookmarks-pushpull.t |
|
39 | test-bookmarks-pushpull.t | |
40 | test-bookmarks-rebase.t |
|
40 | test-bookmarks-rebase.t | |
41 | test-bookmarks-strip.t |
|
41 | test-bookmarks-strip.t | |
42 | test-bookmarks.t |
|
42 | test-bookmarks.t | |
43 | test-branch-change.t |
|
43 | test-branch-change.t | |
44 | test-branch-option.t |
|
44 | test-branch-option.t | |
45 | test-branch-tag-confict.t |
|
45 | test-branch-tag-confict.t | |
46 | test-branches.t |
|
46 | test-branches.t | |
47 | test-bugzilla.t |
|
47 | test-bugzilla.t | |
48 | test-bundle-phases.t |
|
48 | test-bundle-phases.t | |
49 | test-bundle-r.t |
|
49 | test-bundle-r.t | |
50 | test-bundle-type.t |
|
50 | test-bundle-type.t | |
51 | test-bundle-vs-outgoing.t |
|
51 | test-bundle-vs-outgoing.t | |
52 | test-bundle.t |
|
52 | test-bundle.t | |
53 | test-bundle2-exchange.t |
|
53 | test-bundle2-exchange.t | |
54 | test-bundle2-format.t |
|
54 | test-bundle2-format.t | |
55 | test-bundle2-multiple-changegroups.t |
|
55 | test-bundle2-multiple-changegroups.t | |
56 | test-bundle2-pushback.t |
|
56 | test-bundle2-pushback.t | |
57 | test-bundle2-remote-changegroup.t |
|
57 | test-bundle2-remote-changegroup.t | |
58 | test-cache-abuse.t |
|
58 | test-cache-abuse.t | |
59 | test-cappedreader.py |
|
59 | test-cappedreader.py | |
60 | test-casecollision-merge.t |
|
60 | test-casecollision-merge.t | |
61 | test-casecollision.t |
|
61 | test-casecollision.t | |
62 | test-casefolding.t |
|
62 | test-casefolding.t | |
63 | test-cat.t |
|
63 | test-cat.t | |
64 | test-cbor.py |
|
64 | test-cbor.py | |
65 | test-censor.t |
|
65 | test-censor.t | |
66 | test-changelog-exec.t |
|
66 | test-changelog-exec.t | |
67 | test-check-code.t |
|
67 | test-check-code.t | |
68 | test-check-commit.t |
|
68 | test-check-commit.t | |
69 | test-check-config.py |
|
69 | test-check-config.py | |
70 | test-check-config.t |
|
70 | test-check-config.t | |
71 | test-check-execute.t |
|
71 | test-check-execute.t | |
72 | test-check-help.t |
|
72 | test-check-help.t | |
73 | test-check-interfaces.py |
|
73 | test-check-interfaces.py | |
74 | test-check-module-imports.t |
|
74 | test-check-module-imports.t | |
75 | test-check-py3-compat.t |
|
75 | test-check-py3-compat.t | |
76 | test-check-pyflakes.t |
|
76 | test-check-pyflakes.t | |
77 | test-check-pylint.t |
|
77 | test-check-pylint.t | |
78 | test-check-shbang.t |
|
78 | test-check-shbang.t | |
79 | test-children.t |
|
79 | test-children.t | |
80 | test-churn.t |
|
80 | test-churn.t | |
81 | test-clone-cgi.t |
|
81 | test-clone-cgi.t | |
82 | test-clone-pull-corruption.t |
|
82 | test-clone-pull-corruption.t | |
83 | test-clone-r.t |
|
83 | test-clone-r.t | |
84 | test-clone-uncompressed.t |
|
84 | test-clone-uncompressed.t | |
85 | test-clone-update-order.t |
|
85 | test-clone-update-order.t | |
86 | test-clone.t |
|
86 | test-clone.t | |
87 | test-clonebundles.t |
|
87 | test-clonebundles.t | |
88 | test-close-head.t |
|
88 | test-close-head.t | |
89 | test-commandserver.t |
|
89 | test-commandserver.t | |
90 | test-commit-amend.t |
|
90 | test-commit-amend.t | |
91 | test-commit-interactive.t |
|
91 | test-commit-interactive.t | |
92 | test-commit-multiple.t |
|
92 | test-commit-multiple.t | |
93 | test-commit-unresolved.t |
|
93 | test-commit-unresolved.t | |
94 | test-commit.t |
|
94 | test-commit.t | |
95 | test-committer.t |
|
95 | test-committer.t | |
96 | test-completion.t |
|
96 | test-completion.t | |
97 | test-config-env.py |
|
97 | test-config-env.py | |
98 | test-config.t |
|
98 | test-config.t | |
99 | test-conflict.t |
|
99 | test-conflict.t | |
100 | test-confused-revert.t |
|
100 | test-confused-revert.t | |
101 | test-context-metadata.t |
|
101 | test-context-metadata.t | |
102 | test-context.py |
|
102 | test-context.py | |
103 | test-contrib-check-code.t |
|
103 | test-contrib-check-code.t | |
104 | test-contrib-check-commit.t |
|
104 | test-contrib-check-commit.t | |
105 | test-contrib-dumprevlog.t |
|
105 | test-contrib-dumprevlog.t | |
106 | test-contrib-perf.t |
|
106 | test-contrib-perf.t | |
107 | test-contrib-relnotes.t |
|
107 | test-contrib-relnotes.t | |
108 | test-contrib-testparseutil.t |
|
108 | test-contrib-testparseutil.t | |
109 | test-contrib.t |
|
109 | test-contrib.t | |
110 | test-convert-authormap.t |
|
110 | test-convert-authormap.t | |
111 | test-convert-clonebranches.t |
|
111 | test-convert-clonebranches.t | |
112 | test-convert-cvs-branch.t |
|
112 | test-convert-cvs-branch.t | |
113 | test-convert-cvs-detectmerge.t |
|
113 | test-convert-cvs-detectmerge.t | |
114 | test-convert-cvs-synthetic.t |
|
114 | test-convert-cvs-synthetic.t | |
115 | test-convert-cvs.t |
|
115 | test-convert-cvs.t | |
116 | test-convert-cvsnt-mergepoints.t |
|
116 | test-convert-cvsnt-mergepoints.t | |
117 | test-convert-datesort.t |
|
117 | test-convert-datesort.t | |
118 | test-convert-filemap.t |
|
118 | test-convert-filemap.t | |
119 | test-convert-git.t |
|
119 | test-convert-git.t | |
120 | test-convert-hg-sink.t |
|
120 | test-convert-hg-sink.t | |
121 | test-convert-hg-source.t |
|
121 | test-convert-hg-source.t | |
122 | test-convert-hg-startrev.t |
|
122 | test-convert-hg-startrev.t | |
123 | test-convert-splicemap.t |
|
123 | test-convert-splicemap.t | |
124 | test-convert-svn-sink.t |
|
124 | test-convert-svn-sink.t | |
125 | test-convert-tagsbranch-topology.t |
|
125 | test-convert-tagsbranch-topology.t | |
126 | test-convert.t |
|
126 | test-convert.t | |
127 | test-copy-move-merge.t |
|
127 | test-copy-move-merge.t | |
128 | test-copy.t |
|
128 | test-copy.t | |
129 | test-copytrace-heuristics.t |
|
129 | test-copytrace-heuristics.t | |
130 | test-custom-filters.t |
|
130 | test-custom-filters.t | |
131 | test-debugbuilddag.t |
|
131 | test-debugbuilddag.t | |
132 | test-debugbundle.t |
|
132 | test-debugbundle.t | |
133 | test-debugcommands.t |
|
133 | test-debugcommands.t | |
134 | test-debugextensions.t |
|
134 | test-debugextensions.t | |
135 | test-debugindexdot.t |
|
135 | test-debugindexdot.t | |
136 | test-debugrename.t |
|
136 | test-debugrename.t | |
137 | test-default-push.t |
|
137 | test-default-push.t | |
138 | test-diff-antipatience.t |
|
138 | test-diff-antipatience.t | |
139 | test-diff-binary-file.t |
|
139 | test-diff-binary-file.t | |
140 | test-diff-change.t |
|
140 | test-diff-change.t | |
141 | test-diff-color.t |
|
141 | test-diff-color.t | |
142 | test-diff-copy-depth.t |
|
142 | test-diff-copy-depth.t | |
143 | test-diff-hashes.t |
|
143 | test-diff-hashes.t | |
144 | test-diff-ignore-whitespace.t |
|
144 | test-diff-ignore-whitespace.t | |
145 | test-diff-indent-heuristic.t |
|
145 | test-diff-indent-heuristic.t | |
146 | test-diff-issue2761.t |
|
146 | test-diff-issue2761.t | |
147 | test-diff-newlines.t |
|
147 | test-diff-newlines.t | |
148 | test-diff-reverse.t |
|
148 | test-diff-reverse.t | |
149 | test-diff-subdir.t |
|
149 | test-diff-subdir.t | |
150 | test-diff-unified.t |
|
150 | test-diff-unified.t | |
151 | test-diff-upgrade.t |
|
151 | test-diff-upgrade.t | |
152 | test-diffdir.t |
|
152 | test-diffdir.t | |
153 | test-diffstat.t |
|
153 | test-diffstat.t | |
154 | test-directaccess.t |
|
154 | test-directaccess.t | |
155 | test-dirstate-backup.t |
|
155 | test-dirstate-backup.t | |
156 | test-dirstate-nonnormalset.t |
|
156 | test-dirstate-nonnormalset.t | |
157 | test-dirstate-race.t |
|
157 | test-dirstate-race.t | |
158 | test-dirstate.t |
|
158 | test-dirstate.t | |
159 | test-dispatch.py |
|
159 | test-dispatch.py | |
160 | test-dispatch.t |
|
160 | test-dispatch.t | |
161 | test-doctest.py |
|
161 | test-doctest.py | |
162 | test-double-merge.t |
|
162 | test-double-merge.t | |
163 | test-drawdag.t |
|
163 | test-drawdag.t | |
164 | test-duplicateoptions.py |
|
164 | test-duplicateoptions.py | |
165 | test-editor-filename.t |
|
165 | test-editor-filename.t | |
166 | test-empty-dir.t |
|
166 | test-empty-dir.t | |
167 | test-empty-file.t |
|
167 | test-empty-file.t | |
168 | test-empty-group.t |
|
168 | test-empty-group.t | |
169 | test-empty.t |
|
169 | test-empty.t | |
170 | test-encode.t |
|
170 | test-encode.t | |
171 | test-encoding-align.t |
|
171 | test-encoding-align.t | |
172 | test-encoding-func.py |
|
172 | test-encoding-func.py | |
173 | test-encoding-textwrap.t |
|
173 | test-encoding-textwrap.t | |
174 | test-encoding.t |
|
174 | test-encoding.t | |
175 | test-eol-add.t |
|
175 | test-eol-add.t | |
176 | test-eol-clone.t |
|
176 | test-eol-clone.t | |
177 | test-eol-hook.t |
|
177 | test-eol-hook.t | |
178 | test-eol-patch.t |
|
178 | test-eol-patch.t | |
179 | test-eol-tag.t |
|
179 | test-eol-tag.t | |
180 | test-eol-update.t |
|
180 | test-eol-update.t | |
181 | test-eol.t |
|
181 | test-eol.t | |
182 | test-eolfilename.t |
|
182 | test-eolfilename.t | |
183 | test-excessive-merge.t |
|
183 | test-excessive-merge.t | |
184 | test-exchange-obsmarkers-case-A1.t |
|
184 | test-exchange-obsmarkers-case-A1.t | |
185 | test-exchange-obsmarkers-case-A2.t |
|
185 | test-exchange-obsmarkers-case-A2.t | |
186 | test-exchange-obsmarkers-case-A3.t |
|
186 | test-exchange-obsmarkers-case-A3.t | |
187 | test-exchange-obsmarkers-case-A4.t |
|
187 | test-exchange-obsmarkers-case-A4.t | |
188 | test-exchange-obsmarkers-case-A5.t |
|
188 | test-exchange-obsmarkers-case-A5.t | |
189 | test-exchange-obsmarkers-case-A6.t |
|
189 | test-exchange-obsmarkers-case-A6.t | |
190 | test-exchange-obsmarkers-case-A7.t |
|
190 | test-exchange-obsmarkers-case-A7.t | |
191 | test-exchange-obsmarkers-case-B1.t |
|
191 | test-exchange-obsmarkers-case-B1.t | |
192 | test-exchange-obsmarkers-case-B2.t |
|
192 | test-exchange-obsmarkers-case-B2.t | |
193 | test-exchange-obsmarkers-case-B3.t |
|
193 | test-exchange-obsmarkers-case-B3.t | |
194 | test-exchange-obsmarkers-case-B4.t |
|
194 | test-exchange-obsmarkers-case-B4.t | |
195 | test-exchange-obsmarkers-case-B5.t |
|
195 | test-exchange-obsmarkers-case-B5.t | |
196 | test-exchange-obsmarkers-case-B6.t |
|
196 | test-exchange-obsmarkers-case-B6.t | |
197 | test-exchange-obsmarkers-case-B7.t |
|
197 | test-exchange-obsmarkers-case-B7.t | |
198 | test-exchange-obsmarkers-case-C1.t |
|
198 | test-exchange-obsmarkers-case-C1.t | |
199 | test-exchange-obsmarkers-case-C2.t |
|
199 | test-exchange-obsmarkers-case-C2.t | |
200 | test-exchange-obsmarkers-case-C3.t |
|
200 | test-exchange-obsmarkers-case-C3.t | |
201 | test-exchange-obsmarkers-case-C4.t |
|
201 | test-exchange-obsmarkers-case-C4.t | |
202 | test-exchange-obsmarkers-case-D1.t |
|
202 | test-exchange-obsmarkers-case-D1.t | |
203 | test-exchange-obsmarkers-case-D2.t |
|
203 | test-exchange-obsmarkers-case-D2.t | |
204 | test-exchange-obsmarkers-case-D3.t |
|
204 | test-exchange-obsmarkers-case-D3.t | |
205 | test-exchange-obsmarkers-case-D4.t |
|
205 | test-exchange-obsmarkers-case-D4.t | |
206 | test-execute-bit.t |
|
206 | test-execute-bit.t | |
207 | test-export.t |
|
207 | test-export.t | |
208 | test-extdata.t |
|
208 | test-extdata.t | |
209 | test-extdiff.t |
|
209 | test-extdiff.t | |
210 | test-extension-timing.t |
|
210 | test-extension-timing.t | |
211 | test-extensions-afterloaded.t |
|
211 | test-extensions-afterloaded.t | |
212 | test-extensions-wrapfunction.py |
|
212 | test-extensions-wrapfunction.py | |
213 | test-extra-filelog-entry.t |
|
213 | test-extra-filelog-entry.t | |
214 | test-fastannotate-corrupt.t |
|
214 | test-fastannotate-corrupt.t | |
215 | test-fastannotate-diffopts.t |
|
215 | test-fastannotate-diffopts.t | |
216 | test-fastannotate-hg.t |
|
216 | test-fastannotate-hg.t | |
217 | test-fastannotate-perfhack.t |
|
217 | test-fastannotate-perfhack.t | |
218 | test-fastannotate-protocol.t |
|
218 | test-fastannotate-protocol.t | |
219 | test-fastannotate-renames.t |
|
219 | test-fastannotate-renames.t | |
220 | test-fastannotate-revmap.py |
|
220 | test-fastannotate-revmap.py | |
221 | test-fastannotate.t |
|
221 | test-fastannotate.t | |
222 | test-fetch.t |
|
222 | test-fetch.t | |
223 | test-filebranch.t |
|
223 | test-filebranch.t | |
224 | test-filecache.py |
|
224 | test-filecache.py | |
225 | test-filelog.py |
|
225 | test-filelog.py | |
226 | test-fileset-generated.t |
|
226 | test-fileset-generated.t | |
227 | test-fileset.t |
|
227 | test-fileset.t | |
228 | test-fix-topology.t |
|
228 | test-fix-topology.t | |
229 | test-fix.t |
|
229 | test-fix.t | |
230 | test-flags.t |
|
230 | test-flags.t | |
231 | test-fncache.t |
|
231 | test-fncache.t | |
232 | test-gendoc-da.t |
|
232 | test-gendoc-da.t | |
233 | test-gendoc-de.t |
|
233 | test-gendoc-de.t | |
234 | test-gendoc-el.t |
|
234 | test-gendoc-el.t | |
235 | test-gendoc-fr.t |
|
235 | test-gendoc-fr.t | |
236 | test-gendoc-it.t |
|
236 | test-gendoc-it.t | |
237 | test-gendoc-ja.t |
|
237 | test-gendoc-ja.t | |
238 | test-gendoc-pt_BR.t |
|
238 | test-gendoc-pt_BR.t | |
239 | test-gendoc-ro.t |
|
239 | test-gendoc-ro.t | |
240 | test-gendoc-ru.t |
|
240 | test-gendoc-ru.t | |
241 | test-gendoc-sv.t |
|
241 | test-gendoc-sv.t | |
242 | test-gendoc-zh_CN.t |
|
242 | test-gendoc-zh_CN.t | |
243 | test-gendoc-zh_TW.t |
|
243 | test-gendoc-zh_TW.t | |
244 | test-gendoc.t |
|
244 | test-gendoc.t | |
245 | test-generaldelta.t |
|
245 | test-generaldelta.t | |
246 | test-getbundle.t |
|
246 | test-getbundle.t | |
247 | test-git-export.t |
|
247 | test-git-export.t | |
248 | test-githelp.t |
|
248 | test-githelp.t | |
249 | test-globalopts.t |
|
249 | test-globalopts.t | |
250 | test-glog-beautifygraph.t |
|
250 | test-glog-beautifygraph.t | |
251 | test-glog-topological.t |
|
251 | test-glog-topological.t | |
252 | test-glog.t |
|
252 | test-glog.t | |
253 | test-gpg.t |
|
253 | test-gpg.t | |
254 | test-graft.t |
|
254 | test-graft.t | |
255 | test-grep.t |
|
255 | test-grep.t | |
256 | test-hardlinks.t |
|
256 | test-hardlinks.t | |
257 | test-help-hide.t |
|
257 | test-help-hide.t | |
258 | test-help.t |
|
258 | test-help.t | |
259 | test-hg-parseurl.py |
|
259 | test-hg-parseurl.py | |
260 | test-hghave.t |
|
260 | test-hghave.t | |
261 | test-hgignore.t |
|
261 | test-hgignore.t | |
262 | test-hgk.t |
|
262 | test-hgk.t | |
263 | test-hgrc.t |
|
263 | test-hgrc.t | |
264 | test-hgweb-annotate-whitespace.t |
|
264 | test-hgweb-annotate-whitespace.t | |
265 | test-hgweb-auth.py |
|
265 | test-hgweb-auth.py | |
266 | test-hgweb-bundle.t |
|
266 | test-hgweb-bundle.t | |
267 | test-hgweb-commands.t |
|
267 | test-hgweb-commands.t | |
268 | test-hgweb-csp.t |
|
268 | test-hgweb-csp.t | |
269 | test-hgweb-descend-empties.t |
|
269 | test-hgweb-descend-empties.t | |
270 | test-hgweb-diffs.t |
|
270 | test-hgweb-diffs.t | |
271 | test-hgweb-empty.t |
|
271 | test-hgweb-empty.t | |
272 | test-hgweb-filelog.t |
|
272 | test-hgweb-filelog.t | |
273 | test-hgweb-no-path-info.t |
|
273 | test-hgweb-no-path-info.t | |
274 | test-hgweb-no-request-uri.t |
|
274 | test-hgweb-no-request-uri.t | |
275 | test-hgweb-non-interactive.t |
|
275 | test-hgweb-non-interactive.t | |
276 | test-hgweb-raw.t |
|
276 | test-hgweb-raw.t | |
277 | test-hgweb-removed.t |
|
277 | test-hgweb-removed.t | |
278 | test-hgweb-symrev.t |
|
278 | test-hgweb-symrev.t | |
279 | test-hgweb.t |
|
279 | test-hgweb.t | |
280 | test-hgwebdir-paths.py |
|
280 | test-hgwebdir-paths.py | |
281 | test-hgwebdir.t |
|
281 | test-hgwebdir.t | |
282 | test-hgwebdirsym.t |
|
282 | test-hgwebdirsym.t | |
283 | test-histedit-arguments.t |
|
283 | test-histedit-arguments.t | |
284 | test-histedit-base.t |
|
284 | test-histedit-base.t | |
285 | test-histedit-bookmark-motion.t |
|
285 | test-histedit-bookmark-motion.t | |
286 | test-histedit-commute.t |
|
286 | test-histedit-commute.t | |
287 | test-histedit-drop.t |
|
287 | test-histedit-drop.t | |
288 | test-histedit-edit.t |
|
288 | test-histedit-edit.t | |
289 | test-histedit-fold-non-commute.t |
|
289 | test-histedit-fold-non-commute.t | |
290 | test-histedit-fold.t |
|
290 | test-histedit-fold.t | |
291 | test-histedit-no-backup.t |
|
291 | test-histedit-no-backup.t | |
292 | test-histedit-no-change.t |
|
292 | test-histedit-no-change.t | |
293 | test-histedit-non-commute-abort.t |
|
293 | test-histedit-non-commute-abort.t | |
294 | test-histedit-non-commute.t |
|
294 | test-histedit-non-commute.t | |
295 | test-histedit-obsolete.t |
|
295 | test-histedit-obsolete.t | |
296 | test-histedit-outgoing.t |
|
296 | test-histedit-outgoing.t | |
297 | test-histedit-templates.t |
|
297 | test-histedit-templates.t | |
298 | test-http-api-httpv2.t |
|
298 | test-http-api-httpv2.t | |
299 | test-http-api.t |
|
299 | test-http-api.t | |
300 | test-http-bad-server.t |
|
300 | test-http-bad-server.t | |
301 | test-http-branchmap.t |
|
301 | test-http-branchmap.t | |
302 | test-http-bundle1.t |
|
302 | test-http-bundle1.t | |
303 | test-http-clone-r.t |
|
303 | test-http-clone-r.t | |
304 | test-http-permissions.t |
|
304 | test-http-permissions.t | |
305 | test-http-protocol.t |
|
305 | test-http-protocol.t | |
306 | test-http.t |
|
306 | test-http.t | |
307 | test-hybridencode.py |
|
307 | test-hybridencode.py | |
308 | test-i18n.t |
|
308 | test-i18n.t | |
309 | test-identify.t |
|
309 | test-identify.t | |
310 | test-impexp-branch.t |
|
310 | test-impexp-branch.t | |
311 | test-import-bypass.t |
|
311 | test-import-bypass.t | |
312 | test-import-context.t |
|
312 | test-import-context.t | |
313 | test-import-eol.t |
|
313 | test-import-eol.t | |
|
314 | test-import-git.t | |||
314 | test-import-merge.t |
|
315 | test-import-merge.t | |
315 | test-import-unknown.t |
|
316 | test-import-unknown.t | |
316 | test-import.t |
|
317 | test-import.t | |
317 | test-imports-checker.t |
|
318 | test-imports-checker.t | |
318 | test-incoming-outgoing.t |
|
319 | test-incoming-outgoing.t | |
319 | test-infinitepush-bundlestore.t |
|
320 | test-infinitepush-bundlestore.t | |
320 | test-infinitepush-ci.t |
|
321 | test-infinitepush-ci.t | |
321 | test-infinitepush.t |
|
322 | test-infinitepush.t | |
322 | test-inherit-mode.t |
|
323 | test-inherit-mode.t | |
323 | test-init.t |
|
324 | test-init.t | |
324 | test-install.t |
|
325 | test-install.t | |
325 | test-issue1089.t |
|
326 | test-issue1089.t | |
326 | test-issue1102.t |
|
327 | test-issue1102.t | |
327 | test-issue1175.t |
|
328 | test-issue1175.t | |
328 | test-issue1306.t |
|
329 | test-issue1306.t | |
329 | test-issue1438.t |
|
330 | test-issue1438.t | |
330 | test-issue1502.t |
|
331 | test-issue1502.t | |
331 | test-issue1802.t |
|
332 | test-issue1802.t | |
332 | test-issue1877.t |
|
333 | test-issue1877.t | |
333 | test-issue1993.t |
|
334 | test-issue1993.t | |
334 | test-issue2137.t |
|
335 | test-issue2137.t | |
335 | test-issue3084.t |
|
336 | test-issue3084.t | |
336 | test-issue4074.t |
|
337 | test-issue4074.t | |
337 | test-issue522.t |
|
338 | test-issue522.t | |
338 | test-issue586.t |
|
339 | test-issue586.t | |
339 | test-issue5979.t |
|
340 | test-issue5979.t | |
340 | test-issue612.t |
|
341 | test-issue612.t | |
341 | test-issue619.t |
|
342 | test-issue619.t | |
342 | test-issue660.t |
|
343 | test-issue660.t | |
343 | test-issue672.t |
|
344 | test-issue672.t | |
344 | test-issue842.t |
|
345 | test-issue842.t | |
345 | test-journal-exists.t |
|
346 | test-journal-exists.t | |
346 | test-journal-share.t |
|
347 | test-journal-share.t | |
347 | test-journal.t |
|
348 | test-journal.t | |
348 | test-keyword.t |
|
349 | test-keyword.t | |
349 | test-known.t |
|
350 | test-known.t | |
350 | test-largefiles-cache.t |
|
351 | test-largefiles-cache.t | |
351 | test-largefiles-misc.t |
|
352 | test-largefiles-misc.t | |
352 | test-largefiles-small-disk.t |
|
353 | test-largefiles-small-disk.t | |
353 | test-largefiles-update.t |
|
354 | test-largefiles-update.t | |
354 | test-largefiles-wireproto.t |
|
355 | test-largefiles-wireproto.t | |
355 | test-largefiles.t |
|
356 | test-largefiles.t | |
356 | test-lfconvert.t |
|
357 | test-lfconvert.t | |
357 | test-lfs-bundle.t |
|
358 | test-lfs-bundle.t | |
358 | test-lfs-largefiles.t |
|
359 | test-lfs-largefiles.t | |
359 | test-lfs-pointer.py |
|
360 | test-lfs-pointer.py | |
360 | test-lfs-test-server.t |
|
361 | test-lfs-test-server.t | |
361 | test-lfs.t |
|
362 | test-lfs.t | |
362 | test-linelog.py |
|
363 | test-linelog.py | |
363 | test-linerange.py |
|
364 | test-linerange.py | |
364 | test-locate.t |
|
365 | test-locate.t | |
365 | test-lock-badness.t |
|
366 | test-lock-badness.t | |
366 | test-lock.py |
|
367 | test-lock.py | |
367 | test-log-exthook.t |
|
368 | test-log-exthook.t | |
368 | test-log-linerange.t |
|
369 | test-log-linerange.t | |
369 | test-log.t |
|
370 | test-log.t | |
370 | test-logexchange.t |
|
371 | test-logexchange.t | |
371 | test-logtoprocess.t |
|
372 | test-logtoprocess.t | |
372 | test-lrucachedict.py |
|
373 | test-lrucachedict.py | |
373 | test-mactext.t |
|
374 | test-mactext.t | |
374 | test-mailmap.t |
|
375 | test-mailmap.t | |
375 | test-manifest-merging.t |
|
376 | test-manifest-merging.t | |
376 | test-manifest.py |
|
377 | test-manifest.py | |
377 | test-manifest.t |
|
378 | test-manifest.t | |
378 | test-match.py |
|
379 | test-match.py | |
379 | test-mdiff.py |
|
380 | test-mdiff.py | |
380 | test-merge-changedelete.t |
|
381 | test-merge-changedelete.t | |
381 | test-merge-closedheads.t |
|
382 | test-merge-closedheads.t | |
382 | test-merge-commit.t |
|
383 | test-merge-commit.t | |
383 | test-merge-criss-cross.t |
|
384 | test-merge-criss-cross.t | |
384 | test-merge-default.t |
|
385 | test-merge-default.t | |
385 | test-merge-force.t |
|
386 | test-merge-force.t | |
386 | test-merge-halt.t |
|
387 | test-merge-halt.t | |
387 | test-merge-internal-tools-pattern.t |
|
388 | test-merge-internal-tools-pattern.t | |
388 | test-merge-local.t |
|
389 | test-merge-local.t | |
389 | test-merge-no-file-change.t |
|
390 | test-merge-no-file-change.t | |
390 | test-merge-remove.t |
|
391 | test-merge-remove.t | |
391 | test-merge-revert.t |
|
392 | test-merge-revert.t | |
392 | test-merge-revert2.t |
|
393 | test-merge-revert2.t | |
393 | test-merge-subrepos.t |
|
394 | test-merge-subrepos.t | |
394 | test-merge-symlinks.t |
|
395 | test-merge-symlinks.t | |
395 | test-merge-tools.t |
|
396 | test-merge-tools.t | |
396 | test-merge-types.t |
|
397 | test-merge-types.t | |
397 | test-merge1.t |
|
398 | test-merge1.t | |
398 | test-merge10.t |
|
399 | test-merge10.t | |
399 | test-merge2.t |
|
400 | test-merge2.t | |
400 | test-merge4.t |
|
401 | test-merge4.t | |
401 | test-merge5.t |
|
402 | test-merge5.t | |
402 | test-merge6.t |
|
403 | test-merge6.t | |
403 | test-merge7.t |
|
404 | test-merge7.t | |
404 | test-merge8.t |
|
405 | test-merge8.t | |
405 | test-merge9.t |
|
406 | test-merge9.t | |
406 | test-minifileset.py |
|
407 | test-minifileset.py | |
407 | test-minirst.py |
|
408 | test-minirst.py | |
408 | test-missing-capability.t |
|
409 | test-missing-capability.t | |
409 | test-mq-eol.t |
|
410 | test-mq-eol.t | |
410 | test-mq-git.t |
|
411 | test-mq-git.t | |
411 | test-mq-guards.t |
|
412 | test-mq-guards.t | |
412 | test-mq-header-date.t |
|
413 | test-mq-header-date.t | |
413 | test-mq-header-from.t |
|
414 | test-mq-header-from.t | |
414 | test-mq-merge.t |
|
415 | test-mq-merge.t | |
415 | test-mq-missingfiles.t |
|
416 | test-mq-missingfiles.t | |
416 | test-mq-pull-from-bundle.t |
|
417 | test-mq-pull-from-bundle.t | |
417 | test-mq-qclone-http.t |
|
418 | test-mq-qclone-http.t | |
418 | test-mq-qdelete.t |
|
419 | test-mq-qdelete.t | |
419 | test-mq-qdiff.t |
|
420 | test-mq-qdiff.t | |
420 | test-mq-qfold.t |
|
421 | test-mq-qfold.t | |
421 | test-mq-qgoto.t |
|
422 | test-mq-qgoto.t | |
422 | test-mq-qimport-fail-cleanup.t |
|
423 | test-mq-qimport-fail-cleanup.t | |
423 | test-mq-qimport.t |
|
424 | test-mq-qimport.t | |
424 | test-mq-qnew.t |
|
425 | test-mq-qnew.t | |
425 | test-mq-qpush-exact.t |
|
426 | test-mq-qpush-exact.t | |
426 | test-mq-qpush-fail.t |
|
427 | test-mq-qpush-fail.t | |
427 | test-mq-qqueue.t |
|
428 | test-mq-qqueue.t | |
428 | test-mq-qrefresh-interactive.t |
|
429 | test-mq-qrefresh-interactive.t | |
429 | test-mq-qrefresh-replace-log-message.t |
|
430 | test-mq-qrefresh-replace-log-message.t | |
430 | test-mq-qrefresh.t |
|
431 | test-mq-qrefresh.t | |
431 | test-mq-qrename.t |
|
432 | test-mq-qrename.t | |
432 | test-mq-qsave.t |
|
433 | test-mq-qsave.t | |
433 | test-mq-safety.t |
|
434 | test-mq-safety.t | |
434 | test-mq-subrepo.t |
|
435 | test-mq-subrepo.t | |
435 | test-mq-symlinks.t |
|
436 | test-mq-symlinks.t | |
436 | test-mq.t |
|
437 | test-mq.t | |
437 | test-mv-cp-st-diff.t |
|
438 | test-mv-cp-st-diff.t | |
438 | test-narrow-acl.t |
|
439 | test-narrow-acl.t | |
439 | test-narrow-archive.t |
|
440 | test-narrow-archive.t | |
440 | test-narrow-clone-no-ellipsis.t |
|
441 | test-narrow-clone-no-ellipsis.t | |
441 | test-narrow-clone-non-narrow-server.t |
|
442 | test-narrow-clone-non-narrow-server.t | |
442 | test-narrow-clone-nonlinear.t |
|
443 | test-narrow-clone-nonlinear.t | |
443 | test-narrow-clone-stream.t |
|
444 | test-narrow-clone-stream.t | |
444 | test-narrow-clone.t |
|
445 | test-narrow-clone.t | |
445 | test-narrow-commit.t |
|
446 | test-narrow-commit.t | |
446 | test-narrow-copies.t |
|
447 | test-narrow-copies.t | |
447 | test-narrow-debugcommands.t |
|
448 | test-narrow-debugcommands.t | |
448 | test-narrow-debugrebuilddirstate.t |
|
449 | test-narrow-debugrebuilddirstate.t | |
449 | test-narrow-exchange-merges.t |
|
450 | test-narrow-exchange-merges.t | |
450 | test-narrow-exchange.t |
|
451 | test-narrow-exchange.t | |
451 | test-narrow-expanddirstate.t |
|
452 | test-narrow-expanddirstate.t | |
452 | test-narrow-merge.t |
|
453 | test-narrow-merge.t | |
453 | test-narrow-patch.t |
|
454 | test-narrow-patch.t | |
454 | test-narrow-patterns.t |
|
455 | test-narrow-patterns.t | |
455 | test-narrow-pull.t |
|
456 | test-narrow-pull.t | |
456 | test-narrow-rebase.t |
|
457 | test-narrow-rebase.t | |
457 | test-narrow-shallow-merges.t |
|
458 | test-narrow-shallow-merges.t | |
458 | test-narrow-shallow.t |
|
459 | test-narrow-shallow.t | |
459 | test-narrow-share.t |
|
460 | test-narrow-share.t | |
460 | test-narrow-sparse.t |
|
461 | test-narrow-sparse.t | |
461 | test-narrow-strip.t |
|
462 | test-narrow-strip.t | |
462 | test-narrow-trackedcmd.t |
|
463 | test-narrow-trackedcmd.t | |
463 | test-narrow-update.t |
|
464 | test-narrow-update.t | |
464 | test-narrow-widen-no-ellipsis.t |
|
465 | test-narrow-widen-no-ellipsis.t | |
465 | test-narrow-widen.t |
|
466 | test-narrow-widen.t | |
466 | test-narrow.t |
|
467 | test-narrow.t | |
467 | test-nested-repo.t |
|
468 | test-nested-repo.t | |
468 | test-newbranch.t |
|
469 | test-newbranch.t | |
469 | test-newcgi.t |
|
470 | test-newcgi.t | |
470 | test-newercgi.t |
|
471 | test-newercgi.t | |
471 | test-nointerrupt.t |
|
472 | test-nointerrupt.t | |
472 | test-notify-changegroup.t |
|
473 | test-notify-changegroup.t | |
473 | test-obshistory.t |
|
474 | test-obshistory.t | |
474 | test-obsmarker-template.t |
|
475 | test-obsmarker-template.t | |
475 | test-obsmarkers-effectflag.t |
|
476 | test-obsmarkers-effectflag.t | |
476 | test-obsolete-bounds-checking.t |
|
477 | test-obsolete-bounds-checking.t | |
477 | test-obsolete-bundle-strip.t |
|
478 | test-obsolete-bundle-strip.t | |
478 | test-obsolete-changeset-exchange.t |
|
479 | test-obsolete-changeset-exchange.t | |
479 | test-obsolete-checkheads.t |
|
480 | test-obsolete-checkheads.t | |
480 | test-obsolete-distributed.t |
|
481 | test-obsolete-distributed.t | |
481 | test-obsolete-divergent.t |
|
482 | test-obsolete-divergent.t | |
482 | test-obsolete-tag-cache.t |
|
483 | test-obsolete-tag-cache.t | |
483 | test-obsolete.t |
|
484 | test-obsolete.t | |
484 | test-oldcgi.t |
|
485 | test-oldcgi.t | |
485 | test-origbackup-conflict.t |
|
486 | test-origbackup-conflict.t | |
486 | test-pager-legacy.t |
|
487 | test-pager-legacy.t | |
487 | test-pager.t |
|
488 | test-pager.t | |
488 | test-parents.t |
|
489 | test-parents.t | |
489 | test-parse-date.t |
|
490 | test-parse-date.t | |
490 | test-parseindex.t |
|
491 | test-parseindex.t | |
491 | test-parseindex2.py |
|
492 | test-parseindex2.py | |
492 | test-patch-offset.t |
|
493 | test-patch-offset.t | |
493 | test-patch.t |
|
494 | test-patch.t | |
494 | test-patchbomb-bookmark.t |
|
495 | test-patchbomb-bookmark.t | |
495 | test-patchbomb-tls.t |
|
496 | test-patchbomb-tls.t | |
496 | test-patchbomb.t |
|
497 | test-patchbomb.t | |
497 | test-pathconflicts-basic.t |
|
498 | test-pathconflicts-basic.t | |
498 | test-pathconflicts-merge.t |
|
499 | test-pathconflicts-merge.t | |
499 | test-pathconflicts-update.t |
|
500 | test-pathconflicts-update.t | |
500 | test-pathencode.py |
|
501 | test-pathencode.py | |
501 | test-pending.t |
|
502 | test-pending.t | |
502 | test-permissions.t |
|
503 | test-permissions.t | |
503 | test-phases-exchange.t |
|
504 | test-phases-exchange.t | |
504 | test-phases.t |
|
505 | test-phases.t | |
505 | test-profile.t |
|
506 | test-profile.t | |
506 | test-progress.t |
|
507 | test-progress.t | |
507 | test-propertycache.py |
|
508 | test-propertycache.py | |
508 | test-pull-branch.t |
|
509 | test-pull-branch.t | |
509 | test-pull-bundle.t |
|
510 | test-pull-bundle.t | |
510 | test-pull-http.t |
|
511 | test-pull-http.t | |
511 | test-pull-permission.t |
|
512 | test-pull-permission.t | |
512 | test-pull-pull-corruption.t |
|
513 | test-pull-pull-corruption.t | |
513 | test-pull-r.t |
|
514 | test-pull-r.t | |
514 | test-pull-update.t |
|
515 | test-pull-update.t | |
515 | test-pull.t |
|
516 | test-pull.t | |
516 | test-purge.t |
|
517 | test-purge.t | |
517 | test-push-cgi.t |
|
518 | test-push-cgi.t | |
518 | test-push-checkheads-partial-C1.t |
|
519 | test-push-checkheads-partial-C1.t | |
519 | test-push-checkheads-partial-C2.t |
|
520 | test-push-checkheads-partial-C2.t | |
520 | test-push-checkheads-partial-C3.t |
|
521 | test-push-checkheads-partial-C3.t | |
521 | test-push-checkheads-partial-C4.t |
|
522 | test-push-checkheads-partial-C4.t | |
522 | test-push-checkheads-pruned-B1.t |
|
523 | test-push-checkheads-pruned-B1.t | |
523 | test-push-checkheads-pruned-B2.t |
|
524 | test-push-checkheads-pruned-B2.t | |
524 | test-push-checkheads-pruned-B3.t |
|
525 | test-push-checkheads-pruned-B3.t | |
525 | test-push-checkheads-pruned-B4.t |
|
526 | test-push-checkheads-pruned-B4.t | |
526 | test-push-checkheads-pruned-B5.t |
|
527 | test-push-checkheads-pruned-B5.t | |
527 | test-push-checkheads-pruned-B6.t |
|
528 | test-push-checkheads-pruned-B6.t | |
528 | test-push-checkheads-pruned-B7.t |
|
529 | test-push-checkheads-pruned-B7.t | |
529 | test-push-checkheads-pruned-B8.t |
|
530 | test-push-checkheads-pruned-B8.t | |
530 | test-push-checkheads-superceed-A1.t |
|
531 | test-push-checkheads-superceed-A1.t | |
531 | test-push-checkheads-superceed-A2.t |
|
532 | test-push-checkheads-superceed-A2.t | |
532 | test-push-checkheads-superceed-A3.t |
|
533 | test-push-checkheads-superceed-A3.t | |
533 | test-push-checkheads-superceed-A4.t |
|
534 | test-push-checkheads-superceed-A4.t | |
534 | test-push-checkheads-superceed-A5.t |
|
535 | test-push-checkheads-superceed-A5.t | |
535 | test-push-checkheads-superceed-A6.t |
|
536 | test-push-checkheads-superceed-A6.t | |
536 | test-push-checkheads-superceed-A7.t |
|
537 | test-push-checkheads-superceed-A7.t | |
537 | test-push-checkheads-superceed-A8.t |
|
538 | test-push-checkheads-superceed-A8.t | |
538 | test-push-checkheads-unpushed-D1.t |
|
539 | test-push-checkheads-unpushed-D1.t | |
539 | test-push-checkheads-unpushed-D2.t |
|
540 | test-push-checkheads-unpushed-D2.t | |
540 | test-push-checkheads-unpushed-D3.t |
|
541 | test-push-checkheads-unpushed-D3.t | |
541 | test-push-checkheads-unpushed-D4.t |
|
542 | test-push-checkheads-unpushed-D4.t | |
542 | test-push-checkheads-unpushed-D5.t |
|
543 | test-push-checkheads-unpushed-D5.t | |
543 | test-push-checkheads-unpushed-D6.t |
|
544 | test-push-checkheads-unpushed-D6.t | |
544 | test-push-checkheads-unpushed-D7.t |
|
545 | test-push-checkheads-unpushed-D7.t | |
545 | test-push-http.t |
|
546 | test-push-http.t | |
546 | test-push-race.t |
|
547 | test-push-race.t | |
547 | test-push-warn.t |
|
548 | test-push-warn.t | |
548 | test-push.t |
|
549 | test-push.t | |
549 | test-pushvars.t |
|
550 | test-pushvars.t | |
550 | test-qrecord.t |
|
551 | test-qrecord.t | |
551 | test-rebase-abort.t |
|
552 | test-rebase-abort.t | |
552 | test-rebase-backup.t |
|
553 | test-rebase-backup.t | |
553 | test-rebase-base-flag.t |
|
554 | test-rebase-base-flag.t | |
554 | test-rebase-bookmarks.t |
|
555 | test-rebase-bookmarks.t | |
555 | test-rebase-brute-force.t |
|
556 | test-rebase-brute-force.t | |
556 | test-rebase-cache.t |
|
557 | test-rebase-cache.t | |
557 | test-rebase-check-restore.t |
|
558 | test-rebase-check-restore.t | |
558 | test-rebase-collapse.t |
|
559 | test-rebase-collapse.t | |
559 | test-rebase-conflicts.t |
|
560 | test-rebase-conflicts.t | |
560 | test-rebase-dest.t |
|
561 | test-rebase-dest.t | |
561 | test-rebase-detach.t |
|
562 | test-rebase-detach.t | |
562 | test-rebase-emptycommit.t |
|
563 | test-rebase-emptycommit.t | |
563 | test-rebase-inmemory.t |
|
564 | test-rebase-inmemory.t | |
564 | test-rebase-interruptions.t |
|
565 | test-rebase-interruptions.t | |
565 | test-rebase-issue-noparam-single-rev.t |
|
566 | test-rebase-issue-noparam-single-rev.t | |
566 | test-rebase-legacy.t |
|
567 | test-rebase-legacy.t | |
567 | test-rebase-mq-skip.t |
|
568 | test-rebase-mq-skip.t | |
568 | test-rebase-mq.t |
|
569 | test-rebase-mq.t | |
569 | test-rebase-named-branches.t |
|
570 | test-rebase-named-branches.t | |
570 | test-rebase-newancestor.t |
|
571 | test-rebase-newancestor.t | |
571 | test-rebase-obsolete.t |
|
572 | test-rebase-obsolete.t | |
572 | test-rebase-parameters.t |
|
573 | test-rebase-parameters.t | |
573 | test-rebase-partial.t |
|
574 | test-rebase-partial.t | |
574 | test-rebase-pull.t |
|
575 | test-rebase-pull.t | |
575 | test-rebase-rename.t |
|
576 | test-rebase-rename.t | |
576 | test-rebase-scenario-global.t |
|
577 | test-rebase-scenario-global.t | |
577 | test-rebase-templates.t |
|
578 | test-rebase-templates.t | |
578 | test-rebase-transaction.t |
|
579 | test-rebase-transaction.t | |
579 | test-rebuildstate.t |
|
580 | test-rebuildstate.t | |
580 | test-record.t |
|
581 | test-record.t | |
581 | test-releasenotes-formatting.t |
|
582 | test-releasenotes-formatting.t | |
582 | test-releasenotes-merging.t |
|
583 | test-releasenotes-merging.t | |
583 | test-releasenotes-parsing.t |
|
584 | test-releasenotes-parsing.t | |
584 | test-relink.t |
|
585 | test-relink.t | |
585 | test-remotefilelog-bad-configs.t |
|
586 | test-remotefilelog-bad-configs.t | |
586 | test-remotefilelog-bgprefetch.t |
|
587 | test-remotefilelog-bgprefetch.t | |
587 | test-remotefilelog-blame.t |
|
588 | test-remotefilelog-blame.t | |
588 | test-remotefilelog-bundle2.t |
|
589 | test-remotefilelog-bundle2.t | |
589 | test-remotefilelog-bundles.t |
|
590 | test-remotefilelog-bundles.t | |
590 | test-remotefilelog-cacheprocess.t |
|
591 | test-remotefilelog-cacheprocess.t | |
591 | test-remotefilelog-clone-tree.t |
|
592 | test-remotefilelog-clone-tree.t | |
592 | test-remotefilelog-clone.t |
|
593 | test-remotefilelog-clone.t | |
593 | test-remotefilelog-datapack.py |
|
594 | test-remotefilelog-datapack.py | |
594 | test-remotefilelog-gcrepack.t |
|
595 | test-remotefilelog-gcrepack.t | |
595 | test-remotefilelog-histpack.py |
|
596 | test-remotefilelog-histpack.py | |
596 | test-remotefilelog-http.t |
|
597 | test-remotefilelog-http.t | |
597 | test-remotefilelog-keepset.t |
|
598 | test-remotefilelog-keepset.t | |
598 | test-remotefilelog-local.t |
|
599 | test-remotefilelog-local.t | |
599 | test-remotefilelog-log.t |
|
600 | test-remotefilelog-log.t | |
600 | test-remotefilelog-partial-shallow.t |
|
601 | test-remotefilelog-partial-shallow.t | |
601 | test-remotefilelog-permissions.t |
|
602 | test-remotefilelog-permissions.t | |
602 | test-remotefilelog-permisssions.t |
|
603 | test-remotefilelog-permisssions.t | |
603 | test-remotefilelog-prefetch.t |
|
604 | test-remotefilelog-prefetch.t | |
604 | test-remotefilelog-pull-noshallow.t |
|
605 | test-remotefilelog-pull-noshallow.t | |
605 | test-remotefilelog-share.t |
|
606 | test-remotefilelog-share.t | |
606 | test-remotefilelog-sparse.t |
|
607 | test-remotefilelog-sparse.t | |
607 | test-remotefilelog-tags.t |
|
608 | test-remotefilelog-tags.t | |
608 | test-remotefilelog-wireproto.t |
|
609 | test-remotefilelog-wireproto.t | |
609 | test-remove.t |
|
610 | test-remove.t | |
610 | test-removeemptydirs.t |
|
611 | test-removeemptydirs.t | |
611 | test-rename-after-merge.t |
|
612 | test-rename-after-merge.t | |
612 | test-rename-dir-merge.t |
|
613 | test-rename-dir-merge.t | |
613 | test-rename-merge1.t |
|
614 | test-rename-merge1.t | |
614 | test-rename-merge2.t |
|
615 | test-rename-merge2.t | |
615 | test-rename.t |
|
616 | test-rename.t | |
616 | test-repair-strip.t |
|
617 | test-repair-strip.t | |
617 | test-repo-compengines.t |
|
618 | test-repo-compengines.t | |
618 | test-requires.t |
|
619 | test-requires.t | |
619 | test-resolve.t |
|
620 | test-resolve.t | |
620 | test-revert-flags.t |
|
621 | test-revert-flags.t | |
621 | test-revert-interactive.t |
|
622 | test-revert-interactive.t | |
622 | test-revert-unknown.t |
|
623 | test-revert-unknown.t | |
623 | test-revert.t |
|
624 | test-revert.t | |
624 | test-revisions.t |
|
625 | test-revisions.t | |
625 | test-revlog-ancestry.py |
|
626 | test-revlog-ancestry.py | |
626 | test-revlog-group-emptyiter.t |
|
627 | test-revlog-group-emptyiter.t | |
627 | test-revlog-mmapindex.t |
|
628 | test-revlog-mmapindex.t | |
628 | test-revlog-packentry.t |
|
629 | test-revlog-packentry.t | |
629 | test-revlog-raw.py |
|
630 | test-revlog-raw.py | |
630 | test-revlog-v2.t |
|
631 | test-revlog-v2.t | |
631 | test-revlog.t |
|
632 | test-revlog.t | |
632 | test-revset-dirstate-parents.t |
|
633 | test-revset-dirstate-parents.t | |
633 | test-revset-legacy-lookup.t |
|
634 | test-revset-legacy-lookup.t | |
634 | test-revset-outgoing.t |
|
635 | test-revset-outgoing.t | |
635 | test-revset2.t |
|
636 | test-revset2.t | |
636 | test-rollback.t |
|
637 | test-rollback.t | |
637 | test-run-tests.py |
|
638 | test-run-tests.py | |
638 | test-run-tests.t |
|
639 | test-run-tests.t | |
639 | test-rust-ancestor.py |
|
640 | test-rust-ancestor.py | |
640 | test-schemes.t |
|
641 | test-schemes.t | |
641 | test-serve.t |
|
642 | test-serve.t | |
642 | test-setdiscovery.t |
|
643 | test-setdiscovery.t | |
643 | test-share.t |
|
644 | test-share.t | |
644 | test-shelve.t |
|
645 | test-shelve.t | |
645 | test-shelve2.t |
|
646 | test-shelve2.t | |
646 | test-show-stack.t |
|
647 | test-show-stack.t | |
647 | test-show-work.t |
|
648 | test-show-work.t | |
648 | test-show.t |
|
649 | test-show.t | |
649 | test-simple-update.t |
|
650 | test-simple-update.t | |
650 | test-simplekeyvaluefile.py |
|
651 | test-simplekeyvaluefile.py | |
651 | test-simplemerge.py |
|
652 | test-simplemerge.py | |
652 | test-single-head.t |
|
653 | test-single-head.t | |
653 | test-sparse-clear.t |
|
654 | test-sparse-clear.t | |
654 | test-sparse-clone.t |
|
655 | test-sparse-clone.t | |
655 | test-sparse-import.t |
|
656 | test-sparse-import.t | |
656 | test-sparse-merges.t |
|
657 | test-sparse-merges.t | |
657 | test-sparse-profiles.t |
|
658 | test-sparse-profiles.t | |
658 | test-sparse-requirement.t |
|
659 | test-sparse-requirement.t | |
659 | test-sparse-verbose-json.t |
|
660 | test-sparse-verbose-json.t | |
660 | test-sparse.t |
|
661 | test-sparse.t | |
661 | test-split.t |
|
662 | test-split.t | |
662 | test-ssh-bundle1.t |
|
663 | test-ssh-bundle1.t | |
663 | test-ssh-clone-r.t |
|
664 | test-ssh-clone-r.t | |
664 | test-ssh-proto-unbundle.t |
|
665 | test-ssh-proto-unbundle.t | |
665 | test-ssh-proto.t |
|
666 | test-ssh-proto.t | |
666 | test-ssh-repoerror.t |
|
667 | test-ssh-repoerror.t | |
667 | test-ssh.t |
|
668 | test-ssh.t | |
668 | test-sshserver.py |
|
669 | test-sshserver.py | |
669 | test-stack.t |
|
670 | test-stack.t | |
670 | test-static-http.t |
|
671 | test-static-http.t | |
671 | test-status-color.t |
|
672 | test-status-color.t | |
672 | test-status-inprocess.py |
|
673 | test-status-inprocess.py | |
673 | test-status-rev.t |
|
674 | test-status-rev.t | |
674 | test-status-terse.t |
|
675 | test-status-terse.t | |
675 | test-status.t |
|
676 | test-status.t | |
676 | test-storage.py |
|
677 | test-storage.py | |
677 | test-stream-bundle-v2.t |
|
678 | test-stream-bundle-v2.t | |
678 | test-strict.t |
|
679 | test-strict.t | |
679 | test-strip-cross.t |
|
680 | test-strip-cross.t | |
680 | test-strip.t |
|
681 | test-strip.t | |
681 | test-subrepo-deep-nested-change.t |
|
682 | test-subrepo-deep-nested-change.t | |
682 | test-subrepo-git.t |
|
683 | test-subrepo-git.t | |
683 | test-subrepo-missing.t |
|
684 | test-subrepo-missing.t | |
684 | test-subrepo-paths.t |
|
685 | test-subrepo-paths.t | |
685 | test-subrepo-recursion.t |
|
686 | test-subrepo-recursion.t | |
686 | test-subrepo-relative-path.t |
|
687 | test-subrepo-relative-path.t | |
687 | test-subrepo.t |
|
688 | test-subrepo.t | |
688 | test-symlink-os-yes-fs-no.py |
|
689 | test-symlink-os-yes-fs-no.py | |
689 | test-symlink-placeholder.t |
|
690 | test-symlink-placeholder.t | |
690 | test-symlinks.t |
|
691 | test-symlinks.t | |
691 | test-tag.t |
|
692 | test-tag.t | |
692 | test-tags.t |
|
693 | test-tags.t | |
693 | test-template-basic.t |
|
694 | test-template-basic.t | |
694 | test-template-functions.t |
|
695 | test-template-functions.t | |
695 | test-template-keywords.t |
|
696 | test-template-keywords.t | |
696 | test-template-map.t |
|
697 | test-template-map.t | |
697 | test-tools.t |
|
698 | test-tools.t | |
698 | test-transplant.t |
|
699 | test-transplant.t | |
699 | test-treediscovery-legacy.t |
|
700 | test-treediscovery-legacy.t | |
700 | test-treediscovery.t |
|
701 | test-treediscovery.t | |
701 | test-treemanifest.t |
|
702 | test-treemanifest.t | |
702 | test-ui-color.py |
|
703 | test-ui-color.py | |
703 | test-ui-config.py |
|
704 | test-ui-config.py | |
704 | test-ui-verbosity.py |
|
705 | test-ui-verbosity.py | |
705 | test-unamend.t |
|
706 | test-unamend.t | |
706 | test-unbundlehash.t |
|
707 | test-unbundlehash.t | |
707 | test-uncommit.t |
|
708 | test-uncommit.t | |
708 | test-unified-test.t |
|
709 | test-unified-test.t | |
709 | test-unionrepo.t |
|
710 | test-unionrepo.t | |
710 | test-unrelated-pull.t |
|
711 | test-unrelated-pull.t | |
711 | test-up-local-change.t |
|
712 | test-up-local-change.t | |
712 | test-update-atomic.t |
|
713 | test-update-atomic.t | |
713 | test-update-branches.t |
|
714 | test-update-branches.t | |
714 | test-update-dest.t |
|
715 | test-update-dest.t | |
715 | test-update-issue1456.t |
|
716 | test-update-issue1456.t | |
716 | test-update-names.t |
|
717 | test-update-names.t | |
717 | test-update-reverse.t |
|
718 | test-update-reverse.t | |
718 | test-upgrade-repo.t |
|
719 | test-upgrade-repo.t | |
719 | test-url-download.t |
|
720 | test-url-download.t | |
720 | test-url-rev.t |
|
721 | test-url-rev.t | |
721 | test-url.py |
|
722 | test-url.py | |
722 | test-username-newline.t |
|
723 | test-username-newline.t | |
723 | test-util.py |
|
724 | test-util.py | |
724 | test-verify.t |
|
725 | test-verify.t | |
725 | test-walk.t |
|
726 | test-walk.t | |
726 | test-walkrepo.py |
|
727 | test-walkrepo.py | |
727 | test-websub.t |
|
728 | test-websub.t | |
728 | test-win32text.t |
|
729 | test-win32text.t | |
729 | test-wireproto-caching.t |
|
730 | test-wireproto-caching.t | |
730 | test-wireproto-clientreactor.py |
|
731 | test-wireproto-clientreactor.py | |
731 | test-wireproto-command-branchmap.t |
|
732 | test-wireproto-command-branchmap.t | |
732 | test-wireproto-command-capabilities.t |
|
733 | test-wireproto-command-capabilities.t | |
733 | test-wireproto-command-changesetdata.t |
|
734 | test-wireproto-command-changesetdata.t | |
734 | test-wireproto-command-filedata.t |
|
735 | test-wireproto-command-filedata.t | |
735 | test-wireproto-command-filesdata.t |
|
736 | test-wireproto-command-filesdata.t | |
736 | test-wireproto-command-heads.t |
|
737 | test-wireproto-command-heads.t | |
737 | test-wireproto-command-known.t |
|
738 | test-wireproto-command-known.t | |
738 | test-wireproto-command-listkeys.t |
|
739 | test-wireproto-command-listkeys.t | |
739 | test-wireproto-command-lookup.t |
|
740 | test-wireproto-command-lookup.t | |
740 | test-wireproto-command-manifestdata.t |
|
741 | test-wireproto-command-manifestdata.t | |
741 | test-wireproto-command-pushkey.t |
|
742 | test-wireproto-command-pushkey.t | |
742 | test-wireproto-command-rawstorefiledata.t |
|
743 | test-wireproto-command-rawstorefiledata.t | |
743 | test-wireproto-content-redirects.t |
|
744 | test-wireproto-content-redirects.t | |
744 | test-wireproto-exchangev2.t |
|
745 | test-wireproto-exchangev2.t | |
745 | test-wireproto-framing.py |
|
746 | test-wireproto-framing.py | |
746 | test-wireproto-serverreactor.py |
|
747 | test-wireproto-serverreactor.py | |
747 | test-wireproto.py |
|
748 | test-wireproto.py | |
748 | test-wireproto.t |
|
749 | test-wireproto.t | |
749 | test-wsgirequest.py |
|
750 | test-wsgirequest.py | |
750 | test-xdg.t |
|
751 | test-xdg.t |
@@ -1,848 +1,848 b'' | |||||
1 | $ hg init repo |
|
1 | $ hg init repo | |
2 | $ cd repo |
|
2 | $ cd repo | |
3 |
|
3 | |||
4 | New file: |
|
4 | New file: | |
5 |
|
5 | |||
6 | $ hg import -d "1000000 0" -mnew - <<EOF |
|
6 | $ hg import -d "1000000 0" -mnew - <<EOF | |
7 | > diff --git a/new b/new |
|
7 | > diff --git a/new b/new | |
8 | > new file mode 100644 |
|
8 | > new file mode 100644 | |
9 | > index 0000000..7898192 |
|
9 | > index 0000000..7898192 | |
10 | > --- /dev/null |
|
10 | > --- /dev/null | |
11 | > +++ b/new |
|
11 | > +++ b/new | |
12 | > @@ -0,0 +1 @@ |
|
12 | > @@ -0,0 +1 @@ | |
13 | > +a |
|
13 | > +a | |
14 | > EOF |
|
14 | > EOF | |
15 | applying patch from stdin |
|
15 | applying patch from stdin | |
16 |
|
16 | |||
17 | $ hg tip -q |
|
17 | $ hg tip -q | |
18 | 0:ae3ee40d2079 |
|
18 | 0:ae3ee40d2079 | |
19 |
|
19 | |||
20 | New empty file: |
|
20 | New empty file: | |
21 |
|
21 | |||
22 | $ hg import -d "1000000 0" -mempty - <<EOF |
|
22 | $ hg import -d "1000000 0" -mempty - <<EOF | |
23 | > diff --git a/empty b/empty |
|
23 | > diff --git a/empty b/empty | |
24 | > new file mode 100644 |
|
24 | > new file mode 100644 | |
25 | > EOF |
|
25 | > EOF | |
26 | applying patch from stdin |
|
26 | applying patch from stdin | |
27 |
|
27 | |||
28 | $ hg tip -q |
|
28 | $ hg tip -q | |
29 | 1:ab199dc869b5 |
|
29 | 1:ab199dc869b5 | |
30 |
|
30 | |||
31 | $ hg locate empty |
|
31 | $ hg locate empty | |
32 | empty |
|
32 | empty | |
33 |
|
33 | |||
34 | chmod +x: |
|
34 | chmod +x: | |
35 |
|
35 | |||
36 | $ hg import -d "1000000 0" -msetx - <<EOF |
|
36 | $ hg import -d "1000000 0" -msetx - <<EOF | |
37 | > diff --git a/new b/new |
|
37 | > diff --git a/new b/new | |
38 | > old mode 100644 |
|
38 | > old mode 100644 | |
39 | > new mode 100755 |
|
39 | > new mode 100755 | |
40 | > EOF |
|
40 | > EOF | |
41 | applying patch from stdin |
|
41 | applying patch from stdin | |
42 |
|
42 | |||
43 | #if execbit |
|
43 | #if execbit | |
44 | $ hg tip -q |
|
44 | $ hg tip -q | |
45 | 2:3a34410f282e |
|
45 | 2:3a34410f282e | |
46 | $ test -x new |
|
46 | $ test -x new | |
47 | $ hg rollback -q |
|
47 | $ hg rollback -q | |
48 | #else |
|
48 | #else | |
49 | $ hg tip -q |
|
49 | $ hg tip -q | |
50 | 1:ab199dc869b5 |
|
50 | 1:ab199dc869b5 | |
51 | #endif |
|
51 | #endif | |
52 |
|
52 | |||
53 | Copy and removing x bit: |
|
53 | Copy and removing x bit: | |
54 |
|
54 | |||
55 | $ hg import -f -d "1000000 0" -mcopy - <<EOF |
|
55 | $ hg import -f -d "1000000 0" -mcopy - <<EOF | |
56 | > diff --git a/new b/copy |
|
56 | > diff --git a/new b/copy | |
57 | > old mode 100755 |
|
57 | > old mode 100755 | |
58 | > new mode 100644 |
|
58 | > new mode 100644 | |
59 | > similarity index 100% |
|
59 | > similarity index 100% | |
60 | > copy from new |
|
60 | > copy from new | |
61 | > copy to copy |
|
61 | > copy to copy | |
62 | > diff --git a/new b/copyx |
|
62 | > diff --git a/new b/copyx | |
63 | > similarity index 100% |
|
63 | > similarity index 100% | |
64 | > copy from new |
|
64 | > copy from new | |
65 | > copy to copyx |
|
65 | > copy to copyx | |
66 | > EOF |
|
66 | > EOF | |
67 | applying patch from stdin |
|
67 | applying patch from stdin | |
68 |
|
68 | |||
69 | $ test -f copy |
|
69 | $ test -f copy | |
70 | #if execbit |
|
70 | #if execbit | |
71 | $ test ! -x copy |
|
71 | $ test ! -x copy | |
72 | $ test -x copyx |
|
72 | $ test -x copyx | |
73 | $ hg tip -q |
|
73 | $ hg tip -q | |
74 | 2:21dfaae65c71 |
|
74 | 2:21dfaae65c71 | |
75 | #else |
|
75 | #else | |
76 | $ hg tip -q |
|
76 | $ hg tip -q | |
77 | 2:0efdaa8e3bf3 |
|
77 | 2:0efdaa8e3bf3 | |
78 | #endif |
|
78 | #endif | |
79 |
|
79 | |||
80 | $ hg up -qCr1 |
|
80 | $ hg up -qCr1 | |
81 | $ hg rollback -q |
|
81 | $ hg rollback -q | |
82 |
|
82 | |||
83 | Copy (like above but independent of execbit): |
|
83 | Copy (like above but independent of execbit): | |
84 |
|
84 | |||
85 | $ hg import -d "1000000 0" -mcopy - <<EOF |
|
85 | $ hg import -d "1000000 0" -mcopy - <<EOF | |
86 | > diff --git a/new b/copy |
|
86 | > diff --git a/new b/copy | |
87 | > similarity index 100% |
|
87 | > similarity index 100% | |
88 | > copy from new |
|
88 | > copy from new | |
89 | > copy to copy |
|
89 | > copy to copy | |
90 | > diff --git a/new b/copyx |
|
90 | > diff --git a/new b/copyx | |
91 | > similarity index 100% |
|
91 | > similarity index 100% | |
92 | > copy from new |
|
92 | > copy from new | |
93 | > copy to copyx |
|
93 | > copy to copyx | |
94 | > EOF |
|
94 | > EOF | |
95 | applying patch from stdin |
|
95 | applying patch from stdin | |
96 |
|
96 | |||
97 | $ hg tip -q |
|
97 | $ hg tip -q | |
98 | 2:0efdaa8e3bf3 |
|
98 | 2:0efdaa8e3bf3 | |
99 | $ test -f copy |
|
99 | $ test -f copy | |
100 |
|
100 | |||
101 | $ cat copy |
|
101 | $ cat copy | |
102 | a |
|
102 | a | |
103 |
|
103 | |||
104 | $ hg cat copy |
|
104 | $ hg cat copy | |
105 | a |
|
105 | a | |
106 |
|
106 | |||
107 | Rename: |
|
107 | Rename: | |
108 |
|
108 | |||
109 | $ hg import -d "1000000 0" -mrename - <<EOF |
|
109 | $ hg import -d "1000000 0" -mrename - <<EOF | |
110 | > diff --git a/copy b/rename |
|
110 | > diff --git a/copy b/rename | |
111 | > similarity index 100% |
|
111 | > similarity index 100% | |
112 | > rename from copy |
|
112 | > rename from copy | |
113 | > rename to rename |
|
113 | > rename to rename | |
114 | > EOF |
|
114 | > EOF | |
115 | applying patch from stdin |
|
115 | applying patch from stdin | |
116 |
|
116 | |||
117 | $ hg tip -q |
|
117 | $ hg tip -q | |
118 | 3:b1f57753fad2 |
|
118 | 3:b1f57753fad2 | |
119 |
|
119 | |||
120 | $ hg locate |
|
120 | $ hg locate | |
121 | copyx |
|
121 | copyx | |
122 | empty |
|
122 | empty | |
123 | new |
|
123 | new | |
124 | rename |
|
124 | rename | |
125 |
|
125 | |||
126 | Delete: |
|
126 | Delete: | |
127 |
|
127 | |||
128 | $ hg import -d "1000000 0" -mdelete - <<EOF |
|
128 | $ hg import -d "1000000 0" -mdelete - <<EOF | |
129 | > diff --git a/copyx b/copyx |
|
129 | > diff --git a/copyx b/copyx | |
130 | > deleted file mode 100755 |
|
130 | > deleted file mode 100755 | |
131 | > index 7898192..0000000 |
|
131 | > index 7898192..0000000 | |
132 | > --- a/copyx |
|
132 | > --- a/copyx | |
133 | > +++ /dev/null |
|
133 | > +++ /dev/null | |
134 | > @@ -1 +0,0 @@ |
|
134 | > @@ -1 +0,0 @@ | |
135 | > -a |
|
135 | > -a | |
136 | > EOF |
|
136 | > EOF | |
137 | applying patch from stdin |
|
137 | applying patch from stdin | |
138 |
|
138 | |||
139 | $ hg tip -q |
|
139 | $ hg tip -q | |
140 | 4:1bd1da94b9b2 |
|
140 | 4:1bd1da94b9b2 | |
141 |
|
141 | |||
142 | $ hg locate |
|
142 | $ hg locate | |
143 | empty |
|
143 | empty | |
144 | new |
|
144 | new | |
145 | rename |
|
145 | rename | |
146 |
|
146 | |||
147 | $ test -f copyx |
|
147 | $ test -f copyx | |
148 | [1] |
|
148 | [1] | |
149 |
|
149 | |||
150 | Regular diff: |
|
150 | Regular diff: | |
151 |
|
151 | |||
152 | $ hg import -d "1000000 0" -mregular - <<EOF |
|
152 | $ hg import -d "1000000 0" -mregular - <<EOF | |
153 | > diff --git a/rename b/rename |
|
153 | > diff --git a/rename b/rename | |
154 | > index 7898192..72e1fe3 100644 |
|
154 | > index 7898192..72e1fe3 100644 | |
155 | > --- a/rename |
|
155 | > --- a/rename | |
156 | > +++ b/rename |
|
156 | > +++ b/rename | |
157 | > @@ -1 +1,5 @@ |
|
157 | > @@ -1 +1,5 @@ | |
158 | > a |
|
158 | > a | |
159 | > +a |
|
159 | > +a | |
160 | > +a |
|
160 | > +a | |
161 | > +a |
|
161 | > +a | |
162 | > +a |
|
162 | > +a | |
163 | > EOF |
|
163 | > EOF | |
164 | applying patch from stdin |
|
164 | applying patch from stdin | |
165 |
|
165 | |||
166 | $ hg tip -q |
|
166 | $ hg tip -q | |
167 | 5:46fe99cb3035 |
|
167 | 5:46fe99cb3035 | |
168 |
|
168 | |||
169 | Copy and modify: |
|
169 | Copy and modify: | |
170 |
|
170 | |||
171 | $ hg import -d "1000000 0" -mcopymod - <<EOF |
|
171 | $ hg import -d "1000000 0" -mcopymod - <<EOF | |
172 | > diff --git a/rename b/copy2 |
|
172 | > diff --git a/rename b/copy2 | |
173 | > similarity index 80% |
|
173 | > similarity index 80% | |
174 | > copy from rename |
|
174 | > copy from rename | |
175 | > copy to copy2 |
|
175 | > copy to copy2 | |
176 | > index 72e1fe3..b53c148 100644 |
|
176 | > index 72e1fe3..b53c148 100644 | |
177 | > --- a/rename |
|
177 | > --- a/rename | |
178 | > +++ b/copy2 |
|
178 | > +++ b/copy2 | |
179 | > @@ -1,5 +1,5 @@ |
|
179 | > @@ -1,5 +1,5 @@ | |
180 | > a |
|
180 | > a | |
181 | > a |
|
181 | > a | |
182 | > -a |
|
182 | > -a | |
183 | > +b |
|
183 | > +b | |
184 | > a |
|
184 | > a | |
185 | > a |
|
185 | > a | |
186 | > EOF |
|
186 | > EOF | |
187 | applying patch from stdin |
|
187 | applying patch from stdin | |
188 |
|
188 | |||
189 | $ hg tip -q |
|
189 | $ hg tip -q | |
190 | 6:ffeb3197c12d |
|
190 | 6:ffeb3197c12d | |
191 |
|
191 | |||
192 | $ hg cat copy2 |
|
192 | $ hg cat copy2 | |
193 | a |
|
193 | a | |
194 | a |
|
194 | a | |
195 | b |
|
195 | b | |
196 | a |
|
196 | a | |
197 | a |
|
197 | a | |
198 |
|
198 | |||
199 | Rename and modify: |
|
199 | Rename and modify: | |
200 |
|
200 | |||
201 | $ hg import -d "1000000 0" -mrenamemod - <<EOF |
|
201 | $ hg import -d "1000000 0" -mrenamemod - <<EOF | |
202 | > diff --git a/copy2 b/rename2 |
|
202 | > diff --git a/copy2 b/rename2 | |
203 | > similarity index 80% |
|
203 | > similarity index 80% | |
204 | > rename from copy2 |
|
204 | > rename from copy2 | |
205 | > rename to rename2 |
|
205 | > rename to rename2 | |
206 | > index b53c148..8f81e29 100644 |
|
206 | > index b53c148..8f81e29 100644 | |
207 | > --- a/copy2 |
|
207 | > --- a/copy2 | |
208 | > +++ b/rename2 |
|
208 | > +++ b/rename2 | |
209 | > @@ -1,5 +1,5 @@ |
|
209 | > @@ -1,5 +1,5 @@ | |
210 | > a |
|
210 | > a | |
211 | > a |
|
211 | > a | |
212 | > b |
|
212 | > b | |
213 | > -a |
|
213 | > -a | |
214 | > +c |
|
214 | > +c | |
215 | > a |
|
215 | > a | |
216 | > EOF |
|
216 | > EOF | |
217 | applying patch from stdin |
|
217 | applying patch from stdin | |
218 |
|
218 | |||
219 | $ hg tip -q |
|
219 | $ hg tip -q | |
220 | 7:401aede9e6bb |
|
220 | 7:401aede9e6bb | |
221 |
|
221 | |||
222 | $ hg locate copy2 |
|
222 | $ hg locate copy2 | |
223 | [1] |
|
223 | [1] | |
224 | $ hg cat rename2 |
|
224 | $ hg cat rename2 | |
225 | a |
|
225 | a | |
226 | a |
|
226 | a | |
227 | b |
|
227 | b | |
228 | c |
|
228 | c | |
229 | a |
|
229 | a | |
230 |
|
230 | |||
231 | One file renamed multiple times: |
|
231 | One file renamed multiple times: | |
232 |
|
232 | |||
233 | $ hg import -d "1000000 0" -mmultirenames - <<EOF |
|
233 | $ hg import -d "1000000 0" -mmultirenames - <<EOF | |
234 | > diff --git a/rename2 b/rename3 |
|
234 | > diff --git a/rename2 b/rename3 | |
235 | > rename from rename2 |
|
235 | > rename from rename2 | |
236 | > rename to rename3 |
|
236 | > rename to rename3 | |
237 | > diff --git a/rename2 b/rename3-2 |
|
237 | > diff --git a/rename2 b/rename3-2 | |
238 | > rename from rename2 |
|
238 | > rename from rename2 | |
239 | > rename to rename3-2 |
|
239 | > rename to rename3-2 | |
240 | > EOF |
|
240 | > EOF | |
241 | applying patch from stdin |
|
241 | applying patch from stdin | |
242 |
|
242 | |||
243 | $ hg tip -q |
|
243 | $ hg tip -q | |
244 | 8:2ef727e684e8 |
|
244 | 8:2ef727e684e8 | |
245 |
|
245 | |||
246 | $ hg log -vr. --template '{rev} {files} / {file_copies}\n' |
|
246 | $ hg log -vr. --template '{rev} {files} / {file_copies}\n' | |
247 | 8 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) |
|
247 | 8 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) | |
248 |
|
248 | |||
249 | $ hg locate rename2 rename3 rename3-2 |
|
249 | $ hg locate rename2 rename3 rename3-2 | |
250 | rename3 |
|
250 | rename3 | |
251 | rename3-2 |
|
251 | rename3-2 | |
252 |
|
252 | |||
253 | $ hg cat rename3 |
|
253 | $ hg cat rename3 | |
254 | a |
|
254 | a | |
255 | a |
|
255 | a | |
256 | b |
|
256 | b | |
257 | c |
|
257 | c | |
258 | a |
|
258 | a | |
259 |
|
259 | |||
260 | $ hg cat rename3-2 |
|
260 | $ hg cat rename3-2 | |
261 | a |
|
261 | a | |
262 | a |
|
262 | a | |
263 | b |
|
263 | b | |
264 | c |
|
264 | c | |
265 | a |
|
265 | a | |
266 |
|
266 | |||
267 | $ echo foo > foo |
|
267 | $ echo foo > foo | |
268 | $ hg add foo |
|
268 | $ hg add foo | |
269 | $ hg ci -m 'add foo' |
|
269 | $ hg ci -m 'add foo' | |
270 |
|
270 | |||
271 | Binary files and regular patch hunks: |
|
271 | Binary files and regular patch hunks: | |
272 |
|
272 | |||
273 | $ hg import -d "1000000 0" -m binaryregular - <<EOF |
|
273 | $ hg import -d "1000000 0" -m binaryregular - <<EOF | |
274 | > diff --git a/binary b/binary |
|
274 | > diff --git a/binary b/binary | |
275 | > new file mode 100644 |
|
275 | > new file mode 100644 | |
276 | > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 |
|
276 | > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 | |
277 | > GIT binary patch |
|
277 | > GIT binary patch | |
278 | > literal 4 |
|
278 | > literal 4 | |
279 | > Lc\${NkU|;|M00aO5 |
|
279 | > Lc\${NkU|;|M00aO5 | |
280 | > |
|
280 | > | |
281 | > diff --git a/foo b/foo2 |
|
281 | > diff --git a/foo b/foo2 | |
282 | > rename from foo |
|
282 | > rename from foo | |
283 | > rename to foo2 |
|
283 | > rename to foo2 | |
284 | > EOF |
|
284 | > EOF | |
285 | applying patch from stdin |
|
285 | applying patch from stdin | |
286 |
|
286 | |||
287 | $ hg tip -q |
|
287 | $ hg tip -q | |
288 | 10:27377172366e |
|
288 | 10:27377172366e | |
289 |
|
289 | |||
290 | $ cat foo2 |
|
290 | $ cat foo2 | |
291 | foo |
|
291 | foo | |
292 |
|
292 | |||
293 | $ hg manifest --debug | grep binary |
|
293 | $ hg manifest --debug | grep binary | |
294 | 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary |
|
294 | 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary | |
295 |
|
295 | |||
296 | Multiple binary files: |
|
296 | Multiple binary files: | |
297 |
|
297 | |||
298 | $ hg import -d "1000000 0" -m multibinary - <<EOF |
|
298 | $ hg import -d "1000000 0" -m multibinary - <<EOF | |
299 | > diff --git a/mbinary1 b/mbinary1 |
|
299 | > diff --git a/mbinary1 b/mbinary1 | |
300 | > new file mode 100644 |
|
300 | > new file mode 100644 | |
301 | > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 |
|
301 | > index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 | |
302 | > GIT binary patch |
|
302 | > GIT binary patch | |
303 | > literal 4 |
|
303 | > literal 4 | |
304 | > Lc\${NkU|;|M00aO5 |
|
304 | > Lc\${NkU|;|M00aO5 | |
305 | > |
|
305 | > | |
306 | > diff --git a/mbinary2 b/mbinary2 |
|
306 | > diff --git a/mbinary2 b/mbinary2 | |
307 | > new file mode 100644 |
|
307 | > new file mode 100644 | |
308 | > index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490 |
|
308 | > index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490 | |
309 | > GIT binary patch |
|
309 | > GIT binary patch | |
310 | > literal 5 |
|
310 | > literal 5 | |
311 | > Mc\${NkU|\`?^000jF3jhEB |
|
311 | > Mc\${NkU|\`?^000jF3jhEB | |
312 | > |
|
312 | > | |
313 | > EOF |
|
313 | > EOF | |
314 | applying patch from stdin |
|
314 | applying patch from stdin | |
315 |
|
315 | |||
316 | $ hg tip -q |
|
316 | $ hg tip -q | |
317 | 11:18b73a84b4ab |
|
317 | 11:18b73a84b4ab | |
318 |
|
318 | |||
319 | $ hg manifest --debug | grep mbinary |
|
319 | $ hg manifest --debug | grep mbinary | |
320 | 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 |
|
320 | 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 | |
321 | a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 |
|
321 | a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 | |
322 |
|
322 | |||
323 | Binary file and delta hunk (we build the patch using this sed hack to |
|
323 | Binary file and delta hunk (we build the patch using this sed hack to | |
324 | avoid an unquoted ^, which check-code says breaks sh on Solaris): |
|
324 | avoid an unquoted ^, which check-code says breaks sh on Solaris): | |
325 |
|
325 | |||
326 | $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF' |
|
326 | $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF' | |
327 | > diff --git a/delta b/delta |
|
327 | > diff --git a/delta b/delta | |
328 | > new file mode 100644 |
|
328 | > new file mode 100644 | |
329 | > index 0000000000000000000000000000000000000000..8c9b7831b231c2600843e303e66b521353a200b3 |
|
329 | > index 0000000000000000000000000000000000000000..8c9b7831b231c2600843e303e66b521353a200b3 | |
330 | > GIT binary patch |
|
330 | > GIT binary patch | |
331 | > literal 3749 |
|
331 | > literal 3749 | |
332 | > zcmV;W4qEYvP)<h;3K|Lk000e1NJLTq006iE002D*0ssI2kt{U(0000PbVXQnQ*UN; |
|
332 | > zcmV;W4qEYvP)<h;3K|Lk000e1NJLTq006iE002D*0ssI2kt{U(0000PbVXQnQ*UN; | |
333 | > zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=M@d9MRCwC#oC!>o#}>x{(W-y~UN*tK |
|
333 | > zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=M@d9MRCwC#oC!>o#}>x{(W-y~UN*tK | |
334 | > z%A%sxiUy2Ys)0Vm#ueArYKoYqX;GuiqZpgirM6nCVoYk?YNAz3G~z;BZ~@~&OQEe4 |
|
334 | > z%A%sxiUy2Ys)0Vm#ueArYKoYqX;GuiqZpgirM6nCVoYk?YNAz3G~z;BZ~@~&OQEe4 | |
335 | > zmGvS5isFJI;Pd_7J+EKxyHZeu` caret t4r2>F;h-+VK3{_{WoGv8dSpFDYDrA%3UX03pt |
|
335 | > zmGvS5isFJI;Pd_7J+EKxyHZeu` caret t4r2>F;h-+VK3{_{WoGv8dSpFDYDrA%3UX03pt | |
336 | > zOaVoi0*W#P6lDr1$`nwPDWE7*rhuYM0Y#YtiZTThWeO<D6i}2YpqR<%$s>bRRaI42 |
|
336 | > zOaVoi0*W#P6lDr1$`nwPDWE7*rhuYM0Y#YtiZTThWeO<D6i}2YpqR<%$s>bRRaI42 | |
337 | > zS3iFIxJ8Q=EnBv1Z7?pBw_bLjJb3V+tgP(Tty_2R-mR#p04x78n2n7MSOFyt4i1iv |
|
337 | > zS3iFIxJ8Q=EnBv1Z7?pBw_bLjJb3V+tgP(Tty_2R-mR#p04x78n2n7MSOFyt4i1iv | |
338 | > zjxH`PPEJmgD7U?IK&h;(EGQ@_DJc<@01=4fiNXHcKZ8LhZQ8T}E3U4tUS3}OrcgQW |
|
338 | > zjxH`PPEJmgD7U?IK&h;(EGQ@_DJc<@01=4fiNXHcKZ8LhZQ8T}E3U4tUS3}OrcgQW | |
339 | > zWdX{K8#l7Ev&#$ysR)G#0*rC+<WGZ3?CtG4bm-ve>Dj$|_qJ`@D*stNP_AFUe&x!Q |
|
339 | > zWdX{K8#l7Ev&#$ysR)G#0*rC+<WGZ3?CtG4bm-ve>Dj$|_qJ`@D*stNP_AFUe&x!Q | |
340 | > zJ9q9B7Z=ym)MyZ?Tg1ROunUYr81nV?B@!tYS~5_|%gfW#(_s<4UN1!Q?Dv8d>g#m6 |
|
340 | > zJ9q9B7Z=ym)MyZ?Tg1ROunUYr81nV?B@!tYS~5_|%gfW#(_s<4UN1!Q?Dv8d>g#m6 | |
341 | > z%*@R2@bI2JdnzxQ!EDU`$eQY!tgI~Zn$prz;gaXNod5*5p(1Bz=P$qfvZ$y?dC@X~ |
|
341 | > z%*@R2@bI2JdnzxQ!EDU`$eQY!tgI~Zn$prz;gaXNod5*5p(1Bz=P$qfvZ$y?dC@X~ | |
342 | > zlAD+NAKhB{=;6bMwzjqn>9mavvKOGd`s%A+fBiL>Q;xJWpa72C+}u{JTHUX>{~}Qj |
|
342 | > zlAD+NAKhB{=;6bMwzjqn>9mavvKOGd`s%A+fBiL>Q;xJWpa72C+}u{JTHUX>{~}Qj | |
343 | > zUb%hyHgN~c?cBLjInvUALMD9g-aXt54ZL8AOCvXL-V6!~ijR*kEG$&Mv?!pE61OlI |
|
343 | > zUb%hyHgN~c?cBLjInvUALMD9g-aXt54ZL8AOCvXL-V6!~ijR*kEG$&Mv?!pE61OlI | |
344 | > z8nzMSPE8F7bH|Py*RNl1VUCggq<V)>@_6gkEeiz7{rmTeuNTW6+KVS#0FG%IHf-3L |
|
344 | > z8nzMSPE8F7bH|Py*RNl1VUCggq<V)>@_6gkEeiz7{rmTeuNTW6+KVS#0FG%IHf-3L | |
345 | > zGiS21vn>WCCr+GLx caret !uNetzB6u3o(w6&1C2?_LW8ij$+$sZ*zZ`|US3H@8N~%&V%Z |
|
345 | > zGiS21vn>WCCr+GLx caret !uNetzB6u3o(w6&1C2?_LW8ij$+$sZ*zZ`|US3H@8N~%&V%Z | |
346 | > zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc caret )dfdvA caret 5u`Xf;Zzu<ZQHgG?28V-#s<;T |
|
346 | > zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc caret )dfdvA caret 5u`Xf;Zzu<ZQHgG?28V-#s<;T | |
347 | > zzkh#LA)v7gpoE5ou3o*GoUUF%b#iht&kl9d0)><$FE1}ACr68;uCA`6DrGmz_U+rp |
|
347 | > zzkh#LA)v7gpoE5ou3o*GoUUF%b#iht&kl9d0)><$FE1}ACr68;uCA`6DrGmz_U+rp | |
348 | > zL>Rx;X_yhk$fP_yJrTCQ|NgsW0A<985g&c@k-NKly<>mgU8n||ZPPV<`SN8#%$+-T |
|
348 | > zL>Rx;X_yhk$fP_yJrTCQ|NgsW0A<985g&c@k-NKly<>mgU8n||ZPPV<`SN8#%$+-T | |
349 | > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W |
|
349 | > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W | |
350 | > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z<P<kox5bMWuUWH(sF9hONgd$Q |
|
350 | > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z<P<kox5bMWuUWH(sF9hONgd$Q | |
351 | > zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7 |
|
351 | > zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7 | |
352 | > zh>{5j2@f7T=-an%L_`E)h;mZ4D_5>?7tjQtVPRo2XU-&;mX(!l-MSTJP4XWY82JAC |
|
352 | > zh>{5j2@f7T=-an%L_`E)h;mZ4D_5>?7tjQtVPRo2XU-&;mX(!l-MSTJP4XWY82JAC | |
353 | > z@57+y&!1=P{Mn{W8)-HzEsgAtd63}Cazc>O6vGb>51%@9DzbyI3?4j~$ijmT95_IS |
|
353 | > z@57+y&!1=P{Mn{W8)-HzEsgAtd63}Cazc>O6vGb>51%@9DzbyI3?4j~$ijmT95_IS | |
354 | > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} caret 73NL%zk`)Jk!yxUAt-1r}ggLn-Zq} |
|
354 | > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} caret 73NL%zk`)Jk!yxUAt-1r}ggLn-Zq} | |
355 | > z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6<Vp(Z58%l#~>ZK?&s7y?b}i |
|
355 | > z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6<Vp(Z58%l#~>ZK?&s7y?b}i | |
356 | > zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN |
|
356 | > zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN | |
357 | > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87( |
|
357 | > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87( | |
358 | > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3 |
|
358 | > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3 | |
359 | > zARqv caret bm-85xnRCng3OT|MyVSmR3ND7 caret ?KaQGG! caret (aTbo1N;Nz;X3Q9FJbwK6`0?Yp |
|
359 | > zARqv caret bm-85xnRCng3OT|MyVSmR3ND7 caret ?KaQGG! caret (aTbo1N;Nz;X3Q9FJbwK6`0?Yp | |
360 | > zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E caret WAsfrK=x&@B!`w7Hik81sPz4 |
|
360 | > zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E caret WAsfrK=x&@B!`w7Hik81sPz4 | |
361 | > zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k caret 7>9!)56DbjmA~`OJJ40v |
|
361 | > zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k caret 7>9!)56DbjmA~`OJJ40v | |
362 | > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%! |
|
362 | > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%! | |
363 | > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! caret 5Lfr%vKg |
|
363 | > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! caret 5Lfr%vKg | |
364 | > zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp> |
|
364 | > zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp> | |
365 | > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1<x)!`;Qjg&}bb!Lrnl@xH#kS~VYE |
|
365 | > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1<x)!`;Qjg&}bb!Lrnl@xH#kS~VYE | |
366 | > zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3 |
|
366 | > zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3 | |
367 | > zEyhVTj-gO?kfDu1g9afo<RkPrYzG#_yF41IFxF%Ylg>9lx6<clPweR-b7Hn+r)e1l |
|
367 | > zEyhVTj-gO?kfDu1g9afo<RkPrYzG#_yF41IFxF%Ylg>9lx6<clPweR-b7Hn+r)e1l | |
368 | > zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B |
|
368 | > zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B | |
369 | > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&<dzEP&cO|87Ju#j*=;wH~Exr>i*Hpp&@ |
|
369 | > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&<dzEP&cO|87Ju#j*=;wH~Exr>i*Hpp&@ | |
370 | > z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e<M4F8KEID&pT7QmqoSgq&06adp5T=U |
|
370 | > z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e<M4F8KEID&pT7QmqoSgq&06adp5T=U | |
371 | > z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%) |
|
371 | > z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%) | |
372 | > z&<t3F>d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw<mB+I#v11TKRpKWQS+lvVL7=u |
|
372 | > z&<t3F>d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw<mB+I#v11TKRpKWQS+lvVL7=u | |
373 | > zHr6)1ynEF<i3kO6A8&ppPMo-F=PnWfXkSj@i*7J6C<F}wR?s(O0niC?t+6;+k}pPq |
|
373 | > zHr6)1ynEF<i3kO6A8&ppPMo-F=PnWfXkSj@i*7J6C<F}wR?s(O0niC?t+6;+k}pPq | |
374 | > zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 caret cKP||pUr;+r)hyn9O37=xA`3%Bj-ih |
|
374 | > zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 caret cKP||pUr;+r)hyn9O37=xA`3%Bj-ih | |
375 | > z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p caret {}n$q |
|
375 | > z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p caret {}n$q | |
376 | > z3@9W=KmGI*Ng_Q#AzA%-z|Z caret |#oW(hkfgpuS$RKRhlrarX%efMMCs}GLChec5+y{6 |
|
376 | > z3@9W=KmGI*Ng_Q#AzA%-z|Z caret |#oW(hkfgpuS$RKRhlrarX%efMMCs}GLChec5+y{6 | |
377 | > z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt caret asFCe0&a@tqp |
|
377 | > z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt caret asFCe0&a@tqp | |
378 | > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV |
|
378 | > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV | |
379 | > zSohlc=7K+spN<ctf}5KgKqNyJDNP9;LZd)nTE=9|6Xdr9%Hzk63-tL2c9FD*rsyYY |
|
379 | > zSohlc=7K+spN<ctf}5KgKqNyJDNP9;LZd)nTE=9|6Xdr9%Hzk63-tL2c9FD*rsyYY | |
380 | > z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ caret QD#sw3&vS$FwlTk |
|
380 | > z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ caret QD#sw3&vS$FwlTk | |
381 | > zp1#Gw!Qo-$LtvpXt#ApV0g) caret F=qFB`VB!W297x=$mr<$>rco3v$QKih_xN!k6;M=@ |
|
381 | > zp1#Gw!Qo-$LtvpXt#ApV0g) caret F=qFB`VB!W297x=$mr<$>rco3v$QKih_xN!k6;M=@ | |
382 | > zCr?gDNQj7tm@;JwD;Ty&NlBSCYZk(b3dZeN8D4h2{r20dSFc7;(>E&r`s=TVtzpB4 |
|
382 | > zCr?gDNQj7tm@;JwD;Ty&NlBSCYZk(b3dZeN8D4h2{r20dSFc7;(>E&r`s=TVtzpB4 | |
383 | > zk+ caret N&zCAiRns(?p6iBlk9v&h{1ve(FNtc)td51M>)TkXhc6{>5C)`fS$&)A1*CP1% |
|
383 | > zk+ caret N&zCAiRns(?p6iBlk9v&h{1ve(FNtc)td51M>)TkXhc6{>5C)`fS$&)A1*CP1% | |
384 | > zld+peue4aYbg3C0!+4mu+}vE caret j_feX+ZijvffBI7Ofh#RZ*U3<3J5(+nfRCzexqQ5 |
|
384 | > zld+peue4aYbg3C0!+4mu+}vE caret j_feX+ZijvffBI7Ofh#RZ*U3<3J5(+nfRCzexqQ5 | |
385 | > zgM&##Y4Dd{e%ZKjqrbm@|Ni}l4jo!AqtFynj3Xsd$o caret ?yV4$|UQ(j&UWCH>M=o_&N |
|
385 | > zgM&##Y4Dd{e%ZKjqrbm@|Ni}l4jo!AqtFynj3Xsd$o caret ?yV4$|UQ(j&UWCH>M=o_&N | |
386 | > zmclXc3i|Q#<;#EoG>~V}4unTHbUK}u=y4;rA3S&vzC3 caret aJP!&D4RvvGfoyo(>C>la |
|
386 | > zmclXc3i|Q#<;#EoG>~V}4unTHbUK}u=y4;rA3S&vzC3 caret aJP!&D4RvvGfoyo(>C>la | |
387 | > zijP<=v>X{3Ne&2BXo}DV8l0V-jdv`$am0ubG{Wuh%CTd|l9Q7m;G&|U@#Dvbhlj(d |
|
387 | > zijP<=v>X{3Ne&2BXo}DV8l0V-jdv`$am0ubG{Wuh%CTd|l9Q7m;G&|U@#Dvbhlj(d | |
388 | > zg6W{3ATxYt#T?)3;SmIgOP4M|Dki~I_TX7SxP0x}wI~DQI7Lhm2BI7gph(aPIFAd; |
|
388 | > zg6W{3ATxYt#T?)3;SmIgOP4M|Dki~I_TX7SxP0x}wI~DQI7Lhm2BI7gph(aPIFAd; | |
389 | > zQ&UsF`Q{rOz+z=87c5v%@5u~d6dWV5OlX`oH3cAH&UlvsZUEo(Q(P|lKs17rXvaiU |
|
389 | > zQ&UsF`Q{rOz+z=87c5v%@5u~d6dWV5OlX`oH3cAH&UlvsZUEo(Q(P|lKs17rXvaiU | |
390 | > zQcj}IEufi1+Bnh6&(EhF{7O3vLHp`jjlp0J<M1kh$+$2xGm~Zk7OY7(q=&Rdhq*RG |
|
390 | > zQcj}IEufi1+Bnh6&(EhF{7O3vLHp`jjlp0J<M1kh$+$2xGm~Zk7OY7(q=&Rdhq*RG | |
391 | > zwrmcd5MnP}xByB_)P@{J>DR9x6;`cUwPM8z){yooNiXPOc9_{W-gtwxE5TUg0vJk6 |
|
391 | > zwrmcd5MnP}xByB_)P@{J>DR9x6;`cUwPM8z){yooNiXPOc9_{W-gtwxE5TUg0vJk6 | |
392 | > zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI |
|
392 | > zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI | |
393 | > zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ caret xa6o2jwdRk54a$>pcRbC29ZyG!Cfdp |
|
393 | > zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ caret xa6o2jwdRk54a$>pcRbC29ZyG!Cfdp | |
394 | > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d<H`Ar;(@%aNa9VPU8Z |
|
394 | > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d<H`Ar;(@%aNa9VPU8Z | |
395 | > z;tq*`y}dm#NDJHKlV}uTIm!_vAq5E7!X-p{P=Z=Sh668>PuVS1*6e}OwOiMc;u3OQ |
|
395 | > z;tq*`y}dm#NDJHKlV}uTIm!_vAq5E7!X-p{P=Z=Sh668>PuVS1*6e}OwOiMc;u3OQ | |
396 | > z@Bs)w3=lzfKoufH$SFuPG@uZ4NOnM#+=8LnQ2Q4zUd+nM+OT26;lqbN{P07dhH{jH |
|
396 | > z@Bs)w3=lzfKoufH$SFuPG@uZ4NOnM#+=8LnQ2Q4zUd+nM+OT26;lqbN{P07dhH{jH | |
397 | > zManE8 caret dLms-Q2;1kB<*Q1a3f8kZr;xX=!Qro@`~@xN*Qj>gx;i;0Z24!~i2uLb`}v |
|
397 | > zManE8 caret dLms-Q2;1kB<*Q1a3f8kZr;xX=!Qro@`~@xN*Qj>gx;i;0Z24!~i2uLb`}v | |
398 | > zA?R$|wvC+m caret Ups=*(4lDh*=UN8{5h(A?p#D caret 2N$8u4Z55!q?ZAh(iEEng9_Zi>IgO |
|
398 | > zA?R$|wvC+m caret Ups=*(4lDh*=UN8{5h(A?p#D caret 2N$8u4Z55!q?ZAh(iEEng9_Zi>IgO | |
399 | > z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl caret *=8x3n&;akBf caret - |
|
399 | > z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl caret *=8x3n&;akBf caret - | |
400 | > zJd&86kq$%%907v caret tgWoQdwI`|oNK%VvU~S#C<o caret F?6c48?Cjj#-4P<>HFD%&|Ni~t |
|
400 | > zJd&86kq$%%907v caret tgWoQdwI`|oNK%VvU~S#C<o caret F?6c48?Cjj#-4P<>HFD%&|Ni~t | |
401 | > zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@ |
|
401 | > zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@ | |
402 | > zX+}l{`A%?f@T5tT%ztu60p;)be`fWC`tP@WpO=?cpf8Xuf1OSj6d3f@Ki(ovDYq%0 |
|
402 | > zX+}l{`A%?f@T5tT%ztu60p;)be`fWC`tP@WpO=?cpf8Xuf1OSj6d3f@Ki(ovDYq%0 | |
403 | > z{4ZSe`kOay5@=lAT!}vFzxyemC{sXDrhuYM0Y#ZI1r%ipD9W11{w=@&xgJ}t2x;ep |
|
403 | > z{4ZSe`kOay5@=lAT!}vFzxyemC{sXDrhuYM0Y#ZI1r%ipD9W11{w=@&xgJ}t2x;ep | |
404 | > P00000NkvXXu0mjfZ5|Er |
|
404 | > P00000NkvXXu0mjfZ5|Er | |
405 | > |
|
405 | > | |
406 | > literal 0 |
|
406 | > literal 0 | |
407 | > HcmV?d00001 |
|
407 | > HcmV?d00001 | |
408 | > |
|
408 | > | |
409 | > EOF |
|
409 | > EOF | |
410 | $ hg import -d "1000000 0" -m delta quote-hack.patch |
|
410 | $ hg import -d "1000000 0" -m delta quote-hack.patch | |
411 | applying quote-hack.patch |
|
411 | applying quote-hack.patch | |
412 | $ rm quote-hack.patch |
|
412 | $ rm quote-hack.patch | |
413 |
|
413 | |||
414 | $ hg manifest --debug | grep delta |
|
414 | $ hg manifest --debug | grep delta | |
415 | 9600f98bb60ce732634d126aaa4ac1ec959c573e 644 delta |
|
415 | 9600f98bb60ce732634d126aaa4ac1ec959c573e 644 delta | |
416 |
|
416 | |||
417 | $ hg import -d "1000000 0" -m delta - <<'EOF' |
|
417 | $ hg import -d "1000000 0" -m delta - <<'EOF' | |
418 | > diff --git a/delta b/delta |
|
418 | > diff --git a/delta b/delta | |
419 | > index 8c9b7831b231c2600843e303e66b521353a200b3..0021dd95bc0dba53c39ce81377126d43731d68df 100644 |
|
419 | > index 8c9b7831b231c2600843e303e66b521353a200b3..0021dd95bc0dba53c39ce81377126d43731d68df 100644 | |
420 | > GIT binary patch |
|
420 | > GIT binary patch | |
421 | > delta 49 |
|
421 | > delta 49 | |
422 | > zcmZ1~yHs|=21Z8J$r~9bFdA-lVv=EEw4WT$qRf2QSa5SIOAHI6(&k4T8H|kLo4vWB |
|
422 | > zcmZ1~yHs|=21Z8J$r~9bFdA-lVv=EEw4WT$qRf2QSa5SIOAHI6(&k4T8H|kLo4vWB | |
423 | > FSO9ZT4bA`n |
|
423 | > FSO9ZT4bA`n | |
424 | > |
|
424 | > | |
425 | > delta 49 |
|
425 | > delta 49 | |
426 | > zcmV-10M7rV9i<(xumJ(}ld%Di0Xefm0vrMXpOaq%BLm9I%d>?9Tm%6Vv*HM70RcC& |
|
426 | > zcmV-10M7rV9i<(xumJ(}ld%Di0Xefm0vrMXpOaq%BLm9I%d>?9Tm%6Vv*HM70RcC& | |
427 | > HOA1;9yU-AD |
|
427 | > HOA1;9yU-AD | |
428 | > |
|
428 | > | |
429 | > EOF |
|
429 | > EOF | |
430 | applying patch from stdin |
|
430 | applying patch from stdin | |
431 |
|
431 | |||
432 | $ hg manifest --debug | grep delta |
|
432 | $ hg manifest --debug | grep delta | |
433 | 56094bbea136dcf8dbd4088f6af469bde1a98b75 644 delta |
|
433 | 56094bbea136dcf8dbd4088f6af469bde1a98b75 644 delta | |
434 |
|
434 | |||
435 | Filenames with spaces: |
|
435 | Filenames with spaces: | |
436 |
|
436 | |||
437 | $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - |
|
437 | $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - | |
438 | > diff --git a/foo bar b/foo bar |
|
438 | > diff --git a/foo bar b/foo bar | |
439 | > new file mode 100644 |
|
439 | > new file mode 100644 | |
440 | > index 0000000..257cc56 |
|
440 | > index 0000000..257cc56 | |
441 | > --- /dev/null |
|
441 | > --- /dev/null | |
442 | > +++ b/foo bar EOL |
|
442 | > +++ b/foo bar EOL | |
443 | > @@ -0,0 +1 @@ |
|
443 | > @@ -0,0 +1 @@ | |
444 | > +foo |
|
444 | > +foo | |
445 | > EOF |
|
445 | > EOF | |
446 | applying patch from stdin |
|
446 | applying patch from stdin | |
447 |
|
447 | |||
448 | $ hg tip -q |
|
448 | $ hg tip -q | |
449 | 14:4b79479c9a6d |
|
449 | 14:4b79479c9a6d | |
450 |
|
450 | |||
451 | $ cat "foo bar" |
|
451 | $ cat "foo bar" | |
452 | foo |
|
452 | foo | |
453 |
|
453 | |||
454 | Copy then modify the original file: |
|
454 | Copy then modify the original file: | |
455 |
|
455 | |||
456 | $ hg import -d "1000000 0" -m copy-mod-orig - <<EOF |
|
456 | $ hg import -d "1000000 0" -m copy-mod-orig - <<EOF | |
457 | > diff --git a/foo2 b/foo2 |
|
457 | > diff --git a/foo2 b/foo2 | |
458 | > index 257cc56..fe08ec6 100644 |
|
458 | > index 257cc56..fe08ec6 100644 | |
459 | > --- a/foo2 |
|
459 | > --- a/foo2 | |
460 | > +++ b/foo2 |
|
460 | > +++ b/foo2 | |
461 | > @@ -1 +1,2 @@ |
|
461 | > @@ -1 +1,2 @@ | |
462 | > foo |
|
462 | > foo | |
463 | > +new line |
|
463 | > +new line | |
464 | > diff --git a/foo2 b/foo3 |
|
464 | > diff --git a/foo2 b/foo3 | |
465 | > similarity index 100% |
|
465 | > similarity index 100% | |
466 | > copy from foo2 |
|
466 | > copy from foo2 | |
467 | > copy to foo3 |
|
467 | > copy to foo3 | |
468 | > EOF |
|
468 | > EOF | |
469 | applying patch from stdin |
|
469 | applying patch from stdin | |
470 |
|
470 | |||
471 | $ hg tip -q |
|
471 | $ hg tip -q | |
472 | 15:9cbe44af4ae9 |
|
472 | 15:9cbe44af4ae9 | |
473 |
|
473 | |||
474 | $ cat foo3 |
|
474 | $ cat foo3 | |
475 | foo |
|
475 | foo | |
476 |
|
476 | |||
477 | Move text file and patch as binary |
|
477 | Move text file and patch as binary | |
478 |
|
478 | |||
479 | $ echo a > text2 |
|
479 | $ echo a > text2 | |
480 | $ hg ci -Am0 |
|
480 | $ hg ci -Am0 | |
481 | adding text2 |
|
481 | adding text2 | |
482 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
|
482 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | |
483 | > diff --git a/text2 b/binary2 |
|
483 | > diff --git a/text2 b/binary2 | |
484 | > rename from text2 |
|
484 | > rename from text2 | |
485 | > rename to binary2 |
|
485 | > rename to binary2 | |
486 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
|
486 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
487 | > GIT binary patch |
|
487 | > GIT binary patch | |
488 | > literal 5 |
|
488 | > literal 5 | |
489 | > Mc$`b*O5$Pw00T?_*Z=?k |
|
489 | > Mc$`b*O5$Pw00T?_*Z=?k | |
490 | > |
|
490 | > | |
491 | > EOF |
|
491 | > EOF | |
492 | applying patch from stdin |
|
492 | applying patch from stdin | |
493 |
|
493 | |||
494 | $ cat binary2 |
|
494 | $ cat binary2 | |
495 | a |
|
495 | a | |
496 | b |
|
496 | b | |
497 | \x00 (no-eol) (esc) |
|
497 | \x00 (no-eol) (esc) | |
498 |
|
498 | |||
499 | $ hg st --copies --change . |
|
499 | $ hg st --copies --change . | |
500 | A binary2 |
|
500 | A binary2 | |
501 | text2 |
|
501 | text2 | |
502 | R text2 |
|
502 | R text2 | |
503 |
|
503 | |||
504 | Invalid base85 content |
|
504 | Invalid base85 content | |
505 |
|
505 | |||
506 | $ hg rollback |
|
506 | $ hg rollback | |
507 | repository tip rolled back to revision 16 (undo import) |
|
507 | repository tip rolled back to revision 16 (undo import) | |
508 | working directory now based on revision 16 |
|
508 | working directory now based on revision 16 | |
509 | $ hg revert -aq |
|
509 | $ hg revert -aq | |
510 | $ hg import -d "1000000 0" -m invalid-binary - <<"EOF" |
|
510 | $ hg import -d "1000000 0" -m invalid-binary - <<"EOF" | |
511 | > diff --git a/text2 b/binary2 |
|
511 | > diff --git a/text2 b/binary2 | |
512 | > rename from text2 |
|
512 | > rename from text2 | |
513 | > rename to binary2 |
|
513 | > rename to binary2 | |
514 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
|
514 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
515 | > GIT binary patch |
|
515 | > GIT binary patch | |
516 | > literal 5 |
|
516 | > literal 5 | |
517 | > Mc$`b*O.$Pw00T?_*Z=?k |
|
517 | > Mc$`b*O.$Pw00T?_*Z=?k | |
518 | > |
|
518 | > | |
519 | > EOF |
|
519 | > EOF | |
520 | applying patch from stdin |
|
520 | applying patch from stdin | |
521 | abort: could not decode "binary2" binary patch: bad base85 character at position 6 |
|
521 | abort: could not decode "binary2" binary patch: bad base85 character at position 6 | |
522 | [255] |
|
522 | [255] | |
523 |
|
523 | |||
524 | $ hg revert -aq |
|
524 | $ hg revert -aq | |
525 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
|
525 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | |
526 | > diff --git a/text2 b/binary2 |
|
526 | > diff --git a/text2 b/binary2 | |
527 | > rename from text2 |
|
527 | > rename from text2 | |
528 | > rename to binary2 |
|
528 | > rename to binary2 | |
529 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
|
529 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
530 | > GIT binary patch |
|
530 | > GIT binary patch | |
531 | > literal 6 |
|
531 | > literal 6 | |
532 | > Mc$`b*O5$Pw00T?_*Z=?k |
|
532 | > Mc$`b*O5$Pw00T?_*Z=?k | |
533 | > |
|
533 | > | |
534 | > EOF |
|
534 | > EOF | |
535 | applying patch from stdin |
|
535 | applying patch from stdin | |
536 | abort: "binary2" length is 5 bytes, should be 6 |
|
536 | abort: "binary2" length is 5 bytes, should be 6 | |
537 | [255] |
|
537 | [255] | |
538 |
|
538 | |||
539 | $ hg revert -aq |
|
539 | $ hg revert -aq | |
540 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" |
|
540 | $ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | |
541 | > diff --git a/text2 b/binary2 |
|
541 | > diff --git a/text2 b/binary2 | |
542 | > rename from text2 |
|
542 | > rename from text2 | |
543 | > rename to binary2 |
|
543 | > rename to binary2 | |
544 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
|
544 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
545 | > GIT binary patch |
|
545 | > GIT binary patch | |
546 | > Mc$`b*O5$Pw00T?_*Z=?k |
|
546 | > Mc$`b*O5$Pw00T?_*Z=?k | |
547 | > |
|
547 | > | |
548 | > EOF |
|
548 | > EOF | |
549 | applying patch from stdin |
|
549 | applying patch from stdin | |
550 | abort: could not extract "binary2" binary data |
|
550 | abort: could not extract "binary2" binary data | |
551 | [255] |
|
551 | [255] | |
552 |
|
552 | |||
553 | Simulate a copy/paste turning LF into CRLF (issue2870) |
|
553 | Simulate a copy/paste turning LF into CRLF (issue2870) | |
554 |
|
554 | |||
555 | $ hg revert -aq |
|
555 | $ hg revert -aq | |
556 | $ cat > binary.diff <<"EOF" |
|
556 | $ cat > binary.diff <<"EOF" | |
557 | > diff --git a/text2 b/binary2 |
|
557 | > diff --git a/text2 b/binary2 | |
558 | > rename from text2 |
|
558 | > rename from text2 | |
559 | > rename to binary2 |
|
559 | > rename to binary2 | |
560 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 |
|
560 | > index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | |
561 | > GIT binary patch |
|
561 | > GIT binary patch | |
562 | > literal 5 |
|
562 | > literal 5 | |
563 | > Mc$`b*O5$Pw00T?_*Z=?k |
|
563 | > Mc$`b*O5$Pw00T?_*Z=?k | |
564 | > |
|
564 | > | |
565 | > EOF |
|
565 | > EOF | |
566 | >>> fp = open('binary.diff', 'rb') |
|
566 | >>> fp = open('binary.diff', 'rb') | |
567 | >>> data = fp.read() |
|
567 | >>> data = fp.read() | |
568 | >>> fp.close() |
|
568 | >>> fp.close() | |
569 | >>> open('binary.diff', 'wb').write(data.replace(b'\n', b'\r\n')) and None |
|
569 | >>> open('binary.diff', 'wb').write(data.replace(b'\n', b'\r\n')) and None | |
570 | $ rm binary2 |
|
570 | $ rm binary2 | |
571 | $ hg import --no-commit binary.diff |
|
571 | $ hg import --no-commit binary.diff | |
572 | applying binary.diff |
|
572 | applying binary.diff | |
573 |
|
573 | |||
574 | $ cd .. |
|
574 | $ cd .. | |
575 |
|
575 | |||
576 | Consecutive import with renames (issue2459) |
|
576 | Consecutive import with renames (issue2459) | |
577 |
|
577 | |||
578 | $ hg init issue2459 |
|
578 | $ hg init issue2459 | |
579 | $ cd issue2459 |
|
579 | $ cd issue2459 | |
580 | $ hg import --no-commit --force - <<EOF |
|
580 | $ hg import --no-commit --force - <<EOF | |
581 | > diff --git a/a b/a |
|
581 | > diff --git a/a b/a | |
582 | > new file mode 100644 |
|
582 | > new file mode 100644 | |
583 | > EOF |
|
583 | > EOF | |
584 | applying patch from stdin |
|
584 | applying patch from stdin | |
585 | $ hg import --no-commit --force - <<EOF |
|
585 | $ hg import --no-commit --force - <<EOF | |
586 | > diff --git a/a b/b |
|
586 | > diff --git a/a b/b | |
587 | > rename from a |
|
587 | > rename from a | |
588 | > rename to b |
|
588 | > rename to b | |
589 | > EOF |
|
589 | > EOF | |
590 | applying patch from stdin |
|
590 | applying patch from stdin | |
591 | a has not been committed yet, so no copy data will be stored for b. |
|
591 | a has not been committed yet, so no copy data will be stored for b. | |
592 | $ hg debugstate |
|
592 | $ hg debugstate | |
593 | a 0 -1 unset b |
|
593 | a 0 -1 unset b | |
594 | $ hg ci -m done |
|
594 | $ hg ci -m done | |
595 | $ cd .. |
|
595 | $ cd .. | |
596 |
|
596 | |||
597 | Renames and strip |
|
597 | Renames and strip | |
598 |
|
598 | |||
599 | $ hg init renameandstrip |
|
599 | $ hg init renameandstrip | |
600 | $ cd renameandstrip |
|
600 | $ cd renameandstrip | |
601 | $ echo a > a |
|
601 | $ echo a > a | |
602 | $ hg ci -Am adda |
|
602 | $ hg ci -Am adda | |
603 | adding a |
|
603 | adding a | |
604 | $ hg import --no-commit -p2 - <<EOF |
|
604 | $ hg import --no-commit -p2 - <<EOF | |
605 | > diff --git a/foo/a b/foo/b |
|
605 | > diff --git a/foo/a b/foo/b | |
606 | > rename from foo/a |
|
606 | > rename from foo/a | |
607 | > rename to foo/b |
|
607 | > rename to foo/b | |
608 | > EOF |
|
608 | > EOF | |
609 | applying patch from stdin |
|
609 | applying patch from stdin | |
610 | $ hg st --copies |
|
610 | $ hg st --copies | |
611 | A b |
|
611 | A b | |
612 | a |
|
612 | a | |
613 | R a |
|
613 | R a | |
614 |
|
614 | |||
615 | Prefix with strip, renames, creates etc |
|
615 | Prefix with strip, renames, creates etc | |
616 |
|
616 | |||
617 | $ hg revert -aC |
|
617 | $ hg revert -aC | |
618 | forgetting b |
|
618 | forgetting b | |
619 | undeleting a |
|
619 | undeleting a | |
620 | $ rm b |
|
620 | $ rm b | |
621 | $ mkdir -p dir/dir2 |
|
621 | $ mkdir -p dir/dir2 | |
622 | $ echo b > dir/dir2/b |
|
622 | $ echo b > dir/dir2/b | |
623 | $ echo c > dir/dir2/c |
|
623 | $ echo c > dir/dir2/c | |
624 | $ echo d > dir/d |
|
624 | $ echo d > dir/d | |
625 | $ hg ci -Am addbcd |
|
625 | $ hg ci -Am addbcd | |
626 | adding dir/d |
|
626 | adding dir/d | |
627 | adding dir/dir2/b |
|
627 | adding dir/dir2/b | |
628 | adding dir/dir2/c |
|
628 | adding dir/dir2/c | |
629 |
|
629 | |||
630 | prefix '.' is the same as no prefix |
|
630 | prefix '.' is the same as no prefix | |
631 | $ hg import --no-commit --prefix . - <<EOF |
|
631 | $ hg import --no-commit --prefix . - <<EOF | |
632 | > diff --git a/dir/a b/dir/a |
|
632 | > diff --git a/dir/a b/dir/a | |
633 | > --- /dev/null |
|
633 | > --- /dev/null | |
634 | > +++ b/dir/a |
|
634 | > +++ b/dir/a | |
635 | > @@ -0,0 +1 @@ |
|
635 | > @@ -0,0 +1 @@ | |
636 | > +aaaa |
|
636 | > +aaaa | |
637 | > diff --git a/dir/d b/dir/d |
|
637 | > diff --git a/dir/d b/dir/d | |
638 | > --- a/dir/d |
|
638 | > --- a/dir/d | |
639 | > +++ b/dir/d |
|
639 | > +++ b/dir/d | |
640 | > @@ -1,1 +1,2 @@ |
|
640 | > @@ -1,1 +1,2 @@ | |
641 | > d |
|
641 | > d | |
642 | > +dddd |
|
642 | > +dddd | |
643 | > EOF |
|
643 | > EOF | |
644 | applying patch from stdin |
|
644 | applying patch from stdin | |
645 | $ cat dir/a |
|
645 | $ cat dir/a | |
646 | aaaa |
|
646 | aaaa | |
647 | $ cat dir/d |
|
647 | $ cat dir/d | |
648 | d |
|
648 | d | |
649 | dddd |
|
649 | dddd | |
650 | $ hg revert -aC |
|
650 | $ hg revert -aC | |
651 | forgetting dir/a |
|
651 | forgetting dir/a | |
652 | reverting dir/d |
|
652 | reverting dir/d | |
653 | $ rm dir/a |
|
653 | $ rm dir/a | |
654 |
|
654 | |||
655 | prefix with default strip |
|
655 | prefix with default strip | |
656 | $ hg import --no-commit --prefix dir/ - <<EOF |
|
656 | $ hg import --no-commit --prefix dir/ - <<EOF | |
657 | > diff --git a/a b/a |
|
657 | > diff --git a/a b/a | |
658 | > --- /dev/null |
|
658 | > --- /dev/null | |
659 | > +++ b/a |
|
659 | > +++ b/a | |
660 | > @@ -0,0 +1 @@ |
|
660 | > @@ -0,0 +1 @@ | |
661 | > +aaa |
|
661 | > +aaa | |
662 | > diff --git a/d b/d |
|
662 | > diff --git a/d b/d | |
663 | > --- a/d |
|
663 | > --- a/d | |
664 | > +++ b/d |
|
664 | > +++ b/d | |
665 | > @@ -1,1 +1,2 @@ |
|
665 | > @@ -1,1 +1,2 @@ | |
666 | > d |
|
666 | > d | |
667 | > +dd |
|
667 | > +dd | |
668 | > EOF |
|
668 | > EOF | |
669 | applying patch from stdin |
|
669 | applying patch from stdin | |
670 | $ cat dir/a |
|
670 | $ cat dir/a | |
671 | aaa |
|
671 | aaa | |
672 | $ cat dir/d |
|
672 | $ cat dir/d | |
673 | d |
|
673 | d | |
674 | dd |
|
674 | dd | |
675 | $ hg revert -aC |
|
675 | $ hg revert -aC | |
676 | forgetting dir/a |
|
676 | forgetting dir/a | |
677 | reverting dir/d |
|
677 | reverting dir/d | |
678 | $ rm dir/a |
|
678 | $ rm dir/a | |
679 | (test that prefixes are relative to the cwd) |
|
679 | (test that prefixes are relative to the cwd) | |
680 | $ mkdir tmpdir |
|
680 | $ mkdir tmpdir | |
681 | $ cd tmpdir |
|
681 | $ cd tmpdir | |
682 | $ hg import --no-commit -p2 --prefix ../dir/ - <<EOF |
|
682 | $ hg import --no-commit -p2 --prefix ../dir/ - <<EOF | |
683 | > diff --git a/foo/a b/foo/a |
|
683 | > diff --git a/foo/a b/foo/a | |
684 | > new file mode 100644 |
|
684 | > new file mode 100644 | |
685 | > --- /dev/null |
|
685 | > --- /dev/null | |
686 | > +++ b/foo/a |
|
686 | > +++ b/foo/a | |
687 | > @@ -0,0 +1 @@ |
|
687 | > @@ -0,0 +1 @@ | |
688 | > +a |
|
688 | > +a | |
689 | > diff --git a/foo/dir2/b b/foo/dir2/b2 |
|
689 | > diff --git a/foo/dir2/b b/foo/dir2/b2 | |
690 | > rename from foo/dir2/b |
|
690 | > rename from foo/dir2/b | |
691 | > rename to foo/dir2/b2 |
|
691 | > rename to foo/dir2/b2 | |
692 | > diff --git a/foo/dir2/c b/foo/dir2/c |
|
692 | > diff --git a/foo/dir2/c b/foo/dir2/c | |
693 | > --- a/foo/dir2/c |
|
693 | > --- a/foo/dir2/c | |
694 | > +++ b/foo/dir2/c |
|
694 | > +++ b/foo/dir2/c | |
695 | > @@ -0,0 +1 @@ |
|
695 | > @@ -0,0 +1 @@ | |
696 | > +cc |
|
696 | > +cc | |
697 | > diff --git a/foo/d b/foo/d |
|
697 | > diff --git a/foo/d b/foo/d | |
698 | > deleted file mode 100644 |
|
698 | > deleted file mode 100644 | |
699 | > --- a/foo/d |
|
699 | > --- a/foo/d | |
700 | > +++ /dev/null |
|
700 | > +++ /dev/null | |
701 | > @@ -1,1 +0,0 @@ |
|
701 | > @@ -1,1 +0,0 @@ | |
702 | > -d |
|
702 | > -d | |
703 | > EOF |
|
703 | > EOF | |
704 | applying patch from stdin |
|
704 | applying patch from stdin | |
705 | $ hg st --copies |
|
705 | $ hg st --copies | |
706 | M dir/dir2/c |
|
706 | M dir/dir2/c | |
707 | A dir/a |
|
707 | A dir/a | |
708 | A dir/dir2/b2 |
|
708 | A dir/dir2/b2 | |
709 | dir/dir2/b |
|
709 | dir/dir2/b | |
710 | R dir/d |
|
710 | R dir/d | |
711 | R dir/dir2/b |
|
711 | R dir/dir2/b | |
712 | $ cd .. |
|
712 | $ cd .. | |
713 |
|
713 | |||
714 | Renames, similarity and git diff |
|
714 | Renames, similarity and git diff | |
715 |
|
715 | |||
716 | $ hg revert -aC |
|
716 | $ hg revert -aC | |
717 | forgetting dir/a |
|
717 | forgetting dir/a | |
718 | forgetting dir/dir2/b2 |
|
718 | forgetting dir/dir2/b2 | |
719 | reverting dir/dir2/c |
|
719 | reverting dir/dir2/c | |
720 | undeleting dir/d |
|
720 | undeleting dir/d | |
721 | undeleting dir/dir2/b |
|
721 | undeleting dir/dir2/b | |
722 | $ rm dir/a dir/dir2/b2 |
|
722 | $ rm dir/a dir/dir2/b2 | |
723 | $ hg import --similarity 90 --no-commit - <<EOF |
|
723 | $ hg import --similarity 90 --no-commit - <<EOF | |
724 | > diff --git a/a b/b |
|
724 | > diff --git a/a b/b | |
725 | > rename from a |
|
725 | > rename from a | |
726 | > rename to b |
|
726 | > rename to b | |
727 | > EOF |
|
727 | > EOF | |
728 | applying patch from stdin |
|
728 | applying patch from stdin | |
729 | $ hg st --copies |
|
729 | $ hg st --copies | |
730 | A b |
|
730 | A b | |
731 | a |
|
731 | a | |
732 | R a |
|
732 | R a | |
733 | $ cd .. |
|
733 | $ cd .. | |
734 |
|
734 | |||
735 | Pure copy with existing destination |
|
735 | Pure copy with existing destination | |
736 |
|
736 | |||
737 | $ hg init copytoexisting |
|
737 | $ hg init copytoexisting | |
738 | $ cd copytoexisting |
|
738 | $ cd copytoexisting | |
739 | $ echo a > a |
|
739 | $ echo a > a | |
740 | $ echo b > b |
|
740 | $ echo b > b | |
741 | $ hg ci -Am add |
|
741 | $ hg ci -Am add | |
742 | adding a |
|
742 | adding a | |
743 | adding b |
|
743 | adding b | |
744 | $ hg import --no-commit - <<EOF |
|
744 | $ hg import --no-commit - <<EOF | |
745 | > diff --git a/a b/b |
|
745 | > diff --git a/a b/b | |
746 | > copy from a |
|
746 | > copy from a | |
747 | > copy to b |
|
747 | > copy to b | |
748 | > EOF |
|
748 | > EOF | |
749 | applying patch from stdin |
|
749 | applying patch from stdin | |
750 | abort: cannot create b: destination already exists |
|
750 | abort: cannot create b: destination already exists | |
751 | [255] |
|
751 | [255] | |
752 | $ cat b |
|
752 | $ cat b | |
753 | b |
|
753 | b | |
754 |
|
754 | |||
755 | Copy and changes with existing destination |
|
755 | Copy and changes with existing destination | |
756 |
|
756 | |||
757 | $ hg import --no-commit - <<EOF |
|
757 | $ hg import --no-commit - <<EOF | |
758 | > diff --git a/a b/b |
|
758 | > diff --git a/a b/b | |
759 | > copy from a |
|
759 | > copy from a | |
760 | > copy to b |
|
760 | > copy to b | |
761 | > --- a/a |
|
761 | > --- a/a | |
762 | > +++ b/b |
|
762 | > +++ b/b | |
763 | > @@ -1,1 +1,2 @@ |
|
763 | > @@ -1,1 +1,2 @@ | |
764 | > a |
|
764 | > a | |
765 | > +b |
|
765 | > +b | |
766 | > EOF |
|
766 | > EOF | |
767 | applying patch from stdin |
|
767 | applying patch from stdin | |
768 | cannot create b: destination already exists |
|
768 | cannot create b: destination already exists | |
769 | 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
|
769 | 1 out of 1 hunks FAILED -- saving rejects to file b.rej | |
770 | abort: patch failed to apply |
|
770 | abort: patch failed to apply | |
771 | [255] |
|
771 | [255] | |
772 | $ cat b |
|
772 | $ cat b | |
773 | b |
|
773 | b | |
774 |
|
774 | |||
775 | #if symlink |
|
775 | #if symlink | |
776 |
|
776 | |||
777 | $ ln -s b linkb |
|
777 | $ ln -s b linkb | |
778 | $ hg add linkb |
|
778 | $ hg add linkb | |
779 | $ hg ci -m addlinkb |
|
779 | $ hg ci -m addlinkb | |
780 | $ hg import --no-commit - <<EOF |
|
780 | $ hg import --no-commit - <<EOF | |
781 | > diff --git a/linkb b/linkb |
|
781 | > diff --git a/linkb b/linkb | |
782 | > deleted file mode 120000 |
|
782 | > deleted file mode 120000 | |
783 | > --- a/linkb |
|
783 | > --- a/linkb | |
784 | > +++ /dev/null |
|
784 | > +++ /dev/null | |
785 | > @@ -1,1 +0,0 @@ |
|
785 | > @@ -1,1 +0,0 @@ | |
786 | > -badhunk |
|
786 | > -badhunk | |
787 | > \ No newline at end of file |
|
787 | > \ No newline at end of file | |
788 | > EOF |
|
788 | > EOF | |
789 | applying patch from stdin |
|
789 | applying patch from stdin | |
790 | patching file linkb |
|
790 | patching file linkb | |
791 | Hunk #1 FAILED at 0 |
|
791 | Hunk #1 FAILED at 0 | |
792 | 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej |
|
792 | 1 out of 1 hunks FAILED -- saving rejects to file linkb.rej | |
793 | abort: patch failed to apply |
|
793 | abort: patch failed to apply | |
794 | [255] |
|
794 | [255] | |
795 | $ hg st |
|
795 | $ hg st | |
796 | ? b.rej |
|
796 | ? b.rej | |
797 | ? linkb.rej |
|
797 | ? linkb.rej | |
798 |
|
798 | |||
799 | #endif |
|
799 | #endif | |
800 |
|
800 | |||
801 | Test corner case involving copies and multiple hunks (issue3384) |
|
801 | Test corner case involving copies and multiple hunks (issue3384) | |
802 |
|
802 | |||
803 | $ hg revert -qa |
|
803 | $ hg revert -qa | |
804 | $ hg import --no-commit - <<EOF |
|
804 | $ hg import --no-commit - <<EOF | |
805 | > diff --git a/a b/c |
|
805 | > diff --git a/a b/c | |
806 | > copy from a |
|
806 | > copy from a | |
807 | > copy to c |
|
807 | > copy to c | |
808 | > --- a/a |
|
808 | > --- a/a | |
809 | > +++ b/c |
|
809 | > +++ b/c | |
810 | > @@ -1,1 +1,2 @@ |
|
810 | > @@ -1,1 +1,2 @@ | |
811 | > a |
|
811 | > a | |
812 | > +a |
|
812 | > +a | |
813 | > @@ -2,1 +2,2 @@ |
|
813 | > @@ -2,1 +2,2 @@ | |
814 | > a |
|
814 | > a | |
815 | > +a |
|
815 | > +a | |
816 | > diff --git a/a b/a |
|
816 | > diff --git a/a b/a | |
817 | > --- a/a |
|
817 | > --- a/a | |
818 | > +++ b/a |
|
818 | > +++ b/a | |
819 | > @@ -1,1 +1,2 @@ |
|
819 | > @@ -1,1 +1,2 @@ | |
820 | > a |
|
820 | > a | |
821 | > +b |
|
821 | > +b | |
822 | > EOF |
|
822 | > EOF | |
823 | applying patch from stdin |
|
823 | applying patch from stdin | |
824 |
|
824 | |||
825 | Test email metadata |
|
825 | Test email metadata | |
826 |
|
826 | |||
827 | $ hg revert -qa |
|
827 | $ hg revert -qa | |
828 | $ hg --encoding utf-8 import - <<EOF |
|
828 | $ hg --encoding utf-8 import - <<EOF | |
829 |
> From: =? |
|
829 | > From: =?utf-8?q?Rapha=C3=ABl_Hertzog_=3Chertzog=40debian=2Eorg=3E?= | |
830 | > Subject: [PATCH] =?UTF-8?q?=C5=A7=E2=82=AC=C3=9F=E1=B9=AA?= |
|
830 | > Subject: [PATCH] =?UTF-8?q?=C5=A7=E2=82=AC=C3=9F=E1=B9=AA?= | |
831 | > |
|
831 | > | |
832 | > diff --git a/a b/a |
|
832 | > diff --git a/a b/a | |
833 | > --- a/a |
|
833 | > --- a/a | |
834 | > +++ b/a |
|
834 | > +++ b/a | |
835 | > @@ -1,1 +1,2 @@ |
|
835 | > @@ -1,1 +1,2 @@ | |
836 | > a |
|
836 | > a | |
837 | > +a |
|
837 | > +a | |
838 | > EOF |
|
838 | > EOF | |
839 | applying patch from stdin |
|
839 | applying patch from stdin | |
840 | $ hg --encoding utf-8 log -r . |
|
840 | $ hg --encoding utf-8 log -r . | |
841 | changeset: *:* (glob) |
|
841 | changeset: *:* (glob) | |
842 | tag: tip |
|
842 | tag: tip | |
843 | user: Rapha\xc3\xabl Hertzog <hertzog@debian.org> (esc) |
|
843 | user: Rapha\xc3\xabl Hertzog <hertzog@debian.org> (esc) | |
844 | date: * (glob) |
|
844 | date: * (glob) | |
845 | summary: \xc5\xa7\xe2\x82\xac\xc3\x9f\xe1\xb9\xaa (esc) |
|
845 | summary: \xc5\xa7\xe2\x82\xac\xc3\x9f\xe1\xb9\xaa (esc) | |
846 |
|
846 | |||
847 |
|
847 | |||
848 | $ cd .. |
|
848 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now