sort the list of tags and branches when listed

Author: spderosso

gitless/cli/gl_branch.py

@@ -81,7 +81,7 @@ def _do_list(repo, list_remote, v=False):
   pprint.blank()
 
 
-  for b in (repo.lookup_branch(n) for n in repo.listall_branches()):
+  for b in (repo.lookup_branch(n) for n in sorted(repo.listall_branches())):
     current_str = '*' if b.is_current else ' '
     upstream_str = '(upstream is {0})'.format(b.upstream) if b.upstream else ''
     color = colored.green if b.is_current else colored.yellow
@@ -91,8 +91,8 @@ def _do_list(repo, list_remote, v=False):
       pprint.item('    ➜ head is {0}'.format(pprint.commit_str(b.head)))
 
   if list_remote:
-    for r in repo.remotes:
-      for b in (r.lookup_branch(n) for n in r.listall_branches()):
+    for r in sorted(repo.remotes, key=lambda r: r.name):
+      for b in (r.lookup_branch(n) for n in sorted(r.listall_branches())):
         pprint.item('  {0}'.format(colored.yellow(str(b))))
         if v:
           pprint.item('    ➜ head is {0}'.format(pprint.commit_str(b.head)))

gitless/cli/gl_tag.py

@@ -56,13 +56,13 @@ def _do_list(repo, list_remote):
   pprint.blank()
 
   no_tags = True
-  for t in (repo.lookup_tag(n) for n in repo.listall_tags()):
+  for t in (repo.lookup_tag(n) for n in sorted(repo.listall_tags())):
     pprint.item('{0} ➜ tags {1}'.format(t, pprint.commit_str(t.commit)))
     no_tags = False
 
   if list_remote:
-    for r in repo.remotes:
-      for t in (r.lookup_tag(n) for n in r.listall_tags()):
+    for r in sorted(repo.remotes, key=lambda r: r.name):
+      for t in (r.lookup_tag(n) for n in sorted(r.listall_tags())):
         pprint.item('{0} ➜ tags {1}'.format(t, pprint.commit_str(t.commit)))
         no_tags = False
 

gitless/tests/test_e2e.py

@@ -286,10 +286,18 @@ def test_upstream(self):
     self.assertRaises(
         ErrorReturnCode, gl.branch, '-su', 'non-existent/non-existent')
 
+  def test_list(self):
+    gl.branch(c=self.BRANCH_1)
+    gl.branch(c=self.BRANCH_2)
+    branch_out = utils.stdout(gl.branch(_tty_out=False))
+    self.assertTrue(
+        branch_out.find(self.BRANCH_1) < branch_out.find(self.BRANCH_2))
+
 
 class TestTag(TestEndToEnd):
 
   TAG_1 = 'tag1'
+  TAG_2 = 'tag2'
 
   def setUp(self):
     super(TestTag, self).setUp()
@@ -310,6 +318,13 @@ def test_remove(self):
     if self.TAG_1 in utils.stdout(gl.tag(_tty_out=False)):
       self.fail()
 
+  def test_list(self):
+    gl.tag(c=self.TAG_1)
+    gl.tag(c=self.TAG_2)
+    tag_out = utils.stdout(gl.tag(_tty_out=False))
+    self.assertTrue(
+        tag_out.find(self.TAG_1) < tag_out.find(self.TAG_2))
+
 
 class TestDiffFile(TestEndToEnd):