Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- branch
- 5_5_x
- changeset 3717
- 7e3c0ffa307d
- parent 3591
- 2f2a4a76dd22
- child 3864
- bac91da5d76a
equal
deleted
inserted
replaced
| 3712:09b6f92a82ca | 3717:7e3c0ffa307d |
|---|---|
| 138 args.append("--newest-first") | 138 args.append("--newest-first") |
| 139 if self.vcs.hasSubrepositories(): | 139 if self.vcs.hasSubrepositories(): |
| 140 args.append("--subrepos") | 140 args.append("--subrepos") |
| 141 if self.mode == "log": | 141 if self.mode == "log": |
| 142 args.append('--copies') | 142 args.append('--copies') |
| 143 args.append('--style') | 143 if self.vcs.version >= (3, 0): |
| 144 if self.vcs.version >= (2, 1): | 144 args.append('--template') |
| 145 args.append(os.path.join(os.path.dirname(__file__), | 145 args.append(os.path.join(os.path.dirname(__file__), |
| 146 "styles", "logDialogBookmarkPhase.style")) | 146 "templates", |
| 147 else: | 147 "logDialogBookmarkPhase.tmpl")) |
| 148 args.append(os.path.join(os.path.dirname(__file__), | 148 else: |
| 149 "styles", "logDialogBookmark.style")) | 149 args.append('--style') |
| 150 if self.vcs.version >= (2, 1): | |
| 151 args.append(os.path.join(os.path.dirname(__file__), | |
| 152 "styles", | |
| 153 "logDialogBookmarkPhase.style")) | |
| 154 else: | |
| 155 args.append(os.path.join(os.path.dirname(__file__), | |
| 156 "styles", | |
| 157 "logDialogBookmark.style")) | |
| 150 if self.mode == "incoming": | 158 if self.mode == "incoming": |
| 151 if self.bundle: | 159 if self.bundle: |
| 152 args.append(self.bundle) | 160 args.append(self.bundle) |
| 153 elif not self.vcs.hasSubrepositories(): | 161 elif not self.vcs.hasSubrepositories(): |
| 154 project = e5App().getObject("Project") | 162 project = e5App().getObject("Project") |
| 345 | 353 |
| 346 if "phase" in entry: | 354 if "phase" in entry: |
| 347 html += self.tr("Phase: {0}<br />\n")\ | 355 html += self.tr("Phase: {0}<br />\n")\ |
| 348 .format(entry["phase"]) | 356 .format(entry["phase"]) |
| 349 | 357 |
| 350 html += self.tr("Branches: {0}<br />\n")\ | 358 html += self.tr("Branch: {0}<br />\n")\ |
| 351 .format(entry["branches"]) | 359 .format(entry["branches"]) |
| 352 | 360 |
| 353 html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) | 361 html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) |
| 354 | 362 |
| 355 if "bookmarks" in entry: | 363 if "bookmarks" in entry: |
| 358 | 366 |
| 359 html += self.tr("Parents: {0}<br />\n")\ | 367 html += self.tr("Parents: {0}<br />\n")\ |
| 360 .format(entry["parents"]) | 368 .format(entry["parents"]) |
| 361 | 369 |
| 362 html += self.tr('<i>Author: {0}</i><br />\n')\ | 370 html += self.tr('<i>Author: {0}</i><br />\n')\ |
| 363 .format(entry["user"]) | 371 .format(Utilities.html_encode(entry["user"])) |
| 364 | 372 |
| 365 date, time = entry["date"].split()[:2] | 373 date, time = entry["date"].split()[:2] |
| 366 html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ | 374 html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ |
| 367 .format(date, time) | 375 .format(date, time) |
| 368 | 376 |
