equal
deleted
inserted
replaced
216 |
216 |
217 if date: |
217 if date: |
218 parseddate = "%d %d" % util.parsedate(date) |
218 parseddate = "%d %d" % util.parsedate(date) |
219 else: |
219 else: |
220 parseddate = "%d %d" % util.makedate() |
220 parseddate = "%d %d" % util.makedate() |
221 if extra and extra.get("branch") in ("default", ""): |
221 if extra: |
222 del extra["branch"] |
222 branch = extra.get("branch") |
|
223 if branch in ("default", ""): |
|
224 del extra["branch"] |
|
225 elif branch in (".", "null", "tip"): |
|
226 raise error.RevlogError(_('the name \'%s\' is reserved') |
|
227 % branch) |
223 if extra: |
228 if extra: |
224 extra = encodeextra(extra) |
229 extra = encodeextra(extra) |
225 parseddate = "%s %s" % (parseddate, extra) |
230 parseddate = "%s %s" % (parseddate, extra) |
226 l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc] |
231 l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc] |
227 text = "\n".join(l) |
232 text = "\n".join(l) |