Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Benoit Boissinot
- Thu, 06 Nov 2008 09:39:52
Show More
tests/test-bookmarks-rebase
0
created
755
+38
0
@@
-0,0
+1,38
b''
1
#!/bin/sh
2
3
echo "[extensions]" >> $HGRCPATH
4
echo "rebase=" >> $HGRCPATH
5
echo "bookmarks=" >> $HGRCPATH
6
7
cleanoutput () {
8
sed -e 's/\(Rebase status stored to\).*/\1/' \
9
-e 's/\(Rebase status restored from\).*/\1/' \
10
-e 's/\(saving bundle to \).*/\1/'
11
}
12
13
echo % initialize repository
14
hg init
15
16
echo 'a' > a
17
hg ci -A -d '0 0' -u test -m "0"
18
19
echo 'b' > b
20
hg ci -A -d '0 0' -u test -m "1"
21
22
hg up 0
23
echo 'c' > c
24
hg ci -A -d '0 0' -u test -m "2"
25
26
echo 'd' > d
27
hg ci -A -d '0 0' -u test -m "3"
28
29
hg bookmark -r 1 one
30
hg bookmark -r 3 two
31
32
echo % bookmark list
33
hg bookmark
34
35
echo % rebase
36
hg rebase -s two -d one 2>&1 | cleanoutput
37
38
hg log
No newline at end of file
tests/test-bookmarks-rebase.out
0
created
644
+42
0
@@
-0,0
+1,42
b''
1
% initialize repository
2
adding a
3
adding b
4
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5
adding c
6
created new head
7
adding d
8
% bookmark list
9
* two 3:2ae46b1d99a7
10
one 1:925d80f479bb
11
% rebase
12
saving bundle to
13
adding branch
14
adding changesets
15
adding manifests
16
adding file changes
17
added 1 changesets with 1 changes to 1 files (-1 heads)
18
rebase completed
19
changeset: 3:9163974d1cb5
20
tag: tip
21
parent: 1:925d80f479bb
22
parent: 2:db815d6d32e6
23
user: test
24
date: Thu Jan 01 00:00:00 1970 +0000
25
summary: 3
26
27
changeset: 2:db815d6d32e6
28
parent: 0:f7b1eb17ad24
29
user: test
30
date: Thu Jan 01 00:00:00 1970 +0000
31
summary: 2
32
33
changeset: 1:925d80f479bb
34
user: test
35
date: Thu Jan 01 00:00:00 1970 +0000
36
summary: 1
37
38
changeset: 0:f7b1eb17ad24
39
user: test
40
date: Thu Jan 01 00:00:00 1970 +0000
41
summary: 0
42
tests/test-bookmarks-strip
0
created
755
+44
0
@@
-0,0
+1,44
b''
1
#!/bin/sh
2
3
echo "[extensions]" >> $HGRCPATH
4
echo "bookmarks=" >> $HGRCPATH
5
echo "mq=" >> $HGRCPATH
6
7
hg init
8
9
echo qqq>qqq.txt
10
11
echo % add file
12
hg add
13
14
echo % commit first revision
15
hg ci -m 1 -u user -d "1 0"
16
17
echo % set bookmark
18
hg book test
19
20
echo www>>qqq.txt
21
22
echo % commit second revision
23
hg ci -m 2 -u usr -d "1 0"
24
25
echo % set bookmark
26
hg book test2
27
28
echo % update to -2
29
hg update -r -2
30
31
echo eee>>qqq.txt
32
33
echo % commit new head
34
hg ci -m 3 -u user -d "1 0"
35
36
echo % bookmarks updated?
37
hg book
38
39
echo % strip to revision 1
40
hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
41
42
echo % list bookmarks
43
hg book
44
tests/test-bookmarks-strip.out
0
created
644
+24
0
@@
-0,0
+1,24
b''
1
% add file
2
adding qqq.txt
3
% commit first revision
4
% set bookmark
5
% commit second revision
6
% set bookmark
7
% update to -2
8
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9
% commit new head
10
created new head
11
% bookmarks updated?
12
test 1:16b24da7e457
13
test2 1:16b24da7e457
14
% strip to revision 1
15
saving bundle to
16
saving bundle to
17
adding branch
18
adding changesets
19
adding manifests
20
adding file changes
21
added 1 changesets with 1 changes to 1 files
22
% list bookmarks
23
* test 1:9f1b7e78eff8
24
* test2 1:9f1b7e78eff8
hgext/bookmarks.py
0
+2
-5
@@
-200,10
+200,7
b' def reposetup(ui, repo):'
200
200
return node
201
201
202
202
def addchangegroup ( self , source , srctype , url , emptyok = False ):
203
try :
204
onode = repo . changectx ( '.' ) . node ()
205
except RepoError , inst :
206
pass
203
parents = repo . dirstate . parents ()
207
204
208
205
result = super ( bookmark_repo , self ) . addchangegroup (
209
206
source , srctype , url , emptyok )
@@
-214,7
+211,7
b' def reposetup(ui, repo):'
214
211
marks = parse ( repo )
215
212
update = False
216
213
for mark , n in marks . items ():
217
if n == onode:
214
if n in parents :
218
215
marks [ mark ] = node
219
216
update = True
220
217
if update :
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