core/commands/ls: Remove trailing tabs
Since 607468a9 (beautify 'ipfs ls' and 'ipfs object links', #833) we've had these. That pull request was about text/tabwriter [1] and elastic tabstops [2], but we don't need a column separator at the end of each line. [1]: https://golang.org/pkg/text/tabwriter/ [2]: http://nickgravgaard.com/elastic-tabstops/index.html Licence: MIT Signed-off-by: W. Trevor King <wking@tremily.us>
W. Trevor King committed
Jun 8, 2015 at 22:36 UTC
15135e10df47c6225eada08089116276d03891d6
3 files changed
+22
-22
core/commands/ls.go
+2
-2
@@ -116,13 +116,13 @@ it contains, with the following format:
116
fmt.Fprintf(w, "%s:\n", object.Hash)
117
}
118
if headers {
119
- fmt.Fprintln(w, "Hash\tSize\tName\t")
119
+ fmt.Fprintln(w, "Hash\tSize\tName")
120
}
121
for _, link := range object.Links {
122
if link.Type == unixfspb.Data_Directory {
123
link.Name += "/"
124
}
125
- fmt.Fprintf(w, "%s\t%v\t%s\t\n", link.Hash, link.Size, link.Name)
125
+ fmt.Fprintf(w, "%s\t%v\t%s\n", link.Hash, link.Size, link.Name)
126
}
127
if len(output.Objects) > 1 {
128
fmt.Fprintln(w)
test/sharness/t0045-ls.sh
+19
-19
@@ -45,18 +45,18 @@ test_ls_cmd() {
45
test_expect_success "'ipfs ls <three dir hashes>' output looks good" '
46
cat <<-\EOF >expected_ls &&
47
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
48
- QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
49
- QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
50
- QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
51
- QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
48
+ QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
49
+ QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
50
+ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
51
+ QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
52
53
QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy:
54
- QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
55
- QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
54
+ QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
55
+ QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
56
57
QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss:
58
- QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
59
- QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
58
+ QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
59
+ QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
60
61
EOF
62
test_cmp expected_ls actual_ls
@@ -69,21 +69,21 @@ test_ls_cmd() {
69
test_expect_success "'ipfs ls --headers <three dir hashes>' output looks good" '
70
cat <<-\EOF >expected_ls_headers &&
71
QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
72
- Hash Size Name
73
- QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
74
- QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
75
- QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
76
- QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
72
+ Hash Size Name
73
+ QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
74
+ QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
75
+ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
76
+ QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
77
78
QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy:
79
- Hash Size Name
80
- QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
81
- QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
79
+ Hash Size Name
80
+ QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
81
+ QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
82
83
QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss:
84
- Hash Size Name
85
- QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
86
- QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
84
+ Hash Size Name
85
+ QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
86
+ QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
87
88
EOF
89
test_cmp expected_ls_headers actual_ls_headers
test/sharness/t0051-object.sh
+1
-1
@@ -105,7 +105,7 @@ test_object_cmd() {
105
'
106
107
test_expect_success "output looks good" '
108
- echo "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn 4 foo/ " > patched_exp &&
108
+ echo "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn 4 foo/" > patched_exp &&
109
test_cmp patched_exp patched_output
110
'
111