headers
O'hara Takuzo | 4 Jun 17:22
Picon

Re: [commit] rev 173: Implemented some basic functionality for git:

Hello list,

I have ported my work to current version of DVC.
I would like my work to be reviewed and hopefully, included.

2007/5/17, Stefan Reichör <stefan <at> xsteve.at>:
> "O'hara Takuzo" <takuzo.ohara <at> gmail.com> writes:
>
> > Hello, it's first time for me to post here.
> >
> > I think I can help in supporting git, if you are kind enough to accept code of
> > a novice elisp programmer.
>
> It would be great when you can help us with the git functionality!
>
> One thing we need from you is, that you sign papers that allows the
> inclusion of your work in emacs.

I am very honored to do so.
Can you tell me how to do this?

I have prepared my repository at:
    http://takuzo.jpn.ph/~takuzo/bzr/dvc/

There are two major commits (xgit-log, xgit-annotate) and other
small ones.

   -. Adds better support for xgit-log mode.
      (revno. 183-187)
	-. Adds customizable max count to xgit-log, as git
(Continue reading)

Permalink | Reply | 19 comments |
headers
Stefan Reichör | 5 Jun 20:23
Picon

[commit] rev 183: Fix a bogus newline difference when running dvc-diff-ediff in mercurial repositories

Committed revision 183 to http://bzr.xsteve.at/dvc/

Fix a bogus newline difference when running dvc-diff-ediff in mercurial repositories

  Patch from Magnus Carlsson

  (xhg-revision-get-last-revision): Don't drop the final newline from the hg cat output
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 5 Jun 20:23
Picon

[commit] rev 184: Bugfix for xhg-save-diff

Committed revision 184 to http://bzr.xsteve.at/dvc/

Bugfix for xhg-save-diff

  (xhg-save-diff): Ensure that the opened diff buffer is writeable
     before attempting to insert the diff
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 5 Jun 20:23
Picon

[commit] rev 182: Merged the major git improvement from O'hara Takuzo

Committed revision 182 to http://bzr.xsteve.at/dvc/

Merged the major git improvement from O'hara Takuzo

  The main new features are a much enhanced xgit-log-mode and a new
  xgit-annotate-mode
    ------------------------------------------------------------
    revno: 181.1.9
    merged: takuzo.ohara <at> gmail.com-20070604142803-ku9hqu06rxs8ktnt
    committer: Takuzo O'hara <takuzo.ohara <at> gmail.com>
    branch nick: dvc-takuzo
    timestamp: Mon 2007-06-04 23:28:03 +0900
    message:
      Fixed 'cg to 'xgit in xgit-revision.el.
    ------------------------------------------------------------
    revno: 181.1.8
    merged: takuzo.ohara <at> gmail.com-20070604142622-wywyh6l6kulq5mby
    committer: Takuzo O'hara <takuzo.ohara <at> gmail.com>
    branch nick: dvc-takuzo
    timestamp: Mon 2007-06-04 23:26:22 +0900
    message:
      fixed typo in line.
    ------------------------------------------------------------
    revno: 181.1.7
    merged: takuzo.ohara <at> gmail.com-20070603125730-hc709n3b5irc7mpv
    committer: Takuzo O'hara <takuzo.ohara <at> gmail.com>
    branch nick: dvc-takuzo
    timestamp: Sun 2007-06-03 21:57:30 +0900
    message:
      Adds dvc-annotate, generic color support to dvc-annotate.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stefan Reichör | 5 Jun 20:37
Picon

Re: [commit] rev 173: Implemented some basic functionality for git:

"O'hara Takuzo" <takuzo.ohara <at> gmail.com> writes:

> Hello list,
>
> I have ported my work to current version of DVC.
> I would like my work to be reviewed and hopefully, included.
>
> 2007/5/17, Stefan Reichör <stefan <at> xsteve.at>:
>> "O'hara Takuzo" <takuzo.ohara <at> gmail.com> writes:
>>
>> > Hello, it's first time for me to post here.
>> >
>> > I think I can help in supporting git, if you are kind enough to accept code of
>> > a novice elisp programmer.
>>
>> It would be great when you can help us with the git functionality!
>>
>> One thing we need from you is, that you sign papers that allows the
>> inclusion of your work in emacs.
>
> I am very honored to do so.
> Can you tell me how to do this?

This task was handled by Masatake YAMATO. However Mastake told us
lately he can't do it in the moment. And I have not heard from him since then...

Masatake are you still around?

For me it is enough that you are willing to sign the papers.
I have merged your improvements because I am excited to see a better
(Continue reading)

Permalink | Reply | 17 comments |
headers
Stefan Reichör | 5 Jun 21:31
Picon

[commit] rev 185: dvc-bookmarks: Added ability to show the defined partners in the *dvc-bookmarks* buffer

Committed revision 185 to http://bzr.xsteve.at/dvc/

