Re: [fossil-users] fossil-users Digest, Vol 118, Issue 13
On Sat, Nov 11, 2017 at 8:40 PM, wrote: > > Subject: Re: [fossil-users] [Nmh-workers] Merging Source Files with > git.(fwd) > Richard said: There is no way to track file merges in Fossil. Nor is there a way to > track splits - when a single source code file is split into multiple > smaller files because the original became too large. > And I said: I think you could do that with a serials of operations. (I have NOT tested > any of this) > Clarifying my response: True, Fossil only tracks merges on the commit level. So, not (directly) possible to track merges of differently named files. On the other hand, Fossil does track renaming files. My proposal indirectly uses this renaming tracking to track the merges. It does require several commits for each file. My proposed procedure is (possibly over) cautious in that it makes a commit after each file operation. It might be possible to accomplish with less frequent commits. Also, if more than one set of files is being merged ( foo*.c => foo.c, bar*.c => bar.c, etc ), should be able to do all of the same operation for each set then commit. ___ 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] feature request: diff -tk: 'q' to quit
On Saturday, 11 Nov 2017 7:08 PM -0500, Stephan Beal wrote: > --===3478356516174635687== > Content-Type: multipart/alternative; boundary="94eb2c1cc16658e44a055dbdf4c0" > > --94eb2c1cc16658e44a055dbdf4c0 > Content-Type: text/plain; charset="UTF-8" > > Lol - i never even noticed that there was a search box in the diff view. > > i'd be just as happy with ctrl-q - anything which is left-hand friendly. > > On Nov 12, 2017 01:06, wrote: > >> >> Stephan Beal writes: >> > Sometime in the far past, tapping 'q' (or maybe it was 'x') in the diff >> -tk >> > widget used to exit that widget. Nowadays one has to click the "Quit" >> > button or tap Alt-F4 (a really finger-clumsy holdover from early Windows >> > versions). >> >> It was 'q'. It was removed by >> http://fossil-scm.org/index.html/info/f6d9583173cbd6d2 >> >> It missed it so much that I use a for that patched fossil. >> >> > Can we please, please, please get the 'q'==>quit functionality back? It >> > sounds like a trivial thing to add, but the tcl code is all Greek to me >> :/. >> >> I second that plea. >> >> I still use the proposed patch from >> >> https://www.mail-archive.com/fossil-users@lists.fossil-scm. >> org/msg24885.html >> ___ One really needs to have *some* sort of keyboard binding to quit - I don't care if it's Alt-Q, Ctrl-Q, or something else, but *something* other than a mouse action. -- Will ___ 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] feature request: diff -tk: 'q' to quit
Lol - i never even noticed that there was a search box in the diff view. i'd be just as happy with ctrl-q - anything which is left-hand friendly. - stephan Sent from a mobile device, possibly from bed. Please excuse brevity, typos, and top-posting. On Nov 12, 2017 01:06, wrote: > > Stephan Beal writes: > > Sometime in the far past, tapping 'q' (or maybe it was 'x') in the diff > -tk > > widget used to exit that widget. Nowadays one has to click the "Quit" > > button or tap Alt-F4 (a really finger-clumsy holdover from early Windows > > versions). > > It was 'q'. It was removed by > http://fossil-scm.org/index.html/info/f6d9583173cbd6d2 > > It missed it so much that I use a for that patched fossil. > > > Can we please, please, please get the 'q'==>quit functionality back? It > > sounds like a trivial thing to add, but the tcl code is all Greek to me > :/. > > I second that plea. > > I still use the proposed patch from > > https://www.mail-archive.com/fossil-users@lists.fossil-scm. > org/msg24885.html > ___ > 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] feature request: diff -tk: 'q' to quit
Stephan Beal writes: > Sometime in the far past, tapping 'q' (or maybe it was 'x') in the diff -tk > widget used to exit that widget. Nowadays one has to click the "Quit" > button or tap Alt-F4 (a really finger-clumsy holdover from early Windows > versions). It was 'q'. It was removed by http://fossil-scm.org/index.html/info/f6d9583173cbd6d2 It missed it so much that I use a for that patched fossil. > Can we please, please, please get the 'q'==>quit functionality back? It > sounds like a trivial thing to add, but the tcl code is all Greek to me :/. I second that plea. I still use the proposed patch from https://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg24885.html ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] feature request: diff -tk: 'q' to quit
Sometime in the far past, tapping 'q' (or maybe it was 'x') in the diff -tk widget used to exit that widget. Nowadays one has to click the "Quit" button or tap Alt-F4 (a really finger-clumsy holdover from early Windows versions). Can we please, please, please get the 'q'==>quit functionality back? It sounds like a trivial thing to add, but the tcl code is all Greek to me :/. -- - stephan beal http://wanderinghorse.net/home/stephan/ "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
Re: [fossil-users] [Nmh-workers] Merging Source Files
On Sat, Nov 11, 2017 at 7:00 AM,
wrote:
>
> Date: Sat, 11 Nov 2017 10:22:15 +
> From: Thomas Levine <_...@thomaslevine.com>
> Subject: [fossil-users] [Nmh-workers] Merging Source Files with git.
> (fwd)
>
> Ralph asks whether a particular feature is available in git,
> so I am curious, is it available in fossil?
>
> --- Forwarded Message
>
> Date:Fri, 10 Nov 2017 23:51:07 +
> From:Ralph Corderoy
>
> This suggests foo_{add,del,find,save,tweak}.c should in time become
> foo.c, allowing globals to become statics in foo.c, and currently global
> structs, etc., to also move to foo.c. Is there a good way of doing
> this, in multiple stages if necessary, that allows git to preserve the
> chain of history? Say telling it foo_add.c is now foo.c in one commit,
> and then foo_del.c has merged with foo.c in the next.
>
I think you could do that with a serials of operations. (I have NOT tested
any of this)
1. Create a branch for combining the files
2. fossil mv foo_add.c foo.c
3. fossil ci
4. Branch again
5. Edit foo_del.c to include functions from foo.c
6. fossil rm foo.c
7. fossil ci
8. fossil mv foo_del.c foo.c
9. fossil ci
10. Merge this branch to branch created in 1, then check in the result
11. Goto 4 and repeat for next foo_*.*
12. Merge final result (in branch from 1) to trunck (or where ever "1" came
from)
In theory, could do this without creating a new branch for each foo_*.* but
the "extra" branching will help make the combining history clearer.
These steps can probably be simplified.
___
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] [Nmh-workers] Merging Source Files with git. (fwd)
There is no way to track file merges in Fossil. Nor is there a way to
track splits - when a single source code file is split into multiple
smaller files because the original became too large.
On 11/11/17, Thomas Levine <_...@thomaslevine.com> wrote:
> Ralph asks whether a particular feature is available in git,
> so I am curious, is it available in fossil?
>
> --- Forwarded Message
>
> Date:Fri, 10 Nov 2017 23:51:07 +
> From:Ralph Corderoy
> To: nmh-work...@nongnu.org
> Subject: [Nmh-workers] Merging Source Files with git.
>
> Hi,
>
> I'm in the Augean process of creating .h interface files for each of the
> .c implementation files, depleting h/prototypes.h of content along the
> way, to help show the dependencies between the modules. Something
> that's obvious before and during is there's too many one-function C
> files, often with a piddly little functions, and a whole clutch of them
> are related.
>
> This suggests foo_{add,del,find,save,tweak}.c should in time become
> foo.c, allowing globals to become statics in foo.c, and currently global
> structs, etc., to also move to foo.c. Is there a good way of doing
> this, in multiple stages if necessary, that allows git to preserve the
> chain of history? Say telling it foo_add.c is now foo.c in one commit,
> and then foo_del.c has merged with foo.c in the next.
>
> - --
> Cheers, Ralph.
> https://plus.google.com/+RalphCorderoy
>
> - --
> Nmh-workers
> https://lists.nongnu.org/mailman/listinfo/nmh-workers
>
> --- End of Forwarded Message
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
--
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
[fossil-users] [Nmh-workers] Merging Source Files with git. (fwd)
Ralph asks whether a particular feature is available in git,
so I am curious, is it available in fossil?
--- Forwarded Message
Date:Fri, 10 Nov 2017 23:51:07 +
From:Ralph Corderoy
To: nmh-work...@nongnu.org
Subject: [Nmh-workers] Merging Source Files with git.
Hi,
I'm in the Augean process of creating .h interface files for each of the
.c implementation files, depleting h/prototypes.h of content along the
way, to help show the dependencies between the modules. Something
that's obvious before and during is there's too many one-function C
files, often with a piddly little functions, and a whole clutch of them
are related.
This suggests foo_{add,del,find,save,tweak}.c should in time become
foo.c, allowing globals to become statics in foo.c, and currently global
structs, etc., to also move to foo.c. Is there a good way of doing
this, in multiple stages if necessary, that allows git to preserve the
chain of history? Say telling it foo_add.c is now foo.c in one commit,
and then foo_del.c has merged with foo.c in the next.
- --
Cheers, Ralph.
https://plus.google.com/+RalphCorderoy
- --
Nmh-workers
https://lists.nongnu.org/mailman/listinfo/nmh-workers
--- End of Forwarded Message
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
