124 vieworder = views.keys() |
124 vieworder = views.keys() |
125 vieworder.sort(key=len, reverse=True) |
125 vieworder.sort(key=len, reverse=True) |
126 |
126 |
127 # handle revision limiting |
127 # handle revision limiting |
128 startrev = self.ui.config('convert', 'p4.startrev', default=0) |
128 startrev = self.ui.config('convert', 'p4.startrev', default=0) |
129 self.p4changes = [x for x in self.p4changes |
|
130 if ((not startrev or int(x) >= int(startrev)) and |
|
131 (not self.revs or int(x) <= int(self.revs[0])))] |
|
132 |
129 |
133 # now read the full changelists to get the list of file revisions |
130 # now read the full changelists to get the list of file revisions |
134 ui.status(_('collecting p4 changelists\n')) |
131 ui.status(_('collecting p4 changelists\n')) |
135 lastid = None |
132 lastid = None |
136 for change in self.p4changes: |
133 for change in self.p4changes: |
|
134 if startrev and int(change) < int(startrev): |
|
135 continue |
|
136 if self.revs and int(change) > int(self.revs[0]): |
|
137 continue |
|
138 |
137 cmd = "p4 -G describe -s %s" % change |
139 cmd = "p4 -G describe -s %s" % change |
138 stdout = util.popen(cmd, mode='rb') |
140 stdout = util.popen(cmd, mode='rb') |
139 d = marshal.load(stdout) |
141 d = marshal.load(stdout) |
140 desc = self.recode(d.get("desc", "")) |
142 desc = self.recode(d.get("desc", "")) |
141 shortdesc = desc.split("\n", 1)[0] |
143 shortdesc = desc.split("\n", 1)[0] |