Re: [PATCH v2 3/4] git-p4: Fix t9815 git-p4-submit-fail test case on OS X

2015-10-04 Thread Pete Wyckoff
> >>stat --format=%A text+x | egrep ^-r-x > >>fi > > > > Not a new problem but why do we need "stat" here? > > > > Shouldn't "test -r", "! test -x", and their usual friends be > > suffi

git-p4 maintainership change

2015-01-23 Thread Pete Wyckoff
Hi Junio. I'm fortunate enough to need no longer any git integration with Perforce (p4). I work only in git these days. Thus you might expect my interest in improving git-p4 would be waning. Luke, on the other hand, continues to need git-p4 and is active in improving it. I think you should conside

Re: [PATCH] git-p4: correct --prepare-p4-only instructions

2015-01-23 Thread Pete Wyckoff
l...@diamand.org wrote on Fri, 23 Jan 2015 09:15 +: > If you use git-p4 with the "--prepare-p4-only" option, then > it prints the p4 command line to use. However, the command > line was incorrect: the changelist specification must be > supplied on standard input, not as an argument to p4. > >

Re: [PATCH] git-p4: support exclude in 'git p4 sync'

2015-01-18 Thread Pete Wyckoff
l...@diamand.org wrote on Sat, 17 Jan 2015 20:56 +: > The git-p4 'clone' subcommand has long had the option to specify > parts of the repo to be excluded, on the command line. But this has > not been present in 'sync', which makes it less than useful: as > soon as you do a sync, the excluded pa

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Pete Wyckoff
-OPTIONS > + > ifndef NO_PYTHON > $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS > $(SCRIPT_PYTHON_GEN): % : %.py > -- > 2.1.0.rc2.206.gedb03e5 Looks obviously correct, thanks for remembering the other scripting languages. :) Acked-by: Pete Wyckoff -- To unsub

Re: [PATCH] git p4 test: fix failure in 9814-git-p4-rename.sh Was: Re: Test failure in t9814-git-p4-rename.sh - my environment or bad test?

2014-07-23 Thread Pete Wyckoff
these not so flaky, but your change here fixes a problem, and doesn't do any harm. And gives you an opportunity to fix it more later. :) Be sure to fix the word-wrapping you have on two of the lines below. And be careful not to top post. Here's my ack for when you decide to send it back t

Re: git p4 diff-tree ambiguous argument error

2014-07-12 Thread Pete Wyckoff
duanemur...@mac.com wrote on Thu, 10 Jul 2014 12:19 -0700: > Some additional investigation. > > I am working in a copy of a repository that was originally used to pull the > data > from Perforce. As part of my experiments to figure out this problem, I > deleted > the contents of .git/git-p4-t

Re: git-p4 and initial import

2014-07-12 Thread Pete Wyckoff
lcharri...@promptu.com wrote on Thu, 10 Jul 2014 15:45 +0200: > I've used git-p4 for several years now and it's generally working well for > me. > > The only thing that bugs me at this time is having to re-clone regularly. > Here is how this happens: > > * Say my p4 client maps //foo/bar/... to /

Re: Test failure in t9814-git-p4-rename.sh - my environment or bad test?

2014-07-06 Thread Pete Wyckoff
ml.christophbon...@gmail.com wrote on Sun, 06 Jul 2014 16:32 +0200: > I'm trying to get the git p4 tests to pass on my machine (OS X > Mavericks) from master before making some changes. I'm experiencing a > test failure in "detect copies" of the rename test. > > The test creates file2 with some co

Re: [PATCH] Fix git-p4 submit in non --prepare-p4-only mode

2014-06-11 Thread Pete Wyckoff
frrr...@gmail.com wrote on Wed, 11 Jun 2014 14:06 +0100: > On Tue, Jun 10, 2014 at 06:39:58PM -0400, Pete Wyckoff wrote: > > frrr...@gmail.com wrote on Tue, 10 Jun 2014 13:14 +0100: > > > b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here > > > is a p

Re: [PATCH] Fix git-p4 submit in non --prepare-p4-only mode

2014-06-10 Thread Pete Wyckoff
frrr...@gmail.com wrote on Tue, 10 Jun 2014 13:14 +0100: > b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here > is a proper fix, including proper handling for windows end of lines. I guess we don't have test coverage for these cases? Is this something that should get put into a ma

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

2014-05-24 Thread Pete Wyckoff
existing 9807 is fine. Unless of course you have one ready to go. Acked-by: Pete Wyckoff You might add my ack and send it directly to Junio + CC the list. It'll be a nice improvement for the next available release. -- Pete -- To unsubscribe from this list: send the line &qu

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-05-05 Thread Pete Wyckoff
eers, > >Tolga > > Any feedback is appreciated. Sorry, travel delay. This explanation is pretty straight-forward, thanks. Suggest you include it in the commit message along with the other text you had, and resend to the list, cc me and junio. Oh, and include an ack: Acked

Re: [PATCH] git-p4: format-patch to diff-tree change breaks binary patches

