Mercurial > hg
view hgext/share.py @ 16492:774e2dcd0a65 stable
update: fix case-collision with a clean wd and no --clean
cbf2ea2f5ca1 introduced some logic to avoid case-collision detection between
source and destination revisions when it does not make sense: clean or to be
cleaned working directories. Unfortunately, part of it was flawed and the
related test was broken by another bug.
This patch disables cross revision case collision detection for updates without
option or with --check, if the working directory is clean.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Mon, 23 Apr 2012 14:32:59 +0200 |
parents | d23dfcbb8840 |
children | 38caf405d010 |
line wrap: on
line source
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''share a common history between several working directories''' from mercurial.i18n import _ from mercurial import hg, commands, util def share(ui, source, dest=None, noupdate=False): """create a new shared repository Initialize a new repository and working directory that shares its history with another repository. .. note:: using rollback or extensions that destroy/modify history (mq, rebase, etc.) can cause considerable confusion with shared clones. In particular, if two shared clones are both updated to the same changeset, and one of them destroys that changeset with rollback, the other clone will suddenly stop working: all operations will fail with "abort: working directory has unknown parent". The only known workaround is to use debugsetparents on the broken clone to reset it to a changeset that still exists (e.g. tip). """ return hg.share(ui, source, dest, not noupdate) def unshare(ui, repo): """convert a shared repository to a normal one Copy the store data to the repo and remove the sharedpath data. """ if repo.sharedpath == repo.path: raise util.Abort(_("this is not a shared repo")) destlock = lock = None lock = repo.lock() try: # we use locks here because if we race with commit, we # can end up with extra data in the cloned revlogs that's # not pointed to by changesets, thus causing verify to # fail destlock = hg.copystore(ui, repo, repo.path) sharefile = repo.join('sharedpath') util.rename(sharefile, sharefile + '.old') repo.requirements.discard('sharedpath') repo._writerequirements() finally: destlock and destlock.release() lock and lock.release() # update store, spath, sopener and sjoin of repo repo.__init__(ui, repo.root) cmdtable = { "share": (share, [('U', 'noupdate', None, _('do not create a working copy'))], _('[-U] SOURCE [DEST]')), "unshare": (unshare, [], ''), } commands.norepo += " share"