예제 #1
0
파일: sync.py 프로젝트: obmarg/synchg
def _SanityCheckRepos(local_repo, host, remote_path, remote):
    """
    Does a sanity check of the repositories, and attempts
    to fix any problems found.

    This includes cloning the repository, setting up remotes
    and setting up mq repositories.

    It's expected that the local path will be set up by this point

    :param local_repo:  A Repo object for the local repository
    :param host:        The hostname of the remote repo
    :param remote_path: The path to the remote repository as a string
    :param remote:      A plumbum machine for the remote machine
    """
    patch_dir = plumbum.local.cwd / ".hg" / "patches"
    if patch_dir.exists():
        if not (patch_dir / ".hg").exists():
            # Seems mq --init hasn't been run.  Run it.
            local_repo.InitMq()
            local_repo.CommitMq()

    # Check if the remote exists, and clone it if not
    hg_remote_path = "ssh://{0}/{1}".format(host, remote_path)
    rpath = remote.cwd / remote_path
    if not rpath.exists():
        print "Remote repository can't be found."
        if yn("Do you want to create a clone?"):
            local_repo.Clone(hg_remote_path)
        else:
            raise AbortException

    # Check if remote paths are set up properly
    if host not in local_repo.config.remotes:
        local_repo.config.AddRemote(host, hg_remote_path)

    if host not in local_repo.mqconfig.remotes:
        local_repo.mqconfig.AddRemote(host, hg_remote_path + "/.hg/patches")

    # TODO: Would probably be good to check that the remotes aren't
    #       pointing at the wrong address as well

    # Finally, check if the mq repository needs cloned
    if patch_dir.exists() and not (rpath / ".hg" / "patches").exists():
        local_repo.CloneMq(hg_remote_path)
예제 #2
0
파일: sync.py 프로젝트: obmarg/synchg
def _SanityCheckRepos(local_repo, host, remote_path, remote):
    '''
    Does a sanity check of the repositories, and attempts
    to fix any problems found.

    This includes cloning the repository, setting up remotes
    and setting up mq repositories.

    It's expected that the local path will be set up by this point

    :param local_repo:  A Repo object for the local repository
    :param host:        The hostname of the remote repo
    :param remote_path: The path to the remote repository as a string
    :param remote:      A plumbum machine for the remote machine
    '''
    patch_dir = plumbum.local.cwd / '.hg' / 'patches'
    if patch_dir.exists():
        if not (patch_dir / '.hg').exists():
            # Seems mq --init hasn't been run.  Run it.
            local_repo.InitMq()
            local_repo.CommitMq()

    # Check if the remote exists, and clone it if not
    hg_remote_path = 'ssh://{0}/{1}'.format(host, remote_path)
    rpath = remote.cwd / remote_path
    if not rpath.exists():
        print "Remote repository can't be found."
        if yn('Do you want to create a clone?'):
            local_repo.Clone(hg_remote_path)
        else:
            raise AbortException

    # Check if remote paths are set up properly
    if host not in local_repo.config.remotes:
        local_repo.config.AddRemote(host, hg_remote_path)

    if host not in local_repo.mqconfig.remotes:
        local_repo.mqconfig.AddRemote(host, hg_remote_path + '/.hg/patches')

    # TODO: Would probably be good to check that the remotes aren't
    #       pointing at the wrong address as well

    # Finally, check if the mq repository needs cloned
    if patch_dir.exists() and not (rpath / '.hg' / 'patches').exists():
        local_repo.CloneMq(hg_remote_path)
예제 #3
0
파일: sync.py 프로젝트: obmarg/synchg
def _DoSync(local, remote):
    """
    Function that actually handles the syncing after everything
    has been set up

    :param local:   The local repository
    :param remote:  The remote repository
    """
    # First, check the state of each repository
    if remote.summary.commit.modified:
        # Changes might be lost on remote...
        raise SyncError("Remote repository has uncommitted changes")

    lsummary = local.summary
    if lsummary.commit.modified:
        print "Local repository has uncommitted changes."
        if lsummary.mq.applied:
            # We can't push/pop patches to check remote is
            # in sync if we've got local changes, so prompt to refresh.
            if yn("Do you want to refresh the current patch?"):
                local.RefreshMq()
            else:
                print "Ok.  Please run again after dealing with changes."
                raise AbortException
        else:
            # If we're not doing an mq sync, we can happily ignore
            # these changes, but probably want to make sure that's
            # what the user wants...
            if not yn("Do you want to ignore these changes?"):
                print "Ok.  Please run again after dealing with changes."
                raise AbortException

    # Pop any patches on the remote before we begin
    remote.PopPatch()

    with local.CleanMq():
        if local.outgoings:
            incomings = local.incomings
            if incomings:
                # Don't want to be creating new remote heads when we push
                print "Changesets will be stripped from remote:"
                for hash, desc in incomings:
                    if len(desc) > 50:
                        desc = desc[:47] + "..."
                    print "  {0}  {1}".format(hash[:6], desc)
                if not yn("Do you want to continue?"):
                    raise AbortException()
                remote.Strip(incomings)
            print "Pushing to remote"
            local.PushToRemote()

    print "Updating remote"
    remote.Update(local.currentRev)

    appliedPatch = local.lastAppliedPatch
    if appliedPatch:
        print "Syncing mq repos"
        local.CommitMq()
        local.PushMqToRemote()
        print "Updating remote mq repo"
        remote.UpdateMq()
        remote.PushPatch(appliedPatch)

    print "Ok!"
예제 #4
0
파일: sync.py 프로젝트: obmarg/synchg
def _DoSync(local, remote):
    '''
    Function that actually handles the syncing after everything
    has been set up

    :param local:   The local repository
    :param remote:  The remote repository
    '''
    # First, check the state of each repository
    if remote.summary.commit.modified:
        # Changes might be lost on remote...
        raise SyncError('Remote repository has uncommitted changes')

    lsummary = local.summary
    if lsummary.commit.modified:
        print "Local repository has uncommitted changes."
        if lsummary.mq.applied:
            # We can't push/pop patches to check remote is
            # in sync if we've got local changes, so prompt to refresh.
            if yn('Do you want to refresh the current patch?'):
                local.RefreshMq()
            else:
                print "Ok.  Please run again after dealing with changes."
                raise AbortException
        else:
            # If we're not doing an mq sync, we can happily ignore
            # these changes, but probably want to make sure that's
            # what the user wants...
            if not yn('Do you want to ignore these changes?'):
                print "Ok.  Please run again after dealing with changes."
                raise AbortException

    # Pop any patches on the remote before we begin
    remote.PopPatch()

    with local.CleanMq():
        if local.outgoings:
            incomings = local.incomings
            if incomings:
                # Don't want to be creating new remote heads when we push
                print "Changesets will be stripped from remote:"
                for hash, desc in incomings:
                    if len(desc) > 50:
                        desc = desc[:47] + '...'
                    print "  {0}  {1}".format(hash[:6], desc)
                if not yn('Do you want to continue?'):
                    raise AbortException()
                remote.Strip(incomings)
            print "Pushing to remote"
            local.PushToRemote()

    print "Updating remote"
    remote.Update(local.currentRev)

    appliedPatch = local.lastAppliedPatch
    if appliedPatch:
        print "Syncing mq repos"
        local.CommitMq()
        local.PushMqToRemote()
        print "Updating remote mq repo"
        remote.UpdateMq()
        remote.PushPatch(appliedPatch)

    print "Ok!"