2014-04-26 Thread Pete Wyckoff
tolga.cey...@gmail.com wrote on Thu, 24 Apr 2014 21:46 -0700: > When applying binary patches a full index is required. format-patch > already handles this, but diff-tree needs '--full-index' argument > to always output full index. > > Signed-off-by: Tolga Ceylan > --- > git-p4.py |2 +- > 1

Re: git p4: bug - branch detection broken on empty branches

2014-04-26 Thread Pete Wyckoff
dpr...@gmail.com wrote on Tue, 22 Apr 2014 10:20 +0100: > As part of my work to help get git-p4 close to bug-free before Git > 2.0, I'm posting all bugs and patches to this mailing list. Please > direct me elsewhere if this is incorrect. > > When trying to clone a particular directory from a depot

Re: Fwd: git p4: feature request - branch check filtering

2014-04-23 Thread Pete Wyckoff
ul text. 2. Include at the bottom of that message: Acked-by: Pete Wyckoff 3. Inline the text of your patch, not just a link to github. 4. Consider adding a t98xx test. This isn't required for a fairly minor change like yours, but if you think TDD is

Re: [PATCH] git-p4: explicitly specify that HEAD is a revision

2014-04-07 Thread Pete Wyckoff
' to separate paths from revisions, like this: > 'git [...] -- [...]' > > Take the suggestion above and explicitly state that HEAD should be > treated as a revision. > > Signed-off-by: Vlad Dogaru This looks obviously good to me, thanks! Junio, could you car

Re: Fwd: git p4: feature request - branch check filtering

2014-02-23 Thread Pete Wyckoff
dpr...@gmail.com wrote on Tue, 18 Feb 2014 12:42 +: > I work at a company that has recently moved all CVS, SVN, and git > repositories to Perforce. Depots have not been setup correctly in > every case, and there is one depot that contains literally hundreds of > projects under commercial devel

[PATCHv2 11/11] git p4 doc: use two-line style for options with multiple spellings

2014-01-22 Thread Pete Wyckoff
Signed-off-by: Pete Wyckoff --- Documentation/git-p4.txt | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8cba16d..6ab5f94 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -168,7 +168,8 @@ All

[PATCHv2 09/11] git p4: fix an error message when "p4 where" fails

2014-01-22 Thread Pete Wyckoff
When "p4 where" fails, for whatever reason, the error message tries to show an undefined variable. This minor bug applies only when using a client spec, and was introduced recently in 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30). Signed-

[PATCHv2 10/11] git p4 test: examine behavior with locked (+l) files

2014-01-22 Thread Pete Wyckoff
fixes appear in the future. Signed-off-by: Pete Wyckoff --- t/t9816-git-p4-locked.sh | 145 +++ 1 file changed, 145 insertions(+) create mode 100755 t/t9816-git-p4-locked.sh diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh new file

[PATCHv2 08/11] git p4: handle files with wildcards when doing RCS scrubbing

2014-01-22 Thread Pete Wyckoff
y calling wildcard_encode() on the raw filename. Signed-off-by: Pete Wyckoff --- git-p4.py | 4 ++-- t/t9812-git-p4-wildcards.sh | 23 +++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index f0a327d..39a0fa0 100755 -

[PATCHv2 07/11] git p4 test: do not pollute /tmp

2014-01-22 Thread Pete Wyckoff
ec the args directly, without shell expansion. Second, without shell expansion, the trick of "P4EDITOR=:" used in the tests doesn't work. Use a real command, true, as the non-interactive editor for testing. Signed-off-by: Pete Wyckoff --- git-p4.py | 2 +- t/l

[PATCHv2 05/11] git p4 test: is_cli_file_writeable succeeds

2014-01-22 Thread Pete Wyckoff
Commit e9df0f9 (git p4: cygwin p4 client does not mark read-only, 2013-01-26) fixed a problem with "test -w" on cygwin, but mistakenly marked the new test as failing. Fix this. Signed-off-by: Pete Wyckoff --- t/t9807-git-p4-submit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletio

[PATCHv2 06/11] git p4 test: run as user "author"

