date:20150319

Re: [PATCH 14/14] diff_opt_parse(): use convert_i() when handling --abbrev=num

2015-03-19 Thread Junio C Hamano

Michael Haggerty mhag...@alum.mit.edu writes:

 die() with an error message if the argument is not a non-negative
 integer. This change tightens up parsing: '+' and '-', leading
 whitespace, and trailing junk are all disallowed now.

 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  diff.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/diff.c b/diff.c
 index be389ae..1cc5428 100644
 --- a/diff.c
 +++ b/diff.c
 @@ -3830,7 +3830,8 @@ int diff_opt_parse(struct diff_options *options, const 
 char **av, int ac)
   else if (!strcmp(arg, --abbrev))
   options-abbrev = DEFAULT_ABBREV;
   else if (skip_prefix(arg, --abbrev=, arg)) {
 - options-abbrev = strtoul(arg, NULL, 10);
 + if (convert_i(arg, 10, options-abbrev))
 + die(--abbrev requires an integer argument);

Everybody leading up to this step said a non-negative integer, but
this one is different?

   if (options-abbrev  MINIMUM_ABBREV)
   options-abbrev = MINIMUM_ABBREV;
   else if (40  options-abbrev)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 05/14] handle_revision_opt(): use convert_i() when handling -digit

2015-03-19 Thread Junio C Hamano

Michael Haggerty mhag...@alum.mit.edu writes:

 This tightens up the parsing a bit:

 * Leading whitespace is no longer allowed
 * '+' and '-' are no longer allowed

 It also removes the need to check separately that max_count is
 non-negative.

Hmmm, on the surface this sound nice, but I am not sure if it is a
good idea.  git cmd-in-log-family -3 --max-count=-1 would have
been a nice way to flip a max-count given earlier on the command
line back to the default (unlimited) and we are removing it without
giving any escape hatch?


 Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
 ---
  revision.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/revision.c b/revision.c
 index 25838fc..4908e66 100644
 --- a/revision.c
 +++ b/revision.c
 @@ -1,4 +1,5 @@
  #include cache.h
 +#include numparse.h
  #include tag.h
  #include blob.h
  #include tree.h
 @@ -1709,8 +1710,7 @@ static int handle_revision_opt(struct rev_info *revs, 
 int argc, const char **arg
   return argcount;
   } else if ((*arg == '-')  isdigit(arg[1])) {
   /* accept -digit, like traditional head */
 - if (strtol_i(arg + 1, 10, revs-max_count)  0 ||
 - revs-max_count  0)
 + if (convert_i(arg + 1, 10, revs-max_count))
   die('%s': not a non-negative integer, arg + 1);

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git with Lader logic

2015-03-19 Thread Bharat Suvarna

Thanks all .. I will have a look. But could I just set this up on my laptop and
checking this works on system first before installing one of Git on server

Sent from my iPhone

On 18 Mar 2015, at 22:28, Doug Kelly dougk@gmail.com wrote:

On Wed, Mar 18, 2015 at 2:53 PM, Randall S. Becker
rsbec...@nexbridge.com wrote:
On March 17, 2015 7:34 PM, Bharat Suvarna wrote:
I am trying to find a way of using version control on PLC programmers like
Allen
Bradley PLC. I can't find a way of this.

Could you please give me an idea if it will work with Plc programs. Which
are
basically Ladder logic.

Many PLC programs either store their project code in XML, L5K or L5X (for
example), TXT, CSV, or some other text format or can import and export to
text forms. If you have a directory structure that represents your project,
and the file formats have reasonable line separators so that diffs can be
done easily, git very likely would work out for you. You do not have to have
the local .git repository in the same directory as your working area if your
tool has issues with that or .gitignore. You may want to use a GUI client to
manage your local repository and handle the commit/push/pull/merge/rebase
functions as I expect whatever PLC system you are using does not have git
built-in.

To store binary PLC data natively, which some tools use, I expect that those
who are better at git-conjuring than I, could provide guidance on how to
automate binary diffs for your tool's particular file format.

The one thing I find interesting about RSLogix in general (caveat: I
only have very limited experience with RSLogix 500 / 5000; if I do
anything nowadays, it's in the micro series using RSLogix Micro
Starter Lite)... they do have some limited notion of version control
inside the application itself, though it seems rudimentary to me.
This could prove to be helpful or extremely annoying, since even when
I connect to a PLC and go online, just to reset the RTC, it still
prompts me to save again (even though nothing changed, other than the
processor state).

You may also find this link on stackexchange helpful:
http://programmers.stackexchange.com/questions/102487/are-there-realistic-useful-solutions-for-source-control-for-ladder-logic-program

As Randall noted, L5K is just text, and RSLogix 5000 uses it,
according to this post. It may work okay.

--Doug
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

77 matches

Mail list logo