Merge lp:~dedeco/bzr-explorer/fix-948268 into lp:bzr-explorer

Proposed by Dedeco on 2012-03-15
Status: Merged
Merge reported by: Alexander Belchenko
Merged at revision: not available
Proposed branch: lp:~dedeco/bzr-explorer/fix-948268
Merge into: lp:bzr-explorer
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
lib/i18n.py (+9/-0)
Text conflict in lib/i18n.py
To merge this branch: bzr merge lp:~dedeco/bzr-explorer/fix-948268
Reviewer Review Type Date Requested Status
Bazaar Explorer Developers 2012-03-15 Pending
Review via email: mp+97634@code.launchpad.net

This proposal supersedes a proposal from 2012-03-07.

Description of the change

Fixes bug #948268.

Unmerged changes in this branch (rev. 553) are:

- tabs to spaces on changed lines

- this time commit has "--fixes lp:948268"

To post a comment you must log in.
Alexander Belchenko (bialix) wrote : Posted in a previous version of this proposal

The actual change looks good enough for me. But why did you change the identation of the surrounding code? It's a bad idea to arbitrary change identation or formatting in open source projects. Furthermore, in bzr-explorer, qbzr, we're trying to follow recommendations of PEP-8 for python syntax, e.g. use 4 spaces for identation.

I'm inclined to merge only relevant part of you patch and revert other changes.

Alexander Belchenko (bialix) wrote : Posted in a previous version of this proposal

OK, I see, you have changed spaces to tabs. That's also bad: we use only spaces for identation.

Alexander Belchenko (bialix) wrote : Posted in a previous version of this proposal

Also, please use `bzr commit --fixes lp:NNNN` if you want to mark revision as if it supposed to fix the corresponding bug number. It's also available in GUI qcommit under "Fixed bugs" checkbox.

Alexander Belchenko (bialix) wrote : Posted in a previous version of this proposal

Don't use tags for this purpose, please.

Dedeco (dedeco) wrote : Posted in a previous version of this proposal

All right. :)

I'll have these in mind next times.

For the indentation, I used the "standard" 8 spaces tabs, and soft indentation in 4 space stops (in other words, tabs as much as possible, some spaces if needed). So in any editor that tabs are equal to 8 spaces, visual formating would be correct.

Alexander Belchenko (bialix) wrote :

Sorry, I've already merged your branch today and fixed all places I wanted. I see no reason to merge it again. I hope you understand.

Dedeco (dedeco) wrote :

> Sorry, I've already merged your branch today and fixed all places I wanted. I see no reason to merge it again. I hope you understand.
No problem at all.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/i18n.py'
2--- lib/i18n.py 2012-03-15 09:46:34 +0000
3+++ lib/i18n.py 2012-03-15 12:52:19 +0000
4@@ -87,10 +87,19 @@
5 from bzrlib import config
6 lang = config.GlobalConfig().get_user_option('language')
7 if lang:
8+<<<<<<< TREE
9 os.environ['LANGUAGE'] = lang
10 return lang
11 if sys.platform == 'win32':
12 _check_win32_locale()
13+=======
14+ os.environ['LANGUAGE'] = lang
15+ return lang
16+
17+ if sys.platform == 'win32':
18+_check_win32_locale()
19+
20+>>>>>>> MERGE-SOURCE
21 for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
22 lang = os.environ.get(i)
23 if lang:

Subscribers

People subscribed via source and target branches