2014-01-22 Thread Pete Wyckoff
duced in 848de9c (git-p4: warn if git authorship won't be retained, 2011-05-13). Fix t9813 to use @example.com instead of @localhost due to change in p4_add_user(). Move the function into the git p4 test library so author can be added at initialization time. Signed-off-by: Pete Wyckoff ---

[PATCHv2 03/11] git p4: work around p4 bug that causes empty symlinks

2014-01-22 Thread Pete Wyckoff
roduced by 1292df1 (git-p4: Fix occasional truncation of symlink contents., 2013-08-08) and appeared first in 1.8.5. But it shows up only in p4 repositories of dubious character, so can wait for a proper release. Tested-by: Damien Gérard Signed-off-by: Pete Wyckoff --- git-p4.py

[PATCHv2 02/11] git p4 test: ensure p4 symlink parsing works

2014-01-22 Thread Pete Wyckoff
While this happens to work, there was no test to make sure that the basic importing of a symlink from p4 to git functioned. Add a simple test to create a symlink in p4 and import it into git, then verify that the symlink exists and has the correct target. Signed-off-by: Pete Wyckoff --- t

[PATCHv2 04/11] git p4 test: explicitly check p4 wildcard delete

2014-01-22 Thread Pete Wyckoff
There was no test where p4 deleted a file with a wildcard character. Make sure git p4 applies the wildcard decoding properly when importing a delete that includes a wildcard. Signed-off-by: Pete Wyckoff --- t/t9812-git-p4-wildcards.sh | 27 +++ 1 file changed, 27

[PATCHv2 01/11] git p4 test: wildcards are supported

2014-01-22 Thread Pete Wyckoff
Since 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30), all the wildcard types should be supported. Change must-fail tests to mark that they now pass. Signed-off-by: Pete Wyckoff --- t/t9809-git-p4-client-view.sh | 16 1 file changed, 8

Re: [PATCH 00/11] git p4 tests and a few bug fixes

2014-01-22 Thread Pete Wyckoff
gits...@pobox.com wrote on Tue, 21 Jan 2014 16:03 -0800: > Pete Wyckoff writes: [..] > > Patch 03 is a regression fix, found and narrowed down thanks to > > much work by Damien Gérard. But it is obscure enough that I'm > > not proposing it for a maintenance relea

[PATCH 11/11] git p4 doc: use two-line style for options with multiple spellings

2014-01-21 Thread Pete Wyckoff
Signed-off-by: Pete Wyckoff --- Documentation/git-p4.txt | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8cba16d..6ab5f94 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -168,7 +168,8 @@ All

[PATCH 10/11] git p4 test: examine behavior with locked (+l) files

2014-01-21 Thread Pete Wyckoff
fixes appear in the future. Signed-off-by: Pete Wyckoff --- t/t9816-git-p4-locked.sh | 145 +++ 1 file changed, 145 insertions(+) create mode 100755 t/t9816-git-p4-locked.sh diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh new file

[PATCH 09/11] git p4: fix an error message when "p4 where" fails

2014-01-21 Thread Pete Wyckoff
When "p4 where" fails, for whatever reason, the error message tries to show an undefined variable. This minor bug applies only when using a client spec, and was introduced recently in 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30). Signed-

[PATCH 08/11] git p4: handle files with wildcards when doing RCS scrubbing

2014-01-21 Thread Pete Wyckoff
y calling wildcard_encode() on the raw filename. Signed-off-by: Pete Wyckoff --- git-p4.py | 4 ++-- t/t9812-git-p4-wildcards.sh | 23 +++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index a4414b5..26b874f 100755 -

[PATCH 05/11] git p4 test: is_cli_file_writeable succeeds

2014-01-21 Thread Pete Wyckoff
Commit e9df0f9 (git p4: cygwin p4 client does not mark read-only, 2013-01-26) fixed a problem with "test -w" on cygwin, but mistakenly marked the new test as failing. Fix this. Signed-off-by: Pete Wyckoff --- t/t9807-git-p4-submit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletio

[PATCH 07/11] git p4 test: do not pollute /tmp

2014-01-21 Thread Pete Wyckoff
ec the args directly, without shell expansion. Second, without shell expansion, the trick of "P4EDITOR=:" used in the tests doesn't work. Use a real command, true, as the non-interactive editor for testing. Signed-off-by: Pete Wyckoff --- git-p4.py | 2 +- t/l

[PATCH 06/11] git p4 test: run as user "author"

