Mercurial > public > mercurial-scm > hg
diff hgext/share.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | 526750cdd02d |
| children | 687b865b95ad |
line wrap: on
line diff
--- a/hgext/share.py Sat Oct 05 10:29:34 2019 -0400 +++ b/hgext/share.py Sun Oct 06 09:45:02 2019 -0400 @@ -60,17 +60,26 @@ # leave the attribute unspecified. testedwith = 'ships-with-hg-core' -@command('share', - [('U', 'noupdate', None, _('do not create a working directory')), - ('B', 'bookmarks', None, _('also share bookmarks')), - ('', 'relative', None, _('point to source using a relative path ' - '(EXPERIMENTAL)')), + +@command( + 'share', + [ + ('U', 'noupdate', None, _('do not create a working directory')), + ('B', 'bookmarks', None, _('also share bookmarks')), + ( + '', + 'relative', + None, + _('point to source using a relative path ' '(EXPERIMENTAL)'), + ), ], _('[-U] [-B] SOURCE [DEST]'), helpcategory=command.CATEGORY_REPO_CREATION, - norepo=True) -def share(ui, source, dest=None, noupdate=False, bookmarks=False, - relative=False): + norepo=True, +) +def share( + ui, source, dest=None, noupdate=False, bookmarks=False, relative=False +): """create a new shared repository Initialize a new repository and working directory that shares its @@ -88,10 +97,17 @@ the broken clone to reset it to a changeset that still exists. """ - hg.share(ui, source, dest=dest, update=not noupdate, - bookmarks=bookmarks, relative=relative) + hg.share( + ui, + source, + dest=dest, + update=not noupdate, + bookmarks=bookmarks, + relative=relative, + ) return 0 + @command('unshare', [], '', helpcategory=command.CATEGORY_MAINTENANCE) def unshare(ui, repo): """convert a shared repository to a normal one @@ -104,6 +120,7 @@ hg.unshare(ui, repo) + # Wrap clone command to pass auto share options. def clone(orig, ui, source, *args, **opts): pool = ui.config('share', 'pool') @@ -117,12 +134,14 @@ return orig(ui, source, *args, **opts) + def extsetup(ui): extensions.wrapfunction(bookmarks, '_getbkfile', getbkfile) extensions.wrapfunction(bookmarks.bmstore, '_recordchange', recordchange) extensions.wrapfunction(bookmarks.bmstore, '_writerepo', writerepo) extensions.wrapcommand(commands.table, 'clone', clone) + def _hassharedbookmarks(repo): """Returns whether this repo has shared bookmarks""" if bookmarks.bookmarksinstore(repo): @@ -137,6 +156,7 @@ return False return hg.sharedbookmarks in shared + def getbkfile(orig, repo): if _hassharedbookmarks(repo): srcrepo = hg.sharedreposource(repo) @@ -144,8 +164,9 @@ # just orig(srcrepo) doesn't work as expected, because # HG_PENDING refers repo.root. try: - fp, pending = txnutil.trypending(repo.root, repo.vfs, - 'bookmarks') + fp, pending = txnutil.trypending( + repo.root, repo.vfs, 'bookmarks' + ) if pending: # only in this case, bookmark information in repo # is up-to-date. @@ -165,6 +186,7 @@ # See also https://www.mercurial-scm.org/wiki/SharedRepository return orig(repo) + def recordchange(orig, self, tr): # Continue with write to local bookmarks file as usual orig(self, tr) @@ -175,6 +197,7 @@ category = 'share-bookmarks' tr.addpostclose(category, lambda tr: self._writerepo(srcrepo)) + def writerepo(orig, self, repo): # First write local bookmarks file in case we ever unshare orig(self, repo)