[chirp_devel] #553 Icom ID-51 support

[Tom Hayward]

On Tue, Feb 19, 2013 at 1:29 PM, Dean Gibson AE7Q <data at ae7q.net> wrote:
> The first time I ran "hg export tip", it showed changes (by Dan) to files
> that I hadn't touched.  What's that about?

At that time, that was the most recent thing applied to your local
repository. You must have done that before running hg qnew.

> Subsequent invocations return my changes to two files.  These two files need
> to be two separate patches (two separate bug #s).
> What the hell is "tip" ???

tip is the latest commit. Same as git's HEAD.

Multiple files can be lumped in the same commit, as long as they go
with the same bug/feature.

If you need to export more than one commit at a time (two separate
issues), you would first run "hg qnew" for each, with appropriate
options to attach the intended files (see the man page). With multiple
commits to export, we can't use the tip shortcut, we need to look up
the revisions numbers with hg log. Then export as needed like "hg
export -r 1897 > id31.patch", "hg export -r 1898 > id51.patch", etc.

> OK, I did "hg qnew -l chirp\id51.py -ef <comment>".  Then I removed it with
> "hg qpop".  Somewhere in these few steps my changes (including all of
> id51.py) were deleted.   Is that what you mean by "minimal learning curve"
> below?  Fortunately (that means having some experience with the batch of new
> SCM packages out there), I had a complete backup elsewhere.
> I just now decided to have multiple backups of my changes.  Perhaps I'll use
> CVS internally ...
> Another "hg qpop" also removed a "patch" named "help";  I'll let you guess
> as to how that got there (grin).

Yep, hg qpop removes it from your working stack, so you're back to
vanilla Chirp. hg qpush puts it back.

> <rant>
>
> So far this has been all downhill.  I've spent far more time screwing around
> with the submission process, that I did to create id51.py (and make proposed
> changes to id31.py).

Chirp uses industry standard SCM software and a submission process
identical to a huge number of open source projects. I use very similar
SCM tools to manage the code I produce for work. We're not trying to
burden you, just using modern standard tools.

> So, I'll try once more:
>
>    hg qnew -l chirp\id51.py -ef "[id51] Add support for Icom ID-51"
>
> I'm supposed to enter the bug # (553), but "qnew" won't take a "#" on the
> command line, and up pops a NotePad window with the changed file (??? I just
> closed it).  So, no info on that.  What follows is the output from the next
> command. I sure don't see my comment (above), and I sure thought that almost
> all of the lines would be prefixed by a "+".  So,, my guess is that this
> will be unacceptable as well.  I'm sure not going to submit any changes to
> id31.py until I've sorted this out.

The editor opened so you could compose a commit message like the following:
[id51] Add support for Icom ID-51. #553

>    hg export tip
>
> # HG changeset patch
> # User Dean Gibson <data at ae7q.net>
> # Date 1361307603 28800
> # Node ID b94ce8ef429fb5bf5750d96341c6d38354837b57
> # Parent  5528bdcdc34e5966d5b7f0dbb6859f700b5f9366

Since you just closed Notepad before typing a commit message, there's
no commit message on the following patch, but otherwise you have used
the tools correctly. Congratulations!

> # Copyright 2012 Dan Smith <dsmith at danplanet.com>

If you wrote the following code, it is appropriate for you to change
the copyright to your name.

Tom KD7LXL