2014-01-21 Thread Pete Wyckoff
s was introduced in 848de9c (git-p4: warn if git authorship won't be retained, 2011-05-13). Fix t9813 to use @example.com instead of @localhost due to change in p4_add_user(). Move the function into the git p4 test library so author can be added at initialization time. Signed-off-by: Pete Wyckoff

[PATCH 03/11] git p4: work around p4 bug that causes empty symlinks

2014-01-21 Thread Pete Wyckoff
roduced by 1292df1 (git-p4: Fix occasional truncation of symlink contents., 2013-08-08) and appeared first in 1.8.5. But it only shows up only in p4 repositories of dubious character, so can wait for a proper release. Tested-by: Damien Gérard Signed-off-by: Pete Wyckoff --- git-p4.py

[PATCH 04/11] git p4 test: explicitly check p4 wildcard delete

2014-01-21 Thread Pete Wyckoff
There was no test where p4 deleted a file with a wildcard character. Make sure git p4 applies the wildcard decoding properly when importing a delete that includes a wildcard. Signed-off-by: Pete Wyckoff --- t/t9812-git-p4-wildcards.sh | 27 +++ 1 file changed, 27

[PATCH 02/11] git p4 test: ensure p4 symlink parsing works

2014-01-21 Thread Pete Wyckoff
While this happens to work, there was no test to make sure that the basic importing of a symlink from p4 to git functioned. Add a simple test to create a symlink in p4 and import it into git, then verify that the symlink exists and has the correct target. Signed-off-by: Pete Wyckoff --- t

[PATCH 00/11] git p4 tests and a few bug fixes

2014-01-21 Thread Pete Wyckoff
d can wait for the next release. Pete Wyckoff (11): git p4 test: wildcards are supported git p4 test: ensure p4 symlink parsing works git p4: work around p4 bug that causes empty symlinks git p4 test: explicitly check p4 wildcard delete git p4 test: is_cli_file_writeable succeeds git p4

[PATCH 01/11] git p4 test: wildcards are supported

2014-01-21 Thread Pete Wyckoff
Since 9d57c4a (git p4: implement view spec wildcards with "p4 where", 2013-08-30), all the wildcard types should be supported. Change must-fail tests to mark that they now pass. Signed-off-by: Pete Wyckoff --- t/t9809-git-p4-client-view.sh | 16 1 file changed, 8

Re: git-p4: exception when cloning a perforce repository

2014-01-18 Thread Pete Wyckoff
dam...@iwi.me wrote on Thu, 16 Jan 2014 17:02 +0100: > > On 16 Jan 2014, at 15:45, Pete Wyckoff wrote: > > > Oh cool, that helps a lot. P4 is just broken here, so we can get > > away with being a bit sloppy in git. I'll try just pretending > > "empty syml

Re: git-p4: exception when cloning a perforce repository

2014-01-16 Thread Pete Wyckoff
dam...@iwi.me wrote on Thu, 16 Jan 2014 14:46 +0100: > > On 16 Jan 2014, at 14:08, Pete Wyckoff wrote: > > > dam...@iwi.me wrote on Wed, 15 Jan 2014 09:56 +0100: > >> p4 fstat //depot/openssl/0.9.8j/openssl/include/openssl/bn.h@59702 > >> ... depotFile //dep

Re: git-p4: exception when cloning a perforce repository

2014-01-16 Thread Pete Wyckoff
dam...@iwi.me wrote on Wed, 15 Jan 2014 09:56 +0100: > p4 fstat //depot/openssl/0.9.8j/openssl/include/openssl/bn.h@59702 > ... depotFile //depot/openssl/0.9.8j/openssl/include/openssl/bn.h > ... headAction edit > ... headType symlink > ... headTime 1237906419 > ... headRev 2 > ... headChange 597

Re: git-p4: exception when cloning a perforce repository

2014-01-14 Thread Pete Wyckoff
p...@padd.com wrote on Mon, 13 Jan 2014 19:18 -0500: > dam...@iwi.me wrote on Mon, 13 Jan 2014 14:37 +0100: > > I am trying to clone a perforce repository via git and I am having the > > following backtrace : > > > > {14:20}~/projects/:master ✗ ➭ git p4 clone //depot/@all . > > Importing revi

Re: git-p4: exception when cloning a perforce repository

2014-01-13 Thread Pete Wyckoff
dam...@iwi.me wrote on Mon, 13 Jan 2014 14:37 +0100: > I am trying to clone a perforce repository via git and I am having the > following backtrace : > > {14:20}~/projects/:master ✗ ➭ git p4 clone //depot/@all . > Importing revision … > [...] > Importing revision 59702 (45%)Traceback (most re

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

2014-01-13 Thread Pete Wyckoff
frrr...@gmail.com wrote on Mon, 13 Jan 2014 12:10 +: > Hello, > > On Sun, Jan 12, 2014 at 05:29:46PM -0500, Pete Wyckoff wrote: > > Thanks for the patch, but I'm curious how you'd like this to > > work. I never use the option myself. > > > > As i

Re: [PATCH] git-p4: Do not include diff in spec file when just preparing p4

2014-01-12 Thread Pete Wyckoff
frrr...@gmail.com wrote on Fri, 10 Jan 2014 18:18 +: > The diff information render the spec file unusable as is by p4, > do not include it when run with --prepare-p4-only so that the > given file can be directly passed to p4. Thanks for the patch, but I'm curious how you'd like this to work.

Re: [PATCH 4/9] contrib: remove git-p4import

2013-11-26 Thread Pete Wyckoff
> Noticed while considering marking the contrib/p4import/git-p4import.py > script executable as part of a wider sweep. I haven't seen git-p4import mentioned for the last 6 years either. Thanks, Acked-by: Pete Wyckoff -- To unsubscribe from this list: send the line "

Re: [PATCH] git p4: Use git diff-tree instead of format-patch

2013-11-22 Thread Pete Wyckoff
uot;--check --apply -" > > I do not do p4 myself, but from a cursory reading it looks like the > right thing to do. Thanks. > > The output of "git shortlog --no-merges --since=1.year git-p4.py" > tells me that Pete should be the person much more familiar with the &g

Re: git-p4 out of memory for very large repository

2013-09-07 Thread Pete Wyckoff
cmt...@gmail.com wrote on Fri, 06 Sep 2013 15:03 -0400: > Finally, I claim success! Unfortunately I did not try either of the OOM > score or strace suggestions - sorry! After spending so much time on > this, I've gotten to the point that I'm more interested in getting it to > work than in figurin

Re: git-p4 out of memory for very large repository

2013-08-29 Thread Pete Wyckoff
cmt...@gmail.com wrote on Wed, 28 Aug 2013 11:41 -0400: > On Mon, Aug 26, 2013 at 09:47:56AM -0400, Corey Thompson wrote: > > You are correct that git-fast-import is killed by the OOM killer, but I > > was unclear about which process was malloc()ing so much memory that the > > OOM killer got invoke

Re: [PATCH v2] git-p4: Ask "p4" to interpret View setting

2013-08-29 Thread Pete Wyckoff
h mail that incorporated your sent one? > Or nothing to do? It would be good if you could fold the one I sent in with yours, and clean up any stylistic issues as you go. I'll play with it a bit more, then send on to Junio for the next release. Thanks, this is a good addition!

Re: git-p4 out of memory for very large repository

2013-08-25 Thread Pete Wyckoff
cmt...@gmail.com wrote on Fri, 23 Aug 2013 07:48 -0400: > On Fri, Aug 23, 2013 at 08:16:58AM +0100, Luke Diamand wrote: > > On 23/08/13 02:12, Corey Thompson wrote: > > >Hello, > > > > > >Has anyone actually gotten git-p4 to clone a large Perforce repository? > > > > Yes. I've cloned repos with a

Re: [PATCH v2] git-p4: Ask "p4" to interpret View setting

2013-08-24 Thread Pete Wyckoff
p...@padd.com wrote on Thu, 15 Aug 2013 21:24 -0400: > ksaitoh...@gmail.com wrote on Wed, 14 Aug 2013 09:59 +0900: > > > My only concern is in the commit message, about performance. A > > > change that has lots of files in it will cause many roundtrips to > > > p4d to do "p4 where" on each. When

Re: What's cooking in git.git (Aug 2013, #03; Tue, 13)

2013-08-18 Thread Pete Wyckoff
gits...@pobox.com wrote on Tue, 13 Aug 2013 15:06 -0700: > * ks/p4-view-spec (2013-08-11) 3 commits > - WAITING FOR ACK > - git p4: implement view spec wildcards with "p4 where" > - git p4 test: sanitize P4CHARSET > > Waiting for an ack. I'm still running perf tests on the 3-patch version. I

Re: [PATCH v2] git-p4: Ask "p4" to interpret View setting

2013-08-15 Thread Pete Wyckoff
ksaitoh...@gmail.com wrote on Wed, 14 Aug 2013 09:59 +0900: > > My only concern is in the commit message, about performance. A > > change that has lots of files in it will cause many roundtrips to > > p4d to do "p4 where" on each. When the files don't have much > > edited content, this new approa

Re: [PATCH] git-p4: Fix occasional truncation of symlink contents.

2013-08-12 Thread Pete Wyckoff
al...@rosedu.org wrote on Mon, 12 Aug 2013 10:46 +0300: > On 11 August 2013 14:57, Pete Wyckoff wrote: > > al...@rosedu.org wrote on Thu, 08 Aug 2013 16:17 +0300: > >> Symlink contents in p4 print sometimes have a trailing > >> new line character, but sometimes it doesn

Re: [PATCH] git-p4: Fix occasional truncation of symlink contents.

2013-08-11 Thread Pete Wyckoff
al...@rosedu.org wrote on Thu, 08 Aug 2013 16:17 +0300: > Symlink contents in p4 print sometimes have a trailing > new line character, but sometimes it doesn't. git-p4 > should only remove the last character if that character > is '\n'. Your patch looks fine, and harmless if symlinks continue to h

[PATCH 1/2] git p4 test: sanitize P4CHARSET

2013-08-10 Thread Pete Wyckoff
[pw: use unset, add commit text] Signed-off-by: Kazuki Saitoh Signed-off-by: Pete Wyckoff --- t/lib-git-p4.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 2098b9b..ccd918e 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -4

[PATCH 2/2] git p4: implement view spec wildcards with "p4 where"

2013-08-10 Thread Pete Wyckoff
rns out to be a problem, we might consider resurrecting the old wildcard code just for use on the "easy" cases it understands. [pw: redo code and tests] Signed-off-by: Kazuki Saitoh Signed-off-by: Pete Wyckoff --- git-p4.py | 204 +--

Re: [PATCH v2] git-p4: Ask "p4" to interpret View setting

2013-08-10 Thread Pete Wyckoff
ksaitoh...@gmail.com wrote on Tue, 06 Aug 2013 15:45 +0900: > In Perforce, View setting of p4 client can describe > -//depot/project/files/*.xls //client/project/files/*.xls > to exclude Excel files. > But "git p4 --use-client-spec" cannot support '*'. > > In git-p4.py, "map_in_client" method an

Re: [PATCH] git-p4: use "p4 fstat" to interpret View setting

2013-08-02 Thread Pete Wyckoff
ksaitoh...@gmail.com wrote on Fri, 02 Aug 2013 17:02 +0900: > I trying clone Perforce project and I found git-p4. It's a great tool! > > And I don't know how to exclude special extension file in a directory? > (Practically, I want to exclude Excel files at git p4 clone/sync.) > > In Perforce, Vie

Re: [PATCH] git p4 test: Check ignore files with client spec

2013-07-20 Thread Pete Wyckoff
on with Matthieu that we did indeed have tests for detect-branches with use-client-spec. This test sure seems like it should cover that situation though. Acked-by: Pete Wyckoff > --- > t/t9801-git-p4-branch.sh | 23 --- > 1 file changed, 20 insertions(+), 3 deletio

Re: Git-P4 Bug With Filename Case Change

2013-07-20 Thread Pete Wyckoff
aaron.dw...@imgtec.com wrote on Wed, 17 Jul 2013 22:11 +: > We recently have moved our project from Git to Perforce and those of us > who prefer Git still are using Git p4 to stay in Git land. One of the files > in our repository was renamed while still in Git, but the rename only > c

Re: [PATCH] Change "remote tracking" to "remote-tracking"

2013-07-03 Thread Pete Wyckoff
+ > > The default is "master". > > > > The rest of the patch looks good. > > Myy reading did hiccup at the same "remote-tracking" used as if it > were a noun, and your rewritten version reads much better. Yes, very clear and complete rewrite;

Re: [PATCH 2/2] t/t9802: explicitly name the upstream branch to use as a base

2013-06-18 Thread Pete Wyckoff
s by explicitly > naming the upstream branch to base the new local branch on when > calling 'git checkout'. Thanks for finding and fixing this. Great explanation. I tested it locally too. Acked-by: Pete Wyckoff -- Pete -- To unsubscribe from this list: send the li

Re: Bug: git-p4: Sometimes p4 generates Windows-style output on OS X

2013-05-12 Thread Pete Wyckoff
davidf...@gmail.com wrote on Mon, 06 May 2013 10:59 -0700: > I've observed that the p4 command that git-p4 delegates to > occasionally outputs Windows-style line endings even on the OS X > platform. When this happens, git-p4 gets very confused and crashes > out. > > I've attached a patch which see

Re: "git grep" parallelism question

2013-05-05 Thread Pete Wyckoff
torva...@linux-foundation.org wrote on Fri, 26 Apr 2013 13:31 -0700: > Anyway, I think your patch is good if for no other reason that it > allows this kind of testing, but at least for my machine, clearly the > current default of eight threads is actually "good enough". Maybe > somebody with a very

Re: is git-p4 compatible with p4/linux?

2013-04-20 Thread Pete Wyckoff
dav...@gmail.com wrote on Sat, 20 Apr 2013 03:50 -0700: > On Thu, Apr 18, 2013 at 5:09 PM, Pete Wyckoff wrote: > >> First issue > >> --- > >> > >> git-p4 assumes the output of 'p4 print' adds a newline to the > >> target.

Re: is git-p4 compatible with p4/linux?

2013-04-19 Thread Pete Wyckoff
a...@aivor.com wrote on Thu, 18 Apr 2013 20:34 -0500: > Perhaps it is a configuration item on the server and/or client. It seems we > are running the same version of p4. But just to be sure, check yours against > mine: > > $ cksum $(which p4) > 3254530484 2420552 /usr/bin/p4 > > If yours if di

Re: is git-p4 compatible with p4/linux?

2013-04-18 Thread Pete Wyckoff
a...@aivor.com wrote on Tue, 16 Apr 2013 23:31 -0500: > git-p4.py (1.8.2.1.418.gaec3f77) has at least two behaviors that > seem to be incompatible with the version of p4 that I recently > downloaded from perforce.com (P4/LINUX26X86_64/2013.1/610569). > > TLDR: Is git-p4 written for an old version

Re: git p4 submit failing

2013-04-18 Thread Pete Wyckoff
ll of this started I had core.autocrlf set to false, and no > > .gitattributes file and perforce workspace's LineEnd was set to the > > default, but I got a conflict where the only difference was the line > > endings, so I changed things to the way they are now. > > > > An

Re: git p4 submit failing

2013-04-13 Thread Pete Wyckoff
l...@diamand.org wrote on Thu, 11 Apr 2013 21:19 +0100: > Just a thought, but check the files that are failing to see if they've > got RCS keywords in them ($Id$, $File$, $Date$, etc). These cause all > sorts of nasty problems. > > That's assuming it's definitely not a CRLF line ending problem on

Re: [PATCH] git-p4: support exclusively locked files

2013-03-24 Thread Pete Wyckoff
of it, but there are more issues as well. I'll address them once you've taken care of the opened/fstat issue. Thanks, -- Pete --- 8< --- >From c6691126ae75c364763ab4d774c75045285b8ddd Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Sun, 17 Mar 2013 16:05:07 -

Re: [PATCH] git-p4: support exclusively locked files

2013-03-19 Thread Pete Wyckoff
ion. Do you want to reroll your patch to use fstat? I'll work on the tests, and also look into potential failure modes of "git p4 submit" when somebody else has the exclusive file open. -- Pete > On 17/03/2013 20:04, "Pete Wyckoff" wrote: > >

Re: [PATCH] git-p4: support exclusively locked files

2013-03-17 Thread Pete Wyckoff
danny.tho...@blackboard.com wrote on Wed, 13 Mar 2013 13:51 -0400: > By default, newly added binary files are exclusively locked by Perforce: > > 'add default change (binary+l) *exclusive*' > > This results in a 'Could not determine file type' error as the regex > expects > the line to end after

Re: [RFC/PATCH] Documentation/technical/api-fswatch.txt: start with outline

2013-03-15 Thread Pete Wyckoff
gits...@pobox.com wrote on Wed, 13 Mar 2013 12:38 -0700: > Karsten Blees writes: > > > However, AFAIK inotify doesn't work recursively, so the daemon > > would at least have to track the directory structure to be able to > > register / unregister inotify handlers as directories come and go. > >

[PATCH v2 3/3] git p4: avoid expanding client paths in chdir

2013-03-11 Thread Pete Wyckoff
] Thanks-to: John Keeping Signed-off-by: Pete Wyckoff --- git-p4.py | 29 ++--- t/t9808-git-p4-chdir.sh | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/git-p4.py b/git-p4.py index 647f110..7288c0b 100755 --- a/git-p4.py +++ b/git-p4.py

