diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-18 12:24:27 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-18 12:24:27 +0100 |
| commit | 2bcc7ba44734c73a4a80b40b80a42b1376af5e00 (patch) | |
| tree | 24c47a885bdbf907b8f2b66e03dbf6f58050f579 | |
| parent | 1ff0d7088d6d800f26392850861d71bb2f14932c (diff) | |
| parent | e1ee5840b7e3bb034894fb3a3450dbeaa655b73f (diff) | |
| download | definitions-2bcc7ba44734c73a4a80b40b80a42b1376af5e00.tar.gz | |
Merge branch 'samthursfield/morph-status-in-workspace-sorted'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 5 | ||||
| -rw-r--r-- | tests.branching/status-in-workspace.stdout | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 7fd30420..2c5d1847 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -1345,8 +1345,9 @@ class BranchAndMergePlugin(cliapp.Plugin): if branch is None: self.app.output.write("System branches in current workspace:\n") - for dirname in self.walk_special_directories( - workspace, special_subdir='.morph-system-branch'): + branch_dirs = sorted(self.walk_special_directories( + workspace, special_subdir='.morph-system-branch')) + for dirname in branch_dirs: branch = self.get_branch_config(dirname, 'branch.name') self.app.output.write(" %s\n" % branch) return diff --git a/tests.branching/status-in-workspace.stdout b/tests.branching/status-in-workspace.stdout index 8d34a8a6..15958736 100644 --- a/tests.branching/status-in-workspace.stdout +++ b/tests.branching/status-in-workspace.stdout @@ -1,4 +1,4 @@ System branches in current workspace: - master a/b/c/d/e/bar a/b/c/d/e/foo + master |