Show More
@@ -9,7 +9,7 b'' | |||||
9 | <?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?> |
|
9 | <?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?> | |
10 | <?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?> |
|
10 | <?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?> | |
11 |
|
11 | |||
12 | <Product Name='Mercurial' Id='*' |
|
12 | <Product Name='Mercurial $(var.Version)' Id='*' | |
13 | UpgradeCode='$(var.ProductUpgradeCode)' |
|
13 | UpgradeCode='$(var.ProductUpgradeCode)' | |
14 | Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'> |
|
14 | Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'> | |
15 |
|
15 | |||
@@ -80,12 +80,12 b'' | |||||
80 |
|
80 | |||
81 | <Directory Id="DesktopFolder" Name="Desktop" /> |
|
81 | <Directory Id="DesktopFolder" Name="Desktop" /> | |
82 | <Merge Id='VCRuntime' DiskId='1' Language='1033' |
|
82 | <Merge Id='VCRuntime' DiskId='1' Language='1033' | |
83 |
SourceFile=' |
|
83 | SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' /> | |
84 | <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' |
|
84 | <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' | |
85 |
SourceFile=' |
|
85 | SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> | |
86 | </Directory> |
|
86 | </Directory> | |
87 |
|
87 | |||
88 |
<Feature Id='Complete' Title='Mercurial |
|
88 | <Feature Id='Complete' Title='Mercurial' Description='The complete package' | |
89 | Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > |
|
89 | Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > | |
90 | <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' |
|
90 | <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' | |
91 | Level='1' Absent='disallow' > |
|
91 | Level='1' Absent='disallow' > |
@@ -96,13 +96,11 b' class patchheader(object):' | |||||
96 |
|
96 | |||
97 | for line in file(pf): |
|
97 | for line in file(pf): | |
98 | line = line.rstrip() |
|
98 | line = line.rstrip() | |
99 |
if line.startswith('diff --git') |
|
99 | if (line.startswith('diff --git') | |
|
100 | or (diffstart and line.startswith('+++ '))): | |||
100 | diffstart = 2 |
|
101 | diffstart = 2 | |
101 | break |
|
102 | break | |
102 |
if |
|
103 | diffstart = 0 # reset | |
103 | if line.startswith('+++ '): |
|
|||
104 | diffstart = 2 |
|
|||
105 | break |
|
|||
106 | if line.startswith("--- "): |
|
104 | if line.startswith("--- "): | |
107 | diffstart = 1 |
|
105 | diffstart = 1 | |
108 | continue |
|
106 | continue |
@@ -61,7 +61,7 b' class filelog(revlog.revlog):' | |||||
61 | """compare text with a given file revision""" |
|
61 | """compare text with a given file revision""" | |
62 |
|
62 | |||
63 | # for renames, we have to go the slow way |
|
63 | # for renames, we have to go the slow way | |
64 | if self.renamed(node): |
|
64 | if text.startswith('\1\n') or self.renamed(node): | |
65 | t2 = self.read(node) |
|
65 | t2 = self.read(node) | |
66 | return t2 != text |
|
66 | return t2 != text | |
67 |
|
67 |
@@ -209,6 +209,7 b' def clone(ui, source, dest=None, pull=Fa' | |||||
209 | src_repo = repository(ui, source) |
|
209 | src_repo = repository(ui, source) | |
210 | else: |
|
210 | else: | |
211 | src_repo = source |
|
211 | src_repo = source | |
|
212 | branch = None | |||
212 | origsource = source = src_repo.url() |
|
213 | origsource = source = src_repo.url() | |
213 | rev, checkout = addbranchrevs(src_repo, src_repo, branch, rev) |
|
214 | rev, checkout = addbranchrevs(src_repo, src_repo, branch, rev) | |
214 |
|
215 |
@@ -1091,10 +1091,11 b' class localrepository(repo.repository):' | |||||
1091 | rejected.append(f) |
|
1091 | rejected.append(f) | |
1092 | continue |
|
1092 | continue | |
1093 | if st.st_size > 10000000: |
|
1093 | if st.st_size > 10000000: | |
1094 |
self.ui.warn(_("%s: |
|
1094 | self.ui.warn(_("%s: up to %d MB of RAM may be required " | |
1095 |
" |
|
1095 | "to manage this file\n" | |
1096 |
"(use 'hg revert %s' to |
|
1096 | "(use 'hg revert %s' to cancel the " | |
1097 |
|
|
1097 | "pending addition)\n") | |
|
1098 | % (f, 3 * st.st_size // 1000000, f)) | |||
1098 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): |
|
1099 | if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): | |
1099 | self.ui.warn(_("%s not added: only files and symlinks " |
|
1100 | self.ui.warn(_("%s not added: only files and symlinks " | |
1100 | "supported currently\n") % f) |
|
1101 | "supported currently\n") % f) |
@@ -178,7 +178,8 b' def extract(ui, fileobj):' | |||||
178 | # (this heuristic is borrowed from quilt) |
|
178 | # (this heuristic is borrowed from quilt) | |
179 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' |
|
179 | diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' | |
180 | r'retrieving revision [0-9]+(\.[0-9]+)*$|' |
|
180 | r'retrieving revision [0-9]+(\.[0-9]+)*$|' | |
181 |
r' |
|
181 | r'---[ \t].*?^\+\+\+[ \t]|' | |
|
182 | r'\*\*\*[ \t].*?^---[ \t])', re.MULTILINE|re.DOTALL) | |||
182 |
|
183 | |||
183 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') |
|
184 | fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') | |
184 | tmpfp = os.fdopen(fd, 'w') |
|
185 | tmpfp = os.fdopen(fd, 'w') |
@@ -375,6 +375,25 b" hg import -d '0 0' a.patch" | |||||
375 | hg parents -v |
|
375 | hg parents -v | |
376 | cd .. |
|
376 | cd .. | |
377 |
|
377 | |||
|
378 | echo % '--- in commit message' | |||
|
379 | hg init commitconfusion | |||
|
380 | cd commitconfusion | |||
|
381 | cat > a.patch <<EOF | |||
|
382 | module: summary | |||
|
383 | ||||
|
384 | --- description | |||
|
385 | ||||
|
386 | diff --git a/a b/a | |||
|
387 | new file mode 100644 | |||
|
388 | --- /dev/null | |||
|
389 | +++ b/a | |||
|
390 | @@ -0,0 +1,1 @@ | |||
|
391 | +a | |||
|
392 | EOF | |||
|
393 | hg import -d '0 0' a.patch | |||
|
394 | hg parents -v | |||
|
395 | cd .. | |||
|
396 | ||||
378 | echo '% tricky header splitting' |
|
397 | echo '% tricky header splitting' | |
379 | cat > trickyheaders.patch <<EOF |
|
398 | cat > trickyheaders.patch <<EOF | |
380 | From: User A <user@a> |
|
399 | From: User A <user@a> |
@@ -318,6 +318,17 b' module: summary' | |||||
318 | description |
|
318 | description | |
319 |
|
319 | |||
320 |
|
320 | |||
|
321 | % --- in commit message | |||
|
322 | applying a.patch | |||
|
323 | changeset: 0:f34d9187897d | |||
|
324 | tag: tip | |||
|
325 | user: test | |||
|
326 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
327 | files: a | |||
|
328 | description: | |||
|
329 | module: summary | |||
|
330 | ||||
|
331 | ||||
321 | % tricky header splitting |
|
332 | % tricky header splitting | |
322 | applying ../trickyheaders.patch |
|
333 | applying ../trickyheaders.patch | |
323 | # HG changeset patch |
|
334 | # HG changeset patch |
@@ -86,6 +86,11 b' cd f' | |||||
86 | hg init --mq |
|
86 | hg init --mq | |
87 | cd .. |
|
87 | cd .. | |
88 |
|
88 | |||
|
89 | echo '% init --mq with repo path' | |||
|
90 | hg init g | |||
|
91 | hg init --mq g | |||
|
92 | test -d g/.hg/patches/.hg && echo "ok" || echo "failed" | |||
|
93 | ||||
89 | echo '% init --mq with nonexistent directory' |
|
94 | echo '% init --mq with nonexistent directory' | |
90 | hg init --mq nonexistentdir |
|
95 | hg init --mq nonexistentdir | |
91 |
|
96 |
@@ -43,6 +43,7 b' Text before patch.' | |||||
43 | First line of commit message. |
|
43 | First line of commit message. | |
44 |
|
44 | |||
45 | More text in commit message. |
|
45 | More text in commit message. | |
|
46 | --- confuse the diff detection | |||
46 |
|
47 | |||
47 | diff --git a/x b/x |
|
48 | diff --git a/x b/x | |
48 | new file mode 100644 |
|
49 | new file mode 100644 |
@@ -91,6 +91,8 b' A' | |||||
91 | B |
|
91 | B | |
92 | % init --mq without repo |
|
92 | % init --mq without repo | |
93 | abort: There is no Mercurial repository here (.hg not found) |
|
93 | abort: There is no Mercurial repository here (.hg not found) | |
|
94 | % init --mq with repo path | |||
|
95 | ok | |||
94 | % init --mq with nonexistent directory |
|
96 | % init --mq with nonexistent directory | |
95 | abort: repository nonexistentdir not found! |
|
97 | abort: repository nonexistentdir not found! | |
96 | % init --mq with bundle (non "local") |
|
98 | % init --mq with bundle (non "local") |
General Comments 0
You need to be logged in to leave comments.
Login now