From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: conflict state Date: Wed, 09 Apr 2008 16:35:43 -0400 Message-ID: References: <200804061740.m36Hemw8021394@sallyv1.ics.uci.edu> <200804081503.m38F3C3A019899@sallyv1.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1207773367 4254 80.91.229.12 (9 Apr 2008 20:36:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Apr 2008 20:36:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 09 22:36:39 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Jjh1y-000233-P7 for ged-emacs-devel@m.gmane.org; Wed, 09 Apr 2008 22:36:31 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jjh1L-00008C-9L for ged-emacs-devel@m.gmane.org; Wed, 09 Apr 2008 16:35:51 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jjh1I-000087-0k for emacs-devel@gnu.org; Wed, 09 Apr 2008 16:35:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jjh1F-00007v-L2 for emacs-devel@gnu.org; Wed, 09 Apr 2008 16:35:46 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jjh1F-00007s-DW for emacs-devel@gnu.org; Wed, 09 Apr 2008 16:35:45 -0400 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182] helo=ironport2-out.teksavvy.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Jjh1F-0004Pf-1M for emacs-devel@gnu.org; Wed, 09 Apr 2008 16:35:45 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlMFAK7F/EfO+KV8/2dsb2JhbACBXKo3 X-IronPort-AV: E=Sophos;i="4.25,631,1199682000"; d="scan'208";a="18236911" Original-Received: from smtp.pppoe.ca (HELO smtp.teksavvy.com) ([65.39.196.238]) by ironport2-out.teksavvy.com with ESMTP; 09 Apr 2008 16:35:43 -0400 Original-Received: from pastel.home ([206.248.165.124]) by smtp.teksavvy.com (Internet Mail Server v1.0) with ESMTP id PYS79843; Wed, 09 Apr 2008 16:35:43 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 8F3B88958; Wed, 9 Apr 2008 16:35:43 -0400 (EDT) In-Reply-To: <200804081503.m38F3C3A019899@sallyv1.ics.uci.edu> (Dan Nicolaescu's message of "Tue, 08 Apr 2008 08:03:12 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:94808 Archived-At: >> > This has been in Todo for a while, displaying this stuff is trivial, VC >> > needs just to provide the information. Someone just needs to sit down >> > and figure out how it's supposed to work in VC... >> >> With some backends (E.g. Svn and Bzr), it would make a lot of sense to >> make it a new vc-state, since you need to run `(svn|bzr) resolve' to >> switch from that state to `edited' and you can't commit before. >> >> In other bakends, it's less clear. Maybe you should try to simply add >> `conflict' as a new `vc-state' and see how it works out. This will >> require checking all uses of `vc-state' to adjust them to the new state. > A patch to implement the new conflict state is below. Can you please > change the magic that runs the resolve command and turns on > smerge-mode to use this state instead? I do not have time to do that right now. > Not sure what to do about the new `mark-resolved' backend function for > CVS, it probably should be just a no-op, it should be easy to see once > the smerge logic is in place. Yes, it should be a no-op. > @@ -775,10 +777,10 @@ Before doing that, check if there are an > (eq (vc-checkout-model file) 'implicit) > (vc-file-setprop file 'vc-state 'edited) > (vc-mode-line file) > - (if (featurep 'vc) > - ;; If VC is not loaded, then there can't be > - ;; any VC Dired buffer to synchronize. > - (vc-dired-resynch-file file))))) > + (when (featurep 'vc) > + ;; If VC is not loaded, then there can't be > + ;; any VC Dired buffer to synchronize. > + (vc-dired-resynch-file file))))) > (defvar vc-menu-entry > '(menu-item "Version Control" vc-menu-map Please use "diff -b" when sending patches that are intended for review rather than for installation. > @@ -861,6 +863,9 @@ This function assumes that the file is r > ((eq state 'added) > (setq state-echo "Locally added file") > (concat backend "@" rev)) > + ((eq state 'conflict) > + (setq state-echo "File contains conflicts after the last merge") > + (concat backend "!!" rev)) > ((eq state 'removed) > (setq state-echo "File removed from the VC system") > (concat backend "!" rev)) I'm not really happy with ! for removed and !! for conflict. I'd rather just use the same for edited and conflict if we can't come up with a good one. This reminds me: we have to be careful that `conflict' is for conflicts in the file's contents. Not for conflicts about meta-info (e.g. when a file is moved to the same location as some other file, or when a file is renamed in two conflicting ways, ...). > +;; - mark-resolved (files) > +;; > +;; The the VCS that conflicts have been resolved. Not all systems > +;; need to do this. I don't know enough about The The to know if they're an appropriate reference here, but I guess not. We can probably provide a (defalias 'vc-default-mark-resolved 'ignore) > +(defun vc-mark-resolved (files) > + (with-vc-properties > + files > + (vc-call mark-resolved files) > + ;; XXX: Is this TRTD? > + `((vc-state . edited)))) I'd rather we just call vc-state-heuristic to get the new state. > @@ -3898,6 +3913,10 @@ to provide the `find-revision' operation > (with-current-buffer (find-file-noselect new) > (vc-register))) > +(defun vc-default-mark-resolved (backend files) > + ;; XXX: For testing. > + (error "Backend implements the conflict state, but it does not implement a `mark-resolved' function")) If we don't want to just do nothing, then let's just not provide any default: the vc-call mechanism will then signal an error for us. We should probably arrange to call mark-resolved from vc-after-save (after checking that all the conflicts were indeed resolved). Stefan