Mercurial > hg
changeset 2816:52516e48e3f3
Update qsave to use StatusEntry; don't throw exception on bad status lines.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 07 Aug 2006 14:48:18 -0700 |
parents | 4b20daa25f15 |
children | ff3edd1c1e27 |
files | hgext/mq.py |
diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Aug 07 14:12:03 2006 -0700 +++ b/hgext/mq.py Mon Aug 07 14:48:18 2006 -0700 @@ -42,7 +42,11 @@ class StatusEntry: def __init__(self, rev, name=None): if not name: - self.rev, self.name = rev.split(':') + fields = rev.split(':') + if len(fields) == 2: + self.rev, self.name = fields + else: + self.rev, self.name = None, None else: self.rev, self.name = rev, name @@ -958,8 +962,7 @@ self.ui.write("%s\n" % x) def issaveline(self, l): - name = l.split(':')[1] - if name == '.hg.patches.save.line': + if l.name == '.hg.patches.save.line': return True def qrepo(self, create=False): @@ -1039,8 +1042,8 @@ pp = r.dirstate.parents() msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) msg += "\n\nPatch Data:\n" - text = msg + "\n".join(str(self.applied)) + '\n' + (ar and "\n".join(ar) - + '\n' or "") + text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and + "\n".join(ar) + '\n' or "") n = repo.commit(None, text, user=None, force=1) if not n: self.ui.warn("repo commit failed\n")