[PATCH v2 2/3] git p4 test: should honor symlink in p4 client root

2013-03-11 Thread Pete Wyckoff
This test fails when the p4 client root includes a symlink. It complains: Path /vol/bar/projects/foo/... is not under client root /p/foo and dumps a traceback. Signed-off-by: Pete Wyckoff --- t/t9808-git-p4-chdir.sh | 27 +++ 1 file changed, 27 insertions(+) diff

[PATCH v2 1/3] git p4 test: make sure P4CONFIG relative path works

2013-03-11 Thread Pete Wyckoff
; it builds a path by prepending the contents of the PWD environment variable. Signed-off-by: Pete Wyckoff --- t/t9808-git-p4-chdir.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh index dc92e60..55c5e36 100755 --- a/t/t9808-git

[PATCH v2 0/3] fix git-p4 client root symlink problems

2013-03-11 Thread Pete Wyckoff
4: use absolute directory for PWD env var, 2011-12-09), but that's so long ago that I don't think this is a candidate for maint. -- Pete Miklós Fazekas (1): git p4: avoid expanding client paths in chdir Pete Wyckoff (2): git p4 test: make sure P4CONFIG relative path works

[PATCH 3/3] git p4: avoid expanding client paths in chdir

2013-03-07 Thread Pete Wyckoff
] Thanks-to: John Keeping Signed-off-by: Pete Wyckoff --- git-p4.py | 29 ++--- t/t9808-git-p4-chdir.sh | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/git-p4.py b/git-p4.py index 647f110..7288c0b 100755 --- a/git-p4.py +++ b/git-p4.py

