Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-23 Thread Antoine Latter
This would benifit darcs, as the help-text would be correct even if I've
renamed the executable. For example darcs-beta vs. darcs.

On Aug 23, 2010 3:49 PM, "Joachim Breitner" 
wrote:
> Hi,
>
> Am Montag, den 23.08.2010, 13:43 -0700 schrieb Jason Dagit:
>> On Mon, Aug 23, 2010 at 1:32 PM, Joachim Breitner
>>  wrote:
>>
>> $ ipatch split --help
>> Usage: darcs split [OPTION]... 
>>
>>
>> Darcs?
>>
>>
>>
>> $ ./dist/build/ipatch/ipatch apply --help
>> Usage: darcs apply [OPTION]... 
>>
>>
>> Darcs?
>>
>>
>> I assume those are typos left over from borrowing code?
>
> actually I’m not borrowing the code, I’m using the Darcs API, including
> the Help and Command infrastructure, which is not fully generalized yet.
> I need to have a look at the Darcs code and think of the best way of
> making it more configurable, without changing it too much or making it
> harder for Darcs itself.
>
> The function in question is getCommandHelpCore in Darcs.Commands. Maybe
> the name of the executable could be placed in the 'Command' record, then
> it would be available everywhere where needed. If someone from the Darcs
> team wants to help here, that would of course be appreciated.
>
> Greetings,
> Joachim
>
> --
> Joachim "nomeata" Breitner
> mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
> JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
> Debian Developer: nome...@debian.org
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-23 Thread Joachim Breitner
Hi,

Am Montag, den 23.08.2010, 13:43 -0700 schrieb Jason Dagit:
> On Mon, Aug 23, 2010 at 1:32 PM, Joachim Breitner
>  wrote:
>  
> $ ipatch split --help
> Usage: darcs split [OPTION]... 
> 
> 
> Darcs?
> 
> 
> 
> $ ./dist/build/ipatch/ipatch apply --help
> Usage: darcs apply [OPTION]... 
> 
> 
> Darcs?
> 
> 
> I assume those are typos left over from borrowing code?

actually I’m not borrowing the code, I’m using the Darcs API, including
the Help and Command infrastructure, which is not fully generalized yet.
I need to have a look at the Darcs code and think of the best way of
making it more configurable, without changing it too much or making it
harder for Darcs itself.

The function in question is getCommandHelpCore in Darcs.Commands. Maybe
the name of the executable could be placed in the 'Command' record, then
it would be available everywhere where needed. If someone from the Darcs
team wants to help here, that would of course be appreciated.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nome...@debian.org


signature.asc
Description: This is a digitally signed message part
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-23 Thread Jason Dagit
On Mon, Aug 23, 2010 at 1:32 PM, Joachim Breitner
wrote:

>

$ ipatch split --help
> Usage: darcs split [OPTION]... 
>

Darcs?


> $ ./dist/build/ipatch/ipatch apply --help
> Usage: darcs apply [OPTION]... 
>

Darcs?

I assume those are typos left over from borrowing code?

Jason
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-23 Thread Joachim Breitner
Hi,

Am Montag, den 23.08.2010, 15:10 -0500 schrieb Antoine Latter:
> On Tue, Aug 3, 2010 at 3:52 PM, Joachim Breitner
>  wrote:
> > Dear Haskell and Darcs community,
> >
> > I have written a tool to interactively edit patches, which under the
> > hood uses the Darcs API. A more catchy introduction, including a
> > screencast, can be found on
> > https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
> > which ends (and this is where you come in) with
> > „So this is an invitation to join me and make ipatch a great tool. This
> > invitation goes especially to the Darcs developers: Please have a look
> > how the code uses the Darcs API and help to improve the collaboration
> > here. I think we can use the darcs-users mailing list until there is
> > need for a dedicated mailing list.“
> >
> > The code is on http://darcs.nomeata.de/ipatch/.
>
> Do you have any documentation on what this utility does? I don't quite
> understand what I would use it for. What limitations does it have on
> the patch formats I can use with it?

