upstream/mercurial-mirror Files · rust/chg/src/sendfds.c

copies: filter invalid copies only at end of pathcopies() (issue6163)...

copies: filter invalid copies only at end of pathcopies() (issue6163) copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that after chaining copies with dirstate copies or backward renames from another branch. We also do at the end of the changeset-centric copy tracing. The filtering means that we will remove copies to/from files that did not exist in some intermediate commit. That is inconsistent with what we do if a file has been deleted and then re-added (we allow updating across that). Copying the two first examples from issue6163: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but `hg rebase -r 2 -d 4` in the second case does not. That's because we chain and filter via commit 0, which does not have file 'x' in the second case. IMO, that's clearly inconsistent. So this patch removes the filtering step so it only happens at the end. If a file was temporarily removed, whether via a merge base or not, it will now still be considered the same file. That fixes issue6163 for the changeset-centric case. Differential Revision: https://phab.mercurial-scm.org/D6603

Yuya Nishihara - - Load All Authors

File last commit:

r40005:208cb7a9 default


                r42797:d013099c

default

Download file

             sendfds.c
        
                    51 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / rust / chg / src / sendfds.c
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Utility to send fds via Unix domain socket

       *

       * Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>

       *

       * This software may be used and distributed according to the terms of the

       * GNU General Public License version 2 or any later version.

       */

      #include <errno.h>

      #include <stdlib.h>

      #include <string.h>

      #include <sys/socket.h>

      #include <sys/types.h>

      #define MAX_FD_LEN 10

      /*

       * Sends the given fds with 1-byte dummy payload.

       *

       * Returns the number of bytes sent on success, -1 on error and errno is set

       * appropriately.

       */

      ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)

      {

      	char dummy[1] = {0};

      	struct iovec iov = {dummy, sizeof(dummy)};

      	char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];

      	struct msghdr msgh;

      	struct cmsghdr *cmsg;

      	/* just use a fixed-size buffer since we'll never send tons of fds */

      	if (fdlen > MAX_FD_LEN) {

      		errno = EINVAL;

      		return -1;

      	}

      	memset(&msgh, 0, sizeof(msgh));

      	msgh.msg_iov = &iov;

      	msgh.msg_iovlen = 1;

      	msgh.msg_control = fdbuf;

      	msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

      	cmsg = CMSG_FIRSTHDR(&msgh);

      	cmsg->cmsg_level = SOL_SOCKET;

      	cmsg->cmsg_type = SCM_RIGHTS;

      	cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);

      	memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);

      	msgh.msg_controllen = cmsg->cmsg_len;

      	return sendmsg(sockfd, &msgh, 0);

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				* Utility to send fds via Unix domain socket
				*
				* Copyright 2011, 2018 Yuya Nishihara <yuya@tcha.org>
				*
				* This software may be used and distributed according to the terms of the
				* GNU General Public License version 2 or any later version.
				*/

				#include <errno.h>
				#include <stdlib.h>
				#include <string.h>
				#include <sys/socket.h>
				#include <sys/types.h>

				#define MAX_FD_LEN 10

				/*
				* Sends the given fds with 1-byte dummy payload.
				*
				* Returns the number of bytes sent on success, -1 on error and errno is set
				* appropriately.
				*/
				ssize_t sendfds(int sockfd, const int *fds, size_t fdlen)
				{
				char dummy[1] = {0};
				struct iovec iov = {dummy, sizeof(dummy)};
				char fdbuf[CMSG_SPACE(sizeof(fds[0]) * MAX_FD_LEN)];
				struct msghdr msgh;
				struct cmsghdr *cmsg;

				/* just use a fixed-size buffer since we'll never send tons of fds */
				if (fdlen > MAX_FD_LEN) {
				errno = EINVAL;
				return -1;
				}

				memset(&msgh, 0, sizeof(msgh));
				msgh.msg_iov = &iov;
				msgh.msg_iovlen = 1;
				msgh.msg_control = fdbuf;
				msgh.msg_controllen = CMSG_SPACE(sizeof(fds[0]) * fdlen);

				cmsg = CMSG_FIRSTHDR(&msgh);
				cmsg->cmsg_level = SOL_SOCKET;
				cmsg->cmsg_type = SCM_RIGHTS;
				cmsg->cmsg_len = CMSG_LEN(sizeof(fds[0]) * fdlen);
				memcpy(CMSG_DATA(cmsg), fds, sizeof(fds[0]) * fdlen);
				msgh.msg_controllen = cmsg->cmsg_len;
				return sendmsg(sockfd, &msgh, 0);
				}