equal
deleted
inserted
replaced
43 refspec = encoding.tolocal(refspec) |
43 refspec = encoding.tolocal(refspec) |
44 try: |
44 try: |
45 self[refspec] = repo.changelog.lookup(sha) |
45 self[refspec] = repo.changelog.lookup(sha) |
46 except LookupError: |
46 except LookupError: |
47 pass |
47 pass |
48 except IOError, inst: |
48 except IOError as inst: |
49 if inst.errno != errno.ENOENT: |
49 if inst.errno != errno.ENOENT: |
50 raise |
50 raise |
51 |
51 |
52 def getbkfile(self, repo): |
52 def getbkfile(self, repo): |
53 bkfile = None |
53 bkfile = None |
54 if 'HG_PENDING' in os.environ: |
54 if 'HG_PENDING' in os.environ: |
55 try: |
55 try: |
56 bkfile = repo.vfs('bookmarks.pending') |
56 bkfile = repo.vfs('bookmarks.pending') |
57 except IOError, inst: |
57 except IOError as inst: |
58 if inst.errno != errno.ENOENT: |
58 if inst.errno != errno.ENOENT: |
59 raise |
59 raise |
60 if bkfile is None: |
60 if bkfile is None: |
61 bkfile = repo.vfs('bookmarks') |
61 bkfile = repo.vfs('bookmarks') |
62 return bkfile |
62 return bkfile |
114 It is stored in .hg/bookmarks.current |
114 It is stored in .hg/bookmarks.current |
115 """ |
115 """ |
116 mark = None |
116 mark = None |
117 try: |
117 try: |
118 file = repo.vfs('bookmarks.current') |
118 file = repo.vfs('bookmarks.current') |
119 except IOError, inst: |
119 except IOError as inst: |
120 if inst.errno != errno.ENOENT: |
120 if inst.errno != errno.ENOENT: |
121 raise |
121 raise |
122 return None |
122 return None |
123 try: |
123 try: |
124 # No readline() in osutil.posixfile, reading everything is cheap |
124 # No readline() in osutil.posixfile, reading everything is cheap |
157 """ |
157 """ |
158 wlock = repo.wlock() |
158 wlock = repo.wlock() |
159 try: |
159 try: |
160 repo.vfs.unlink('bookmarks.current') |
160 repo.vfs.unlink('bookmarks.current') |
161 repo._activebookmark = None |
161 repo._activebookmark = None |
162 except OSError, inst: |
162 except OSError as inst: |
163 if inst.errno != errno.ENOENT: |
163 if inst.errno != errno.ENOENT: |
164 raise |
164 raise |
165 finally: |
165 finally: |
166 wlock.release() |
166 wlock.release() |
167 |
167 |