dvc-bookmarks: Added ability to show the defined partners in the *dvc-bookmarks* buffer
Permalink | Reply | 0 comments |
headers
Dan Lipsitt | 5 Jun 21:59
Picon

problem with bzr-status

Hi,

I've found a problem with dvc-diff-jump-to-change and
dvc-diff-diff-or-list when invoked from a bzr-status buffer.

The problem is that  'bzr status' produces output like this:

conflicts:
    Text conflict in src/foo.c

When jump-to-change is invoked, it looks for a file named "Text
conflict in src/foo.c", which of course doesn't exist. A similar
problem applies to diff-or-list. It also doesn't know what to do with
pending merge lines, but that's not important to me right now.

I thought 'bzr status --short' might produce cleaner output, but it
doesn't really help with this problem:

C   Text conflict in src/ed/lsm_derivs.f90

I took a look at the source of dvc-diff-jump-to-change. Looks like
this is going to require backend-specific code for bzr. If nobody has
time to deal with this I'm willing to give it a try, but somebody will
have to give me suggestions about where to put the bzr-specific
parsing, and how the dispatch will work. I'm not familiar with how
ewoc works, if that's going to be important.

Regards,
Dan
(Continue reading)

Permalink | Reply | 0 comments |
headers
Dan Lipsitt | 5 Jun 23:39
Picon

Re: problem with bzr-status (patch)

Okay, I think the patch below solves my problem. I've tried to write
it so it works if filenames happen to have spaces in them.

Here are some observations:

- According to http://bazaar-vcs.org/Usability?highlight=%28text+conflicts%29
there are also "logical conflicts." Since I don't know how bzr status
displays them, I am not attempting to parse them.
- "Text conflict" will now be hidden from the user in the bzr-status
view. I'm not sure whether this is a problem.

Patch follows:

--- lisp/bzr.el	2007-05-24 17:57:44 +0000
+++ lisp/bzr.el	2007-06-05 21:31:08 +0000
@@ -406,7 +406,7 @@
                                 (list 'file newname
                                       " " " " dir
                                       oldname)))))
-          ((looking-at " +\\([^\n]*?\\)\\([/@]\\)?$")
+          ((looking-at " +\\(?:Text conflict in \\)?\\([^\n]*?\\)\\([/@]\\)?$")
            (let ((file (match-string-no-properties 1))
                  (dir (match-string-no-properties 2)))
              (with-current-buffer changes-buffer
Permalink | Reply | 0 comments |
headers
Michael Olson | 6 Jun 04:27
Face
Picon
Picon
Gravatar

Re: [commit] rev 173: Implemented some basic functionality for git:

Stefan Reichör <stefan <at> xsteve.at> writes:

> "O'hara Takuzo" <takuzo.ohara <at> gmail.com> writes:
>
>> Hello list,
>>
>> I have ported my work to current version of DVC.
>> I would like my work to be reviewed and hopefully, included.
>>
>> 2007/5/17, Stefan Reichör <stefan <at> xsteve.at>:
>>> "O'hara Takuzo" <takuzo.ohara <at> gmail.com> writes:
>>>
>>> > Hello, it's first time for me to post here.
>>> >
>>> > I think I can help in supporting git, if you are kind enough to
>>> > accept code of a novice elisp programmer.
>>>
>>> It would be great when you can help us with the git functionality!
>>>
>>> One thing we need from you is, that you sign papers that allows the
>>> inclusion of your work in emacs.
>>
>> I am very honored to do so.
>> Can you tell me how to do this?
>
> This task was handled by Masatake YAMATO. However Mastake told us
> lately he can't do it in the moment. And I have not heard from him
> since then...

I've now sent the original poster this information.
(Continue reading)

Permalink | Reply | 16 comments |
headers
Masatake YAMATO | 7 Jun 19:46

Re: [commit] rev 173: Implemented some basic functionality for git:

Forgive me all.

I'm really bad coordinator.
I'd like to improve my wrong procedures to handle the copyright
issue.

First of all, we should track contributors in a file(CONTRIBUTORS).
Stefan, could you apply a patch appended to this mail to you tree?
Currently I don't have any tree which is accessible globally.

And other people, especially newer contributors, could you put
your name in the file after Stefan merges the patch? You may fill
like:

	(contributor :name "Yourname" :signed not-yet)

Once you signed to FSF, change the entry to

	(contributor :name "Yourname" :signed done)

Why S expression? Because I know all of you loves it.
Telling how to sign to FSF to you is my next task. Anyway recording
is important.

I'll check older mail to/from FSF to fill rather older or retired 
contributors. However, if you read this mail, please put your name
by your self. I'm  quite happy if you do so.

Second I should write down the interaction with FSF and the official
procedure for copyright assignment.
(Continue reading)

Permalink | Reply | 15 comments |

Gmane