Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Matt Mackall
- Fri, 19 Mar 2010 21:04:00
Show More
contrib/wix/mercurial.wxs
0
+4
-4
@@
-9,7
+9,7
b''
9
9
<?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?>
10
10
<?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?>
11
11
12
<Product Name='Mercurial' Id='*'
12
<Product Name='Mercurial $(var.Version) ' Id='*'
13
13
UpgradeCode='$(var.ProductUpgradeCode)'
14
14
Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'>
15
15
@@
-80,12
+80,12
b''
80
80
81
81
<Directory Id="DesktopFolder" Name="Desktop" />
82
82
<Merge Id='VCRuntime' DiskId='1' Language='1033'
83
SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' />
83
SourceFile='$(var.VCRedistSrcDir) \microsoft.vcxx.crt.x86_msm.msm' />
84
84
<Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
85
SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
85
SourceFile='$(var.VCRedistSrcDir) \policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
86
86
</Directory>
87
87
88
<Feature Id='Complete' Title='Mercurial $(var.Version)' Description='The complete package'
88
<Feature Id='Complete' Title='Mercurial' Description='The complete package'
89
89
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
90
90
<Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
91
91
Level='1' Absent='disallow' >
hgext/mq.py
0
+3
-5
@@
-96,13
+96,11
b' class patchheader(object):'
96
96
97
97
for line in file ( pf ):
98
98
line = line . rstrip ()
99
if line . startswith ( 'diff --git' ):
99
if ( line . startswith ( 'diff --git' )
100
or ( diffstart and line . startswith ( '+++ ' ))):
100
101
diffstart = 2
101
102
break
102
if diffstart:
103
if line . startswith ( '+++ ' ):
104
diffstart = 2
105
break
103
d iffstart = 0 # reset
106
104
if line . startswith ( "--- " ):
107
105
diffstart = 1
108
106
continue
mercurial/filelog.py
0
+1
-1
@@
-61,7
+61,7
b' class filelog(revlog.revlog):'
61
61
"""compare text with a given file revision"""
62
62
63
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
65
t2 = self . read ( node )
66
66
return t2 != text
67
67
mercurial/hg.py
0
+1
0
@@
-209,6
+209,7
b' def clone(ui, source, dest=None, pull=Fa'
209
209
src_repo = repository ( ui , source )
210
210
else :
211
211
src_repo = source
212
branch = None
212
213
origsource = source = src_repo . url ()
213
214
rev , checkout = addbranchrevs ( src_repo , src_repo , branch , rev )
214
215
mercurial/localrepo.py
0
+5
-4
@@
-1091,10
+1091,11
b' class localrepository(repo.repository):'
1091
1091
rejected . append ( f )
1092
1092
continue
1093
1093
if st . st_size > 10000000 :
1094
self . ui . warn ( _ ( " %s : files over 10MB may cause memory and"
1095
" performance problems \n "
1096
"(use 'hg revert %s ' to unadd the file) \n" )
1097
% (f, f))
1094
self . ui . warn ( _ ( " %s : up to %d MB of RAM may be required "
1095
"to manage this file \n "
1096
"(use 'hg revert %s ' to cancel the "
1097
"pending addition) \n " )
1098
% ( f , 3 * st . st_size // 1000000 , f ))
1098
1099
if not ( stat . S_ISREG ( st . st_mode ) or stat . S_ISLNK ( st . st_mode )):
1099
1100
self . ui . warn ( _ ( " %s not added: only files and symlinks "
1100
1101
"supported currently \n " ) % f )
mercurial/patch.py
0
+2
-1
@@
-178,7
+178,8
b' def extract(ui, fileobj):'
178
178
# (this heuristic is borrowed from quilt)
179
179
diffre = re . compile ( r '^(?:Index:[ \t]|diff[ \t]|RCS file: |'
180
180
r 'retrieving revision [0-9]+(\.[0-9]+)*$|'
181
r '(---|\*\*\*)[ \t])' , re.MULTILINE)
181
r '---[ \t]. *?^ \+ \+ \+[ \t]| '
182
r '\*\*\*[ \t].*?^---[ \t])' , re . MULTILINE | re . DOTALL )
182
183
183
184
fd , tmpname = tempfile . mkstemp ( prefix = 'hg-patch-' )
184
185
tmpfp = os . fdopen ( fd , 'w' )
tests/test-import
0
+19
0
@@
-375,6
+375,25
b" hg import -d '0 0' a.patch"
375
375
hg parents -v
376
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
397
echo '% tricky header splitting'
379
398
cat > trickyheaders.patch <<EOF
380
399
From: User A <user@a>
tests/test-import.out
0
+11
0
@@
-318,6
+318,17
b' module: summary'
318
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
332
% tricky header splitting
322
333
applying ../trickyheaders.patch
323
334
# HG changeset patch
tests/test-mq
0
+5
0
@@
-86,6
+86,11
b' cd f'
86
86
hg init --mq
87
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
94
echo '% init --mq with nonexistent directory'
90
95
hg init --mq nonexistentdir
91
96
tests/test-mq-qimport
0
+1
0
@@
-43,6
+43,7
b' Text before patch.'
43
43
First line of commit message.
44
44
45
45
More text in commit message.
46
--- confuse the diff detection
46
47
47
48
diff --git a/x b/x
48
49
new file mode 100644
tests/test-mq.out
0
+2
0
@@
-91,6
+91,8
b' A'
91
91
B
92
92
% init --mq without repo
93
93
abort: There is no Mercurial repository here (.hg not found)
94
% init --mq with repo path
95
ok
94
96
% init --mq with nonexistent directory
95
97
abort: repository nonexistentdir not found!
96
98
% init --mq with bundle (non "local")
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages