equal
deleted
inserted
replaced
56 (.*) : comment (free text, ideally utf-8) |
56 (.*) : comment (free text, ideally utf-8) |
57 |
57 |
58 changelog v0 doesn't use extra |
58 changelog v0 doesn't use extra |
59 """ |
59 """ |
60 if not text: |
60 if not text: |
61 return (nullid, "", (0, 0), [], "", {}) |
61 return (nullid, "", (0, 0), [], "", {'branch': 'default'}) |
62 last = text.index("\n\n") |
62 last = text.index("\n\n") |
63 desc = util.tolocal(text[last + 2:]) |
63 desc = util.tolocal(text[last + 2:]) |
64 l = text[:last].split('\n') |
64 l = text[:last].split('\n') |
65 manifest = bin(l[0]) |
65 manifest = bin(l[0]) |
66 user = util.tolocal(l[1]) |
66 user = util.tolocal(l[1]) |
76 extra = {} |
76 extra = {} |
77 else: |
77 else: |
78 time, timezone, extra = extra_data |
78 time, timezone, extra = extra_data |
79 time, timezone = float(time), int(timezone) |
79 time, timezone = float(time), int(timezone) |
80 extra = self.decode_extra(extra) |
80 extra = self.decode_extra(extra) |
|
81 if not extra.get('branch'): |
|
82 extra['branch'] = 'default' |
81 files = l[3:] |
83 files = l[3:] |
82 return (manifest, user, (time, timezone), files, desc, extra) |
84 return (manifest, user, (time, timezone), files, desc, extra) |
83 |
85 |
84 def read(self, node): |
86 def read(self, node): |
85 return self.extract(self.revision(node)) |
87 return self.extract(self.revision(node)) |
91 |
93 |
92 if date: |
94 if date: |
93 parseddate = "%d %d" % util.parsedate(date) |
95 parseddate = "%d %d" % util.parsedate(date) |
94 else: |
96 else: |
95 parseddate = "%d %d" % util.makedate() |
97 parseddate = "%d %d" % util.makedate() |
|
98 if extra and extra.get("branch") in ("default", ""): |
|
99 del extra["branch"] |
96 if extra: |
100 if extra: |
97 extra = self.encode_extra(extra) |
101 extra = self.encode_extra(extra) |
98 parseddate = "%s %s" % (parseddate, extra) |
102 parseddate = "%s %s" % (parseddate, extra) |
99 list.sort() |
103 list.sort() |
100 l = [hex(manifest), user, parseddate] + list + ["", desc] |
104 l = [hex(manifest), user, parseddate] + list + ["", desc] |