##// END OF EJS Templates
rebase: use _ctxdesc in one more place...
Jun Wu -
r34011:79ab5369 default
parent child Browse files
Show More
@@ -407,10 +407,7 b' class rebaseruntime(object):'
407 msg = _('note: not rebasing %s, it has no '
407 msg = _('note: not rebasing %s, it has no '
408 'successor\n') % desc
408 'successor\n') % desc
409 else:
409 else:
410 succctx = repo[succ]
410 succdesc = _ctxdesc(repo[succ])
411 succdesc = '%d:%s "%s"' % (
412 succctx.rev(), succctx,
413 succctx.description().split('\n', 1)[0])
414 msg = (_('note: not rebasing %s, already in '
411 msg = (_('note: not rebasing %s, already in '
415 'destination as %s\n') % (desc, succdesc))
412 'destination as %s\n') % (desc, succdesc))
416 repo.ui.status(msg)
413 repo.ui.status(msg)
@@ -206,7 +206,7 b' More complex case where part of the reba'
206
206
207 $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
207 $ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True
208 rebasing 8:8877864f1edb "B"
208 rebasing 8:8877864f1edb "B"
209 note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D"
209 note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 "D" (tip)
210 rebasing 10:5ae4c968c6ac "C"
210 rebasing 10:5ae4c968c6ac "C"
211 $ hg debugobsolete
211 $ hg debugobsolete
212 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
212 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob)
@@ -931,7 +931,7 b' Rebase merge where successor of one pare'
931 > EOF
931 > EOF
932
932
933 $ hg rebase -d B -s D
933 $ hg rebase -d B -s D
934 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
934 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
935 rebasing 4:66f1a38021c9 "F" (F tip)
935 rebasing 4:66f1a38021c9 "F" (F tip)
936 $ hg log -G
936 $ hg log -G
937 o 5:50e9d60b99c6 F
937 o 5:50e9d60b99c6 F
@@ -962,7 +962,7 b' Rebase merge where successor of other pa'
962 > EOF
962 > EOF
963
963
964 $ hg rebase -d B -s E
964 $ hg rebase -d B -s E
965 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
965 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
966 rebasing 4:66f1a38021c9 "F" (F tip)
966 rebasing 4:66f1a38021c9 "F" (F tip)
967 $ hg log -G
967 $ hg log -G
968 o 5:aae1787dacee F
968 o 5:aae1787dacee F
@@ -993,7 +993,7 b' Rebase merge where successor of one pare'
993 > EOF
993 > EOF
994
994
995 $ hg rebase -d C -s D
995 $ hg rebase -d C -s D
996 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
996 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
997 rebasing 5:66f1a38021c9 "F" (F tip)
997 rebasing 5:66f1a38021c9 "F" (F tip)
998
998
999 $ hg log -G
999 $ hg log -G
@@ -1027,7 +1027,7 b' Rebase merge where successor of other pa'
1027 > EOF
1027 > EOF
1028
1028
1029 $ hg rebase -d C -s E
1029 $ hg rebase -d C -s E
1030 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
1030 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1031 rebasing 5:66f1a38021c9 "F" (F tip)
1031 rebasing 5:66f1a38021c9 "F" (F tip)
1032 $ hg log -G
1032 $ hg log -G
1033 o 6:c6ab0cc6d220 F
1033 o 6:c6ab0cc6d220 F
@@ -1061,7 +1061,7 b' Rebase merge where successor of one pare'
1061
1061
1062 $ hg rebase -d C -b F
1062 $ hg rebase -d C -b F
1063 rebasing 2:b18e25de2cf5 "D" (D)
1063 rebasing 2:b18e25de2cf5 "D" (D)
1064 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B"
1064 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1065 rebasing 5:66f1a38021c9 "F" (F tip)
1065 rebasing 5:66f1a38021c9 "F" (F tip)
1066 note: rebase of 5:66f1a38021c9 created no changes to commit
1066 note: rebase of 5:66f1a38021c9 created no changes to commit
1067 $ hg log -G
1067 $ hg log -G
@@ -1095,7 +1095,7 b' Rebase merge where successor of other pa'
1095 > EOF
1095 > EOF
1096
1096
1097 $ hg rebase -d C -b F
1097 $ hg rebase -d C -b F
1098 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B"
1098 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1099 rebasing 3:7fb047a69f22 "E" (E)
1099 rebasing 3:7fb047a69f22 "E" (E)
1100 rebasing 5:66f1a38021c9 "F" (F tip)
1100 rebasing 5:66f1a38021c9 "F" (F tip)
1101 note: rebase of 5:66f1a38021c9 created no changes to commit
1101 note: rebase of 5:66f1a38021c9 created no changes to commit
@@ -1129,8 +1129,8 b' Rebase merge where both parents have suc'
1129 > X Y
1129 > X Y
1130 > EOS
1130 > EOS
1131 $ hg rebase -r A+B+E -d F
1131 $ hg rebase -r A+B+E -d F
1132 note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C"
1132 note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
1133 note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D"
1133 note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
1134 rebasing 7:dac5d11c5a7d "E" (E tip)
1134 rebasing 7:dac5d11c5a7d "E" (E tip)
1135 abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
1135 abort: rebasing 7:dac5d11c5a7d will include unwanted changes from 3:59c792af609c, 5:b23a2cc00842 or 2:ba2b7fa7166d, 4:a3d17304151f
1136 [255]
1136 [255]
@@ -1147,7 +1147,7 b' parent moves as requested.'
1147 > A B C # D/D = D
1147 > A B C # D/D = D
1148 > EOS
1148 > EOS
1149 $ hg rebase -r A+B+D -d Z
1149 $ hg rebase -r A+B+D -d Z
1150 note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C"
1150 note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
1151 rebasing 1:fc2b737bb2e5 "B" (B)
1151 rebasing 1:fc2b737bb2e5 "B" (B)
1152 rebasing 3:b8ed089c80ad "D" (D)
1152 rebasing 3:b8ed089c80ad "D" (D)
1153
1153
@@ -1178,7 +1178,7 b' parent moves as requested.'
1178 > EOS
1178 > EOS
1179 $ hg rebase -r B+A+D -d Z
1179 $ hg rebase -r B+A+D -d Z
1180 rebasing 0:426bada5c675 "A" (A)
1180 rebasing 0:426bada5c675 "A" (A)
1181 note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C"
1181 note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
1182 rebasing 3:b8ed089c80ad "D" (D)
1182 rebasing 3:b8ed089c80ad "D" (D)
1183
1183
1184 $ rm .hg/localtags
1184 $ rm .hg/localtags
@@ -1223,7 +1223,7 b' equivalents in destination'
1223 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1223 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1224 2:1e9a3c00cbe9 b (no-eol)
1224 2:1e9a3c00cbe9 b (no-eol)
1225 $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
1225 $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1
1226 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b"
1226 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip)
1227 Check that working directory and bookmark was updated to rev 3 although rev 2
1227 Check that working directory and bookmark was updated to rev 3 although rev 2
1228 was skipped
1228 was skipped
1229 $ hg log -r .
1229 $ hg log -r .
@@ -1251,7 +1251,7 b' parent gets moved:'
1251 $ hg bookmark book -i
1251 $ hg bookmark book -i
1252 $ hg rebase -r B+D1 -d E
1252 $ hg rebase -r B+D1 -d E
1253 rebasing 1:112478962961 "B" (B)
1253 rebasing 1:112478962961 "B" (B)
1254 note: not rebasing 5:15ecf15e0114 "D1" (D1 tip book), already in destination as 2:0807738e0be9 "D2"
1254 note: not rebasing 5:15ecf15e0114 "D1" (D1 tip book), already in destination as 2:0807738e0be9 "D2" (D2)
1255 $ hg log -G -T '{desc} {bookmarks}'
1255 $ hg log -G -T '{desc} {bookmarks}'
1256 @ B book
1256 @ B book
1257 |
1257 |
General Comments 0
You need to be logged in to leave comments. Login now