##// END OF EJS Templates
fix qseries -v and guards interaction...
Alexis S. L. Carvalho -
r3763:955475d2 default
parent child Browse files
Show More
@@ -1124,21 +1124,21 b' class queue:'
1124 else:
1124 else:
1125 return self.series[i]
1125 return self.series[i]
1126
1126
1127 unapplied = self.series_end(all_patches=True)
1127 applied = dict.fromkeys([p.name for p in self.applied])
1128 if not length:
1128 if not length:
1129 length = len(self.series) - start
1129 length = len(self.series) - start
1130 if not missing:
1130 if not missing:
1131 for i in xrange(start, start+length):
1131 for i in xrange(start, start+length):
1132 pfx = ''
1132 pfx = ''
1133 patch = pname(i)
1133 if self.ui.verbose:
1134 if self.ui.verbose:
1134 if i < unapplied:
1135 if patch in applied:
1135 status = 'A'
1136 stat = 'A'
1136 elif self.pushable(i)[0]:
1137 elif self.pushable(i)[0]:
1137 status = 'U'
1138 stat = 'U'
1138 else:
1139 else:
1139 status = 'G'
1140 stat = 'G'
1140 pfx = '%d %s ' % (i, status)
1141 pfx = '%d %s ' % (i, stat)
1141 patch = pname(i)
1142 self.ui.write('%s%s\n' % (pfx, displayname(patch)))
1142 self.ui.write('%s%s\n' % (pfx, displayname(patch)))
1143 else:
1143 else:
1144 msng_list = []
1144 msng_list = []
@@ -106,4 +106,12 b' echo % b.patch: +2'
106 echo % c.patch: unguarded
106 echo % c.patch: unguarded
107 hg qguard -l
107 hg qguard -l
108
108
109 hg qnew d.patch
110 hg qpop
111 echo % should show new.patch and b.patch as Guarded, c.patch as Applied
112 echo % and d.patch as Unapplied
113 hg qseries -v
109
114
115 hg qguard d.patch +2
116 echo % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
117 hg qseries -v
@@ -89,3 +89,15 b' c.patch'
89 new.patch: +1 +2 -3
89 new.patch: +1 +2 -3
90 b.patch: +2
90 b.patch: +2
91 c.patch: unguarded
91 c.patch: unguarded
92 Now at: c.patch
93 % should show new.patch and b.patch as Guarded, c.patch as Applied
94 % and d.patch as Unapplied
95 0 G new.patch
96 1 G b.patch
97 2 A c.patch
98 3 U d.patch
99 % new.patch, b.patch: Guarded. c.patch: Applied. d.patch: Guarded.
100 0 G new.patch
101 1 G b.patch
102 2 A c.patch
103 3 G d.patch
General Comments 0
You need to be logged in to leave comments. Login now