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