[PATCH 2/3] git p4 test: should honor symlink in p4 client root

2013-03-07 Thread Pete Wyckoff
This test fails when the p4 client root includes a symlink. It complains: Path /vol/bar/projects/foo/... is not under client root /p/foo and dumps a traceback. Signed-off-by: Pete Wyckoff --- t/t9808-git-p4-chdir.sh | 27 +++ 1 file changed, 27 insertions(+) diff

[PATCH 1/3] git p4 test: make sure P4CONFIG relative path works

2013-03-07 Thread Pete Wyckoff
; it builds a path by prepending the contents of the PWD environment variable. Signed-off-by: Pete Wyckoff --- t/t9808-git-p4-chdir.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh index dc92e60..55c5e36 100755 --- a/t/t9808-git

[PATCH 0/3] fix git-p4 client root symlink problems

2013-03-07 Thread Pete Wyckoff
on't think this is a candidate for maint. -- Pete Miklós Fazekas (1): git p4: avoid expanding client paths in chdir Pete Wyckoff (2): git p4 test: make sure P4CONFIG relative path works git p4 test: should honor symlink in p4 client root git-p4.py | 29 +++

Re: [BUG] Incorrect/misleading error when `git rev-list --objects --all` hits the max open files limit

2013-03-05 Thread Pete Wyckoff
rab...@rabbit.us wrote on Mon, 04 Mar 2013 10:29 +1100: > I was tinkering with a massive git repository (actually a bup > repository, but it is a standard valid git repo underneath). While > validating that a repack ran succesfully I executed the command: > > git rev-list --objects --all > rev.