The help output of the commands might be enlighting:

===

$ ipatch 
ipatch version 0.1
Usage: ipatch COMMAND ...

Commands:
  help   Display help about ipatch and ipatch commands.

Changing files
  apply  Apply a diff file interactively.

Changing patches
  split  Split a diff file interactively.

Use 'ipatch COMMAND --help' for help on a single command.
Use 'ipatch --version' to see the ipatch version number.

===

$ ipatch split --help
Usage: darcs split [OPTION]... 
Split a diff file interactively.

Options:
  --disable disable this command
  -h  --helpshows brief description of command and its arguments

Advanced options:
[..]

The `ipatch split file.patch' lets the user select different parts (hunks) of 
the
given patch file. After making a choice for each hunk, the user has to provide a
file name where the selected changes are stored. This procedure is repeated 
until
each change in the original file has been selected for one output file.

No files are modified by this command. The output patch files are all written 
at the
of the process.

===

$ ./dist/build/ipatch/ipatch apply --help
Usage: darcs apply [OPTION]... 
Apply a diff file interactively.

Options:
  --disable disable this command
  -h  --helpshows brief description of command and its arguments

Advanced options:
[..]

The `ipatch apply file.patch' command works similar to a `patch file.patch' 
command.
It will, however, prompt the user about each part of the patch, whether it 
should
be applied or not. Using the integrated hunk editor, the user has full control 
over
the chosen changes.

No files are touched until the end, when the user is asked for a final 
confirmation.

===

I’m not particular sure if apply is helpful. Maybe mostly to review a
patch hunk-for-hunk before applying and doing minor fix-ups (using the
hunk editor) directly there.

The main feature is the split command. My motivation comes from
maintaining Debian package where dpkg-buildpackage generates one large
patch from your changes to the upstream sources which I might want to
store separately, maybe because it contains independent changes.

For this, I plan some integration into quilt, e.g. add a mode that
splits the next patch in the series and puts the generated patches into
the series file.

I don’t think it is of much use if you are already using a VCS to
maintain your changes. Although having a "split" command in "git rebase
-i" that uses ipatch to split a change could be nice.

The limitations on the patch files are that they have to be parseable by
"diffstat" (to obtain the list of changed files) and that they need to
apply cleanly to the current directory using "patch". Unclean patches,
already applied patches or patches that require different "-p" options
are not supported yet, but will eventually.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nome...@debian.org


signature.asc
Description: This is a digitally signed message part
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-23 Thread Antoine Latter
On Tue, Aug 3, 2010 at 3:52 PM, Joachim Breitner
 wrote:
> Dear Haskell and Darcs community,
>
> I have written a tool to interactively edit patches, which under the
> hood uses the Darcs API. A more catchy introduction, including a
> screencast, can be found on
> https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
> which ends (and this is where you come in) with
> „So this is an invitation to join me and make ipatch a great tool. This
> invitation goes especially to the Darcs developers: Please have a look
> how the code uses the Darcs API and help to improve the collaboration
> here. I think we can use the darcs-users mailing list until there is
> need for a dedicated mailing list.“
>
> The code is on http://darcs.nomeata.de/ipatch/.
>
> Enjoy!
> Joachim

Do you have any documentation on what this utility does? I don't quite
understand what I would use it for. What limitations does it have on
the patch formats I can use with it?

Thanks,
Antoine
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-22 Thread Joachim Breitner
Hi,

Am Dienstag, den 03.08.2010, 22:52 +0200 schrieb Joachim Breitner:
> I have written a tool to interactively edit patches, which under the
> hood uses the Darcs API. A more catchy introduction, including a
> screencast, can be found on
> https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
> which ends (and this is where you come in) with
> „So this is an invitation to join me and make ipatch a great tool. This
> invitation goes especially to the Darcs developers: Please have a look
> how the code uses the Darcs API and help to improve the collaboration
> here. I think we can use the darcs-users mailing list until there is
> need for a dedicated mailing list.“
> 
> The code is on http://darcs.nomeata.de/ipatch/.

