Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
- changeset 2827
- 9a7928798cfe
- parent 2816
- 05aab5164d64
- child 2847
- 1843ef6e2656
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2826:22c39062c274 | 2827:9a7928798cfe |
|---|---|
| 385 .format("<br/>".join(cinfo))) | 385 .format("<br/>".join(cinfo))) |
| 386 if "update" in infoDict: | 386 if "update" in infoDict: |
| 387 if infoDict["update"][0] == "@CURRENT@": | 387 if infoDict["update"][0] == "@CURRENT@": |
| 388 uinfo = self.trUtf8("current") | 388 uinfo = self.trUtf8("current") |
| 389 elif infoDict["update"][0] == "@UPDATE@": | 389 elif infoDict["update"][0] == "@UPDATE@": |
| 390 uinfo = self.trUtf8("{0} new changesets<br/>Update required")\ | 390 uinfo = self.trUtf8("%n new changeset(s)<br/>Update required", "", |
| 391 .format(infoDict["update"][1]) | 391 infoDict["update"][1]) |
| 392 elif infoDict["update"][0] == "@MERGE@": | 392 elif infoDict["update"][0] == "@MERGE@": |
| 393 uinfo = self.trUtf8( | 393 uinfo1 = self.trUtf8("%n new changeset(s)", "", infoDict["update"][1]) |
| 394 "{0} new changesets<br/>{1} branch heads<br/>Merge required")\ | 394 uinfo2 = self.trUtf8("%n branch head(s)", "", infoDict["update"][2]) |
| 395 .format(infoDict["update"][1], infoDict["update"][2]) | 395 uinfo = self.trUtf8("{0}<br/>{1}<br/>Merge required", |
| 396 "0 is changesets, 1 is branch heads")\ | |
| 397 .format(uinfo1, uinfo2) | |
| 396 else: | 398 else: |
| 397 uinfo = self.trUtf8("unknown status") | 399 uinfo = self.trUtf8("unknown status") |
| 398 info.append( | 400 info.append( |
| 399 self.trUtf8("<tr><td><b>Update Status</b></td><td>{0}</td></tr>") | 401 self.trUtf8("<tr><td><b>Update Status</b></td><td>{0}</td></tr>") |
| 400 .format(uinfo)) | 402 .format(uinfo)) |
| 407 l.append(self.trUtf8("1 or more incoming")) | 409 l.append(self.trUtf8("1 or more incoming")) |
| 408 if infoDict["remote"][1]: | 410 if infoDict["remote"][1]: |
| 409 l.append(self.trUtf8("{0} outgoing")\ | 411 l.append(self.trUtf8("{0} outgoing")\ |
| 410 .format(infoDict["remote"][1])) | 412 .format(infoDict["remote"][1])) |
| 411 if infoDict["remote"][2]: | 413 if infoDict["remote"][2]: |
| 412 l.append(self.trUtf8("{0} incoming bookmarks") | 414 l.append(self.trUtf8("%n incoming bookmark(s)", "", |
| 413 .format(infoDict["remote"][2])) | 415 infoDict["remote"][2])) |
| 414 if infoDict["remote"][3]: | 416 if infoDict["remote"][3]: |
| 415 l.append(self.trUtf8("{0} outgoing bookmarks") | 417 l.append(self.trUtf8("%n outgoing bookmark(s)", "", |
| 416 .format(infoDict["remote"][3])) | 418 infoDict["remote"][3])) |
| 417 rinfo = "<br/>".join(l) | 419 rinfo = "<br/>".join(l) |
| 418 info.append( | 420 info.append( |
| 419 self.trUtf8("<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") | 421 self.trUtf8("<tr><td><b>Remote Status</b></td><td>{0}</td></tr>") |
| 420 .format(rinfo)) | 422 .format(rinfo)) |
| 421 if "mq" in infoDict: | 423 if "mq" in infoDict: |