Re: Suggested improvements to the git-p4 documentation (branch-related)

2013-02-23 Thread Pete Wyckoff
gits...@pobox.com wrote on Fri, 22 Feb 2013 16:42 -0800: > Olivier Delalleau writes: > > > 2013/1/5 Pete Wyckoff : > >> sh...@keba.be wrote on Thu, 03 Jan 2013 15:58 -0500: > > ... > >> Please do feel welcome to to rearrange or expand the > >> docume

Re: [PATCH v2] read_directory: avoid invoking exclude machinery on tracked files

2013-02-17 Thread Pete Wyckoff
pclo...@gmail.com wrote on Sun, 17 Feb 2013 11:39 +0700: > On Sun, Feb 17, 2013 at 1:11 AM, Pete Wyckoff wrote: > > pclo...@gmail.com wrote on Sat, 16 Feb 2013 14:17 +0700: > >> Finally some numbers (best of 20 runs) that shows why it's worth all > >> the hassle:

Re: [PATCH v2] read_directory: avoid invoking exclude machinery on tracked files

2013-02-16 Thread Pete Wyckoff
pclo...@gmail.com wrote on Sat, 16 Feb 2013 14:17 +0700: > Finally some numbers (best of 20 runs) that shows why it's worth all > the hassle: > > git status | webkit linux-2.6 libreoffice-core gentoo-x86 > -+-- > before | 1.097s0.

