RFC: retire bazaar
Joe Orton
jorton at redhat.com
Fri Aug 24 12:21:21 UTC 2007
On Fri, Aug 24, 2007 at 11:49:09AM +0200, Zoltan Kota wrote:
> Maybe we could keep it for the F8 lifetime at least?! Users then would
> have some more time for migration to bzr. Upstream we still use baz.
> (I will discuss the migration issue with the upstream developer
> anyway.)
>
> So if you agree, and nobody else wants to take it I can get the
> ownership (for a while). Joe, patches would be very welcome! ;-)
Attached.
-------------- next part --------------
--- thelove at canonical.com---dists--bazaar--1.4/src/hackerlab/vu/vu.c.macropen 2005-06-20 23:00:03.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/hackerlab/vu/vu.c 2007-08-09 09:21:27.000000000 +0100
@@ -939,7 +939,7 @@
int fd;
handler = vu_path_dispatch (path);
- fd = handler->vtable->open(errn, path, flags, mode, handler->closure);
+ fd = (handler->vtable->open)(errn, path, flags, mode, handler->closure);
if (fd >= 0)
{
if ((ar_size (fd_handlers.void_ptr) <= fd) || !fd_handlers.hp [fd].vtable)
-------------- next part --------------
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c.neon026 2005-06-20 22:59:37.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c 2007-08-22 16:15:27.000000000 +0100
@@ -1496,7 +1496,7 @@
*/
arch_uri_heuristics (&parsed_uri);
- *user = str_save (0, parsed_uri.authinfo);
+ *user = str_save (0, parsed_uri.userinfo);
*hostname = str_save (0, parsed_uri.host);
if (parsed_uri.port)
{
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c.neon026 2007-08-22 16:15:27.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c 2007-08-22 16:15:51.000000000 +0100
@@ -513,10 +513,10 @@
char *at_pos = str_chr_index (parsed_uri->host, '@');
if (!at_pos)
return;
- parsed_uri->authinfo = str_replace (parsed_uri->authinfo,
- str_alloc_cat (0, parsed_uri->authinfo, "@"));
- parsed_uri->authinfo = str_replace (parsed_uri->authinfo,
- str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
+ parsed_uri->userinfo = str_replace (parsed_uri->userinfo,
+ str_alloc_cat (0, parsed_uri->userinfo, "@"));
+ parsed_uri->userinfo = str_replace (parsed_uri->userinfo,
+ str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
}
--- thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c.neon026 2005-06-20 22:59:37.000000000 +0100
+++ thelove at canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c 2007-08-22 16:15:27.000000000 +0100
@@ -44,7 +44,7 @@
invariant_str_cmp (parsed_uri.host, "email.com at host.phwoar");
arch_uri_heuristics (&parsed_uri);
invariant_str_cmp (parsed_uri.host, "host.phwoar");
- invariant_str_cmp (parsed_uri.authinfo, "user at email.com");
+ invariant_str_cmp (parsed_uri.userinfo, "user at email.com");
invariant_int_cmp (parsed_uri.port, 0);
ne_uri_free(&parsed_uri);
More information about the Fedora-maintainers
mailing list