Tue, 18 Feb 2014 19:25:24 +0100
Changed the Mercurial log dialog to always show a branch (if hg log doesn't give a branch, 'default' is used).
(grafted from 8f7d9799724311591e68171d4afbc26d3ecbd918)
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sat Feb 15 19:29:20 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Tue Feb 18 19:25:24 2014 +0100 @@ -436,10 +436,15 @@ value = line if key == "change": self.endInitialText = True - if key in ("change", "branches", "tags", "parents", "user", - "date", "file_copies", "file_adds", "files_mods", - "file_dels", "bookmarks", "phase"): + if key in ("change", "tags", "parents", "user", "date", + "file_copies", "file_adds", "files_mods", "file_dels", + "bookmarks", "phase"): self.lastLogEntry[key] = value.strip() + elif key == "branches": + if value.strip(): + self.lastLogEntry[key] = value.strip() + else: + self.lastLogEntry[key] = "default" elif key == "description": self.lastLogEntry[key] = [value.strip()] else: