Show More
@@ -42,7 +42,11 b' commands.norepo += " qclone qversion"' | |||||
42 | class StatusEntry: |
|
42 | class StatusEntry: | |
43 | def __init__(self, rev, name=None): |
|
43 | def __init__(self, rev, name=None): | |
44 | if not name: |
|
44 | if not name: | |
45 |
|
|
45 | fields = rev.split(':') | |
|
46 | if len(fields) == 2: | |||
|
47 | self.rev, self.name = fields | |||
|
48 | else: | |||
|
49 | self.rev, self.name = None, None | |||
46 | else: |
|
50 | else: | |
47 | self.rev, self.name = rev, name |
|
51 | self.rev, self.name = rev, name | |
48 |
|
52 | |||
@@ -958,8 +962,7 b' class queue:' | |||||
958 | self.ui.write("%s\n" % x) |
|
962 | self.ui.write("%s\n" % x) | |
959 |
|
963 | |||
960 | def issaveline(self, l): |
|
964 | def issaveline(self, l): | |
961 | name = l.split(':')[1] |
|
965 | if l.name == '.hg.patches.save.line': | |
962 | if name == '.hg.patches.save.line': |
|
|||
963 | return True |
|
966 | return True | |
964 |
|
967 | |||
965 | def qrepo(self, create=False): |
|
968 | def qrepo(self, create=False): | |
@@ -1039,8 +1042,8 b' class queue:' | |||||
1039 | pp = r.dirstate.parents() |
|
1042 | pp = r.dirstate.parents() | |
1040 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) |
|
1043 | msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1])) | |
1041 | msg += "\n\nPatch Data:\n" |
|
1044 | msg += "\n\nPatch Data:\n" | |
1042 |
text = msg + "\n".join(str(self.applied |
|
1045 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and | |
1043 | + '\n' or "") |
|
1046 | "\n".join(ar) + '\n' or "") | |
1044 | n = repo.commit(None, text, user=None, force=1) |
|
1047 | n = repo.commit(None, text, user=None, force=1) | |
1045 | if not n: |
|
1048 | if not n: | |
1046 | self.ui.warn("repo commit failed\n") |
|
1049 | self.ui.warn("repo commit failed\n") |
General Comments 0
You need to be logged in to leave comments.
Login now