Show More
@@ -4,6 +4,7 b'' | |||||
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
|
7 | import errno | |||
7 |
|
8 | |||
8 | from node import nullid |
|
9 | from node import nullid | |
9 | from i18n import _ |
|
10 | from i18n import _ | |
@@ -80,7 +81,9 b' class dirstate(object):' | |||||
80 | def _branch(self): |
|
81 | def _branch(self): | |
81 | try: |
|
82 | try: | |
82 | return self._opener.read("branch").strip() or "default" |
|
83 | return self._opener.read("branch").strip() or "default" | |
83 | except IOError: |
|
84 | except IOError, inst: | |
|
85 | if inst.errno != errno.ENOENT: | |||
|
86 | raise | |||
84 | return "default" |
|
87 | return "default" | |
85 |
|
88 | |||
86 | @propertycache |
|
89 | @propertycache |
General Comments 0
You need to be logged in to leave comments.
Login now