Re: [PATCH] git p4: chdir resolves symlinks only for relative paths

2013-02-03 Thread Pete Wyckoff
mfaze...@szemafor.com wrote on Tue, 29 Jan 2013 09:37 +0100: > If a p4 client is configured to /p/foo which is a symlink > to /vol/bar/projects/foo, then resolving symlink, which > is done by git-p4's chdir will confuse p4: "Path > /vol/bar/projects/foo/... is not under client root /p/foo" > While

Re: [RFC/PATCH v2] CodingGuidelines: add Python coding guidelines

2013-02-03 Thread Pete Wyckoff
j...@keeping.me.uk wrote on Fri, 01 Feb 2013 11:16 +: > On Fri, Feb 01, 2013 at 09:39:39AM +0100, Michael Haggerty wrote: > > On 01/30/2013 09:31 PM, John Keeping wrote: > > > On Wed, Jan 30, 2013 at 11:05:10AM +0100, Michael Haggerty wrote: > > >> [...] maybe we should establish a small Python

Re: What's cooking in git.git (Jan 2013, #10; Sun, 27)

2013-01-30 Thread Pete Wyckoff
gits...@pobox.com wrote on Sun, 27 Jan 2013 22:45 -0800: > * pw/git-p4-on-cygwin (2013-01-26) 21 commits > - git p4: introduce gitConfigBool > - git p4: avoid shell when calling git config > - git p4: avoid shell when invoking git config --get-all > - git p4: avoid shell when invoking git rev-l

[PATCHv2 21/21] git p4: introduce gitConfigBool

2013-01-26 Thread Pete Wyckoff
Make the intent of "--bool" more obvious by returning a direct True or False value. Convert a couple non-bool users with obvious bool intent. Signed-off-by: Pete Wyckoff --- git-p4.py | 45 ++--- 1 file changed, 26 insertions(+), 19 deletion

[PATCHv2 20/21] git p4: avoid shell when calling git config

2013-01-26 Thread Pete Wyckoff
Signed-off-by: Pete Wyckoff --- git-p4.py | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/git-p4.py b/git-p4.py index 7efa9a8..ff3e8c9 100755 --- a/git-p4.py +++ b/git-p4.py @@ -560,13 +560,16 @@ def gitBranchExists(branch): return proc.wait() == 0

[PATCHv2 19/21] git p4: avoid shell when invoking git config --get-all

2013-01-26 Thread Pete Wyckoff
Signed-off-by: Pete Wyckoff --- git-p4.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index c8ae83d..7efa9a8 100755 --- a/git-p4.py +++ b/git-p4.py @@ -571,7 +571,8 @@ def gitConfig(key, args = None): # set args to "--bool", for insta

[PATCHv2 18/21] git p4: avoid shell when invoking git rev-list

2013-01-26 Thread Pete Wyckoff
Invoke git rev-list directly, avoiding the shell, in P4Submit and P4Sync. The overhead of starting extra processes is significant in cygwin; this speeds things up on that platform. Signed-off-by: Pete Wyckoff --- git-p4.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCHv2 17/21] git p4: avoid shell when mapping users

2013-01-26 Thread Pete Wyckoff
The extra quoting and double-% are unneeded, just to work around the shell. Instead, avoid the shell indirection. Signed-off-by: Pete Wyckoff --- git-p4.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index a989704..c43d044 100755 --- a/git-p4.py

[PATCHv2 16/21] git p4: disable read-only attribute before deleting

2013-01-26 Thread Pete Wyckoff
edited to remove adjust the keyword lines. Make sure it is editable before patching. Signed-off-by: Pete Wyckoff --- git-p4.py | 10 ++ 1 file changed, 10 insertions(+) diff --git a/git-p4.py b/git-p4.py index c62b2ca..a989704 100755 --- a/git-p4.py +++ b/git-p4.py @@ -21,6 +21,7

  1   2   3   >