Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 1605
- 899cb1241de5
- parent 1509
- c0b5e693b0eb
- child 1746
- 6c74208f22a2
equal
deleted
inserted
replaced
| 1603:78e467568df7 | 1605:899cb1241de5 |
|---|---|
| 129 if self.mode in ("incoming", "outgoing"): | 129 if self.mode in ("incoming", "outgoing"): |
| 130 args.append("--newest-first") | 130 args.append("--newest-first") |
| 131 if self.mode == "log": | 131 if self.mode == "log": |
| 132 args.append('--copies') | 132 args.append('--copies') |
| 133 args.append('--style') | 133 args.append('--style') |
| 134 if self.vcs.version >= (1, 8): | 134 if self.vcs.version >= (2, 1): |
| 135 args.append(os.path.join(os.path.dirname(__file__), | |
| 136 "styles", "logDialogBookmarkPhase.style")) | |
| 137 elif self.vcs.version >= (1, 8): | |
| 135 args.append(os.path.join(os.path.dirname(__file__), | 138 args.append(os.path.join(os.path.dirname(__file__), |
| 136 "styles", "logDialogBookmark.style")) | 139 "styles", "logDialogBookmark.style")) |
| 137 else: | 140 else: |
| 138 args.append(os.path.join(os.path.dirname(__file__), | 141 args.append(os.path.join(os.path.dirname(__file__), |
| 139 "styles", "logDialog.style")) | 142 "styles", "logDialog.style")) |
| 299 self.trUtf8('diff to {0}').format(parent), | 302 self.trUtf8('diff to {0}').format(parent), |
| 300 ) | 303 ) |
| 301 dstr += '<br />\n' | 304 dstr += '<br />\n' |
| 302 html += dstr | 305 html += dstr |
| 303 | 306 |
| 307 if "phase" in entry: | |
| 308 html += self.trUtf8("Phase: {0}<br />\n").format(entry["phase"]) | |
| 309 | |
| 304 html += self.trUtf8("Branches: {0}<br />\n").format(entry["branches"]) | 310 html += self.trUtf8("Branches: {0}<br />\n").format(entry["branches"]) |
| 305 | 311 |
| 306 html += self.trUtf8("Tags: {0}<br />\n").format(entry["tags"]) | 312 html += self.trUtf8("Tags: {0}<br />\n").format(entry["tags"]) |
| 307 | 313 |
| 308 if "bookmarks" in entry: | 314 if "bookmarks" in entry: |
| 382 value = line | 388 value = line |
| 383 if key == "change": | 389 if key == "change": |
| 384 self.endInitialText = True | 390 self.endInitialText = True |
| 385 if key in ("change", "branches", "tags", "parents", "user", | 391 if key in ("change", "branches", "tags", "parents", "user", |
| 386 "date", "file_copies", "file_adds", "files_mods", | 392 "date", "file_copies", "file_adds", "files_mods", |
| 387 "file_dels", "bookmarks"): | 393 "file_dels", "bookmarks", "phase"): |
| 388 self.lastLogEntry[key] = value.strip() | 394 self.lastLogEntry[key] = value.strip() |
| 389 elif key == "description": | 395 elif key == "description": |
| 390 self.lastLogEntry[key] = [value.strip()] | 396 self.lastLogEntry[key] = [value.strip()] |
| 391 else: | 397 else: |
| 392 if self.endInitialText: | 398 if self.endInitialText: |
