Mercurial > hg-stable
changeset 29424:f21e0d91d386
share: move magic string to a constant
| author | Martijn Pieters <mjpieters@fb.com> |
|---|---|
| date | Fri, 24 Jun 2016 10:32:38 +0100 |
| parents | d2c6f3a948fa |
| children | 4f5531f8ac38 |
| files | hgext/share.py mercurial/hg.py |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/share.py Sat Mar 12 16:08:19 2016 -0800 +++ b/hgext/share.py Fri Jun 24 10:32:38 2016 +0100 @@ -135,7 +135,7 @@ if inst.errno != errno.ENOENT: raise return False - return 'bookmarks' in shared + return hg.sharedbookmarks in shared def _getsrcrepo(repo): """
--- a/mercurial/hg.py Sat Mar 12 16:08:19 2016 -0800 +++ b/mercurial/hg.py Fri Jun 24 10:32:38 2016 +0100 @@ -44,6 +44,9 @@ release = lock.release +# shared features +sharedbookmarks = 'bookmarks' + def _local(path): path = util.expandpath(util.urllocalpath(path)) return (os.path.isfile(path) and bundlerepo or localrepo) @@ -258,7 +261,7 @@ if bookmarks: fp = destrepo.vfs('shared', 'w') - fp.write('bookmarks\n') + fp.write(sharedbookmarks + '\n') fp.close() def _postshareupdate(repo, update, checkout=None):