Re: [fossil-users] auto-adjust of CLI timeline to terminal width?
2015-04-20 23:00 GMT+02:00 Warren Young w...@etr-usa.com: It’s a bug in the #includes at the top of src/comformat.c. The following trivial patch fixes it: Patch applied: http://fossil-scm.org/index.html/info/d32ca5928223a448 I have not checked whether this patch causes a portability regression. If there is in fact a platform where you cannot include sys/ioctl.h if TIOCGWINSZ isn’t defined by termios.h, a different ifdef will be required. It's very unlikely that a system having termios.h would not have sys/ioctl.h. I don't know any. Thanks! Jan Nijtmans ___ 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] Bug? FOSSIL MV does not work as expected (Win7 machine)
On Tue, 21 Apr 2015 11:09:05 +0200, Jan Nijtmans jan.nijtm...@gmail.com wrote: 2015-04-21 10:24 GMT+02:00 Michael Richter ttmrich...@gmail.com: The key wording there is within the repository tree. It doesn't change the file system, only the naming of the files, etc. in the repository. Whether this is desired or correct behaviour is … an area of frequent discussion. Work already has been done by Joe Mistachkin to resolve this (Thanks Joe!) Just configure fossil using --with-legacy-mv-rm and then build it, then: ./fossil set mv-rm-files -global 1 I'm currently using fossil compiled this way, and so far it appears to work fine. any chance to see this becoming the default soon? Regards, Jan Nijtmans ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Using Opera's revolutionary email client: http://www.opera.com/mail/ ___ 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] Bug? FOSSIL MV does not work as expected (Win7 machine)
2015-04-21 10:24 GMT+02:00 Michael Richter ttmrich...@gmail.com: The key wording there is within the repository tree. It doesn't change the file system, only the naming of the files, etc. in the repository. Whether this is desired or correct behaviour is … an area of frequent discussion. Work already has been done by Joe Mistachkin to resolve this (Thanks Joe!) Just configure fossil using --with-legacy-mv-rm and then build it, then: ./fossil set mv-rm-files -global 1 I'm currently using fossil compiled this way, and so far it appears to work fine. Regards, Jan Nijtmans ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] How to pull back from a git mirror?
Hello,
I have been maintaining git mirrors of the fossil repositories of my
personal projects, so that they can be more easily found (on github)
and/or cloned. Here is the snipped of shell script I use to build the
git mirror repository:
cd ${GIT_REPO}
git init
fossil export --git -R ${FOSSIL_REPO} \
| sed 's/nat nat/Natasha Kerensikova nata...@instinctive.eu/' \
| git fast-import
git remote add origin g...@github.com:faelys/${PROJ}.git
and here is the update snippet:
cd ${GIT_REPO}
fossil pull -R ${FOSSIL_REPO}
fossil export --git -R ${FOSSIL_REPO} \
| sed 's/nat nat/Natasha Kerensikova nata...@instinctive.eu/' \
| git fast-import
git push --all origin
This is quite unrefined, but it mostly works well enough for me.
Now the problem is that some of my projects had their git repository
changed, for reasons mostly related to my own negligence, but that's how
it is.
I haven't touched the original fossil repository since, in the hope that
the situation can still somehow be salvaged.
So to make it short, the fossil repository is a prefix of what the git
mirror currently is, with the extra git nodes being generated by git.
Is there any way to backport the git commits into the fossil repository
and still have an automatic script to push to the git mirror?
Ideally it would still work with the script above, but from my foggy
memory of this list there is currently no round-trip support, and my
`sed` call in there probably murks things even further.
So a more realistic request would a procedure to backport the git
commits into fossil, and a new update script to only export stuff beyond
the synchronization point.
Would the export-marks feature be what I need? I haven't really
understood what it is and how it works.
Thanks in advance for your help,
Natasha
pgpjR_2DpR_VS.pgp
Description: PGP signature
___
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] Bug? FOSSIL MV does not work as expected (Win7 machine)
The key wording there is *within the repository* tree. It doesn't change the file system, only the naming of the files, etc. in the repository. Whether this is desired or correct behaviour is … an area of frequent discussion. My own response to that discussion is to use the fsl wrapper ( http://fossil.0branch.com/fsl/home) and make it do whatever I expect it to do. On 17 April 2015 at 21:48, Tony Papadimitriou to...@acm.org wrote: This is on a Win7 machine (if it matters). A simple way to reproduce (f = fossil): f new xxx.fossil f o xxx.fossil mkdir a\a dir a\a\xxx f add a f com -m Initial f mv a\a b f close Based on help screen, and usual behavior of mv, I would expect subdirectory a\a to be now known as b, and of course all files below to move accordingly. But nothing happens. If I move each file separately, it works. This is what the help screen shows: Usage: f mv|rename OLDNAME NEWNAME or: f mv|rename OLDNAME... DIR Move or rename one or more files or directories within the repository tree. You can either rename a file or directory or move it to another subdirectory. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Perhaps people don't believe this, but throughout all of the discussions of entering China our focus has really been what's best for the Chinese people. It's not been about our revenue or profit or whatnot. --Sergey Brin, demonstrating the emptiness of the don't be evil mantra. ___ 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] Bug? FOSSIL MV does not work as expected (Win7machine)
I’m aware of the “within the repository”, and actually I’m not among those who are so interested in this changing this, as proposed by others. So, not the same issue here. What I’m reporting is unrelated to changes happening on disk. If you run the example below you should not be allowed to close the repo since there are uncommitted changes (the mv). But, since nothing actually happened, and that exactly is the problem I’m seeing, you can close it normally (without –force). This looks like a bug to me. From: Michael Richter Sent: Tuesday, April 21, 2015 11:24 AM To: Fossil SCM user's discussion Subject: Re: [fossil-users] Bug? FOSSIL MV does not work as expected (Win7machine) The key wording there is within the repository tree. It doesn't change the file system, only the naming of the files, etc. in the repository. Whether this is desired or correct behaviour is … an area of frequent discussion. My own response to that discussion is to use the fsl wrapper (http://fossil.0branch.com/fsl/home) and make it do whatever I expect it to do. On 17 April 2015 at 21:48, Tony Papadimitriou to...@acm.org wrote: This is on a Win7 machine (if it matters). A simple way to reproduce (f = fossil): f new xxx.fossil f o xxx.fossil mkdir a\a dir a\a\xxx f add a f com -m Initial f mv a\a b f close Based on help screen, and usual behavior of mv, I would expect subdirectory a\a to be now known as b, and of course all files below to move accordingly. But nothing happens. If I move each file separately, it works. This is what the help screen shows: Usage: f mv|rename OLDNAME NEWNAME or: f mv|rename OLDNAME... DIR Move or rename one or more files or directories within the repository tree. You can either rename a file or directory or move it to another subdirectory. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Perhaps people don't believe this, but throughout all of the discussions of entering China our focus has really been what's best for the Chinese people. It's not been about our revenue or profit or whatnot. --Sergey Brin, demonstrating the emptiness of the don't be evil mantra. ___ 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] How to pull back from a git mirror?
On Tue, Apr 21, 2015 at 5:27 AM, Natacha Porté nata...@instinctive.eu wrote: So to make it short, the fossil repository is a prefix of what the git mirror currently is, with the extra git nodes being generated by git. Is there any way to backport the git commits into the fossil repository and still have an automatic script to push to the git mirror? Ideally it would still work with the script above, but from my foggy memory of this list there is currently no round-trip support, and my `sed` call in there probably murks things even further. The effects of the sed command can be reversed, so I don't see that as a problem. I have never tried fossil export --git -R orig.fossil | fossil import new.fossil so I don't know if the commits in new.fossil will be identical to the ones in orig.fossil. I do know that only commits are supported in Git, so new.fossil will not have any tickets, events or internal wiki pages. Also, I have no idea if Git supports incremental export. If it does, there might be a way to tell Git what commits Fossil has (see below about Fossil incremental export). If Git doesn't support incremental export, AND the commits safely round-trip, then I THINK that Fossil will ignore commits it already has. Or, import to a new repo, use SQL commands to make the new repo look like a clone of the original, then sync it to the original. Of course, test all of this using clones of your repos - and make backups - before importing/sync'ing to the real repos. So a more realistic request would a procedure to backport the git commits into fossil, and a new update script to only export stuff beyond the synchronization point. Would the export-marks feature be what I need? I haven't really understood what it is and how it works. Fossil's incremental export/import works like: # initial export fossil export --git --export marksfile -R repo.fossil firstexport # incremental export fossil export --git --import marksfile --export newmarks -R repo.fossil secondexport mv marksfile oldmarks mv newmarks marksfile # initial import fossil import --git mirror.fossil firstexport # incremental import fossil import --git --inc mirror.fossil secondexport Assuming Git support incremental exports and there is a way to supply Git with a list from a file, you would: fossil export --git --export marksfile -R orig.fossil /dev/null # insert sed, awk, Perl or other script to convert marksfile to whatever Git understands # invoke git-fast-export with whatever options needed to use the list of already exported commits. # insert any script needed to (un)modify commit info in Git export file fossil clone orig.fossil clone.fossil fossil import --git --inc clone.fossil gitexport Again, make backups and clones, test all this, then import/sync to the real repos. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
