Show More
@@ -61,7 +61,7 b' class bzr_source(converter_source):' | |||||
61 | try: |
|
61 | try: | |
62 | tree = dir.open_workingtree(recommend_upgrade=False) |
|
62 | tree = dir.open_workingtree(recommend_upgrade=False) | |
63 | branch = tree.branch |
|
63 | branch = tree.branch | |
64 |
except (errors.NoWorkingTree, errors.NotLocalUrl) |
|
64 | except (errors.NoWorkingTree, errors.NotLocalUrl): | |
65 | tree = None |
|
65 | tree = None | |
66 | branch = dir.open_branch() |
|
66 | branch = dir.open_branch() | |
67 | if (tree is not None and tree.bzrdir.root_transport.base != |
|
67 | if (tree is not None and tree.bzrdir.root_transport.base != |
@@ -53,8 +53,6 b' class convert_cvs(converter_source):' | |||||
53 | try: |
|
53 | try: | |
54 | os.chdir(self.path) |
|
54 | os.chdir(self.path) | |
55 | id = None |
|
55 | id = None | |
56 | state = 0 |
|
|||
57 | filerevids = {} |
|
|||
58 |
|
56 | |||
59 | cache = 'update' |
|
57 | cache = 'update' | |
60 | if not self.ui.configbool('convert', 'cvsps.cache', True): |
|
58 | if not self.ui.configbool('convert', 'cvsps.cache', True): |
@@ -21,7 +21,6 b' def start_server(function):' | |||||
21 | Raise QueryFailed if something went wrong |
|
21 | Raise QueryFailed if something went wrong | |
22 | """ |
|
22 | """ | |
23 | def decorated_function(self, *args): |
|
23 | def decorated_function(self, *args): | |
24 | result = None |
|
|||
25 | try: |
|
24 | try: | |
26 | return function(self, *args) |
|
25 | return function(self, *args) | |
27 | except (OSError, socket.error), err: |
|
26 | except (OSError, socket.error), err: |
@@ -1756,7 +1756,6 b' def applied(ui, repo, patch=None, **opts' | |||||
1756 | """print the patches already applied""" |
|
1756 | """print the patches already applied""" | |
1757 |
|
1757 | |||
1758 | q = repo.mq |
|
1758 | q = repo.mq | |
1759 | l = len(q.applied) |
|
|||
1760 |
|
1759 | |||
1761 | if patch: |
|
1760 | if patch: | |
1762 | if patch not in q.series: |
|
1761 | if patch not in q.series: |
@@ -1360,7 +1360,7 b' def debuginstall(ui):' | |||||
1360 | # check username |
|
1360 | # check username | |
1361 | ui.status(_("Checking username...\n")) |
|
1361 | ui.status(_("Checking username...\n")) | |
1362 | try: |
|
1362 | try: | |
1363 |
|
|
1363 | ui.username() | |
1364 | except util.Abort, e: |
|
1364 | except util.Abort, e: | |
1365 | ui.write(" %s\n" % e) |
|
1365 | ui.write(" %s\n" % e) | |
1366 | ui.write(_(" (specify a username in your .hgrc file)\n")) |
|
1366 | ui.write(_(" (specify a username in your .hgrc file)\n")) |
@@ -383,7 +383,6 b' def tags(web, req, tmpl):' | |||||
383 | latestentry=lambda **x: entries(True, 1, **x)) |
|
383 | latestentry=lambda **x: entries(True, 1, **x)) | |
384 |
|
384 | |||
385 | def branches(web, req, tmpl): |
|
385 | def branches(web, req, tmpl): | |
386 | b = web.repo.branchtags() |
|
|||
387 | tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems()) |
|
386 | tips = (web.repo[n] for t, n in web.repo.branchtags().iteritems()) | |
388 | heads = web.repo.heads() |
|
387 | heads = web.repo.heads() | |
389 | parity = paritygen(web.stripecount) |
|
388 | parity = paritygen(web.stripecount) |
@@ -288,7 +288,7 b' def rename(src, dst):' | |||||
288 | '''atomically rename file src to dst, replacing dst if it exists''' |
|
288 | '''atomically rename file src to dst, replacing dst if it exists''' | |
289 | try: |
|
289 | try: | |
290 | os.rename(src, dst) |
|
290 | os.rename(src, dst) | |
291 |
except OSError |
|
291 | except OSError: # FIXME: check err (EEXIST ?) | |
292 |
|
292 | |||
293 | # On windows, rename to existing file is not allowed, so we |
|
293 | # On windows, rename to existing file is not allowed, so we | |
294 | # must delete destination first. But if a file is open, unlink |
|
294 | # must delete destination first. But if a file is open, unlink |
@@ -123,7 +123,7 b' class wirerepository(repo.repository):' | |||||
123 | _('push failed:'), output) |
|
123 | _('push failed:'), output) | |
124 | try: |
|
124 | try: | |
125 | ret = int(ret) |
|
125 | ret = int(ret) | |
126 |
except ValueError |
|
126 | except ValueError: | |
127 | raise error.ResponseError( |
|
127 | raise error.ResponseError( | |
128 | _('push failed (unexpected response):'), ret) |
|
128 | _('push failed (unexpected response):'), ret) | |
129 |
|
129 |
General Comments 0
You need to be logged in to leave comments.
Login now