with Darcs 2.5 Beta 3 on Hackage, I could also upload ipatch to hackage:
http://hackage.haskell.org/package/ipatch
and it is now cabal-install’able.

I also made the program now handle patches that add or remove files,
extended the help texts a bit and added a test suite. This means that
you can actually make use of ipatch as of now, to split patches into
several small patches and to apply a patch interactively. Of course it
needs some more testing, and you might have feature wishes – in either
case, let me know.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nome...@debian.org


signature.asc
Description: This is a digitally signed message part
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-03 Thread Joachim Breitner
Hi,

Am Mittwoch, den 04.08.2010, 07:42 +1000 schrieb Ivan Lazar Miljenovic:
> Joachim Breitner  writes:
> > Dear Haskell and Darcs community,
> >
> > I have written a tool to interactively edit patches, which under the
> > hood uses the Darcs API. A more catchy introduction, including a
> > screencast, can be found on
> > https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
> > which ends (and this is where you come in) with
> > „So this is an invitation to join me and make ipatch a great tool. This
> > invitation goes especially to the Darcs developers: Please have a look
> > how the code uses the Darcs API and help to improve the collaboration
> > here. I think we can use the darcs-users mailing list until there is
> > need for a dedicated mailing list.“
> 
> How does this differ from darcs' hunk splitter/editor?  Or is this just
> making this functionality available to be used when you're not using
> darcs itself?

It is darcs’ hunk splitter/editor, and exactly that: Using it when not
using darcs.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
  mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nome...@debian.org


signature.asc
Description: This is a digitally signed message part
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


Re: [Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-03 Thread Ivan Lazar Miljenovic
Joachim Breitner  writes:

> Dear Haskell and Darcs community,
>
> I have written a tool to interactively edit patches, which under the
> hood uses the Darcs API. A more catchy introduction, including a
> screencast, can be found on
> https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
> which ends (and this is where you come in) with
> „So this is an invitation to join me and make ipatch a great tool. This
> invitation goes especially to the Darcs developers: Please have a look
> how the code uses the Darcs API and help to improve the collaboration
> here. I think we can use the darcs-users mailing list until there is
> need for a dedicated mailing list.“

How does this differ from darcs' hunk splitter/editor?  Or is this just
making this functionality available to be used when you're not using
darcs itself?

-- 
Ivan Lazar Miljenovic
ivan.miljeno...@gmail.com
IvanMiljenovic.wordpress.com
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe


[Haskell-cafe] ANNOUNCE: ipatch, the interactive patch editor

2010-08-03 Thread Joachim Breitner
Dear Haskell and Darcs community,

I have written a tool to interactively edit patches, which under the
hood uses the Darcs API. A more catchy introduction, including a
screencast, can be found on
https://www.joachim-breitner.de/blog/archives/425-ipatch,-the-interactive-patch-editor.html
which ends (and this is where you come in) with
„So this is an invitation to join me and make ipatch a great tool. This
invitation goes especially to the Darcs developers: Please have a look
how the code uses the Darcs API and help to improve the collaboration
here. I think we can use the darcs-users mailing list until there is
need for a dedicated mailing list.“

The code is on http://darcs.nomeata.de/ipatch/.

Enjoy!
Joachim

-- 
Joachim "nomeata" Breitner
  mail: m...@joachim-breitner.de | ICQ# 74513189 | GPG-Key: 4743206C
  JID: nome...@joachim-breitner.de | http://www.joachim-breitner.de/
  Debian Developer: nome...@debian.org


signature.asc
Description: This is a digitally signed message part
___
Haskell-Cafe mailing list
Haskell-Cafe@haskell.org
http://www.haskell.org/mailman/listinfo/haskell-cafe