* vc-dir with Subversion
@ 2008-08-05 7:44 Nick Roberts
0 siblings, 0 replies; 6+ messages in thread
From: Nick Roberts @ 2008-08-05 7:44 UTC (permalink / raw)
To: emacs-devel
In the past I've remarked that with CVS vc-dir ignores vc-stay-local (and
vc-cvs-stay-local) and consults the repository, in any case.
I now see that with SVN, vc-dir also ignores vc-stay-local but this time
never consults the repository.
I'm not sure if it worked with vc-directory, but for this function, the
command "svn log -u" was used when vc-stay-local was nil. In Emacs 23.0.60
it always just sends "svn log"
--
Nick http://www.inet.net.nz/~nickrob
^ permalink raw reply [flat|nested] 6+ messages in thread
* vc-dir with Subversion
@ 2009-04-03 8:04 Nick Roberts
2009-04-03 19:08 ` Richard M Stallman
2009-04-03 19:21 ` Chong Yidong
0 siblings, 2 replies; 6+ messages in thread
From: Nick Roberts @ 2009-04-03 8:04 UTC (permalink / raw)
To: emacs-devel
Using Subversion, vc-dir detects conflicts of two kinds:
1) Prior to updating.
2) After updating.
but labels the status with the keyword `conflict' in both cases. In the
latter case all other keywords use the past tense: removed, edited,
unregistered etc. To avoid confusion I suggest that we use the keyword
`conflicted' for this case. The patch below does this.
OK to apply?
--
Nick http://www.inet.net.nz/~nickrob
2009-04-03 Nick Roberts <nickrob@snap.net.nz>
* vc-svn.el (vc-svn-after-dir-status): Use "conflicted" for a file
with conflicts in it.
* vc-dir.el (vc-default-dir-printer): Use font-lock-warning-face
for keyword above.
*** vc-svn.el.~1.112.~ 2009-02-10 18:59:14.000000000 +1300
--- vc-svn.el 2009-04-03 20:39:29.000000000 +1300
*************** want to force an empty list of arguments
*** 156,162 ****
;; but to distinguish the two output formats based on content.
(defun vc-svn-after-dir-status (callback &optional remote)
(let ((state-map '((?A . added)
! (?C . conflict)
(?D . removed)
(?I . ignored)
(?M . edited)
--- 156,162 ----
;; but to distinguish the two output formats based on content.
(defun vc-svn-after-dir-status (callback &optional remote)
(let ((state-map '((?A . added)
! (?C . conflicted)
(?D . removed)
(?I . ignored)
(?M . edited)
*** vc-dir.el.~1.38.~ 2009-03-21 09:41:38.000000000 +1300
--- vc-dir.el 2009-04-03 20:41:57.000000000 +1300
*************** Interactively, a prefix argument means t
*** 1171,1177 ****
(propertize
(format "%-20s" state)
'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
! ((memq state '(missing conflict)) 'font-lock-warning-face)
(t 'font-lock-variable-name-face))
'mouse-face 'highlight)
" "
--- 1171,1177 ----
(propertize
(format "%-20s" state)
'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
! ((memq state '(missing conflict conflicted)) 'font-lock-warning-face)
(t 'font-lock-variable-name-face))
'mouse-face 'highlight)
" "
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: vc-dir with Subversion
2009-04-03 8:04 Nick Roberts
@ 2009-04-03 19:08 ` Richard M Stallman
2009-04-03 23:13 ` Nick Roberts
2009-04-03 19:21 ` Chong Yidong
1 sibling, 1 reply; 6+ messages in thread
From: Richard M Stallman @ 2009-04-03 19:08 UTC (permalink / raw)
To: Nick Roberts; +Cc: emacs-devel
1) Prior to updating.
2) After updating.
but labels the status with the keyword `conflict' in both cases. In the
latter case all other keywords use the past tense: removed, edited,
unregistered etc. To avoid confusion I suggest that we use the keyword
`conflicted' for this case. The patch below does this.
The difference between "conflict" and "conflicted" is small.
If this distinction is important, I think it is important to make
it more prominent.
Which of these two cases is a CVS conflict similar to?
I think it is case 2, that a conflict in CVS is reported
after updating. If that is true, it seems to me that case 2
should be described with "conflict" and case 1 should have
some other name.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: vc-dir with Subversion
2009-04-03 19:08 ` Richard M Stallman
@ 2009-04-03 23:13 ` Nick Roberts
0 siblings, 0 replies; 6+ messages in thread
From: Nick Roberts @ 2009-04-03 23:13 UTC (permalink / raw)
To: rms; +Cc: emacs-devel
Richard M Stallman writes:
> 1) Prior to updating.
> 2) After updating.
>
> but labels the status with the keyword `conflict' in both cases. In the
> latter case all other keywords use the past tense: removed, edited,
> unregistered etc. To avoid confusion I suggest that we use the keyword
> `conflicted' for this case. The patch below does this.
>
> The difference between "conflict" and "conflicted" is small.
> If this distinction is important, I think it is important to make
> it more prominent.
>
> Which of these two cases is a CVS conflict similar to?
vc-dir with CVS doesn't recognise the first case and just reports the state
as `needs-merge'. That's because it uses the command `cvs status' which
doesn't report that therre will be a conflict (it gives "Status: Needs Patch"
in this case. Interestingly "cvs -n up" does recognise there would be a
conflict in it's output (with the letter `C').
> I think it is case 2, that a conflict in CVS is reported
> after updating. If that is true, it seems to me that case 2
> should be described with "conflict" and case 1 should have
> some other name.
It is case 2. I didn't consider CVS in my e-mail, but I think it would be
more logical to change that case (CVS) to `conflicted'.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: vc-dir with Subversion
2009-04-03 8:04 Nick Roberts
2009-04-03 19:08 ` Richard M Stallman
@ 2009-04-03 19:21 ` Chong Yidong
2009-04-03 23:18 ` Nick Roberts
1 sibling, 1 reply; 6+ messages in thread
From: Chong Yidong @ 2009-04-03 19:21 UTC (permalink / raw)
To: Nick Roberts; +Cc: emacs-devel
nickrob@snap.net.nz (Nick Roberts) writes:
> Using Subversion, vc-dir detects conflicts of two kinds:
>
> 1) Prior to updating.
> 2) After updating.
>
> but labels the status with the keyword `conflict' in both cases. In the
> latter case all other keywords use the past tense: removed, edited,
> unregistered etc. To avoid confusion I suggest that we use the keyword
> `conflicted' for this case.
Is there any practical reason for the user to be able to distinguish
between the two states?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: vc-dir with Subversion
2009-04-03 19:21 ` Chong Yidong
@ 2009-04-03 23:18 ` Nick Roberts
0 siblings, 0 replies; 6+ messages in thread
From: Nick Roberts @ 2009-04-03 23:18 UTC (permalink / raw)
To: Chong Yidong; +Cc: emacs-devel
Chong Yidong writes:
> nickrob@snap.net.nz (Nick Roberts) writes:
>
> > Using Subversion, vc-dir detects conflicts of two kinds:
> >
> > 1) Prior to updating.
> > 2) After updating.
> >
> > but labels the status with the keyword `conflict' in both cases. In the
> > latter case all other keywords use the past tense: removed, edited,
> > unregistered etc. To avoid confusion I suggest that we use the keyword
> > `conflicted' for this case.
>
> Is there any practical reason for the user to be able to distinguish
> between the two states?
If you see the file is marked with `conflict' and visit the file, sometimes
there are conflict markers present and sometimes there aren't. I think it's
confusing to mark to different states with the same keyword.
Is there any practical reason for the user *not* to be able to distinguish
between the two states?
--
Nick http://www.inet.net.nz/~nickrob
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-04-03 23:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-05 7:44 vc-dir with Subversion Nick Roberts
-- strict thread matches above, loose matches on Subject: below --
2009-04-03 8:04 Nick Roberts
2009-04-03 19:08 ` Richard M Stallman
2009-04-03 23:13 ` Nick Roberts
2009-04-03 19:21 ` Chong Yidong
2009-04-03 23:18 ` Nick Roberts
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).