Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Thomas Arendsen Hein
- Thu, 21 Jun 2007 07:25:49
Show More
hgeditor
0
+1
-1
@@
-42,7
+42,7
b' HGTMP="${TMPDIR-/tmp}/hgeditor.$RANDOM.$'
42
42
cat "$1" > "$HGTMP/msg"
43
43
44
44
MD5=$(which md5sum 2>/dev/null) || \
45
MD5=$(which md5 2>/dev/null)
45
MD5=$(which md5 2>/dev/null)
46
46
[ -x "${MD5}" ] && CHECKSUM=`${MD5} "$HGTMP/msg"`
47
47
if [ -s "$HGTMP/diff" ]; then
48
48
$EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $?
mercurial/commands.py
0
+1
-1
@@
-2515,7
+2515,7
b' def tag(ui, repo, name, rev_=None, **opt'
2515
2515
rev_ = opts [ 'rev' ]
2516
2516
message = opts [ 'message' ]
2517
2517
if opts [ 'remove' ]:
2518
if not name in repo . tags ():
2518
if not name in repo . tags ():
2519
2519
raise util . Abort ( _ ( 'tag %s does not exist' ) % name )
2520
2520
rev_ = nullid
2521
2521
if not message :
mercurial/patch.py
0
+1
-1
@@
-303,7
+303,7
b' def patch(patchname, ui, strip=1, cwd=No'
303
303
# Try to be smart only if patch call was not supplied
304
304
if util . needbinarypatch ():
305
305
args . append ( '--binary' )
306
306
307
307
if not patcher :
308
308
raise util . Abort ( _ ( 'no patch command found in hgrc or PATH' ))
309
309
templates/gitweb/map
0
+1
-1
@@
-51,7
+51,7
b' branchtag = \'<span class="branchtag" tit'
51
51
shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b> <span class="logtags">{branches%branchtag}{tags%tagtag}</span></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
52
52
filelogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link"><a href="{url}file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> | <a href="{url}diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">diff</a> | <a href="{url}annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> #rename%filelogrename#</td></tr>'
53
53
archiveentry = ' | <a href="{url}archive/{node|short}{extension}">#type|escape#</a> '
54
indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
54
indexentry = '<tr class="parity#parity#"><td><a class="list" href="#url#{sessionvars%urlparameter}"><b>#name|escape#</b></a></td><td>#description#</td><td>#contact|obfuscate#</td><td class="age">#lastchange|age# ago</td><td class="indexlinks"><a class="rss_logo" href="#url#rss-log">RSS</a> #archives%archiveentry#</td></tr>'
55
55
index = index.tmpl
56
56
urlparameter = '#separator##name#=#value|urlescape#'
57
57
hiddenformentry = '<input type="hidden" name="#name#" value="#value|escape#" />'
templates/static/style.css
0
+2
-2
@@
-3,7
+3,7
b' a { text-decoration:none; }'
3
3
. indexlinks { white-space : nowrap ; }
4
4
. parity0 { background-color : #dddddd ; }
5
5
. parity1 { background-color : #eeeeee ; }
6
. lineno { width : 60 px ; color : #aaaaaa ; font-size : smaller ;
6
. lineno { width : 60 px ; color : #aaaaaa ; font-size : smaller ;
7
7
text-align : right ; padding-right : 1 em ; }
8
8
. plusline { color : green ; }
9
9
. minusline { color : red ; }
@@
-46,7
+46,7
b' pre { margin: 0; }'
46
46
47
47
. logo a {
48
48
font-weight : bold ;
49
font-size : 150 % ;
49
font-size : 150 % ;
50
50
color : #999 ;
51
51
}
52
52
tests/printenv.py
0
+1
-1
@@
-27,7
+27,7
b' if len(sys.argv) > 2:'
27
27
28
28
# variables with empty values may not exist on all platforms, filter
29
29
# them now for portability sake.
30
env = [ k for k , v in os . environ . iteritems ()
30
env = [ k for k , v in os . environ . iteritems ()
31
31
if k . startswith ( "HG_" ) and v ]
32
32
env . sort ()
33
33
tests/test-annotate
0
+1
-1
@@
-78,7
+78,7
b' echo % linkrev vs rev'
78
78
hg annotate -r tip a
79
79
80
80
# test issue 589
81
# annotate was crashing when trying to --follow something
81
# annotate was crashing when trying to --follow something
82
82
# like A -> B -> A
83
83
echo % generate ABA rename configuration
84
84
echo foo > foo
tests/test-dispatch
0
+1
-1
@@
-22,4
+22,4
b' cd ..'
22
22
hg cat
23
23
24
24
exit 0
25
No newline at end of file
25
tests/test-empty-file
0
+1
-1
@@
-18,7
+18,7
b" hg commit -m 'add empty3' -d '1000000 0'"
18
18
hg heads
19
19
20
20
hg merge 1
21
# before changeset 05257fd28591, we didn't notice the
21
# before changeset 05257fd28591, we didn't notice the
22
22
# empty file that came from rev 1.
23
23
hg status
24
24
hg commit -m merge -d '1000000 0'
tests/test-empty-group
0
+7
-7
@@
-1,12
+1,12
b''
1
1
#!/bin/sh
2
2
#
3
# A B
4
#
5
# 3 4 3
6
# |\/| |\
7
# |/\| | \
8
# 1 2 1 2
9
# \ / \ /
3
# A B
4
#
5
# 3 4 3
6
# |\/| |\
7
# |/\| | \
8
# 1 2 1 2
9
# \ / \ /
10
10
# 0 0
11
11
#
12
12
# if the result of the merge of 1 and 2
tests/test-hgrc
0
+1
-1
@@
-4,4
+4,4
b' mkdir t'
4
4
cd t
5
5
hg init
6
6
echo "invalid" > .hg/hgrc
7
hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"
7
hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"
tests/test-hook
0
+1
-1
@@
-40,7
+40,7
b" hg commit -m merge -d '2 0'"
40
40
41
41
# test generic hooks
42
42
hg id
43
hg cat b
43
hg cat b
44
44
45
45
cd ../b
46
46
hg pull ../a
tests/test-issue322
0
+6
-6
@@
-4,17
+4,17
b''
4
4
echo % file replaced with directory
5
5
6
6
hg init a
7
cd a
8
echo a > a
9
hg commit -Ama
10
rm a
11
mkdir a
7
cd a
8
echo a > a
9
hg commit -Ama
10
rm a
11
mkdir a
12
12
echo a > a/a
13
13
14
14
echo % should fail - would corrupt dirstate
15
15
hg add a/a
16
16
17
cd ..
17
cd ..
18
18
19
19
echo % directory replaced with file
20
20
tests/test-issue433
0
+3
-3
@@
-2,9
+2,9
b''
2
2
# http://www.selenic.com/mercurial/bts/issue433
3
3
4
4
hg init a
5
cd a
6
echo a > a
7
hg commit -Ama
5
cd a
6
echo a > a
7
hg commit -Ama
8
8
9
9
hg parents -r 0 doesnotexist
10
10
true
tests/test-mq-qrefresh-replace-log-message
0
+2
-2
@@
-19,7
+19,7
b' echo'
19
19
20
20
# Testing changing message with -m
21
21
echo bbbb > file
22
hg qrefresh -m "Second commit message"
22
hg qrefresh -m "Second commit message"
23
23
echo =======================
24
24
echo "Should display 'Second commit message'"
25
25
hg log -l1 -v | sed -n '/description/,$p'
@@
-41,7
+41,7
b' hg qnew -m "First commit message" second'
41
41
echo aaaa > file2
42
42
hg add file2
43
43
echo bbbb > file2
44
(echo "Fifth commit message"
44
(echo "Fifth commit message"
45
45
echo " This is the 5th log message" >> logfile) |\
46
46
hg qrefresh -l-
47
47
echo =======================
tests/test-rename-merge2
0
+5
-5
@@
-12,7
+12,7
b' EOF'
12
12
HGMERGE="python ../merge"; export HGMERGE
13
13
14
14
# perform a test merge with possible renaming
15
#
15
#
16
16
# args:
17
17
# $1 = action in local branch
18
18
# $2 = action in remote branch
@@
-57,7
+57,7
b' tm()'
57
57
hg status -camC -X rev
58
58
59
59
hg ci -m "merge" -d "0 0"
60
60
61
61
echo "--------------"
62
62
echo
63
63
@@
-65,10
+65,10
b' tm()'
65
65
rm -r t
66
66
}
67
67
68
up() {
68
up() {
69
69
cp rev $1
70
70
hg add $1 2> /dev/null
71
if [ "$2" != "" ] ; then
71
if [ "$2" != "" ] ; then
72
72
cp rev $2
73
73
hg add $2 2> /dev/null
74
74
fi
@@
-95,7
+95,7
b' tm "up b " "nm a b" " " "13 merge '
95
95
tm "nc a b" "up a b" " " "14 merge b no ancestor"
96
96
tm "up b " "nm a b" " " "15 merge b no ancestor, remove a"
97
97
tm "nc a b" "up a b" " " "16 get a, merge b no ancestor"
98
tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
98
tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
99
99
tm "nm a b" "up a b" " " "18 merge b no ancestor"
100
100
tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
101
101
tm "up a " "um a b" " " "20 merge a and b to b, remove a"
tests/test-up-local-change
0
+1
-1
@@
-63,6
+63,6
b' echo a > a/a'
63
63
echo a > b/a
64
64
hg --cwd a commit -A -m a
65
65
cd b
66
hg add a
66
hg add a
67
67
hg pull -u ../a
68
68
hg st
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