##// END OF EJS Templates
Use file contexts in tags code
Matt Mackall -
r3455:baa27127 default
parent child Browse files
Show More
@@ -247,15 +247,12 b' class localrepository(repo.repository):'
247 heads.reverse()
247 heads.reverse()
248 fl = self.file(".hgtags")
248 fl = self.file(".hgtags")
249 for node in heads:
249 for node in heads:
250 change = self.changelog.read(node)
250 f = self.filectx('.hgtags', node)
251 rev = self.changelog.rev(node)
251 if not f: continue
252 fn, ff = self.manifest.find(change[0], '.hgtags')
253 if fn is None: continue
254 count = 0
252 count = 0
255 for l in fl.read(fn).splitlines():
253 for l in f.data().splitlines():
256 count += 1
254 count += 1
257 parsetag(l, _(".hgtags (rev %d:%s), line %d") %
255 parsetag(l, _("%s, line %d") % (str(f), count))
258 (rev, short(node), count))
259 try:
256 try:
260 f = self.opener("localtags")
257 f = self.opener("localtags")
261 count = 0
258 count = 0
@@ -18,20 +18,17 b' 8216907a933d+8a3ca90d111d+ tip'
18 M .hgtags
18 M .hgtags
19 tip 6:e2174d339386
19 tip 6:e2174d339386
20 first 0:0acdaf898367
20 first 0:0acdaf898367
21 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
22 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
23 localtags, line 1: tag 'invalid' refers to unknown node
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
22 .hgtags@c071f74ab5eb, line 2: cannot parse entry
26 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
23 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
27 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
24 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
28 localtags, line 1: tag 'invalid' refers to unknown node
25 localtags, line 1: tag 'invalid' refers to unknown node
29 tip 8:4ca6f1b1a68c
26 tip 8:4ca6f1b1a68c
30 first 0:0acdaf898367
27 first 0:0acdaf898367
31 changeset: 8:4ca6f1b1a68c
28 changeset: 8:4ca6f1b1a68c
32 .hgtags (rev 7:c071f74ab5eb), line 2: cannot parse entry
29 .hgtags@c071f74ab5eb, line 2: cannot parse entry
33 .hgtags (rev 7:c071f74ab5eb), line 4: node 'foo' is not well formed
30 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed
34 .hgtags (rev 8:4ca6f1b1a68c), line 2: node 'x' is not well formed
31 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed
35 localtags, line 1: tag 'invalid' refers to unknown node
32 localtags, line 1: tag 'invalid' refers to unknown node
36 tag: tip
33 tag: tip
37 parent: 3:b2ef3841386b
34 parent: 3:b2ef3841386b
General Comments 0
You need to be logged in to leave comments. Login now