Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
3a4be990
Commit
3a4be990
authored
Nov 13, 2014
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PEP-8 fixes
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
32340436
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
weblate/trans/tests/test_vcs.py
weblate/trans/tests/test_vcs.py
+2
-1
weblate/trans/vcs.py
weblate/trans/vcs.py
+4
-4
No files found.
weblate/trans/tests/test_vcs.py
View file @
3a4be990
...
...
@@ -271,7 +271,8 @@ class VCSHgTest(VCSGitTest):
def
test_set_committer
(
self
):
self
.
repo
.
set_committer
(
u'Foo Bar Žač'
,
'foo@example.net'
)
self
.
assertEqual
(
self
.
repo
.
get_config
(
'ui'
,
'username'
),
u'Foo Bar Žač <foo@example.net>'
self
.
repo
.
get_config
(
'ui'
,
'username'
),
u'Foo Bar Žač <foo@example.net>'
)
def
test_revision
(
self
):
...
...
weblate/trans/vcs.py
View file @
3a4be990
...
...
@@ -610,14 +610,14 @@ class HgRepository(Repository):
TODO: Need to figure out remote revision
"""
self.set_config('
extensions
', '
strip
'
,
'')
self.set_config('
extensions
', '
strip
'
,
'')
self.execute(['
strip
'])
def rebase(self, branch=None, abort=False):
"""
Rebases working copy on top of remote branch.
"""
self.set_config('
extensions
', '
rebase
'
,
'')
self.set_config('
extensions
', '
rebase
'
,
'')
if abort:
self.execute(['
rebase
', '
--
abort
'])
else:
...
...
@@ -781,8 +781,8 @@ class HgRepository(Repository):
self.set_config('
paths
', '
default
-
push
', push_url)
# We also enable some necessary extensions here
self.set_config('
extensions
', '
strip
'
,
'')
self.set_config('
extensions
', '
rebase
'
,
'')
self.set_config('
extensions
', '
strip
'
,
'')
self.set_config('
extensions
', '
rebase
'
,
'')
def configure_branch(self, branch):
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment