equal
deleted
inserted
replaced
2083 |
2083 |
2084 q = self.mq |
2084 q = self.mq |
2085 if not q.applied: |
2085 if not q.applied: |
2086 return tagscache |
2086 return tagscache |
2087 |
2087 |
2088 mqtags = [(patch.rev, patch.name) for patch in q.applied] |
2088 mqtags = [(revlog.bin(patch.rev), patch.name) for patch in q.applied] |
2089 mqtags.append((mqtags[-1][0], 'qtip')) |
2089 mqtags.append((mqtags[-1][0], 'qtip')) |
2090 mqtags.append((mqtags[0][0], 'qbase')) |
2090 mqtags.append((mqtags[0][0], 'qbase')) |
|
2091 mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
2091 for patch in mqtags: |
2092 for patch in mqtags: |
2092 if patch[1] in tagscache: |
2093 if patch[1] in tagscache: |
2093 self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
2094 self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1]) |
2094 else: |
2095 else: |
2095 tagscache[patch[1]] = revlog.bin(patch[0]) |
2096 tagscache[patch[1]] = patch[0] |
2096 |
2097 |
2097 return tagscache |
2098 return tagscache |
2098 |
2099 |
2099 def _branchtags(self): |
2100 def _branchtags(self): |
2100 q = self.mq |
2101 q = self.mq |