Show More
@@ -951,8 +951,9 b' def bookmark(ui, repo, *names, **opts):' | |||||
951 | if ui.quiet: |
|
951 | if ui.quiet: | |
952 | ui.write("%s\n" % bmark, label=label) |
|
952 | ui.write("%s\n" % bmark, label=label) | |
953 | else: |
|
953 | else: | |
954 | ui.write(" %s %-25s %d:%s\n" % ( |
|
954 | pad = " " * (25 - encoding.colwidth(bmark)) | |
955 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
955 | ui.write(" %s %s%s %d:%s\n" % ( | |
|
956 | prefix, bmark, pad, repo.changelog.rev(n), hexfn(n)), | |||
956 | label=label) |
|
957 | label=label) | |
957 |
|
958 | |||
958 | @command('branch', |
|
959 | @command('branch', |
@@ -117,14 +117,17 b' add branches/tags' | |||||
117 | marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc) |
|
117 | marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc) | |
118 | (branches are permanent and global, did you want a bookmark?) |
|
118 | (branches are permanent and global, did you want a bookmark?) | |
119 | $ hg tag $S |
|
119 | $ hg tag $S | |
|
120 | $ hg book -f $S | |||
120 | $ hg branch $M |
|
121 | $ hg branch $M | |
121 | marked working directory as branch MIDDLE_ |
|
122 | marked working directory as branch MIDDLE_ | |
122 | (branches are permanent and global, did you want a bookmark?) |
|
123 | (branches are permanent and global, did you want a bookmark?) | |
123 | $ hg tag $M |
|
124 | $ hg tag $M | |
|
125 | $ hg book -f $M | |||
124 | $ hg branch $L |
|
126 | $ hg branch $L | |
125 | marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
|
127 | marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) | |
126 | (branches are permanent and global, did you want a bookmark?) |
|
128 | (branches are permanent and global, did you want a bookmark?) | |
127 | $ hg tag $L |
|
129 | $ hg tag $L | |
|
130 | $ hg book -f $L | |||
128 |
|
131 | |||
129 | check alignment of branches |
|
132 | check alignment of branches | |
130 |
|
133 | |||
@@ -142,4 +145,9 b' check alignment of tags' | |||||
142 | MIDDLE_ 3:b06c5b6def9e |
|
145 | MIDDLE_ 3:b06c5b6def9e | |
143 | \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) |
|
146 | \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) | |
144 |
|
147 | |||
145 | $ cd .. |
|
148 | check alignment of bookmarks | |
|
149 | ||||
|
150 | $ hg book | |||
|
151 | MIDDLE_ 5:d745ff46155b | |||
|
152 | \xe7\x9f\xad\xe5\x90\x8d 4:9259be597f19 (esc) | |||
|
153 | * \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |
General Comments 0
You need to be logged in to leave comments.
Login now