Show More
@@ -384,7 +384,7 b' def demo(ui, repo, *args, **opts):' | |||||
384 | fn = 'demo.txt' |
|
384 | fn = 'demo.txt' | |
385 | tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
|
385 | tmpdir = tempfile.mkdtemp('', 'kwdemo.') | |
386 | ui.note(_('creating temporary repository at %s\n') % tmpdir) |
|
386 | ui.note(_('creating temporary repository at %s\n') % tmpdir) | |
387 | repo = localrepo.localrepository(ui, tmpdir, True) |
|
387 | repo = localrepo.localrepository(repo.baseui, tmpdir, True) | |
388 | ui.setconfig('keyword', fn, '') |
|
388 | ui.setconfig('keyword', fn, '') | |
389 | svn = ui.configbool('keywordset', 'svn') |
|
389 | svn = ui.configbool('keywordset', 'svn') | |
390 | # explicitly set keywordset for demo output |
|
390 | # explicitly set keywordset for demo output |
@@ -41,7 +41,7 b' def relink(ui, repo, origin=None, **opts' | |||||
41 | if (not util.safehasattr(util, 'samefile') or |
|
41 | if (not util.safehasattr(util, 'samefile') or | |
42 | not util.safehasattr(util, 'samedevice')): |
|
42 | not util.safehasattr(util, 'samedevice')): | |
43 | raise util.Abort(_('hardlinks are not supported on this system')) |
|
43 | raise util.Abort(_('hardlinks are not supported on this system')) | |
44 | src = hg.repository(ui, ui.expandpath(origin or 'default-relink', |
|
44 | src = hg.repository(repo.baseui, ui.expandpath(origin or 'default-relink', | |
45 | origin or 'default')) |
|
45 | origin or 'default')) | |
46 | ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path)) |
|
46 | ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path)) | |
47 | if repo.root == src.root: |
|
47 | if repo.root == src.root: |
@@ -59,7 +59,7 b' def unshare(ui, repo):' | |||||
59 | lock and lock.release() |
|
59 | lock and lock.release() | |
60 |
|
60 | |||
61 | # update store, spath, sopener and sjoin of repo |
|
61 | # update store, spath, sopener and sjoin of repo | |
62 | repo.__init__(ui, repo.root) |
|
62 | repo.__init__(repo.baseui, repo.root) | |
63 |
|
63 | |||
64 | cmdtable = { |
|
64 | cmdtable = { | |
65 | "share": |
|
65 | "share": |
@@ -360,7 +360,8 b' def getremotechanges(ui, repo, other, on' | |||||
360 | bundle = None |
|
360 | bundle = None | |
361 | if not localrepo: |
|
361 | if not localrepo: | |
362 | # use the created uncompressed bundlerepo |
|
362 | # use the created uncompressed bundlerepo | |
363 |
localrepo = bundlerepo = bundlerepository(ui, repo.root, |
|
363 | localrepo = bundlerepo = bundlerepository(repo.baseui, repo.root, | |
|
364 | fname) | |||
364 | # this repo contains local and other now, so filter out local again |
|
365 | # this repo contains local and other now, so filter out local again | |
365 | common = repo.heads() |
|
366 | common = repo.heads() | |
366 | if localrepo: |
|
367 | if localrepo: |
General Comments 0
You need to be logged in to leave comments.
Login now