Re: [fossil-users] Get a checkin diff from cli

2014-01-23 Thread Ron Wilson
On Wed, Jan 22, 2014 at 1:37 PM, Stephan Beal sgb...@googlemail.com wrote:



 On Wed, Jan 22, 2014 at 6:58 PM, Ron Wilson ronw.m...@gmail.com wrote:

 Expanding on my suggestion for relative tags like +2 or -3, the
 capability to specify a commit relative to an arbitrary specified commit
 would be useful as well.


 There's a potential problem there: when a checkin has multiple parents,
 such an identifier is ambiguous.
 
 That said, i like Lluis' idea of:

 fossil diff --checkin uuid

 as a shortcut for diff the given uuid against its parent, with the
 caveat that a multi-parent checkin might need to toss an error there.


A commit with multiple parents would have a primary parent and one or
more merge parents. I think that the previous (or -1) parent would be
the primary/non-merge parent.

I have looked some at the code, but been working extra hours lately.

I hope your dog enjoys visiting his mom.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] Get a checkin diff from cli

2014-01-22 Thread Lluís Batlle i Rossell
Hello all,

knowing the checkin hash, how can I get in cli the diff introduced by of the
checkin? Similar to what appears in the checkin page on the ui.

Regards,
Lluís.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Get a checkin diff from cli

2014-01-22 Thread Richard Hipp
On Wed, Jan 22, 2014 at 3:12 AM, Lluís Batlle i Rossell vi...@viric.namewrote:

 Hello all,

 knowing the checkin hash, how can I get in cli the diff introduced by of
 the
 checkin? Similar to what appears in the checkin page on the ui.


I think you have to know both the checkin hash and the parent check-in
hash.  Then:

fossil diff --from $parent --to $checkin

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Get a checkin diff from cli

2014-01-22 Thread Lluís Batlle i Rossell
On Wed, Jan 22, 2014 at 06:25:14AM -0500, Richard Hipp wrote:
 On Wed, Jan 22, 2014 at 3:12 AM, Lluís Batlle i Rossell 
 vi...@viric.namewrote:
 
  Hello all,
 
  knowing the checkin hash, how can I get in cli the diff introduced by of
  the
  checkin? Similar to what appears in the checkin page on the ui.
 
 
 I think you have to know both the checkin hash and the parent check-in
 hash.  Then:
 
 fossil diff --from $parent --to $checkin

Ok, thank you. That is how I was doing it until now, but I thought there should
be a comfortable way. :)

It'd be nice to have a fossil diff --checkin X or so. As for git, I often use
'git show' to achieve that.

Regards,
Lluís.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Get a checkin diff from cli

2014-01-22 Thread Ron Wilson
If you update your work space to the commit in question, I think you could
do::

fossil diff --from previous


Expanding on my suggestion for relative tags like +2 or -3, the
capability to specify a commit relative to an arbitrary specified commit
would be useful as well.



On Wed, Jan 22, 2014 at 6:29 AM, Lluís Batlle i Rossell vi...@viric.namewrote:

 On Wed, Jan 22, 2014 at 06:25:14AM -0500, Richard Hipp wrote:
  On Wed, Jan 22, 2014 at 3:12 AM, Lluís Batlle i Rossell 
 vi...@viric.namewrote:
 
   Hello all,
  
   knowing the checkin hash, how can I get in cli the diff introduced by
 of
   the
   checkin? Similar to what appears in the checkin page on the ui.
  
 
  I think you have to know both the checkin hash and the parent check-in
  hash.  Then:
 
  fossil diff --from $parent --to $checkin

 Ok, thank you. That is how I was doing it until now, but I thought there
 should
 be a comfortable way. :)

 It'd be nice to have a fossil diff --checkin X or so. As for git, I
 often use
 'git show' to achieve that.

 Regards,
 Lluís.
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Get a checkin diff from cli

2014-01-22 Thread Stephan Beal
On Wed, Jan 22, 2014 at 6:58 PM, Ron Wilson ronw.m...@gmail.com wrote:

 Expanding on my suggestion for relative tags like +2 or -3, the
 capability to specify a commit relative to an arbitrary specified commit
 would be useful as well.


There's a potential problem there: when a checkin has multiple parents,
such an identifier is ambiguous.

That feature/idea has been floated several times over the past years, but
AFAIR it hasn't been seriously experimented with. Sunday this week is set
aside for programming, and next week i'll have an unusual amount of free
time because my dog will be out of town with his mother (so no dog duty for
me next week). If we can come up with a reasonable notation, sensible
semantics, and some SQL to traverse the parents, i'll be able to take a
whack at this.

That said, i like Lluis' idea of:

fossil diff --checkin uuid

as a shortcut for diff the given uuid against its parent, with the caveat
that a multi-parent checkin might need to toss an error there. That would
cover the most common case, i think.

:-?

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do. -- Bigby Wolf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users