Show More
@@ -315,6 +315,8 b' class localrepository(repo.repository):' | |||||
315 | self.nodetagscache = {} |
|
315 | self.nodetagscache = {} | |
316 | for t, n in self.tags().iteritems(): |
|
316 | for t, n in self.tags().iteritems(): | |
317 | self.nodetagscache.setdefault(n, []).append(t) |
|
317 | self.nodetagscache.setdefault(n, []).append(t) | |
|
318 | for tags in self.nodetagscache.itervalues(): | |||
|
319 | tags.sort() | |||
318 | return self.nodetagscache.get(node, []) |
|
320 | return self.nodetagscache.get(node, []) | |
319 |
|
321 | |||
320 | def _branchtags(self, partial, lrev): |
|
322 | def _branchtags(self, partial, lrev): |
@@ -17,9 +17,9 b' adding file changes' | |||||
17 | added 1 changesets with 1 changes to 1 files (-1 heads) |
|
17 | added 1 changesets with 1 changes to 1 files (-1 heads) | |
18 | rebase completed |
|
18 | rebase completed | |
19 | changeset: 3:9163974d1cb5 |
|
19 | changeset: 3:9163974d1cb5 | |
|
20 | tag: one | |||
20 | tag: tip |
|
21 | tag: tip | |
21 | tag: two |
|
22 | tag: two | |
22 | tag: one |
|
|||
23 | parent: 1:925d80f479bb |
|
23 | parent: 1:925d80f479bb | |
24 | parent: 2:db815d6d32e6 |
|
24 | parent: 2:db815d6d32e6 | |
25 | user: test |
|
25 | user: test |
@@ -6,10 +6,10 b' applying email' | |||||
6 | now at: email |
|
6 | now at: email | |
7 | % hg tip -v |
|
7 | % hg tip -v | |
8 | changeset: 0:1a706973a7d8 |
|
8 | changeset: 0:1a706973a7d8 | |
|
9 | tag: email | |||
|
10 | tag: qbase | |||
9 | tag: qtip |
|
11 | tag: qtip | |
10 | tag: tip |
|
12 | tag: tip | |
11 | tag: email |
|
|||
12 | tag: qbase |
|
|||
13 | user: Username in patch <test@example.net> |
|
13 | user: Username in patch <test@example.net> | |
14 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
14 | date: Thu Jan 01 00:00:00 1970 +0000 | |
15 | files: x |
|
15 | files: x |
@@ -357,8 +357,8 b' errors during apply, please fix and refr' | |||||
357 | ? foo.rej |
|
357 | ? foo.rej | |
358 | % mq tags |
|
358 | % mq tags | |
359 | 0 qparent |
|
359 | 0 qparent | |
360 |
1 qbase |
|
360 | 1 foo qbase | |
361 |
2 qtip |
|
361 | 2 bar qtip tip | |
362 | % bad node in status |
|
362 | % bad node in status | |
363 | popping bar |
|
363 | popping bar | |
364 | now at: foo |
|
364 | now at: foo | |
@@ -577,10 +577,10 b' diff -r 9ecee4f634e3 hello.txt' | |||||
577 | hello |
|
577 | hello | |
578 | +world |
|
578 | +world | |
579 | changeset: 1:bf5fc3f07a0a |
|
579 | changeset: 1:bf5fc3f07a0a | |
|
580 | tag: empty | |||
|
581 | tag: qbase | |||
580 | tag: qtip |
|
582 | tag: qtip | |
581 | tag: tip |
|
583 | tag: tip | |
582 | tag: empty |
|
|||
583 | tag: qbase |
|
|||
584 | user: test |
|
584 | user: test | |
585 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
585 | date: Thu Jan 01 00:00:00 1970 +0000 | |
586 | summary: imported patch empty |
|
586 | summary: imported patch empty |
@@ -110,10 +110,10 b" examine changes to 'dir/a.txt'? [Ynsfdaq" | |||||
110 |
|
110 | |||
111 | % after qrecord a.patch 'tip' |
|
111 | % after qrecord a.patch 'tip' | |
112 | changeset: 1:5d1ca63427ee |
|
112 | changeset: 1:5d1ca63427ee | |
|
113 | tag: a.patch | |||
|
114 | tag: qbase | |||
113 | tag: qtip |
|
115 | tag: qtip | |
114 | tag: tip |
|
116 | tag: tip | |
115 | tag: a.patch |
|
|||
116 | tag: qbase |
|
|||
117 | user: test |
|
117 | user: test | |
118 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | date: Thu Jan 01 00:00:00 1970 +0000 | |
119 | summary: aaa |
|
119 | summary: aaa | |
@@ -185,9 +185,9 b" record change 3/3 to 'dir/a.txt'? [Ynsfd" | |||||
185 |
|
185 | |||
186 | % after qrecord b.patch 'tip' |
|
186 | % after qrecord b.patch 'tip' | |
187 | changeset: 2:b056198bf878 |
|
187 | changeset: 2:b056198bf878 | |
|
188 | tag: b.patch | |||
188 | tag: qtip |
|
189 | tag: qtip | |
189 | tag: tip |
|
190 | tag: tip | |
190 | tag: b.patch |
|
|||
191 | user: test |
|
191 | user: test | |
192 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
192 | date: Thu Jan 01 00:00:00 1970 +0000 | |
193 | summary: bbb |
|
193 | summary: bbb |
@@ -13,7 +13,7 b' adding manifests' | |||||
13 | adding file changes |
|
13 | adding file changes | |
14 | added 2 changesets with 2 changes to 2 files |
|
14 | added 2 changesets with 2 changes to 2 files | |
15 | rebase completed |
|
15 | rebase completed | |
16 |
@ 3 P0 tags: p0.patch qtip tip |
|
16 | @ 3 P0 tags: p0.patch qbase qtip tip | |
17 | | |
|
17 | | | |
18 | o 2 P1 tags: qparent |
|
18 | o 2 P1 tags: qparent | |
19 | | |
|
19 | | |
@@ -1,5 +1,5 b'' | |||||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 |
@ 3 P1 tags: |
|
2 | @ 3 P1 tags: f2.patch qtip tip | |
3 | | |
|
3 | | | |
4 | o 2 P0 tags: f.patch qbase |
|
4 | o 2 P0 tags: f.patch qbase | |
5 | | |
|
5 | | | |
@@ -34,7 +34,7 b' adding manifests' | |||||
34 | adding file changes |
|
34 | adding file changes | |
35 | added 2 changesets with 2 changes to 1 files |
|
35 | added 2 changesets with 2 changes to 1 files | |
36 | rebase completed |
|
36 | rebase completed | |
37 |
@ 3 P1 tags: |
|
37 | @ 3 P1 tags: f2.patch qtip tip | |
38 | | |
|
38 | | | |
39 | o 2 P0 tags: f.patch qbase |
|
39 | o 2 P0 tags: f.patch qbase | |
40 | | |
|
40 | | |
@@ -49,9 +49,9 b" abort: '\\n' cannot be used in a tag name" | |||||
49 | abort: ':' cannot be used in a tag name |
|
49 | abort: ':' cannot be used in a tag name | |
50 | % cloning local tags |
|
50 | % cloning local tags | |
51 | changeset: 0:0acdaf898367 |
|
51 | changeset: 0:0acdaf898367 | |
52 | tag: foobar |
|
|||
53 | tag: bleah |
|
52 | tag: bleah | |
54 | tag: bleah0 |
|
53 | tag: bleah0 | |
|
54 | tag: foobar | |||
55 | user: test |
|
55 | user: test | |
56 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
56 | date: Mon Jan 12 13:46:40 1970 +0000 | |
57 | summary: test |
|
57 | summary: test |
General Comments 0
You need to be logged in to leave comments.
Login now