Issue 47210043: Always update branches.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 47210043: Always update branches.

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 4 months ago by benji

Modified:
10 years, 4 months ago

Reviewers:
bac, mp+200337, benji-york

Visibility:
Public.

Description

Always update branches. This fixes a bug in which branches could have all the revisions available but be "at" an earlier revision than head. https://code.launchpad.net/~benji/charmworld/always-update-branches/+merge/200337 (do not edit description out of merge proposal)

Patch Set 1 #

Total comments: 7

Patch Set 2 : Always update branches. #

Created: 10 years, 4 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+15 lines, -21 lines)			Patch
A	[revision details]	View	1	1 chunk	+2 lines, -0 lines	0 comments	Download
M	charmworld/jobs/ingest.py	View		1 chunk	+0 lines, -4 lines	0 comments	Download
M	charmworld/jobs/tests/test_bzr.py	View	1	2 chunks	+11 lines, -3 lines	0 comments	Download
M	charmworld/jobs/tests/test_ingest.py	View		1 chunk	+0 lines, -11 lines	0 comments	Download
M	charmworld/views/api/proof.py	View		1 chunk	+1 line, -2 lines	0 comments	Download
M	charmworld/views/tests/test_proof.py	View		1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 4

Expand All Messages | Collapse All Messages

bac

LGMT https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/ingest.py File charmworld/jobs/ingest.py (left): https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/ingest.py#oldcode194 charmworld/jobs/ingest.py:194: elif branch_is_current(branch_data, branch_dir, log): So the problem was ...

10 years, 4 months ago (2014-01-02 19:40:26 UTC) #2

benji-york

10 years, 4 months ago (2014-01-02 20:01:02 UTC) #4

Thanks for the review.

https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/tests/test_bzr.py
File charmworld/jobs/tests/test_bzr.py (right):

https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/tests/test_bzr...
charmworld/jobs/tests/test_bzr.py:93: def
test_updates_exising_branch_even_if_current(self):
On 2014/01/02 19:40:26, bac wrote:
> typo: existing

Done.

https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/tests/test_bzr...
charmworld/jobs/tests/test_bzr.py:96: # unfortunately that lead to an abscure
bug that was very hard to
On 2014/01/02 19:40:26, bac wrote:
> abstract + obscure = abscure?

Done.

https://codereview.appspot.com/47210043/diff/1/charmworld/jobs/tests/test_bzr...
charmworld/jobs/tests/test_bzr.py:102: # always updates the branch even if it
appears to be up to date.
On 2014/01/02 19:40:26, bac wrote:
> Thanks, nice explanation, which answers my previous question.
> 
> minor: up-to-date

Done.

Expand All Messages | Collapse All Messages