| durin42 |
| hg-reviewers |
With this commit, hg share should be usable with narrow
repos. Design explained on
https://www.mercurial-scm.org/wiki/NarrowSharePlan
I was running into cache invalidation problems when updating the
narrowspec. After spending a day trying to figure out a good solution,
I resorted to just assigning repo.narrowpats and repo._narrowmatch
after invalidating them.
| Lint Skipped |
| Unit Tests Skipped |
- d1/f, d3/f, d3/g and d5/f should no longer be reported $ hg -R main files
+ not deleting possibly dirty file d3/f
+ not deleting possibly dirty file d3/g
+ not deleting possibly dirty file d5/f
I don't think it's good idea that any read-only commands can update working-copy
files. And I suspect the narrowing/widening process could get complicated if
merge/rebase were underway.
Instead, can't we take the repository as dirty/unfinished state if local
narrowspec differs from store's? The user will have to run some command to
narrow/widen the working directory. Maybe he can also restore narrowspec of
the store to finish ongoing merge/rebase.
In D5278#78697, @yuja wrote:
- d1/f, d3/f, d3/g and d5/f should no longer be reported $ hg -R main files
+ not deleting possibly dirty file d3/f
+ not deleting possibly dirty file d3/g
+ not deleting possibly dirty file d5/fI don't think it's good idea that any read-only commands can update working-copy
files. And I suspect the narrowing/widening process could get complicated if
merge/rebase were underway.
Instead, can't we take the repository as dirty/unfinished state if local
narrowspec differs from store's? The user will have to run some command to
narrow/widen the working directory. Maybe he can also restore narrowspec of
the store to finish ongoing merge/rebase.
That's reasonable. I'll make this instead abort if the narrowspecs don't match and I'll add a hg tracked --update-working-copy or something like that.
This is ready for review again, thanks
Can you somehow serialize the stack? hg phabread :D5278 doesn't work, and
I can't figure out which patches are still alive.
I think it was just D5472 that conflicted, so it might work now that that's
queued. This patch should go last of my pending patches. If it's still not
working, I'll try to fix it when I'm back in a week or two.
Queued, thanks.
+def copytoworkingcopy(repo, tr):
+ if tr:
+ def write(file):
+ spec = repo.svfs.read(FILENAME)
+ file.write(spec)
+ file.close()
+ tr.addfilegenerator('narrowspec', (DIRSTATE_FILENAME,), write,
+ location='plain')
+ else:
+ spec = repo.svfs.read(FILENAME)
+ repo.vfs.write(DIRSTATE_FILENAME, spec)
Maybe write(..., atomictemp=True) is a safer option.
+def _writeaddedfiles(repo, pctx, files):
+ actions = merge.emptyactions()
+ addgaction = actions['g'].append
Nit: merge.ACTION_GET.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/TODO.rst (3 lines) | |||
| M | hgext/narrow/narrowcommands.py (11 lines) | |||
| M | mercurial/hg.py (6 lines) | |||
| M | mercurial/localrepo.py (9 lines) | |||
| M | mercurial/narrowspec.py (70 lines) | |||
| M | tests/test-narrow-debugcommands.t (1 line) | |||
| M | tests/test-narrow-share.t (44 lines) | |||
| M | tests/test-narrow-trackedcmd.t (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Dec 21 2018, 1:13 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| Integration with the share extension needs improvement. Right now | |||||
| we've seen some odd bugs. | |||||
| Address commentary in manifest.excludedmanifestrevlog.add - | Address commentary in manifest.excludedmanifestrevlog.add - | ||||
| specifically we should improve the collaboration with core so that | specifically we should improve the collaboration with core so that | ||||
| add() never gets called on an excluded directory and we can improve | add() never gets called on an excluded directory and we can improve | ||||
| the stand-in to raise a ProgrammingError. | the stand-in to raise a ProgrammingError. | ||||
| Reason more completely about rename-filtering logic in | Reason more completely about rename-filtering logic in | ||||
| narrowfilelog. There could be some surprises lurking there. | narrowfilelog. There could be some surprises lurking there. | ||||
| [('', 'addinclude', [], _('new paths to include')), | [('', 'addinclude', [], _('new paths to include')), | ||||
| ('', 'removeinclude', [], _('old paths to no longer include')), | ('', 'removeinclude', [], _('old paths to no longer include')), | ||||
| ('', 'addexclude', [], _('new paths to exclude')), | ('', 'addexclude', [], _('new paths to exclude')), | ||||
| ('', 'import-rules', '', _('import narrowspecs from a file')), | ('', 'import-rules', '', _('import narrowspecs from a file')), | ||||
| ('', 'removeexclude', [], _('old paths to no longer exclude')), | ('', 'removeexclude', [], _('old paths to no longer exclude')), | ||||
| ('', 'clear', False, _('whether to replace the existing narrowspec')), | ('', 'clear', False, _('whether to replace the existing narrowspec')), | ||||
| ('', 'force-delete-local-changes', False, | ('', 'force-delete-local-changes', False, | ||||
| _('forces deletion of local changes when narrowing')), | _('forces deletion of local changes when narrowing')), | ||||
| ('', 'update-working-copy', False, | |||||
| _('update working copy when the store has changed')), | |||||
| ] + commands.remoteopts, | ] + commands.remoteopts, | ||||
| _('[OPTIONS]... [REMOTE]'), | _('[OPTIONS]... [REMOTE]'), | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def trackedcmd(ui, repo, remotepath=None, *pats, **opts): | def trackedcmd(ui, repo, remotepath=None, *pats, **opts): | ||||
| """show or change the current narrowspec | """show or change the current narrowspec | ||||
| With no argument, shows the current narrowspec entries, one per line. Each | With no argument, shows the current narrowspec entries, one per line. Each | ||||
| line will be prefixed with 'I' or 'X' for included or excluded patterns, | line will be prefixed with 'I' or 'X' for included or excluded patterns, | ||||
| opts['addinclude'].extend(includepats) | opts['addinclude'].extend(includepats) | ||||
| opts['addexclude'].extend(excludepats) | opts['addexclude'].extend(excludepats) | ||||
| addedincludes = narrowspec.parsepatterns(opts['addinclude']) | addedincludes = narrowspec.parsepatterns(opts['addinclude']) | ||||
| removedincludes = narrowspec.parsepatterns(opts['removeinclude']) | removedincludes = narrowspec.parsepatterns(opts['removeinclude']) | ||||
| addedexcludes = narrowspec.parsepatterns(opts['addexclude']) | addedexcludes = narrowspec.parsepatterns(opts['addexclude']) | ||||
| removedexcludes = narrowspec.parsepatterns(opts['removeexclude']) | removedexcludes = narrowspec.parsepatterns(opts['removeexclude']) | ||||
| update_working_copy = opts['update_working_copy'] | |||||
| only_show = not (addedincludes or removedincludes or addedexcludes or | only_show = not (addedincludes or removedincludes or addedexcludes or | ||||
| removedexcludes or newrules) | removedexcludes or newrules or update_working_copy) | ||||
| oldincludes, oldexcludes = repo.narrowpats | oldincludes, oldexcludes = repo.narrowpats | ||||
| # filter the user passed additions and deletions into actual additions and | # filter the user passed additions and deletions into actual additions and | ||||
| # deletions of excludes and includes | # deletions of excludes and includes | ||||
| addedincludes -= oldincludes | addedincludes -= oldincludes | ||||
| removedincludes &= oldincludes | removedincludes &= oldincludes | ||||
| addedexcludes -= oldexcludes | addedexcludes -= oldexcludes | ||||
| fm.write('pat', '%s\n', i, label='narrow.included') | fm.write('pat', '%s\n', i, label='narrow.included') | ||||
| for i in sorted(oldexcludes): | for i in sorted(oldexcludes): | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.write('status', '%s ', 'X', label='narrow.excluded') | fm.write('status', '%s ', 'X', label='narrow.excluded') | ||||
| fm.write('pat', '%s\n', i, label='narrow.excluded') | fm.write('pat', '%s\n', i, label='narrow.excluded') | ||||
| fm.end() | fm.end() | ||||
| return 0 | return 0 | ||||
| if update_working_copy: | |||||
| with repo.wlock(), repo.lock(), repo.transaction('narrow-wc') as tr: | |||||
| narrowspec.updateworkingcopy(repo, tr) | |||||
| narrowspec.copytoworkingcopy(repo, tr) | |||||
| return 0 | |||||
| if not widening and not narrowing: | if not widening and not narrowing: | ||||
| ui.status(_("nothing to widen or narrow\n")) | ui.status(_("nothing to widen or narrow\n")) | ||||
| return 0 | return 0 | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| # Find the revisions we have in common with the remote. These will | # Find the revisions we have in common with the remote. These will | ||||
| localrepo, | localrepo, | ||||
| lock, | lock, | ||||
| logcmdutil, | logcmdutil, | ||||
| logexchange, | logexchange, | ||||
| merge as mergemod, | merge as mergemod, | ||||
| narrowspec, | narrowspec, | ||||
| node, | node, | ||||
| phases, | phases, | ||||
| repository as repositorymod, | |||||
| scmutil, | scmutil, | ||||
| sshpeer, | sshpeer, | ||||
| statichttprepo, | statichttprepo, | ||||
| ui as uimod, | ui as uimod, | ||||
| unionrepo, | unionrepo, | ||||
| url, | url, | ||||
| util, | util, | ||||
| verify as verifymod, | verify as verifymod, | ||||
| Extensions can wrap this function and write additional entries to | Extensions can wrap this function and write additional entries to | ||||
| destrepo/.hg/shared to indicate additional pieces of data to be shared. | destrepo/.hg/shared to indicate additional pieces of data to be shared. | ||||
| """ | """ | ||||
| default = defaultpath or sourcerepo.ui.config('paths', 'default') | default = defaultpath or sourcerepo.ui.config('paths', 'default') | ||||
| if default: | if default: | ||||
| template = ('[paths]\n' | template = ('[paths]\n' | ||||
| 'default = %s\n') | 'default = %s\n') | ||||
| destrepo.vfs.write('hgrc', util.tonativeeol(template % default)) | destrepo.vfs.write('hgrc', util.tonativeeol(template % default)) | ||||
| if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: | |||||
| with destrepo.wlock(): | |||||
| narrowspec.copytoworkingcopy(destrepo, None) | |||||
| def _postshareupdate(repo, update, checkout=None): | def _postshareupdate(repo, update, checkout=None): | ||||
| """Maybe perform a working directory update after a shared repo is created. | """Maybe perform a working directory update after a shared repo is created. | ||||
| ``update`` can be a boolean or a revision to update to. | ``update`` can be a boolean or a revision to update to. | ||||
| """ | """ | ||||
| if not update: | if not update: | ||||
| return | return | ||||
| revs = remoterevs | revs = remoterevs | ||||
| checkout = revs[0] | checkout = revs[0] | ||||
| else: | else: | ||||
| revs = None | revs = None | ||||
| local = destpeer.local() | local = destpeer.local() | ||||
| if local: | if local: | ||||
| if narrow: | if narrow: | ||||
| with local.lock(): | with local.wlock(), local.lock(): | ||||
| local.setnarrowpats(storeincludepats, storeexcludepats) | local.setnarrowpats(storeincludepats, storeexcludepats) | ||||
| u = util.url(abspath) | u = util.url(abspath) | ||||
| defaulturl = bytes(u) | defaulturl = bytes(u) | ||||
| local.ui.setconfig('paths', 'default', defaulturl, 'clone') | local.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||||
| if not stream: | if not stream: | ||||
| if pull: | if pull: | ||||
| stream = False | stream = False | ||||
| A tuple of (includes, excludes). | A tuple of (includes, excludes). | ||||
| """ | """ | ||||
| return narrowspec.load(self) | return narrowspec.load(self) | ||||
| @storecache(narrowspec.FILENAME) | @storecache(narrowspec.FILENAME) | ||||
| def _narrowmatch(self): | def _narrowmatch(self): | ||||
| if repository.NARROW_REQUIREMENT not in self.requirements: | if repository.NARROW_REQUIREMENT not in self.requirements: | ||||
| return matchmod.always(self.root, '') | return matchmod.always(self.root, '') | ||||
| narrowspec.checkworkingcopynarrowspec(self) | |||||
| include, exclude = self.narrowpats | include, exclude = self.narrowpats | ||||
| return narrowspec.match(self.root, include=include, exclude=exclude) | return narrowspec.match(self.root, include=include, exclude=exclude) | ||||
| def narrowmatch(self, match=None, includeexact=False): | def narrowmatch(self, match=None, includeexact=False): | ||||
| """matcher corresponding the the repo's narrowspec | """matcher corresponding the the repo's narrowspec | ||||
| If `match` is given, then that will be intersected with the narrow | If `match` is given, then that will be intersected with the narrow | ||||
| matcher. | matcher. | ||||
| If `includeexact` is True, then any exact matches from `match` will | If `includeexact` is True, then any exact matches from `match` will | ||||
| be included even if they're outside the narrowspec. | be included even if they're outside the narrowspec. | ||||
| """ | """ | ||||
| if match: | if match: | ||||
| if includeexact and not self._narrowmatch.always(): | if includeexact and not self._narrowmatch.always(): | ||||
| # do not exclude explicitly-specified paths so that they can | # do not exclude explicitly-specified paths so that they can | ||||
| # be warned later on | # be warned later on | ||||
| em = matchmod.exact(match._root, match._cwd, match.files()) | em = matchmod.exact(match._root, match._cwd, match.files()) | ||||
| nm = matchmod.unionmatcher([self._narrowmatch, em]) | nm = matchmod.unionmatcher([self._narrowmatch, em]) | ||||
| return matchmod.intersectmatchers(match, nm) | return matchmod.intersectmatchers(match, nm) | ||||
| return matchmod.intersectmatchers(match, self._narrowmatch) | return matchmod.intersectmatchers(match, self._narrowmatch) | ||||
| return self._narrowmatch | return self._narrowmatch | ||||
| def setnarrowpats(self, newincludes, newexcludes): | def setnarrowpats(self, newincludes, newexcludes): | ||||
| narrowspec.save(self, newincludes, newexcludes) | narrowspec.save(self, newincludes, newexcludes) | ||||
| narrowspec.copytoworkingcopy(self, self.currenttransaction()) | |||||
| self.invalidate(clearfilecache=True) | self.invalidate(clearfilecache=True) | ||||
| # So the next access won't be considered a conflict | |||||
| # TODO: It seems like there should be a way of doing this that | |||||
| # doesn't involve replacing these attributes. | |||||
| self.narrowpats = newincludes, newexcludes | |||||
| self._narrowmatch = narrowspec.match(self.root, include=newincludes, | |||||
| exclude=newexcludes) | |||||
| def __getitem__(self, changeid): | def __getitem__(self, changeid): | ||||
| if changeid is None: | if changeid is None: | ||||
| return context.workingctx(self) | return context.workingctx(self) | ||||
| if isinstance(changeid, context.basectx): | if isinstance(changeid, context.basectx): | ||||
| return changeid | return changeid | ||||
| if isinstance(changeid, slice): | if isinstance(changeid, slice): | ||||
| # wdirrev isn't contiguous so the slice shouldn't include it | # wdirrev isn't contiguous so the slice shouldn't include it | ||||
| else: | else: | ||||
| # discard all changes (including ones already written | # discard all changes (including ones already written | ||||
| # out) in this transaction | # out) in this transaction | ||||
| narrowspec.restorebackup(self, 'journal.narrowspec') | narrowspec.restorebackup(self, 'journal.narrowspec') | ||||
| repo.dirstate.restorebackup(None, 'journal.dirstate') | repo.dirstate.restorebackup(None, 'journal.dirstate') | ||||
| repo.invalidate(clearfilecache=True) | repo.invalidate(clearfilecache=True) | ||||
| tr = transaction.transaction(rp, self.svfs, vfsmap, | tr = transaction.transaction(rp, self.svfs, vfsmap, | ||||
| "journal", | "journal", | ||||
| "undo", | "undo", | ||||
| aftertrans(renames), | aftertrans(renames), | ||||
| self.store.createmode, | self.store.createmode, | ||||
| validator=validate, | validator=validate, | ||||
| releasefn=releasefn, | releasefn=releasefn, | ||||
| checkambigfiles=_cachedfiles, | checkambigfiles=_cachedfiles, | ||||
| # narrowspec.py - methods for working with a narrow view of a repository | # narrowspec.py - methods for working with a narrow view of a repository | ||||
| # | # | ||||
| # Copyright 2017 Google, Inc. | # Copyright 2017 Google, Inc. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno | import errno | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| error, | error, | ||||
| match as matchmod, | match as matchmod, | ||||
| merge, | |||||
| repository, | repository, | ||||
| sparse, | sparse, | ||||
| util, | util, | ||||
| ) | ) | ||||
| # The file in .hg/store/ that indicates which paths exit in the store | |||||
| FILENAME = 'narrowspec' | FILENAME = 'narrowspec' | ||||
| # The file in .hg/ that indicates which paths exit in the dirstate | |||||
| DIRSTATE_FILENAME = 'narrowspec.dirstate' | |||||
| # Pattern prefixes that are allowed in narrow patterns. This list MUST | # Pattern prefixes that are allowed in narrow patterns. This list MUST | ||||
| # only contain patterns that are fast and safe to evaluate. Keep in mind | # only contain patterns that are fast and safe to evaluate. Keep in mind | ||||
| # that patterns are supplied by clients and executed on remote servers | # that patterns are supplied by clients and executed on remote servers | ||||
| # as part of wire protocol commands. That means that changes to this | # as part of wire protocol commands. That means that changes to this | ||||
| # data structure influence the wire protocol and should not be taken | # data structure influence the wire protocol and should not be taken | ||||
| # lightly - especially removals. | # lightly - especially removals. | ||||
| VALID_PREFIXES = ( | VALID_PREFIXES = ( | ||||
| return parseconfig(repo.ui, spec) | return parseconfig(repo.ui, spec) | ||||
| def save(repo, includepats, excludepats): | def save(repo, includepats, excludepats): | ||||
| validatepatterns(includepats) | validatepatterns(includepats) | ||||
| validatepatterns(excludepats) | validatepatterns(excludepats) | ||||
| spec = format(includepats, excludepats) | spec = format(includepats, excludepats) | ||||
| repo.svfs.write(FILENAME, spec) | repo.svfs.write(FILENAME, spec) | ||||
| def copytoworkingcopy(repo, tr): | |||||
| if tr: | |||||
| def write(file): | |||||
| spec = repo.svfs.read(FILENAME) | |||||
| file.write(spec) | |||||
| file.close() | |||||
| tr.addfilegenerator('narrowspec', (DIRSTATE_FILENAME,), write, | |||||
| location='plain') | |||||
| else: | |||||
| spec = repo.svfs.read(FILENAME) | |||||
| repo.vfs.write(DIRSTATE_FILENAME, spec) | |||||
| def savebackup(repo, backupname): | def savebackup(repo, backupname): | ||||
| if repository.NARROW_REQUIREMENT not in repo.requirements: | if repository.NARROW_REQUIREMENT not in repo.requirements: | ||||
| return | return | ||||
| svfs = repo.svfs | svfs = repo.svfs | ||||
| svfs.tryunlink(backupname) | svfs.tryunlink(backupname) | ||||
| util.copyfile(svfs.join(FILENAME), svfs.join(backupname), hardlink=True) | util.copyfile(svfs.join(FILENAME), svfs.join(backupname), hardlink=True) | ||||
| def restorebackup(repo, backupname): | def restorebackup(repo, backupname): | ||||
| invalid_includes.append(req_include) | invalid_includes.append(req_include) | ||||
| if len(res_includes) == 0: | if len(res_includes) == 0: | ||||
| res_excludes = {'path:.'} | res_excludes = {'path:.'} | ||||
| else: | else: | ||||
| res_includes = set(res_includes) | res_includes = set(res_includes) | ||||
| else: | else: | ||||
| res_includes = set(req_includes) | res_includes = set(req_includes) | ||||
| return res_includes, res_excludes, invalid_includes | return res_includes, res_excludes, invalid_includes | ||||
| # These two are extracted for extensions (specifically for Google's CitC file | |||||
| # system) | |||||
| def _deletecleanfiles(repo, files): | |||||
| for f in files: | |||||
| repo.wvfs.unlinkpath(f) | |||||
| def _writeaddedfiles(repo, pctx, files): | |||||
| actions = merge.emptyactions() | |||||
| addgaction = actions['g'].append | |||||
| mf = repo['.'].manifest() | |||||
| for f in files: | |||||
| if not repo.wvfs.exists(f): | |||||
| addgaction((f, (mf.flags(f), False), "narrowspec updated")) | |||||
| merge.applyupdates(repo, actions, wctx=repo[None], | |||||
| mctx=repo['.'], overwrite=False) | |||||
| def checkworkingcopynarrowspec(repo): | |||||
| storespec = repo.svfs.tryread(FILENAME) | |||||
| wcspec = repo.vfs.tryread(DIRSTATE_FILENAME) | |||||
| if wcspec != storespec: | |||||
| raise error.Abort(_("working copy's narrowspec is stale"), | |||||
| hint=_("run 'hg tracked --update-working-copy'")) | |||||
| def updateworkingcopy(repo, tr): | |||||
| oldspec = repo.vfs.tryread(DIRSTATE_FILENAME) | |||||
| newspec = repo.svfs.tryread(FILENAME) | |||||
| oldincludes, oldexcludes = parseconfig(repo.ui, oldspec) | |||||
| newincludes, newexcludes = parseconfig(repo.ui, newspec) | |||||
| oldmatch = match(repo.root, include=oldincludes, exclude=oldexcludes) | |||||
| newmatch = match(repo.root, include=newincludes, exclude=newexcludes) | |||||
| addedmatch = matchmod.differencematcher(newmatch, oldmatch) | |||||
| removedmatch = matchmod.differencematcher(oldmatch, newmatch) | |||||
| ds = repo.dirstate | |||||
| lookup, status = ds.status(removedmatch, subrepos=[], ignored=False, | |||||
| clean=True, unknown=False) | |||||
| _deletecleanfiles(repo, status.clean) | |||||
| trackeddirty = lookup + status.modified + status.added | |||||
| for f in sorted(trackeddirty): | |||||
| repo.ui.status(_('not deleting possibly dirty file %s\n') % f) | |||||
| for f in status.clean + trackeddirty: | |||||
| ds.drop(f) | |||||
| repo.narrowpats = newincludes, newexcludes | |||||
| repo._narrowmatch = newmatch | |||||
| pctx = repo['.'] | |||||
| newfiles = [f for f in pctx.manifest().walk(addedmatch) if f not in ds] | |||||
| for f in newfiles: | |||||
| ds.normallookup(f) | |||||
| _writeaddedfiles(repo, pctx, newfiles) | |||||
| ds.write(tr) | |||||
| $ . "$TESTDIR/narrow-library.sh" | $ . "$TESTDIR/narrow-library.sh" | ||||
| $ hg init repo | $ hg init repo | ||||
| $ cd repo | $ cd repo | ||||
| $ cat << EOF > .hg/store/narrowspec | $ cat << EOF > .hg/store/narrowspec | ||||
| > [include] | > [include] | ||||
| > path:foo | > path:foo | ||||
| > [exclude] | > [exclude] | ||||
| > EOF | > EOF | ||||
| $ cp .hg/store/narrowspec .hg/narrowspec.dirstate | |||||
| $ echo treemanifest >> .hg/requires | $ echo treemanifest >> .hg/requires | ||||
| $ echo narrowhg-experimental >> .hg/requires | $ echo narrowhg-experimental >> .hg/requires | ||||
| $ mkdir -p foo/bar | $ mkdir -p foo/bar | ||||
| $ echo b > foo/f | $ echo b > foo/f | ||||
| $ echo c > foo/bar/f | $ echo c > foo/bar/f | ||||
| $ hg commit -Am hi | $ hg commit -Am hi | ||||
| adding foo/bar/f | adding foo/bar/f | ||||
| adding foo/f | adding foo/f | ||||
| deleting data/d1/f.i | deleting data/d1/f.i | ||||
| deleting data/d3/f.i | deleting data/d3/f.i | ||||
| deleting data/d5/f.i | deleting data/d5/f.i | ||||
| deleting meta/d1/00manifest.i (tree !) | deleting meta/d1/00manifest.i (tree !) | ||||
| deleting meta/d3/00manifest.i (tree !) | deleting meta/d3/00manifest.i (tree !) | ||||
| deleting meta/d5/00manifest.i (tree !) | deleting meta/d5/00manifest.i (tree !) | ||||
| $ hg -R main tracked | $ hg -R main tracked | ||||
| I path:d7 | I path:d7 | ||||
| $ hg -R main files | |||||
| abort: working copy's narrowspec is stale | |||||
| (run 'hg tracked --update-working-copy') | |||||
| [255] | |||||
| $ hg -R main tracked --update-working-copy | |||||
| not deleting possibly dirty file d3/f | |||||
| not deleting possibly dirty file d3/g | |||||
| not deleting possibly dirty file d5/f | |||||
| # d1/f, d3/f, d3/g and d5/f should no longer be reported | # d1/f, d3/f, d3/g and d5/f should no longer be reported | ||||
| $ hg -R main files | $ hg -R main files | ||||
| main/d7/f | main/d7/f | ||||
| # d1/f should no longer be there, d3/f should be since it was dirty, d3/g should be there since | # d1/f should no longer be there, d3/f should be since it was dirty, d3/g should be there since | ||||
| # it was added, and d5/f should be since we couldn't be sure it was clean | # it was added, and d5/f should be since we couldn't be sure it was clean | ||||
| $ find main/d* -type f | $ find main/d* -type f | ||||
| main/d1/f | |||||
| main/d3/g | main/d3/g | ||||
| main/d3/f | main/d3/f | ||||
| main/d5/f | main/d5/f | ||||
| main/d7/f | main/d7/f | ||||
| Widen the share and check that the main repo's working copy gets updated | Widen the share and check that the main repo's working copy gets updated | ||||
| $ hg -R share tracked --addinclude d1 --addinclude d3 -q | $ hg -R share tracked --addinclude d1 --addinclude d3 -q | ||||
| $ hg -R share tracked | $ hg -R share tracked | ||||
| I path:d1 | I path:d1 | ||||
| I path:d3 | I path:d3 | ||||
| I path:d7 | I path:d7 | ||||
| $ hg -R share files | $ hg -R share files | ||||
| share/d1/f | share/d1/f | ||||
| share/d3/f | share/d3/f | ||||
| share/d7/f | share/d7/f | ||||
| $ hg -R main tracked | $ hg -R main tracked | ||||
| I path:d1 | I path:d1 | ||||
| I path:d3 | I path:d3 | ||||
| I path:d7 | I path:d7 | ||||
| $ hg -R main files | |||||
| abort: working copy's narrowspec is stale | |||||
| (run 'hg tracked --update-working-copy') | |||||
| [255] | |||||
| $ hg -R main tracked --update-working-copy | |||||
| # d1/f, d3/f should be back | # d1/f, d3/f should be back | ||||
| $ hg -R main files | $ hg -R main files | ||||
| main/d1/f | main/d1/f | ||||
| main/d3/f | main/d3/f | ||||
| main/d3/g | |||||
| main/d7/f | main/d7/f | ||||
| # d3/f should be modified (not clobbered by the widening), and d3/g should be untracked | # d3/f should be modified (not clobbered by the widening), and d3/g should be untracked | ||||
| $ hg -R main st --all | $ hg -R main st --all | ||||
| M d3/f | M d3/f | ||||
| A d3/g | ? d3/g | ||||
| C d1/f | C d1/f | ||||
| C d7/f | C d7/f | ||||
| We should also be able to unshare without breaking everything: | We should also be able to unshare without breaking everything: | ||||
| $ hg share main share-unshare | $ hg share main share-unshare | ||||
| updating working directory | updating working directory | ||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ cd share-unshare | $ cd share-unshare | ||||
| $ hg unshare | $ hg unshare | ||||
| $ hg verify | $ hg verify | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| checking directory manifests (tree !) | checking directory manifests (tree !) | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| checked 11 changesets with 3 changes to 3 files | checked 11 changesets with 3 changes to 3 files | ||||
| $ cd .. | $ cd .. | ||||
| Dirstate should be left alone when upgrading from version of hg that didn't support narrow+share | |||||
| $ hg share main share-upgrade | |||||
| updating working directory | |||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ cd share-upgrade | |||||
| $ echo x >> d1/f | |||||
| $ echo y >> d3/g | |||||
| $ hg add d3/g | |||||
| $ hg rm d7/f | |||||
| $ hg st | |||||
| M d1/f | |||||
| A d3/g | |||||
| R d7/f | |||||
| Make it look like a repo from before narrow+share was supported | |||||
| $ rm .hg/narrowspec.dirstate | |||||
| $ hg st | |||||
| abort: working copy's narrowspec is stale | |||||
| (run 'hg tracked --update-working-copy') | |||||
| [255] | |||||
| $ hg tracked --update-working-copy | |||||
| $ hg st | |||||
| M d1/f | |||||
| A d3/g | |||||
| R d7/f | |||||
| $ cd .. | |||||
| --addinclude VALUE [+] new paths to include | --addinclude VALUE [+] new paths to include | ||||
| --removeinclude VALUE [+] old paths to no longer include | --removeinclude VALUE [+] old paths to no longer include | ||||
| --addexclude VALUE [+] new paths to exclude | --addexclude VALUE [+] new paths to exclude | ||||
| --import-rules VALUE import narrowspecs from a file | --import-rules VALUE import narrowspecs from a file | ||||
| --removeexclude VALUE [+] old paths to no longer exclude | --removeexclude VALUE [+] old paths to no longer exclude | ||||
| --clear whether to replace the existing narrowspec | --clear whether to replace the existing narrowspec | ||||
| --force-delete-local-changes forces deletion of local changes when | --force-delete-local-changes forces deletion of local changes when | ||||
| narrowing | narrowing | ||||
| --update-working-copy update working copy when the store has | |||||
| changed | |||||
| -e --ssh CMD specify ssh command to use | -e --ssh CMD specify ssh command to use | ||||
| --remotecmd CMD specify hg command to run on the remote side | --remotecmd CMD specify hg command to run on the remote side | ||||
| --insecure do not verify server certificate (ignoring | --insecure do not verify server certificate (ignoring | ||||
| web.cacerts config) | web.cacerts config) | ||||
| (use 'hg tracked -h' to show more help) | (use 'hg tracked -h' to show more help) | ||||
| [255] | [255] | ||||
| $ hg tracked --import-rules doesnotexist | $ hg tracked --import-rules doesnotexist | ||||