Re: [PATCH] Fix issue #4049 - SEGV on patch that deletes and skips

2011-11-09 Thread Daniel Näslund
On Wed, Nov 9, 2011 at 12:41 PM, Daniel Näslund wrote: > On Wed, Nov 9, 2011 at 10:46 AM, Philip Martin > wrote: >> Daniel Näslund writes: >> What is not clear to me is why skipped targets get added to targets_info >> in the first place.  How about moving the A

Re: [PATCH] Fix issue #4049 - SEGV on patch that deletes and skips

2011-11-09 Thread Daniel Näslund
On Wed, Nov 9, 2011 at 10:46 AM, Philip Martin wrote: > Daniel Näslund writes: > >> Index: subversion/libsvn_client/patch.c >> === >> --- subversion/libsvn_client/patch.c  (revision 1199347) >> +++ su

[PATCH] Fix issue #4049 - SEGV on patch that deletes and skips

2011-11-08 Thread Daniel Näslund
Hi, It's been a year since my last commit and I've forgotten about the internals of the patch code. Sending this patch for review so that I don't mess something up. [[[ Fix issue #4049 - SEGV on patch that deletes and skips. When we do the sanity check of the supplied patch file we set skipped=T

Re: svn commit: r1084138 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/libsvn_diff/parse-diff-test.c

2011-03-26 Thread Daniel Näslund
On Sun, Mar 26, 2000 at 10:27:38AM +0200, Daniel Shahaf wrote: > You can declare VALID_HEADER_FILE in the do{} loop's scope. (I spotted > this because the double initialization stood out.) > > dan...@apache.org wrote on Tue, Mar 22, 2011 at 11:19:44 -: > > Author: dannas > > Date: Tue Mar 22

Re: svn commit: r1034139 - in /subversion/trunk/subversion: libsvn_client/patch.c tests/cmdline/patch_tests.py

2010-11-15 Thread Daniel Näslund
On Fri, Nov 12, 2010 at 03:14:13AM +0200, Daniel Shahaf wrote: > Stefan Sperling wrote on Fri, Nov 12, 2010 at 01:07:53 +0100: > > On Thu, Nov 11, 2010 at 09:21:26PM -, dan...@apache.org wrote: > > > Add support for handling symlinks in 'svn patch'. > > If you haven't done so, can you close th

Re: Some tips on profiling

2010-09-29 Thread Daniel Näslund
On Thu, Sep 30, 2010 at 07:58:45AM +0530, Ramkumar Ramachandra wrote: > Stefan Fuhrmann writes: > > At least the results are much more useful when there is > > a tool like Kcachegrind that allows easy navigation though > > the huge amount of information that was gathered. > > Yep! The visualizer

Re: [WIP] Gracefully handle svn_wc_prop_set4() errors in svn patch

2010-09-28 Thread Daniel Näslund
On Tue, Sep 28, 2010 at 07:18:39PM +0100, Philip Martin wrote: > Daniel Näslund writes: > > > On Tue, Sep 28, 2010 at 03:45:33PM +0200, Daniel Shahaf wrote: > >> Daniel Näslund wrote on Mon, Sep 27, 2010 at 22:09:26 +0200: > >> > >> err_abort() is

Re: [WIP] Gracefully handle svn_wc_prop_set4() errors in svn patch

