##// END OF EJS Templates
show: rename "underway" to "work"...
Gregory Szorc -
r32058:0bb157be stable
parent child Browse files
Show More
@@ -189,8 +189,8 b' def underwayrevset(repo, subset, x):'
189
189
190 return subset & relevant
190 return subset & relevant
191
191
192 @showview('underway', fmtopic='underway')
192 @showview('work', fmtopic='work')
193 def showunderway(ui, repo, fm):
193 def showwork(ui, repo, fm):
194 """changesets that aren't finished"""
194 """changesets that aren't finished"""
195 # TODO support date-based limiting when calling revset.
195 # TODO support date-based limiting when calling revset.
196 revs = repo.revs('sort(_underway(), topo)')
196 revs = repo.revs('sort(_underway(), topo)')
@@ -1,3 +1,3 b''
1 # TODO add label() once we figure out which namespace the labels belong on.
1 # TODO add label() once we figure out which namespace the labels belong on.
2 showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, 5)}\n'
2 showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, 5)}\n'
3 showunderway = '{shortest(node, 5)}{if(branches, " ({branch})")}{if(bookmarks, " ({bookmarks})")} {desc|firstline}'
3 showwork = '{shortest(node, 5)}{if(branches, " ({branch})")}{if(bookmarks, " ({bookmarks})")} {desc|firstline}'
@@ -8,27 +8,27 b''
8
8
9 Command works on an empty repo
9 Command works on an empty repo
10
10
11 $ hg show underway
11 $ hg show work
12
12
13 Single draft changeset shown
13 Single draft changeset shown
14
14
15 $ echo 0 > foo
15 $ echo 0 > foo
16 $ hg -q commit -A -m 'commit 0'
16 $ hg -q commit -A -m 'commit 0'
17
17
18 $ hg show underway
18 $ hg show work
19 @ 9f171 commit 0
19 @ 9f171 commit 0
20
20
21 Even when it isn't the wdir
21 Even when it isn't the wdir
22
22
23 $ hg -q up null
23 $ hg -q up null
24
24
25 $ hg show underway
25 $ hg show work
26 o 9f171 commit 0
26 o 9f171 commit 0
27
27
28 Single changeset is still there when public because it is a head
28 Single changeset is still there when public because it is a head
29
29
30 $ hg phase --public -r 0
30 $ hg phase --public -r 0
31 $ hg show underway
31 $ hg show work
32 o 9f171 commit 0
32 o 9f171 commit 0
33
33
34 A draft child will show both it and public parent
34 A draft child will show both it and public parent
@@ -37,7 +37,7 b' A draft child will show both it and publ'
37 $ echo 1 > foo
37 $ echo 1 > foo
38 $ hg commit -m 'commit 1'
38 $ hg commit -m 'commit 1'
39
39
40 $ hg show underway
40 $ hg show work
41 @ 181cc commit 1
41 @ 181cc commit 1
42 o 9f171 commit 0
42 o 9f171 commit 0
43
43
@@ -46,7 +46,7 b' Multiple draft children will be shown'
46 $ echo 2 > foo
46 $ echo 2 > foo
47 $ hg commit -m 'commit 2'
47 $ hg commit -m 'commit 2'
48
48
49 $ hg show underway
49 $ hg show work
50 @ 128c8 commit 2
50 @ 128c8 commit 2
51 o 181cc commit 1
51 o 181cc commit 1
52 o 9f171 commit 0
52 o 9f171 commit 0
@@ -54,7 +54,7 b' Multiple draft children will be shown'
54 Bumping first draft changeset to public will hide its parent
54 Bumping first draft changeset to public will hide its parent
55
55
56 $ hg phase --public -r 1
56 $ hg phase --public -r 1
57 $ hg show underway
57 $ hg show work
58 @ 128c8 commit 2
58 @ 128c8 commit 2
59 o 181cc commit 1
59 o 181cc commit 1
60 |
60 |
@@ -67,7 +67,7 b' Multiple DAG heads will be shown'
67 $ hg commit -m 'commit 3'
67 $ hg commit -m 'commit 3'
68 created new head
68 created new head
69
69
70 $ hg show underway
70 $ hg show work
71 @ f0abc commit 3
71 @ f0abc commit 3
72 | o 128c8 commit 2
72 | o 128c8 commit 2
73 |/
73 |/
@@ -79,7 +79,7 b' Even when wdir is something else'
79
79
80 $ hg -q up null
80 $ hg -q up null
81
81
82 $ hg show underway
82 $ hg show work
83 o f0abc commit 3
83 o f0abc commit 3
84 | o 128c8 commit 2
84 | o 128c8 commit 2
85 |/
85 |/
@@ -94,7 +94,7 b' Draft child shows public head (multiple '
94 $ hg commit -m 'commit 4'
94 $ hg commit -m 'commit 4'
95 created new head
95 created new head
96
96
97 $ hg show underway
97 $ hg show work
98 @ 668ca commit 4
98 @ 668ca commit 4
99 | o f0abc commit 3
99 | o f0abc commit 3
100 | | o 128c8 commit 2
100 | | o 128c8 commit 2
@@ -125,7 +125,7 b' Branch name appears in output'
125 $ echo 4 > foo
125 $ echo 4 > foo
126 $ hg commit -m 'commit 4'
126 $ hg commit -m 'commit 4'
127
127
128 $ hg show underway
128 $ hg show work
129 @ f8dd3 (mybranch) commit 4
129 @ f8dd3 (mybranch) commit 4
130 o 90cfc (mybranch) commit 3
130 o 90cfc (mybranch) commit 3
131 | o 128c8 commit 2
131 | o 128c8 commit 2
@@ -156,7 +156,7 b' Bookmark name appears in output'
156 $ hg commit -m 'commit 4'
156 $ hg commit -m 'commit 4'
157 $ hg bookmark mybook
157 $ hg bookmark mybook
158
158
159 $ hg show underway
159 $ hg show work
160 @ cac82 (mybook) commit 4
160 @ cac82 (mybook) commit 4
161 o f0abc commit 3
161 o f0abc commit 3
162 | o 128c8 (@) commit 2
162 | o 128c8 (@) commit 2
@@ -11,7 +11,7 b' No arguments shows available views'
11 available views:
11 available views:
12
12
13 bookmarks -- bookmarks and their associated changeset
13 bookmarks -- bookmarks and their associated changeset
14 underway -- changesets that aren't finished
14 work -- changesets that aren't finished
15
15
16 abort: no view requested
16 abort: no view requested
17 (use "hg show VIEW" to choose a view)
17 (use "hg show VIEW" to choose a view)
@@ -40,7 +40,7 b' No arguments shows available views'
40
40
41 bookmarks bookmarks and their associated changeset
41 bookmarks bookmarks and their associated changeset
42
42
43 underway changesets that aren't finished
43 work changesets that aren't finished
44
44
45 (use 'hg help -e show' to show help for the show extension)
45 (use 'hg help -e show' to show help for the show extension)
46
46
General Comments 0
You need to be logged in to leave comments. Login now