Show More
@@ -59,7 +59,7 b' class changelog(revlog):' | |||||
59 | changelog v0 doesn't use extra |
|
59 | changelog v0 doesn't use extra | |
60 | """ |
|
60 | """ | |
61 | if not text: |
|
61 | if not text: | |
62 | return (nullid, "", (0, 0), [], "", {}) |
|
62 | return (nullid, "", (0, 0), [], "", {'branch': 'default'}) | |
63 | last = text.index("\n\n") |
|
63 | last = text.index("\n\n") | |
64 | desc = util.tolocal(text[last + 2:]) |
|
64 | desc = util.tolocal(text[last + 2:]) | |
65 | l = text[:last].split('\n') |
|
65 | l = text[:last].split('\n') | |
@@ -79,6 +79,8 b' class changelog(revlog):' | |||||
79 | time, timezone, extra = extra_data |
|
79 | time, timezone, extra = extra_data | |
80 | time, timezone = float(time), int(timezone) |
|
80 | time, timezone = float(time), int(timezone) | |
81 | extra = self.decode_extra(extra) |
|
81 | extra = self.decode_extra(extra) | |
|
82 | if not extra.get('branch'): | |||
|
83 | extra['branch'] = 'default' | |||
82 | files = l[3:] |
|
84 | files = l[3:] | |
83 | return (manifest, user, (time, timezone), files, desc, extra) |
|
85 | return (manifest, user, (time, timezone), files, desc, extra) | |
84 |
|
86 | |||
@@ -94,6 +96,8 b' class changelog(revlog):' | |||||
94 | parseddate = "%d %d" % util.parsedate(date) |
|
96 | parseddate = "%d %d" % util.parsedate(date) | |
95 | else: |
|
97 | else: | |
96 | parseddate = "%d %d" % util.makedate() |
|
98 | parseddate = "%d %d" % util.makedate() | |
|
99 | if extra and extra.get("branch") in ("default", ""): | |||
|
100 | del extra["branch"] | |||
97 | if extra: |
|
101 | if extra: | |
98 | extra = self.encode_extra(extra) |
|
102 | extra = self.encode_extra(extra) | |
99 | parseddate = "%s %s" % (parseddate, extra) |
|
103 | parseddate = "%s %s" % (parseddate, extra) |
@@ -262,7 +262,8 b' class changeset_printer(object):' | |||||
262 |
|
262 | |||
263 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) |
|
263 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode))) | |
264 |
|
264 | |||
265 | if branch: |
|
265 | # don't show the default branch name | |
|
266 | if branch != 'default': | |||
266 | branch = util.tolocal(branch) |
|
267 | branch = util.tolocal(branch) | |
267 | self.ui.write(_("branch: %s\n") % branch) |
|
268 | self.ui.write(_("branch: %s\n") % branch) | |
268 | for tag in self.repo.nodetags(changenode): |
|
269 | for tag in self.repo.nodetags(changenode): | |
@@ -406,7 +407,7 b' class changeset_templater(changeset_prin' | |||||
406 |
|
407 | |||
407 | def showbranches(**args): |
|
408 | def showbranches(**args): | |
408 | branch = changes[5].get("branch") |
|
409 | branch = changes[5].get("branch") | |
409 | if branch: |
|
410 | if branch != 'default': | |
410 | branch = util.tolocal(branch) |
|
411 | branch = util.tolocal(branch) | |
411 | return showlist('branch', [branch], plural='branches', **args) |
|
412 | return showlist('branch', [branch], plural='branches', **args) | |
412 | # add old style branches if requested |
|
413 | # add old style branches if requested |
@@ -1447,7 +1447,7 b' def identify(ui, repo):' | |||||
1447 | if not ui.quiet: |
|
1447 | if not ui.quiet: | |
1448 |
|
1448 | |||
1449 | branch = util.tolocal(repo.workingctx().branch()) |
|
1449 | branch = util.tolocal(repo.workingctx().branch()) | |
1450 | if branch: |
|
1450 | if branch != 'default': | |
1451 | output.append("(%s)" % branch) |
|
1451 | output.append("(%s)" % branch) | |
1452 |
|
1452 | |||
1453 | # multiple tags for a single parent separated by '/' |
|
1453 | # multiple tags for a single parent separated by '/' |
@@ -413,9 +413,9 b' class workingctx(changectx):' | |||||
413 | def clean(self): return self._status[5] |
|
413 | def clean(self): return self._status[5] | |
414 | def branch(self): |
|
414 | def branch(self): | |
415 | try: |
|
415 | try: | |
416 | return self._repo.opener("branch").read().strip() |
|
416 | return self._repo.opener("branch").read().strip() or "default" | |
417 | except IOError: |
|
417 | except IOError: | |
418 | return "" |
|
418 | return "default" | |
419 |
|
419 | |||
420 | def parents(self): |
|
420 | def parents(self): | |
421 | """return contexts for each parent changeset""" |
|
421 | """return contexts for each parent changeset""" |
@@ -17,7 +17,7 b' demandload(globals(), "os revlog time ut' | |||||
17 | class localrepository(repo.repository): |
|
17 | class localrepository(repo.repository): | |
18 | capabilities = ('lookup', 'changegroupsubset') |
|
18 | capabilities = ('lookup', 'changegroupsubset') | |
19 | supported = ('revlogv1', 'store') |
|
19 | supported = ('revlogv1', 'store') | |
20 |
branchcache_features = (' |
|
20 | branchcache_features = ('default',) | |
21 |
|
21 | |||
22 | def __del__(self): |
|
22 | def __del__(self): | |
23 | self.transhandle = None |
|
23 | self.transhandle = None | |
@@ -727,7 +727,7 b' class localrepository(repo.repository):' | |||||
727 | branchname = "" |
|
727 | branchname = "" | |
728 |
|
728 | |||
729 | if use_dirstate: |
|
729 | if use_dirstate: | |
730 |
oldname = c1[5].get("branch" |
|
730 | oldname = c1[5].get("branch") or "default" # stored in UTF-8 | |
731 | if not commit and not remove and not force and p2 == nullid and \ |
|
731 | if not commit and not remove and not force and p2 == nullid and \ | |
732 | branchname == oldname: |
|
732 | branchname == oldname: | |
733 | self.ui.status(_("nothing changed\n")) |
|
733 | self.ui.status(_("nothing changed\n")) |
@@ -126,13 +126,13 b' tip 5:db5' | |||||
126 | Γ© 3:770b9b11621d |
|
126 | Γ© 3:770b9b11621d | |
127 | % ascii |
|
127 | % ascii | |
128 | ? 5:db5520b4645f |
|
128 | ? 5:db5520b4645f | |
129 |
|
|
129 | default 4:9cff3c980b58 | |
130 | % latin-1 |
|
130 | % latin-1 | |
131 | οΏ½ 5:db5520b4645f |
|
131 | οΏ½ 5:db5520b4645f | |
132 |
|
|
132 | default 4:9cff3c980b58 | |
133 | % utf-8 |
|
133 | % utf-8 | |
134 | Γ© 5:db5520b4645f |
|
134 | Γ© 5:db5520b4645f | |
135 |
|
|
135 | default 4:9cff3c980b58 | |
136 | % utf-8 |
|
136 | % utf-8 | |
137 | changeset: 5:db5520b4645f |
|
137 | changeset: 5:db5520b4645f | |
138 | branch: Γ© |
|
138 | branch: Γ© |
@@ -91,6 +91,7 b' manifest: 1:23226e7a252cacdc2d99e4fbd' | |||||
91 | user: test |
|
91 | user: test | |
92 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
92 | date: Thu Jan 01 00:00:01 1970 +0000 | |
93 | files+: b |
|
93 | files+: b | |
|
94 | extra: branch=default | |||
94 | description: |
|
95 | description: | |
95 | b |
|
96 | b | |
96 |
|
97 | |||
@@ -102,6 +103,7 b' manifest: 0:a0c8bcbbb45c63b90b70ad007' | |||||
102 | user: test |
|
103 | user: test | |
103 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
104 | date: Thu Jan 01 00:00:01 1970 +0000 | |
104 | files+: a |
|
105 | files+: a | |
|
106 | extra: branch=default | |||
105 | description: |
|
107 | description: | |
106 | a |
|
108 | a | |
107 |
|
109 |
@@ -7,7 +7,7 b' No .hg/branches.cache' | |||||
7 | # some regular revisions |
|
7 | # some regular revisions | |
8 | Patch queue now empty |
|
8 | Patch queue now empty | |
9 | tip: 1 |
|
9 | tip: 1 | |
10 |
features: |
|
10 | features: default | |
11 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
11 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
12 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
12 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
13 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
13 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
@@ -16,12 +16,12 b' 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff' | |||||
16 | applying p1 |
|
16 | applying p1 | |
17 | Now at: p1 |
|
17 | Now at: p1 | |
18 | tip: 2 |
|
18 | tip: 2 | |
19 |
features: |
|
19 | features: default | |
20 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
20 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
21 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
21 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
22 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
22 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
23 | tip: 3 |
|
23 | tip: 3 | |
24 |
features: |
|
24 | features: default | |
25 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
25 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
26 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
26 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
27 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
27 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
@@ -30,7 +30,7 b' branch bar: 2' | |||||
30 |
|
30 | |||
31 | # removing the cache |
|
31 | # removing the cache | |
32 | tip: 3 |
|
32 | tip: 3 | |
33 |
features: |
|
33 | features: default | |
34 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
34 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
35 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
35 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
36 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
36 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
@@ -39,7 +39,7 b' branch bar: 2' | |||||
39 |
|
39 | |||
40 | # importing rev 1 (the cache now ends in one of the patches) |
|
40 | # importing rev 1 (the cache now ends in one of the patches) | |
41 | tip: 3 |
|
41 | tip: 3 | |
42 |
features: |
|
42 | features: default | |
43 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
43 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
44 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
44 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
45 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
45 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
@@ -54,6 +54,6 b' applying p1' | |||||
54 | applying p2 |
|
54 | applying p2 | |
55 | Now at: p2 |
|
55 | Now at: p2 | |
56 | tip: 3 |
|
56 | tip: 3 | |
57 |
features: |
|
57 | features: default | |
58 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 |
|
58 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 | |
59 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
59 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
@@ -43,10 +43,10 b' date: Mon Jan 12 13:46:40 1970 +0' | |||||
43 | summary: initial |
|
43 | summary: initial | |
44 |
|
44 | |||
45 | foo 5:5f8fb06e083e |
|
45 | foo 5:5f8fb06e083e | |
46 |
|
|
46 | default 3:bf1bc2f45e83 | |
47 | bar 2:67ec16bde7f1 |
|
47 | bar 2:67ec16bde7f1 | |
48 | foo |
|
48 | foo | |
49 |
|
49 | default | ||
50 | bar |
|
50 | bar | |
51 | % test for invalid branch cache |
|
51 | % test for invalid branch cache | |
52 | rolling back last transaction |
|
52 | rolling back last transaction | |
@@ -74,23 +74,23 b' modify a branch' | |||||
74 |
|
74 | |||
75 |
|
75 | |||
76 | 4:4909a3732169 |
|
76 | 4:4909a3732169 | |
77 |
features: |
|
77 | features: default | |
78 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 |
|
78 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4 | |
79 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 |
|
79 | bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default | |
80 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo |
|
80 | 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo | |
81 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar |
|
81 | 67ec16bde7f1575d523313b9bca000f6a6f12dca bar | |
82 | % test for different branch cache features |
|
82 | % test for different branch cache features | |
83 | branch cache: no features specified |
|
83 | branch cache: no features specified | |
84 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f |
|
84 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
85 |
|
|
85 | default 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
86 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca |
|
86 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
87 |
branch cache: |
|
87 | branch cache: missing features: default | |
88 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f |
|
88 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
89 |
|
|
89 | default 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
90 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca |
|
90 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
91 |
branch cache: missing features: |
|
91 | branch cache: missing features: default | |
92 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f |
|
92 | foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f | |
93 |
|
|
93 | default 3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8 | |
94 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca |
|
94 | bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca | |
95 | % test old hg reading branch cache with feature list |
|
95 | % test old hg reading branch cache with feature list | |
96 | ValueError raised correctly, good. |
|
96 | ValueError raised correctly, good. |
General Comments 0
You need to be logged in to leave comments.
Login now