2010-09-28 Thread Daniel Näslund
On Tue, Sep 28, 2010 at 03:45:33PM +0200, Daniel Shahaf wrote: > Daniel Näslund wrote on Mon, Sep 27, 2010 at 22:09:26 +0200: > > * What is wrong with the way I handle the error? I hit err_abort() when > > the program terminates. (I'm expecting the answer to hurt a bit -

[WIP] Gracefully handle svn_wc_prop_set4() errors in svn patch

2010-09-27 Thread Daniel Näslund
Hi! Questions - * Is it sane to add a svn_wc_notify_failed_prop_patch action for this special case? We're starting to have a lot of actions. * What is wrong with the way I handle the error? I hit err_abort() when the program terminates. (I'm expecting the answer to hurt a bit - th

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-26 Thread Daniel Näslund
On Wed, Sep 01, 2010 at 06:37:08PM +0100, Julian Foad wrote: > Daniel Näslund wrote: > > The question is: Do we want 'svn patch to be able to add empty files. > If "add an empty file" is a well defined operation in Git-diff syntax, > then yes, it would be good to s

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-03 Thread Daniel Näslund
On Fri, Sep 03, 2010 at 12:18:37PM +0200, Branko Čibej wrote: > On 02.09.2010 10:50, Branko Čibej wrote: > > Hmm, this is interesting. :) Git faithfully (blindly?) interprets Unix > > permission bits, whiles SVN faithfully (blindly?) interprets the > > contents of special files ... I wonder if "sv

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-02 Thread Daniel Näslund
On Thu, Sep 02, 2010 at 11:14:27AM +0300, Daniel Shahaf wrote: > (Thanks for the examples. I suppose next time I should try to run > 'touch foo; $svn add foo; $svn diff --git' myself...) > > Daniel Näslund wrote on Thu, Sep 02, 2010 at 07:05:41 +0200: > > On Wed, Sep

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-02 Thread Daniel Näslund
On Thu, Sep 02, 2010 at 11:27:07AM +0300, Daniel Shahaf wrote: > Daniel Näslund wrote on Thu, Sep 02, 2010 at 07:13:00 +0200: > > On Wed, Sep 01, 2010 at 06:37:08PM +0100, Julian Foad wrote: > > > This may be off topic, but I'm wondering whether Git has defined such > >

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-01 Thread Daniel Näslund
On Wed, Sep 01, 2010 at 06:37:08PM +0100, Julian Foad wrote: > Daniel Näslund wrote: > > Hi! > > > > (This started out as me trying to apply added paths using the information > > from a patch file in the git diff format. The only that I could come up > > with wher

Re: Do we want 'svn patch' to be able to add empty files?

2010-09-01 Thread Daniel Näslund
On Wed, Sep 01, 2010 at 10:54:08PM +0300, Daniel Shahaf wrote: > Daniel Näslund wrote on Wed, Sep 01, 2010 at 11:28:51 +0200: > > (This started out as me trying to apply added paths using the information > > from a patch file in the git diff format. The only that I could come up &g

Do we want 'svn patch' to be able to add empty files?

2010-09-01 Thread Daniel Näslund
Hi! (This started out as me trying to apply added paths using the information from a patch file in the git diff format. The only that I could come up with where an add could not be detected by just looking at the regular unidiff headers was adding an empty file (it has no unidiff headers). If any

Re: [PATCH] was: [WIP] Enable passing copyfrom information for the diff code when dealing with repository diffs.

2010-08-30 Thread Daniel Näslund
Daniel, Sorry for the delayed response. I've committed the patch with your suggestions in r990790. Below is just ACK's for those changes. On Mon, Aug 16, 2010 at 10:59:03PM +0300, Daniel Shahaf wrote: > Daniel Näslund wrote on Mon, Aug 16, 2010 at 15:16:33 +0200: > > And thi

Re: [PATCH] was: [WIP] Enable passing copyfrom information for the diff code when dealing with repository diffs.

2010-08-16 Thread Daniel Näslund
And this time with a patch attached. On Mon, Aug 16, 2010 at 03:09:49PM +0200, Daniel Näslund wrote: > I'm touching a lot of code here. Reviews would be much apprecieated. > > [[[ > Make the diff editor able to receive copyfrom information. Involves > passing down a 's

[PATCH] was: [WIP] Enable passing copyfrom information for the diff code when dealing with repository diffs.

2010-08-16 Thread Daniel Näslund
I'm touching a lot of code here. Reviews would be much apprecieated. [[[ Make the diff editor able to receive copyfrom information. Involves passing down a 'send_copyfrom_args' to all RA implemtations. Note that this commit merely allows the copyfrom args to be passed to the client. They copyfrom

[WIP] Enable passing copyfrom information for the diff code when dealing with repository diffs.

2010-08-15 Thread Daniel Näslund
Hi! Why doesn't svn_ra_do_diff3() request that the repository sends copyfrom args? The best explanation I've found is this commit message: r866577 | sussman | 2007-09-10 06:56:55 +0200 (mån, 10 sep 2007) | 87 lines Send cop

Re: svn commit: r985514 - in /subversion/branches/performance/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2010-08-14 Thread Daniel Näslund
On Sat, Aug 14, 2010 at 03:46:13PM -, stef...@apache.org wrote: > Author: stefan2 > Date: Sat Aug 14 15:46:13 2010 > New Revision: 985514 > > URL: http://svn.apache.org/viewvc?rev=985514&view=rev > Log: > Extend the stream API by three functions: > svn_stream_move_mark() to move an existing ma

GSoC coming to an end

2010-08-09 Thread Daniel Näslund
Hi! The "soft" deadline for GSoC 2010 is today. Not much time left then... What has been accomplished: * A parseable diff format for properties. * svn patch can apply properties * We have Python tests for applying properties. * svn diff can create 'git diffs when passed a special flag. * C-unit

Re: svn commit: r982582 - /subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c

2010-08-05 Thread Daniel Näslund
On Thu, Aug 05, 2010 at 11:52:14AM -0400, Paul Burba wrote: > On Thu, Aug 5, 2010 at 8:41 AM, wrote: > > Author: dannas > > Date: Thu Aug  5 12:41:51 2010 > > New Revision: 982582 > > Modified: > >    subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c > > @@ -834,8 +834,9 @@ test_git

Why doesn't svn_ra_do_diff3() provide a reporter that supplies copyfrom info?

2010-08-03 Thread Daniel Näslund
Hi! Why doesn't svn_ra_do_diff3() provide a reporter that supplies copyfrom info? svn_ra_do_update2() does, so why doesn't the diff func? Is it based on a notion of diffs as beeing text compares and thus not interrested in tree changes such as copies/moves? Is there something in the FS layer tha

[PATCH] Clarify that 'svn patch' can only apply changes to targets that are dirs

2010-08-01 Thread Daniel Näslund
Hi! resolve_target_path() makes a few assumptions about the target for a patch file beeing a wc_dir. Currently we can only invoke svn patch like this: svn patch PATCH_FILE WC_DIR_PATH Is this the intended behavoiour? [[[ Make it clearer that the patch code can only use base paths that are di

Re: svn commit: r980784 - in /subversion/trunk/subversion/libsvn_wc: adm_files.c node.c wc_db.h

2010-08-01 Thread Daniel Näslund
On Fri, Jul 30, 2010 at 01:28:39PM -, phi...@apache.org wrote: > Author: philip > Date: Fri Jul 30 13:28:39 2010 > New Revision: 980784 > > Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=9

Re: svn commit: r980427 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/patch.c svn/notify.c tests/cmdline/patch_tests.py

2010-07-29 Thread Daniel Näslund
On Thu, Jul 29, 2010 at 02:54:29PM +0200, Stefan Sperling wrote: > On Thu, Jul 29, 2010 at 12:43:56PM -, dan...@apache.org wrote: > > Author: dannas > > Date: Thu Jul 29 12:43:56 2010 > > New Revision: 980427 > > > > URL: http://svn.apache.org/viewvc?rev=980427&view=rev > > Log: > > Make 'svn

GSoC Progress report

2010-07-28 Thread Daniel Näslund
Hi! Property diffs === * We can create parseable prop patches * We can parse property patches * We can match property patches * We can write patched properties to tmp files * We can install those prop changes to files and dirs (not the wc-root dir yet) Todo -- * Decide on how we w

Re: [WIP] Make the patch code accept dirs as targets for prop only patches

2010-07-26 Thread Daniel Näslund
On Mon, Jul 26, 2010 at 01:07:14PM +0200, Stefan Sperling wrote: > On Mon, Jul 26, 2010 at 09:59:01AM +0200, Daniel Näslund wrote: > > Index: subversion/libsvn_client/patch.c > > === > > --- subversion/

Re: Problems in svn patch when adding a file and the parent dir is scheduled for deletion

2010-07-26 Thread Daniel Näslund
On Mon, Jul 26, 2010 at 01:04:26PM +0200, Daniel Näslund wrote: > Hi! > > Posting this one here so I don't forget about it. > > The patch code should not change the wc when run with the --dry-run > option but it will if we're adding a file with a parent scheduled fo

Problems in svn patch when adding a file and the parent dir is scheduled for deletion

2010-07-26 Thread Daniel Näslund
Hi! Posting this one here so I don't forget about it. The patch code should not change the wc when run with the --dry-run option but it will if we're adding a file with a parent scheduled for deletion. The patch code will add a file with a parent scheduled for deletion to the filesystem but not

[WIP] Make the patch code accept dirs as targets for prop only patches

2010-07-26 Thread Daniel Näslund
Hi Stefan! A few questions and a WIP patch for making the patch code deal with property targets being dirs. * How should we deal with SVN_ERR_ILLEGAL_TARGET? svn_wc_prop_set() throws one of those if we for instance try to set svn:executable on a dir or svn:ignore on a file. Should we do some

Re: A patch that erroneus causes a text conflict

2010-07-23 Thread Daniel Näslund
On Fri, Jul 23, 2010 at 04:13:44PM +0200, Stefan Sperling wrote: > On Fri, Jul 23, 2010 at 04:06:09PM +0200, Daniel Näslund wrote: > > Hi Stefan! > > > > The patch below fails to apply. I'm investigating why. > &g

A patch that erroneus causes a text conflict

2010-07-23 Thread Daniel Näslund
Hi Stefan! The patch below fails to apply. I'm investigating why. Content of the file 'new': - [[[ #!/bin/sh IFS=@ read name address echo "A mail to $name at $address" read subject echo "Subject: $subject" The script is fed its input through standa

[PATCH] Create text_info_t for storing text related parts of patch_target_t

2010-07-16 Thread Daniel Näslund
Hi Stefan! Do you think the attached patch looks reasonable, e.g. it does not interfer with the overall design of 'svn patch'? It's not fun to review a patch that touches on so many parts. Sorry 'bout that. Find below some specific questions. The patch code consist of four steps: 1) match text i

About matching/applying/installing properties with 'svn patch'

2010-07-15 Thread Daniel Näslund
Hi Stefan! I want to be able to reuse the match and apply step in patch.c. Hence I suggest introducing text_info_target_t [1] and prop_info_target_t [2]. The idea is that apply/match uses those structs and thus only deals with streams. Later when we want to install our new text and properties we

What's the responsibility of parse_next_hunk()?

2010-07-14 Thread Daniel Näslund
Hi! I just realized that parse_next_hunk() at present only detects a property hunk if it has a property header ('Added', 'Deleted', 'Modified') directly preceeding it. The second hunk won't know what propname it belongs to. We previously had diff headers and hunk headers. The property header is o

Re: Non-matching revision arguments in the diff code

2010-07-10 Thread Daniel Näslund
On Fri, Jul 09, 2010 at 12:36:35PM +0100, Julian Foad wrote: > On Fri, 2010-07-09 at 09:52 +0200, Daniel Näslund wrote: > > Hi! > > > > The diff callbacks for handling text have revision arguments. The prop > > callbacks don't. > > > > I'm crea

Non-matching revision arguments in the diff code

2010-07-09 Thread Daniel Näslund
Hi! The diff callbacks for handling text have revision arguments. The prop callbacks don't. I'm creating diff headers for the cases when we only have property changes. When creating those diff headers I need revisions. Since the prop diff callback doesn't have revision arguments I'm using the rev

Things left to do for 'svn patch --git-diff'

2010-07-06 Thread Daniel Näslund
Hi! Just trying to sort out what work lays ahead. Things todo for property diffs --- 1) Make svn diff print diff headers even if we have just property changes. 2) Make svn patch able to match (compare streams) property hunks 3) Make svn patch able to apply (write to

Re: svn commit: r958260 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-28 Thread Daniel Näslund
On Mon, Jun 28, 2010 at 02:38:26PM +0200, Daniel Näslund wrote: > Since r958537, there is a diff extension switch to enable git diffs: > > svn diff -x --git-diff [-g] > > In hindsight, I'm not sure that was the best thing to do. I read this > part from svn help diff: >

Re: svn commit: r958260 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-28 Thread Daniel Näslund
On Sat, Jun 26, 2010 at 04:47:46PM -0400, Greg Stein wrote: > On Sat, Jun 26, 2010 at 13:56, wrote: > > Author: dannas > > Date: Sat Jun 26 17:56:06 2010 > > New Revision: 958260 > > > > URL: http://svn.apache.org/viewvc?rev=958260&view=rev > > Log: > > With SVN_EXPERIMENTAL_PATCH defined, only p

Re: [Patch] - Fix paths on OS/2 - svn-paths.diff [1/1]

2010-06-24 Thread Daniel Näslund
On Fri, Jun 25, 2010 at 02:03:17AM +, Paul Smedley wrote: > [[[ > Fix paths & command prompts for OS/2 by re-using WIN32 #ifdef's > > * subversion/libsvn_subr/dirent_uri.c > * subversion/libsvn_subr/io.c > * subversion/libsvn_subr/prompt.c > * subversion/libsvn_ra_local/split_url.c > * subvers

Re: How does the workqueues provide atomic updates, or do they?

2010-06-24 Thread Daniel Näslund
On Thu, Jun 24, 2010 at 09:20:22AM +0100, Philip Martin wrote: > Daniel Näslund writes: > > > How are files installed during an update? > > > > We acquire a write lock > > We crawl the wc > > We tell the repos about o

[WIP] #1957 'svn switch does not update keywords'

2010-06-24 Thread Daniel Näslund
Hi! Is 'svn switch does not update keywords' a problem that needs solving? Is the performance of this solution acceptable (traverse the entire wc one more time after the editor drive)? Alternatives? * Custom db-query that only returns the paths with matching property set on them. Could be use

How does the workqueues provide atomic updates, or do they?

2010-06-24 Thread Daniel Näslund
Hi! Some questions about how the workqueues... work. Have I got it right? How are files installed during an update? We acquire a write lock We crawl the wc We tell the repos about our state The repo runs an editor open_root(): We set status to _status_i

Re: How use patch_target_t for both files and (possibly multiple) properties

2010-06-21 Thread Daniel Näslund
On Mon, Jun 21, 2010 at 11:12:43AM +0200, Stefan Sperling wrote: > On Sun, Jun 20, 2010 at 09:53:29PM +0200, Daniel Näslund wrote: > > Hi stsp! > > > > Attaching a patch showing a suggestion on how to split up > > patch_target_t. Maybe you have some insights on this

How use patch_target_t for both files and (possibly multiple) properties

2010-06-20 Thread Daniel Näslund
Hi stsp! Attaching a patch showing a suggestion on how to split up patch_target_t. Maybe you have some insights on this, before I rush out and start grooking around and making changes to your design. What 'svn patch' does -- 1) Match hunks 2) Apply hunks to a stream backed up

[WIP] How create diff headers even if we only have property diffs?

2010-06-18 Thread Daniel Näslund
Hi! I need to have a diff header even if there's only property changes for the sake of parsing. And I want only one diff header per file. Makes it easier to apply the patch. For each found diff header we create one svn_patch_t object. Simple and clean. What to do? I could add a flag to the diff_

Progress report for GSoC 'svn patch' project

2010-06-17 Thread Daniel Näslund
Hi! The goal is to be able to create, parse and apply diffs in the 'git unidiff' format. The original thought was to add support for property diffs when the basic parts of the 'git unidiff' part was in place, but Stefan suggested that we could easily add property diffs even without the git parts.

Re: svn commit: r952205 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-07 Thread Daniel Näslund
On Mon, Jun 07, 2010 at 03:41:27PM +0200, Stefan Sperling wrote: > On Mon, Jun 07, 2010 at 12:43:19PM -, dan...@apache.org wrote: > > Author: dannas > > Date: Mon Jun 7 12:43:19 2010 > > New Revision: 952205 > > > > URL: http://svn.apache.org/viewvc?rev=952205&view=rev > > Log: > > Use severa

Re: svn commit: r952205 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-07 Thread Daniel Näslund
On Mon, Jun 07, 2010 at 03:33:16PM +0200, Stefan Sperling wrote: > On Mon, Jun 07, 2010 at 12:43:19PM -, dan...@apache.org wrote: > > +static svn_error_t * > > +print_git_diff_header_copied(svn_stream_t *os, const char > > *header_encoding, > > + const char *path,

Re: svn commit: r951871 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-07 Thread Daniel Näslund
On Mon, Jun 07, 2010 at 01:26:49PM +0200, Stefan Sperling wrote: > On Sun, Jun 06, 2010 at 02:49:16PM -, dan...@apache.org wrote: > > URL: http://svn.apache.org/viewvc?rev=951871&view=rev > > Log: > > First small step towards using the 'git unidiff' format for 'svn diff'. > > > > The parts tha

Re: svn commit: r951871 - /subversion/trunk/subversion/libsvn_client/diff.c

2010-06-06 Thread Daniel Näslund
On Sun, Jun 06, 2010 at 02:49:16PM -, dan...@apache.org wrote: > Author: dannas > Date: Sun Jun 6 14:49:15 2010 > New Revision: 951871 > > URL: http://svn.apache.org/viewvc?rev=951871&view=rev > Log: > First small step towards using the 'git unidiff' format for 'svn diff'. > > The parts that

Re: Ideas for handling copies/moves in 'svn diff'

2010-06-01 Thread Daniel Näslund
On Sun, May 30, 2010 at 11:16:55AM +0200, Stefan Sperling wrote: > On Sat, May 29, 2010 at 02:34:06PM +0200, Daniel Näslund wrote: > > Problem 1 > > == > > We're processing the delete-half instead of the add-half for a > > copy/move. At present, copy/mo

Ideas for handling copies/moves in 'svn diff'

2010-05-29 Thread Daniel Näslund
Hi! The Google Summer of Code period has started. Posting about what I'm currently working on as part of implementing the 'git unidiff' format for wc-wc diffs. Perhaps someone sees an obvious solution to any of the three problems I present below. The callchain: === do_diff() svn_wc_

Re: svn commit: r948304 - /subversion/trunk/subversion/libsvn_client/checkout.c

2010-05-25 Thread Daniel Näslund
On Wed, May 26, 2010 at 03:57:52AM -, hwri...@apache.org wrote: > Author: hwright > Date: Wed May 26 03:57:52 2010 > New Revision: 948304 > > URL: http://svn.apache.org/viewvc?rev=948304&view=rev > Log: > Remove a couple of goto statements in favor of some refactoring and a helper > function.

Re: svn_client_patch not applying patch correctly

2010-05-23 Thread Daniel Näslund
Hi Stefan Sperling Just posting to tell I'm looking into this. On Sat, May 22, 2010 at 12:58:42AM +0200, Stefan Sperling wrote: > On Fri, May 21, 2010 at 10:27:42PM +0200, Stefan Küng wrote: > > * ShellCache.h > > -> this file results in three applied and one rejected hunk > > the result a

[WIP] Use repos_root_url and repos_relpath in the status code.

2010-05-16 Thread Daniel Näslund
Hi! There's a lot of parameteter tracking in this patch. Basically it's all about passing down the url arguments to assemble_status(). The goal is that we should be able to remove the entry and parent_entry fields in a follow-up and be able to use the parent_relpath when we want to detect switche

Re: svn commit: r943986 - /subversion/trunk/subversion/libsvn_wc/status.c

2010-05-14 Thread Daniel Näslund
On Thu, May 13, 2010 at 10:35:36PM +0200, Bert Huijben wrote: > > > Log: > > Don't use svn_wc_entry for fetching an url. > > > > * subversion/libsvn_wc/status.c > > (assemble_status): Fetch the url with a node func. Use > > svn_wc__check_wc_root() for determining if a path is switched. > >

WC-NG: Perhaps it's time to write a new summary of where we stand at the moment?

2010-05-12 Thread Daniel Näslund
Hi! Greg [1] identified the following items in the beginning of February. * remove entry_t usage within libsvn_wc/client * remove access_t usage withing libsvn_wc/client * move props into wc.db * move to single/root wc.db * switch to new pristine file mgmt I have the feeling, we've made some pro

What are the plans for svn_wc_status3_t?

2010-05-12 Thread Daniel Näslund
Hi! I set out to remove the entry field in svn_wc_status3_t. The reasons was i) svn_wc_entry_t is deprecated and ii) fetching all the info contained in the entry field is slow and we want 'svn status' to be fast! So far this has been done: -- * The revision information

Re: svn commit: r941793 - /subversion/trunk/subversion/libsvn_wc/util.c

2010-05-07 Thread Daniel Näslund
On Thu, May 06, 2010 at 04:27:27PM -, hwri...@apache.org wrote: > Author: hwright > Date: Thu May 6 16:27:27 2010 > New Revision: 941793 > > URL: http://svn.apache.org/viewvc?rev=941793&view=rev > Log: > * subversion/libsvn_wc/util.c > (svn_wc__status2_from_3): Fix a pointer error, and one

Re: svn commit: r940651 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/status.c libsvn_wc/util.c

2010-05-04 Thread Daniel Näslund
On Mon, May 03, 2010 at 08:41:14PM -0400, Greg Stein wrote: > On Mon, May 3, 2010 at 18:01, wrote: > >... > > +++ subversion/trunk/subversion/libsvn_wc/util.c Mon May  3 22:01:53 2010 > >... > > @@ -565,6 +567,12 @@ svn_wc__status2_from_3(svn_wc_status2_t > >   SVN_ERR(svn_wc__get_entry(&entry, w

Re: svn commit: r940111 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_wc/node.c libsvn_wc/status.c svn/cl.h svn/status-cmd.c svn/status.c

2010-05-03 Thread Daniel Näslund
On Mon, May 03, 2010 at 03:07:49PM +0200, Neels J Hofmeyr wrote: > > dan...@apache.org wrote: > > Author: dannas > > Date: Sat May 1 21:06:36 2010 > > New Revision: 940111 > > > [...] > > > (svn_cl__print_status_xml): Add ctx parameter. > > > > * subversion/svn/status.c > > (print_status):

Future direction for the diff editor

2010-04-27 Thread Daniel Näslund
Hi! First, I've been accepted as a GSoC student for the summer of 2010. I'm really excited and look forward to a summer of coding. I'm supposed to implement the git unidiff format for 'svn diff' and 'svn patch' and I'll start with the diff side. The git unidiff format can represent tree changes b

Re: [PATCH] Converter for svn_wc_status3_t to svn_wc_status2_t

2010-04-26 Thread Daniel Näslund
On Mon, Apr 26, 2010 at 10:53:04PM +0200, Daniel Näslund wrote: > > [[[ > Implmenent converter function for converting svn_wc_status3_t to > svn_wc_status2_t. > > * subversion/include/private/svn_wc_private.h > (svn_wc__status2_from_3): Return svn_error_t * instead of &

[PATCH] Converter for svn_wc_status3_t to svn_wc_status2_t

2010-04-26 Thread Daniel Näslund
Hi! Since I can't test it, and know too little of libsvn_wc, I ask if any of you guys think it looks ok? [[[ Implmenent converter function for converting svn_wc_status3_t to svn_wc_status2_t. * subversion/include/private/svn_wc_private.h (svn_wc__status2_from_3): Return svn_error_t * instead o

Re: [PATCH] Don't use entries for checking status in svn_wc_status3_t. Was: Re: [WIP] Some quirky parts of libsvn_wc/status.c:assemble_status() for retrieving revisions

2010-04-23 Thread Daniel Näslund
On Fri, Apr 23, 2010 at 06:23:49AM -0400, Greg Stein wrote: > On Fri, Apr 23, 2010 at 05:38, Daniel Näslund wrote: > > I wanted to keep the current behaviour since the status code is involved > > in so _many_ tests and rewriting all of those would cause me to loose > > moment

Re: [PATCH] Don't use entries for checking status in svn_wc_status3_t. Was: Re: [WIP] Some quirky parts of libsvn_wc/status.c:assemble_status() for retrieving revisions

2010-04-23 Thread Daniel Näslund
On Thu, Apr 22, 2010 at 05:07:56PM -0400, Greg Stein wrote: > On Thu, Apr 22, 2010 at 15:48, Daniel Näslund wrote: > > >> read_info() returns changed_* information for copied nodes. A copied > >> node has a corresponding node in the repository, and the changed_* > &

Re: [RFC] Proposal for GSoC project - extend 'svn {patch,diff}' with git unidiff format

2010-04-22 Thread Daniel Näslund
On Mon, Apr 05, 2010 at 01:41:03PM +0200, Stefan Sperling wrote: > On Mon, Apr 05, 2010 at 10:02:56AM +0200, Daniel Näslund wrote: > > Git unidiff format extension to 'svn patch' and 'svn diff' > > === [.

Re: [PATCH] Don't use entries for checking status in svn_wc_status3_t. Was: Re: [WIP] Some quirky parts of libsvn_wc/status.c:assemble_status() for retrieving revisions

2010-04-22 Thread Daniel Näslund
On Thu, Apr 22, 2010 at 02:45:08PM -0400, Greg Stein wrote: > On Thu, Apr 22, 2010 at 10:05, Daniel Näslund wrote: > > [[[ > > As part of WC-NG, replace entry calls for revisions from > > svn_wc_status2_t related code. > > > > The entries code set the revision of

[PATCH] Don't use entries for checking status in svn_wc_status3_t. Was: Re: [WIP] Some quirky parts of libsvn_wc/status.c:assemble_status() for retrieving revisions

2010-04-22 Thread Daniel Näslund
Hi! [[[ As part of WC-NG, replace entry calls for revisions from svn_wc_status2_t related code. The entries code set the revision of newly added nodes to 0 but the db sets them to -1. Since too many tests needs to be changed and 'svn info' also uses 0, I'll change those values in a follow-up patc

Re: svn commit: r935095 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/diff.c libsvn_client/prop_commands.c libsvn_client/revisions.c libsvn_wc/node.c

2010-04-21 Thread Daniel Näslund
On Thu, Apr 22, 2010 at 01:28:11AM +0200, Neels J Hofmeyr wrote: > Daniel Näslund wrote: > > On Fri, Apr 16, 2010 at 11:09:06PM -, ne...@apache.org wrote: > >> == > >> --- subversion/trunk/

[WIP] Some quirky parts of libsvn_wc/status.c:assemble_status() for retrieving revisions

2010-04-19 Thread Daniel Näslund
Hi! I have a patch that passes make check. But a test suite can't test everything (although the status code is probably one of the best covered due to it's part in almost every cmdline-test). Posting only the changes in libsvn_wc/status.c What I'm wondering about: * I'm using SVN_INVALID_REVNUM(

[PATCH] Use _node_is_status_added() in libsvn_client/status.c

2010-04-18 Thread Daniel Näslund
Hi! [[[ As part of WC-NG, remove a use of svn_wc_entry_t. * subversion/libsvn_client/status.c (svn_client_status5): Use svn_wc__node_is_status_added() instead of checking entry->schedule. The check is meant to be used for correctly determining when a node has been deleted in the repo

Re: [PATCH] Use a node func for fetching file external status in libsvn_client/delete.c

2010-04-18 Thread Daniel Näslund
On Sat, Apr 17, 2010 at 03:38:16PM -0400, Greg Stein wrote: > Dude. Totally fine. I wrote that function last week for exactly what you're > doing. > > On Apr 17, 2010 2:10 PM, "Daniel Näslund" wrote: > > Hi! > > This patch passes make check. > > s

[PATCH] Use a node func for fetching file external status in libsvn_client/delete.c

2010-04-17 Thread Daniel Näslund
Hi! This patch passes make check. svn_wc__node_is_file_external() seems to be in a bit of a flux yet. Is it ok to commit this one? [[[ As part of WC-NG, remove a usage of svn_wc_entry_t. * subversion/libsvn_client/delete.c (svn_client__can_delete): Use svn_wc__node_is_file_external() instead

Re: svn commit: r935095 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/diff.c libsvn_client/prop_commands.c libsvn_client/revisions.c libsvn_wc/node.c

2010-04-17 Thread Daniel Näslund
On Fri, Apr 16, 2010 at 11:09:06PM -, ne...@apache.org wrote: [...] > == > --- subversion/trunk/subversion/libsvn_wc/node.c (original) > +++ subversion/trunk/subversion/libsvn_wc/node.c Fri Apr 16 23:09:06 2010 > @@ -

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Daniel Näslund
On Wed, Apr 14, 2010 at 08:18:06PM +0200, Alan Barrett wrote: > On Wed, 14 Apr 2010, Stefan Sperling wrote: > > Yes. Just use whatever comes from the patch, including context lines. > > This is consistent with the current behaviour. I think we should avoid > > special cases where this rule is curr

Re: #3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Daniel Näslund
On Wed, Apr 14, 2010 at 05:35:36PM +0200, Stefan Sperling wrote: > On Wed, Apr 14, 2010 at 04:21:56PM +0200, Daniel Näslund wrote: > > Hi! > > > > #3610 [1] is about ignoring white space changes to be able to apply > > patches that have been mangled, i.e. a mailing soft

#3610, How make 'svn patch' able to use the targets lines for intermediate context?

2010-04-14 Thread Daniel Näslund
Hi! #3610 [1] is about ignoring white space changes to be able to apply patches that have been mangled, i.e. a mailing software converting tabs to spaces, removing trailing white spaces or leading white spaces. It means that if a certain option is given, we will match and apply hunks if the only

[PATCH] Follow-up to r932571 - missed one caller was: Re: svn commit: r932571 - in /subversion/trunk/subversion: include/ include/private/ libsvn_client/ libsvn_wc/ svn/

2010-04-12 Thread Daniel Näslund
On Mon, Apr 12, 2010 at 08:58:49AM -0400, Greg Stein wrote: > On Fri, Apr 9, 2010 at 16:16, Greg Stein wrote: > > On Fri, Apr 9, 2010 at 16:07,   wrote: > >>... > >>... > >> +++ subversion/trunk/subversion/libsvn_wc/deprecated.c Fri Apr  9 20:07:51 > >> 2010 > >>... > >> @@ -2515,13 +2551,15 @@ s

[PATCH] Conversion func for translating svn_wc_status3_t to svn_wc_status2_t

2010-04-12 Thread Daniel Näslund
Hi! I'm letting the func return the old struct in the same manner as svn_wc__cd2_to_cd() works for conflict_description_t. When we start replacing entries, we might need to return and error instead, but since the func will only be used in two places I can easily change parameters and return values

Re: [PATCH] rev svn_wc_status2_t to svn_wc_status3_t

2010-04-09 Thread Daniel Näslund
s! > -g > > On Fri, Apr 9, 2010 at 11:06, Daniel Näslund wrote: > > Hi! > > > > This is a _big_ patch but it does very little. I've just replaced every > > occurence of svn_wc_status2_t with the new svn_wc_status3_t. It's > > needed, in the cause of

[PATCH] rev svn_wc_status2_t to svn_wc_status3_t

2010-04-09 Thread Daniel Näslund
Hi! This is a _big_ patch but it does very little. I've just replaced every occurence of svn_wc_status2_t with the new svn_wc_status3_t. It's needed, in the cause of removing the entry field which I intend to do in a follow-up. There's a WIP on the list, that handles most of the chores of the sta

[RFC] Proposal for GSoC project - extend 'svn {patch,diff}' with git unidiff format

2010-04-05 Thread Daniel Näslund
Hi! I'm supposed to send this proposal to the Google Summer of Code machinery and let it be forwarded to the interrested mentor of the Subversion community, in this case Stefan. In the interrest of openess I'm posting it here before sending it off to Google later today. Maybe someone has something

Re: [PATCH v2] 'svn patch' should remove empty dir

2010-04-04 Thread Daniel Näslund
Committed in r930662 on my branch svn-patch-improvements. On Wed, Mar 03, 2010 at 04:25:07PM +0100, Daniel Näslund wrote: > Hi! > > Here's my revised patch. I've commented on the changes inline. > > One strange thing: If you compile this you'll get a compiler war

Re: [PATCH] v4 Fix svnversion message as follow-up to r922176

2010-04-02 Thread Daniel Näslund
We're running out of patch versions here ... gstein pointed out that I should use SVN_IS_VALID_REVNUM(). Fixed! On Fri, Apr 02, 2010 at 10:59:15AM +0200, Daniel Näslund wrote: > Mispelled Uncommitted with one 't'. This patch corrects that. > > On Fri, Apr 02, 2010 at

Re: [PATCH] v2 Fix svnversion message as follow-up to r922176

2010-04-02 Thread Daniel Näslund
Mispelled Uncommitted with one 't'. This patch corrects that. On Fri, Apr 02, 2010 at 10:36:53AM +0200, Daniel Näslund wrote: > On Tue, Mar 30, 2010 at 11:04:13PM +0200, Stefan Sperling wrote: > > On Tue, Mar 30, 2010 at 10:14:42PM +0200, Daniel Näslund wrote: > > > P

Re: [PATCH] v2. Follow-up to r922176

2010-04-02 Thread Daniel Näslund
On Fri, Apr 02, 2010 at 10:22:56AM +0200, Daniel Näslund wrote: > Hi Julian! > > On Wed, Mar 31, 2010 at 10:19:10AM +0100, Julian Foad wrote: > > On Tue, 2010-03-30, Daniel Näslund wrote: > > > Ping! This patch has not been revieved > > > > [...] > >

[PATCH] v2 Fix svnversion message as follow-up to r922176

2010-04-02 Thread Daniel Näslund
On Tue, Mar 30, 2010 at 11:04:13PM +0200, Stefan Sperling wrote: > On Tue, Mar 30, 2010 at 10:14:42PM +0200, Daniel Näslund wrote: > > Ping! This patch has not been reviewed! > > > > On Sun, Mar 14, 2010 at 09:38:15PM +0100, Daniel Näslund wrote: > > > Hi! > >

[PATCH] v2. Follow-up to r922176

2010-04-02 Thread Daniel Näslund
Hi Julian! On Wed, Mar 31, 2010 at 10:19:10AM +0100, Julian Foad wrote: > On Tue, 2010-03-30, Daniel Näslund wrote: > > Ping! This patch has not been revieved > > [...] > > > [[[ > > > Follow-up to r922176. Fix that tree changes were not considered whe

[PATCH] Remove obsolute doc comment about 'svn patch' using diff callbacks

2010-03-31 Thread Daniel Näslund
Hi! [[[ Remove obsolute doc comment about 'svn patch' using diff callbacks. The callbacks were removed in r879144 when we shaved off the SVNPATCH blocks and only kept the unidiff part. * subversion/include/svn_wc.h (svn_wc_diff_callbacks4_t): See above. ]]] Daniel Index: subversion/include/svn

Re: [PATCH] Fix svnversion message as follow-up to r922176

2010-03-30 Thread Daniel Näslund
Ping! This patch has not been reviewed! On Sun, Mar 14, 2010 at 09:38:15PM +0100, Daniel Näslund wrote: > Hi! > > The 1.6 svnversion message was "'path' not versioned, and not exported". > But on trunk more than one message has been changed. My first thought

Re: [PATCH] Follow-up to r922176 was:Re: svn commit: r922176 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/revision_status.c svnversion/main.c

2010-03-30 Thread Daniel Näslund
Ping! This patch has not been revieved On Fri, Mar 12, 2010 at 10:52:55PM +0100, Daniel Näslund wrote: > On Fri, Mar 12, 2010 at 05:43:18AM -0500, Greg Stein wrote: > > On Fri, Mar 12, 2010 at 03:21, wrote: > > >... > > > +++ subversion/trunk/subversion/libsvn_wc/r

[WIP] Replace entry calls for revisions in svn_wc_status2_t

2010-03-30 Thread Daniel Näslund
Hi! This patch passes make check with modifications to some tests to take into account some changed behaviors. I've tried to justificate those changes in the log message below. Is this really right? == When scanning for a deletion I never use the base_del_abspath parameter of

Re: logging #svn-dev

2010-03-30 Thread Daniel Näslund
On Tue, Mar 30, 2010 at 02:15:32PM +0200, neels wrote: > Hi all, > > every now and then I would find it useful if there was a public log of > #svn-dev (on FreeNode IRC). > > I believe it was previously decided not to log #svn-dev because > discussions about potential new committers took place the

Re: What revision should an added not yet commited node have?

2010-03-18 Thread Daniel Näslund
On Fri, Mar 19, 2010 at 02:33:33AM +0100, Neels J Hofmeyr wrote: > C. Michael Pilato wrote: > > Stefan Sperling wrote: > >> On Tue, Mar 16, 2010 at 09:01:28PM +0100, Daniel Näslund wrote: > >>> Hi! > >>> > >>> When trying to replace entries in

What revision should an added not yet commited node have?

2010-03-16 Thread Daniel Näslund
Hi! When trying to replace entries in the status code I got a couple of test failures saying that the revision should be 0 for newly added nodes. Greg pointed out that the entries code set the revision to 0 for those cases while the revision returned from _read_info() sets it to -1. Should we con

  1   2   >