Merge lp:~ricardokirkner/locolander/lean-output into lp:locolander

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 30
Merged at revision: 28
Proposed branch: lp:~ricardokirkner/locolander/lean-output
Merge into: lp:locolander
Prerequisite: lp:~ricardokirkner/locolander/explicit-dependencies
Diff against target: 73 lines (+10/-12)
2 files modified
docker/scripts/locolander (+8/-9)
locolander/locolanderweb/templates/locolanderweb/project/detail.html (+2/-3)
To merge this branch: bzr merge lp:~ricardokirkner/locolander/lean-output
Reviewer Review Type Date Requested Status
Facundo Batista Approve
Review via email: mp+177236@code.launchpad.net

Commit message

limit verboseness of merge request processing output to the minimum

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docker/scripts/locolander'
2--- docker/scripts/locolander 2013-07-09 18:43:37 +0000
3+++ docker/scripts/locolander 2013-07-27 00:07:32 +0000
4@@ -26,12 +26,12 @@
5
6 # 1. get target branch
7 echo "Getting target branch ($TARGET) ..."
8-bzr branch $TARGET target
9+OUTPUT=$(bzr branch $TARGET target 2>&1)
10
11 # 2. merge source
12 echo "Merging source branch ($SOURCE) into target ..."
13 cd target
14-bzr merge $SOURCE
15+OUTPUT=$(bzr merge $SOURCE 2>&1)
16
17 # figure out if there are any changes
18 DIFF=$(bzr diff)
19@@ -53,8 +53,8 @@
20 if [ -e Dockerfile ]; then
21 mv Dockerfile .Dockerfile.locolander
22 fi
23-python ns2df.py $PROJECT .locolander.yml Dockerfile
24-OUTPUT=$(docker build -t $PROJECT .)
25+OUTPUT=$(python ns2df.py $PROJECT .locolander.yml Dockerfile 2>&1)
26+OUTPUT=$(docker build -t $PROJECT . 2>&1)
27 if [ -z $? -o "`echo $OUTPUT | grep 'Error'`" != "" ]; then
28 echo "FAILURE - Build failed:"
29 echo $OUTPUT
30@@ -67,8 +67,7 @@
31
32 # 4. run test script using image
33 echo "Running tests ..."
34-OUTPUT=$(docker run $PROJECT)
35-echo $OUTPUT
36+docker run $PROJECT
37
38 if [ -z $? -o "`echo $OUTPUT | grep 'Error'`" != "" ]; then
39 echo "FAILURE - Tests failed"
40@@ -79,14 +78,14 @@
41 echo "Committing merge ..."
42
43 if [ "$AUTHOR" != "" ]; then
44- bzr commit -m "$COMMIT_MSG" --author="$AUTHOR"
45+ OUTPUT=$(bzr commit -m "$COMMIT_MSG" --author="$AUTHOR" 2>&1)
46 else
47- bzr commit -m "$COMMIT_MSG"
48+ OUTPUT=$(bzr commit -m "$COMMIT_MSG" 2>&1)
49 fi
50
51 # 6. push branch
52 echo "Pushing merge ..."
53-bzr push $TARGET
54+OUTPUT=$(bzr push $TARGET 2>&1)
55
56 echo "SUCCESS"
57
58
59=== modified file 'locolander/locolanderweb/templates/locolanderweb/project/detail.html'
60--- locolander/locolanderweb/templates/locolanderweb/project/detail.html 2013-07-22 01:00:12 +0000
61+++ locolander/locolanderweb/templates/locolanderweb/project/detail.html 2013-07-27 00:07:32 +0000
62@@ -37,9 +37,8 @@
63 <span>
64 {{ entry.timestamp }}
65 </span>
66- <pre style="background: #eeeeee;">
67- {{ entry.raw|wordwrap:120 }}
68- </pre>
69+ {% comment %}make sure not to add any extra whitespace between the pre tags{% endcomment %}
70+ <pre style="background: #eeeeee;">{{ entry.raw|linebreaksbr }}</pre>
71 </div>
72 {% endfor %}
73 {% endif %}

Subscribers

People subscribed via source and target branches

to all changes: