[Monotone-devel] Updated Issue 103 - Enhancement request: Generate filename automatically for 'mtn conflicts resolve_first interactive' (monotone)
Hello, The following issue has been updated: 103 - Enhancement request: Generate filename automatically for 'mtn conflicts resolve_first interactive' Project: monotone Status: Accepted Reported by: joe 23 URL: http://code.monotone.ca/p/monotone/issues/103/ Labels: Type:Defect Priority:Medium Comments (last first): # By Stephen Leake, Nov 8, 2010: No need to peek into _MTN/conflicts; use 'mtn conflicts show_first'. See http://www.monotone.ca/docs/Conflicts.html#Conflicts for more. You must know what conflict you are resolving before specifying the resolution; 'interactive' is only appropriate for file content conflicts (which are the majority of conflicts, but not the only possible ones). At the same time, it is possible to generate a good filename automatically, since 'interactive' is only appropriate for single-file conflicts, which have a well-defined name. The Emacs DVC front-end does exactly that. I'll work on it. Status: Accepted Owner: stephe # By joe 23, Nov 8, 2010: Steps to reproduce the problem: --- 1. mtn conflicts store 2. mtn conflicts resolve_first interactive Expected result: Generate a filename in _MTN automatically to store the resolution. Either a random name, or even better, intelligently pick a name. For example, if the merge is for path/to/foo.c, make the filename be _MTN/foo.c. It is awkward to have to specify a file name on the command line when you don't know what conflict you will be resolving with resolve_first, unless you peek in _MTN/conflicts first. Actual results: --- mtn: misuse: wrong number of arguments Output of `mtn version --full`: --- monotone 0.99.1 (base revision: 8973482283db7c36780dce2b54721ccc0f5b7388) Running on : Linux 2.6.32-25-generic #45-Ubuntu SMP Sat Oct 16 19:48:22 UTC 2010 i686 C++ compiler: GNU C++ version 4.3.2 C++ standard library: GNU libstdc++ version 20080905 Boost version : 1_40 SQLite version : 3.5.9 (compiled against 3.5.9) Lua version : Lua 5.1 PCRE version: 7.6 2008-01-28 (compiled against 7.6) Botan version : 1.8.9 (compiled against 1.8.9) Changes since base revision: format_version 1 new_manifest [c1270158b7fa91abf8235ad129b0476943bde1ed] old_revision [8973482283db7c36780dce2b54721ccc0f5b7388] Generated from data cached in the distribution; further changes may have been made. -- Issue: http://code.monotone.ca/p/monotone/issues/103/ ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] usher 0.99 release (name-based virtual hosting for monotone)
On Fri, Nov 05, 2010 at 11:46:03PM -0500, Timothy Brownawell wrote: There is an actual release of usher available now. It's tagged as usher-0.99 available from mtn://monotone.ca/contrib?net.venge.monotone.usher This is what I've been waiting for! But my browser had other ideas ... You can also browse the source at http://code.monotone.ca/p/contrib/source/tree/t:usher-0.99/ and see the documentation at http://code.monotone.ca/p/contrib/source/file/t:usher-0.99/doc/documentation.html Whe I enter this URL into my iceweasel browser, it tell me: You have chosen to open * documentation.html which is a: HTML Text from: http://code.monotone.ca What should iceweasel do with this file? * Open with [ /usr/bin/galeon (default) ] * Save File * Do this automatically for files like this from now on. [ X cancel ] [ OK ] The drop-down menu that suggests using galeon (another browser) presents me to choose between [ /usr/bin/galeon (default) ] and Other... Is this weird, or what? Iceweasel not knowing what to do with HTML? And suggesting handing it over to another browser? Well, I did download the tarball, http://mtn-host.prjek.net/projects/webhost/files/usher-0.99.tar.gz and untarred it. The README file says The documentation is in doc/documentation.html. But there is no doc directory to be found in the tarball. Of course, when in the browser I select 'save file' and tell it where to put it, it saves it away nicely. Then iceweasel has no trouble showing me the contents of the saved file, which appears to be -- what else? -- documentation! -- hendrik ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] usher 0.99 release (name-based virtual hosting for monotone)
On Fri, Nov 05, 2010 at 11:46:03PM -0500, Timothy Brownawell wrote: There is an actual release of usher available now. It's tagged as usher-0.99 available from mtn://monotone.ca/contrib?net.venge.monotone.usher and there is a tarball available at http://mtn-host.prjek.net/projects/webhost/files/usher-0.99.tar.gz . It works on at least Debian and FreeBSD. You can also browse the source at http://code.monotone.ca/p/contrib/source/tree/t:usher-0.99/ and see the documentation at http://code.monotone.ca/p/contrib/source/file/t:usher-0.99/doc/documentation.html I guess now comes the inevitable flood of stupid questions as i try to make sense of the documentation. I'm not clear what happens to authentication. Have I messed something? The example configuration has the line monotonemtn -k my_key This suggests to me that the various monotones in the herd are going to be performing actions fot the user whose key is my_key. What happens to the identity of the remote user who is initiating the sync operation? -- hendrik ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] usher 0.99 release (name-based virtual hosting for monotone)
On Fri, Nov 05, 2010 at 11:46:03PM -0500, Timothy Brownawell wrote:
There is an actual release of usher available now. It's tagged as
usher-0.99 available from
mtn://monotone.ca/contrib?net.venge.monotone.usher
and there is a tarball available at
http://mtn-host.prjek.net/projects/webhost/files/usher-0.99.tar.gz
I did the ./configure, and make, and then I did make test
I got a lot of stuff that looked like errors, but I suspect that the
complete test environment wasn't available on my system. I don't, to my
knowledge, have a server mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
or is that something the test scripts should have set up?
. It works on at least Debian and FreeBSD.
Using a Debian stable running on a 64-bit AMD64.
-- hendrik
make check-TESTS
make[1]: Entering directory `/farhome/hendrik/dn/usher/usher-0.99'
TESTDIR=/farhome/hendrik/dn/usher/usher-0.99/test-dir
Running test test1...
Copying scripts...
scripts
scripts/foobar.sh
bound to 127.0.0.1:23345
bound to 127.0.0.1:8691
Testing: serve example 127.0.0.1:25436
Testing: multipull 3 mtn://HOST/prjek-s?net.prjek.separate
mtn: misuse: database
/farhome/hendrik/dn/usher/usher-0.99/test-dir/test1/example.mtn does not exist
mtn: setting default server to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: setting default branch include pattern to 'net.prjek.separate'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: Received warning from usher: No server named 'prjek-s?net.prjek.separate'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek-s?net.prjek.separate, disconnecting
mtn: setting default server to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: setting default branch include pattern to 'net.prjek.separate'
Testing: multipull 3 'mtn://HOST/prjek?net.prjek.{fnord,foobar}'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: Received warning from usher: No server named 'prjek-s?net.prjek.separate'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek-s?net.prjek.separate, disconnecting
mtn: setting default server to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: setting default branch include pattern to 'net.prjek.separate'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek-s?net.prjek.separate
mtn: Received warning from usher: No server named 'prjek-s?net.prjek.separate'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek-s?net.prjek.separate, disconnecting
mtn: setting default server to
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: setting default branch include pattern to 'net.prjek.{fnord,foobar}'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: Received warning from usher: No server named
'prjek?net.prjek.{fnord,foobar}'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}, disconnecting
mtn: setting default server to
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: setting default branch include pattern to 'net.prjek.{fnord,foobar}'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: Received warning from usher: No server named
'prjek?net.prjek.{fnord,foobar}'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}, disconnecting
Testing: multipull 3 mtn://HOST/example?org.example
mtn: setting default server to
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: setting default branch include pattern to 'net.prjek.{fnord,foobar}'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}
mtn: Received warning from usher: No server named
'prjek?net.prjek.{fnord,foobar}'
mtn: error: I/O failure while talking to peer
mtn://127.0.0.1:8691/prjek?net.prjek.{fnord,foobar}, disconnecting
mtn: setting default server to mtn://127.0.0.1:8691/example?org.example
mtn: setting default branch include pattern to 'org.example'
mtn: setting default branch exclude pattern to ''
mtn: doing anonymous pull; use -kKEYNAME if you need authentication
mtn: connecting to mtn://127.0.0.1:8691/example?org.example
mtn: Received warning from usher: No server named 'example?org.example'
mtn: error: I/O failure while talking to peer
Re: [Monotone-devel] usher 0.99 release (name-based virtual hosting for monotone)
Am 08.11.10 19:36, schrieb Hendrik Boom: On Fri, Nov 05, 2010 at 11:46:03PM -0500, Timothy Brownawell wrote: There is an actual release of usher available now. It's tagged as usher-0.99 available from mtn://monotone.ca/contrib?net.venge.monotone.usher This is what I've been waiting for! But my browser had other ideas ... You can also browse the source at http://code.monotone.ca/p/contrib/source/tree/t:usher-0.99/ and see the documentation at http://code.monotone.ca/p/contrib/source/file/t:usher-0.99/doc/documentation.html Whe I enter this URL into my iceweasel browser, it tell me: You have chosen to open * documentation.html which is a: HTML Text from: http://code.monotone.ca What should iceweasel do with this file? * Open with [ /usr/bin/galeon (default) ] * Save File * Do this automatically for files like this from now on. [ X cancel ] [ OK ] The drop-down menu that suggests using galeon (another browser) presents me to choose between [ /usr/bin/galeon (default) ] and Other... Is this weird, or what? Iceweasel not knowing what to do with HTML? And suggesting handing it over to another browser? Its because individual files are represented with Content-disposition: attachment and that makes the browser open up the save as dialog. I linked the 0.99 version of the documentation now with a wiki page where you can just view it: http://code.monotone.ca/p/contrib/page/UsherDocumentation/ Thomas. -- GPG-Key 0x160D1092 | tommyd3...@jabber.ccc.de | http://thomaskeller.biz Please note that according to the EU law on data retention, information on every electronic information exchange might be retained for a period of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
