Show More
@@ -993,6 +993,17 b' class queue:' | |||
|
993 | 993 | self.ui.warn(_("no patches applied\n")) |
|
994 | 994 | return not all |
|
995 | 995 | |
|
996 | if all: | |
|
997 | start = 0 | |
|
998 | elif patch: | |
|
999 | start = info[0] + 1 | |
|
1000 | else: | |
|
1001 | start = len(self.applied) - 1 | |
|
1002 | ||
|
1003 | if start >= len(self.applied): | |
|
1004 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) | |
|
1005 | return | |
|
1006 | ||
|
996 | 1007 | if not update: |
|
997 | 1008 | parents = repo.dirstate.parents() |
|
998 | 1009 | rr = [ revlog.bin(x.rev) for x in self.applied ] |
@@ -1004,23 +1015,9 b' class queue:' | |||
|
1004 | 1015 | if not force and update: |
|
1005 | 1016 | self.check_localchanges(repo) |
|
1006 | 1017 | |
|
1007 |
self.applied_dirty = 1 |
|
|
1018 | self.applied_dirty = 1 | |
|
1008 | 1019 | end = len(self.applied) |
|
1009 | if not patch: | |
|
1010 | if all: | |
|
1011 | popi = 0 | |
|
1012 | else: | |
|
1013 | popi = len(self.applied) - 1 | |
|
1014 | else: | |
|
1015 | popi = info[0] + 1 | |
|
1016 | if popi >= end: | |
|
1017 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) | |
|
1018 | return | |
|
1019 | info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name] | |
|
1020 | ||
|
1021 | start = info[0] | |
|
1022 | rev = revlog.bin(info[1]) | |
|
1023 | ||
|
1020 | rev = revlog.bin(self.applied[start].rev) | |
|
1024 | 1021 | if update: |
|
1025 | 1022 | top = self.check_toppatch(repo) |
|
1026 | 1023 |
General Comments 0
You need to be logged in to leave comments.
Login now