Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.py @ 26551:5b8faea8b509
extract: move 'branch' assignment where it is parsed
There is one setter and no consumer, we can move it there directly.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 06 Oct 2015 02:06:36 -0700 |
| parents | 72782f60dbc9 |
| children | 4caf143313a8 |
comparison
equal
deleted
inserted
replaced
| 26550:72782f60dbc9 | 26551:5b8faea8b509 |
|---|---|
| 188 subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n' | 188 subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n' |
| 189 | 189 |
| 190 # should try to parse msg['Date'] | 190 # should try to parse msg['Date'] |
| 191 date = None | 191 date = None |
| 192 nodeid = None | 192 nodeid = None |
| 193 branch = None | |
| 194 parents = [] | 193 parents = [] |
| 195 | 194 |
| 196 if subject: | 195 if subject: |
| 197 if subject.startswith('[PATCH'): | 196 if subject.startswith('[PATCH'): |
| 198 pend = subject.find(']') | 197 pend = subject.find(']') |
| 234 user = line[7:] | 233 user = line[7:] |
| 235 ui.debug('From: %s\n' % user) | 234 ui.debug('From: %s\n' % user) |
| 236 elif line.startswith("# Date "): | 235 elif line.startswith("# Date "): |
| 237 date = line[7:] | 236 date = line[7:] |
| 238 elif line.startswith("# Branch "): | 237 elif line.startswith("# Branch "): |
| 239 branch = line[9:] | 238 data['branch'] = line[9:] |
| 240 elif line.startswith("# Node ID "): | 239 elif line.startswith("# Node ID "): |
| 241 nodeid = line[10:] | 240 nodeid = line[10:] |
| 242 elif line.startswith("# Parent "): | 241 elif line.startswith("# Parent "): |
| 243 parents.append(line[9:].lstrip()) | 242 parents.append(line[9:].lstrip()) |
| 244 elif not line.startswith("# "): | 243 elif not line.startswith("# "): |
| 266 tmpfp.close() | 265 tmpfp.close() |
| 267 if not diffs_seen: | 266 if not diffs_seen: |
| 268 os.unlink(tmpname) | 267 os.unlink(tmpname) |
| 269 data['user'] = user | 268 data['user'] = user |
| 270 data['date'] = date | 269 data['date'] = date |
| 271 data['branch'] = branch | |
| 272 return data | 270 return data |
| 273 | 271 |
| 274 if parents: | 272 if parents: |
| 275 data['p1'] = parents.pop(0) | 273 data['p1'] = parents.pop(0) |
| 276 if parents: | 274 if parents: |
| 277 data['p2'] = parents.pop(0) | 275 data['p2'] = parents.pop(0) |
| 278 | 276 |
| 279 data['filename'] = tmpname | 277 data['filename'] = tmpname |
| 280 data['user'] = user | 278 data['user'] = user |
| 281 data['date'] = date | 279 data['date'] = date |
| 282 data['branch'] = branch | |
| 283 data['nodeid'] = nodeid | 280 data['nodeid'] = nodeid |
| 284 return data | 281 return data |
| 285 | 282 |
| 286 class patchmeta(object): | 283 class patchmeta(object): |
| 287 """Patched file metadata | 284 """Patched file metadata |