[PATCH] Prevent warning

2018-10-29 Thread Pete
Prevent the following warning in the web server error log: gitweb.cgi: Odd number of elements in anonymous hash at /usr/share/gitweb/gitweb.cgi line 3305 --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index

[GIT GUI/PATCH/RFC] git gui: get current theme in 8.5-backwards-compatible way

2016-12-20 Thread Pete Harlan
uot;[ttk::style theme use]" was added to ttext in 30508bc ("Amend tab ordering and text widget border and highlighting.", 2016-10-02). Break out InitTheme's workaround into its own get_current_theme proc and use it in both places. Signed-off-by: Pete Harlan <p...@tento.net> --

Regression? Ambiguous tags listed as "tags/"

2016-01-23 Thread Pete Harlan
tag tagonly Previous behavior: % git tag branchortag tagonly I prefer the previous behavior. Perhaps the change was intentional, but I didn't see it documented. Thanks, Pete Harlan p...@tento.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body o

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

2015-10-04 Thread Pete Wyckoff
| egrep ^-r-- && > >>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

Re: [PATCH v2 2/2] connect: improve check for plink to reduce false positives

2015-04-24 Thread Pete Harlan
-insensitively in the string, which led to false positives when Perhaps s/case-insensitively/anywhere/? It's not important that it ignored case (your change ignores it too), it's that it was too lenient about its context. --Pete GIT_SSH contained uplink. Improve the check by looking for plink

Re: [PATCH 1/5] status: document the -v/--verbose option

2015-04-23 Thread Pete Harlan
--cached`? + twice, then also show the changes in the working tree that + have not yet been staged (i.e., like the output of `git diff + --cached`). ...and should this just be `git diff`? --Pete (Sorry for not replying to the email; bit of a mess here in my setup.) -- To unsubscribe from

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

2015-01-23 Thread Pete Wyckoff
print You can delete the file \%s\ when finished. % fileName Looks obviously good here. Ack! -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

git-p4 maintainership change

2015-01-23 Thread Pete Wyckoff
to git-p4 in the near future. Luke: I think you have a couple patches outstanding; hope these can get merged to mainline soon. Thanks, -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

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

2015-01-18 Thread Pete Wyckoff
, I read through the patch and it looks good and makes sense. You've got my ack on this for what it's worth. Hopefully someone else starts picking up the git-p4 maintenance work. Hint. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

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

2014-11-18 Thread Pete Wyckoff
$(SCRIPT_PYTHON_GEN): % : %.py -- 2.1.0.rc2.206.gedb03e5 Looks obviously correct, thanks for remembering the other scripting languages. :) Acked-by: Pete Wyckoff p...@padd.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

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
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 to the list, cc junio. Acked-by: Pete Wyckoff p...@padd.com --- t/t9814-git-p4

Re: git-p4 and initial import

2014-07-12 Thread Pete Wyckoff
first, before doing p4 print on the file#rev. See also git-p4raw from Sam Vilain that builds up SQL from a raw p4 db. Fun bit of work maybe if you're motivated. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: git p4 diff-tree ambiguous argument error

2014-07-12 Thread Pete Wyckoff
in a debugger and see why it's not writing out the branch head. There's lots of changes since v1.7.12.4, but nothing obvious I can see that would cause this. Sorry, -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

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

2014-07-06 Thread Pete Wyckoff
ack, and they'll show up in a future git release. Thanks! -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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 proper fix, including proper handling

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

2014-06-10 Thread Pete Wyckoff
into a maintenance release, quickly? The fix looks good. It's surprising that none of the tests managed to add a file and trigger the failure. I'll ack this again, as it looks okay, but hope you ran all the unit tests successfully on your machine. -- Pete Signed-off-by: Maxime Coste frrr

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

2014-05-24 Thread Pete Wyckoff
you have one ready to go. Acked-by: Pete Wyckoff p...@padd.com 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 unsubscribe git in the body

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

2014-05-05 Thread Pete Wyckoff
, 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-by: Pete Wyckoff p...@padd.com -- To unsubscribe from this list: send the line

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

2014-04-26 Thread Pete Wyckoff
. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2014-04-26 Thread Pete Wyckoff
a straightforward change, but can you give a bit more background on why a full index is required? Do you mean that git apply will reject a patch with abbreviated blob object names? -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

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

2014-04-23 Thread Pete Wyckoff
. If you could take a look at Documentation/SubmittingPatches, and do a few things: 1. Write a nice commit message, say: git p4: add skipBranchScan to avoid p4 branch scan Some more useful text. 2. Include at the bottom of that message: Acked-by: Pete Wyckoff p

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

2014-04-07 Thread Pete Wyckoff
fixup. Acked-by: Pete Wyckoff p...@padd.com --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index cdfa2df..8d11b25 100755 --- a/git-p4.py +++ b/git-p4.py @@ -3086,7 +3086,7 @@ class P4Rebase(Command): print Rebasing

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

2014-02-23 Thread Pete Wyckoff
of it keeps working. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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 p...@padd.com 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 release. Thanks. I am

[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 p...@padd.com --- t/t9809-git-p4-client-view.sh | 16 1 file changed, 8

[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 p...@padd.com --- t/t9812-git-p4-wildcards.sh | 27 +++ 1 file

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

2014-01-22 Thread Pete Wyckoff
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 dam...@iwi.me Signed-off-by: Pete Wyckoff p...@padd.com --- git-p4.py

[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 p...@padd.com --- t/t9807-git-p4-submit.sh | 2 +- 1 file changed, 1 insertion(+), 1

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

2014-01-22 Thread Pete Wyckoff
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 p...@padd.com

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

2014-01-22 Thread Pete Wyckoff
() on the raw filename. Signed-off-by: Pete Wyckoff p...@padd.com --- 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 --- a/git-p4.py +++ b/git

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

2014-01-22 Thread Pete Wyckoff
, 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 p...@padd.com --- git-p4.py | 2 +- t/lib-git-p4.sh

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

2014-01-22 Thread Pete Wyckoff
that fixes appear in the future. Signed-off-by: Pete Wyckoff p...@padd.com --- 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

[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-off-by: Pete Wyckoff p

[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 p...@padd.com --- 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

[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 p...@padd.com --- t/t9809-git-p4-client-view.sh | 16 1 file changed, 8

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

2014-01-21 Thread Pete Wyckoff
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 test

[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 p

[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 p...@padd.com --- t/t9812-git-p4-wildcards.sh | 27 +++ 1 file

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

2014-01-21 Thread Pete Wyckoff
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 dam...@iwi.me Signed-off-by: Pete Wyckoff p...@padd.com --- git-p4

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

2014-01-21 Thread Pete Wyckoff
. It was 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 p...@padd.com

[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 p...@padd.com --- t/t9807-git-p4-submit.sh | 2 +- 1 file changed, 1 insertion(+), 1

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

2014-01-21 Thread Pete Wyckoff
, 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 p...@padd.com --- git-p4.py | 2 +- t/lib-git-p4.sh

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

2014-01-21 Thread Pete Wyckoff
() on the raw filename. Signed-off-by: Pete Wyckoff p...@padd.com --- 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 --- a/git-p4.py +++ b/git

[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-off-by: Pete Wyckoff p

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

2014-01-21 Thread Pete Wyckoff
that fixes appear in the future. Signed-off-by: Pete Wyckoff p...@padd.com --- 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

[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 p...@padd.com --- 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

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 p...@padd.com 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 symlinks are not in the repo

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

2014-01-16 Thread Pete Wyckoff
a look at how p4 represents the empty symlink in the filesystem: p4 sync @59702 ls -la bn.h -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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 p...@padd.com 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 //depot/openssl/0.9.8j/openssl/include

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

2014-01-14 Thread Pete Wyckoff
, and can get at the p4 depot, the full ,v file would be interesting too. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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 it is, --prepare-p4-only generates a file in /tmp

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

2014-01-13 Thread Pete Wyckoff
//depot/symlink@59702 (probably shows it is headRev 1) $ p4 print -q //depot/symlink#1 $ p4 print -q //depot/symlink#1 | od -c Thanks for checking this depot info first. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

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

2014-01-12 Thread Pete Wyckoff
submit without deleting the diff. That's the part you don't like? -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: How to pre-empt git pull merge error?

2013-11-28 Thread Pete Forman
Thomas Rast t...@thomasrast.ch writes: Antoine Pelisse apeli...@gmail.com writes: On Wed, 27 Nov 2013 15:17:27 + Pete Forman petef4+use...@gmail.com wrote: I am looking for a way of detecting up front whether a git pull or git merge would fail. The sort of script I want to perform

How to pre-empt git pull merge error?

2013-11-27 Thread Pete Forman
-okay that deals with things like benign untracked files. I have also asked this question on Stack Overflow but received no answers. http://stackoverflow.com/questions/20221383/ -- Pete Forman -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

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

2013-11-26 Thread Pete Wyckoff
/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 p...@padd.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

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

2013-11-22 Thread Pete Wyckoff
- applyPatchCmd = patchcmd + --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 code than myself

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

2013-09-07 Thread Pete Wyckoff
not yet seen. I'll see if I can update the docs somewhere. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2013-08-29 Thread Pete Wyckoff
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! -- Pete 2013/8/25 Pete Wyckoff p...@padd.com: p...@padd.com wrote on Thu, 15

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

2013-08-29 Thread Pete Wyckoff
/strace.out git p4 clone and hours later, see if something suggests itself toward the end of that output file. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

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

2013-08-25 Thread Pete Wyckoff
the offending files from git. Can you watch with top? Hit M to sort by memory usage, and see how big the processes get before falling over. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

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

2013-08-24 Thread Pete Wyckoff
favor. Let's go ahead and inflict this on the world and see what they think. Do you have an updated patch? Want to take some time to clean up and resubmit the entire series? The batching should be incorporated with the last 2/2 that I sent out. -- Pete -- To unsubscribe from

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

2013-08-18 Thread Pete Wyckoff
good. You should expect a reroll of the 2nd and 3rd commits, combining them into one patch. Thanks for tracking these. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http

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

2013-08-15 Thread Pete Wyckoff
to work out, we can clean up the patch. Otherwise maybe need to think about having both implementations and use the by-hand one for I don't like that approach. Let's hope it's not needed. -- Pete Subject: [PATCH] git p4: Implement as one batch p4 where query to interpret

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 p...@padd.com 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't. git-p4 should

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

2013-08-11 Thread Pete Wyckoff
n a r 360 y s 004 \0 \0 \0 d a t a s \0 \0 \0 \0 0 400 Also, what version is your server, from p4 info: Server version: P4D/LINUX26X86_64/2013.1/610569 (2013/03/19) -- Pete Signed-off-by: Alex Juncu aju...@ixiacom.com Signed

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

2013-08-10 Thread Pete Wyckoff
much edited content, this new approach will make the import take twice as long, I'll guess. Do you have a big repository where you could test that? Tell me what you think. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

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

2013-08-10 Thread Pete Wyckoff
: use unset, add commit text] Signed-off-by: Kazuki Saitoh ksaitoh...@gmail.com Signed-off-by: Pete Wyckoff p...@padd.com --- 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

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

2013-08-02 Thread Pete Wyckoff
--use-client-spec --dest=$git //depot + git_verify $files +' It works! Cool. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Git-P4 Bug With Filename Case Change

2013-07-20 Thread Pete Wyckoff
core.ignorecase -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2013-07-20 Thread Pete Wyckoff
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 p...@padd.com --- t/t9801-git-p4-branch.sh | 23 --- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git

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

2013-07-03 Thread Pete Wyckoff
of the first sentence, but adds clarity, so I'm happy as it stands. Acked-by: Pete Wyckoff p...@padd.com -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

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

2013-06-18 Thread Pete Wyckoff
for finding and fixing this. Great explanation. I tested it locally too. Acked-by: Pete Wyckoff p...@padd.com -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

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

2013-05-12 Thread Pete Wyckoff
is p4 client -o and see what LineEnd setting exists for the backing p4 workspace. -- Pete From aef963f0c45dea81f3e6f30d3b4185a0983ca4de Mon Sep 17 00:00:00 2001 From: David Foster davidf...@gmail.com Date: Mon, 6 May 2013 10:50:01 -0700 Subject: [PATCH] Compensate for Windows

Re: git grep parallelism question

2013-05-05 Thread Pete Wyckoff
1 real 1m36.969s 2 real 0m51.627s 4 real 0m32.994s 8 real 0m25.657s 16 real 0m21.260s 32 real 0m18.138s 64 real 0m17.265s I am tempted to change the default locally from 8 to 32. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

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 p...@padd.com wrote: First issue --- git-p4 assumes the output of 'p4 print' adds a newline to the target. To work around this, git-p4.py strips the last char from symlinks

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

2013-04-19 Thread Pete Wyckoff
atomlinson 12 Apr 18 20:25 ./xxx - ../libs/pcre/ Me too. That's annoying behavior, but not used by git-p4 fortunately. The -o - option is only used for odd utf16 files where p4 print generates invalid output. -- Pete -- To unsubscribe from this list: send the line unsubscribe git

Re: git p4 submit failing

2013-04-18 Thread Pete Wyckoff
? Does that fix it? There's also the config setting apply.ignorewhitespace; not sure if that would allow the apply step to apply an lf-ending patch to the crlf-ending p4 workspace. -- Pete Hello Simon, I have CCed you to alert you to the possible bug. Any assistance would

Re: git p4 submit failing

2013-04-13 Thread Pete Wyckoff
on Windows. I had recently debugged a similar-looking problem where core.autocrlf was set to input. Christopher, if you have this set and/or the .xml files have ^M (CRLF) line endings, please let us know. -- Pete On Thu, Apr 11, 2013 at 8:01 PM, Christopher Yee Mon christopher.yee

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

2013-03-24 Thread Pete Wyckoff
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 p...@padd.com Date: Sun, 17 Mar 2013 16:05:07 -0400 Subject: [PATCH] git p4 test

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

2013-03-19 Thread Pete Wyckoff
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 p...@padd.com wrote: danny.tho...@blackboard.com wrote on Wed, 13 Mar 2013 13:51 -0400: By default, newly added binary files are exclusively locked

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

2013-03-17 Thread Pete Wyckoff
. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2013-03-15 Thread Pete Wyckoff
should check other directories themselves. fanotify is an option here too; it can watch an entire file system. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

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

2013-03-11 Thread Pete Wyckoff
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 git p4 test: should honor

[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 p...@padd.com --- 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

[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 p...@padd.com --- t/t9808-git-p4-chdir.sh | 27 +++ 1 file changed, 27

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

2013-03-11 Thread Pete Wyckoff
and commit message ] Thanks-to: John Keeping j...@keeping.me.uk Signed-off-by: Pete Wyckoff p...@padd.com --- 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

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

2013-03-07 Thread Pete Wyckoff
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 ++--- t

[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 p...@padd.com --- 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

[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 p...@padd.com --- t/t9808-git-p4-chdir.sh | 27 +++ 1 file changed, 27

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

2013-03-07 Thread Pete Wyckoff
and commit message ] Thanks-to: John Keeping j...@keeping.me.uk Signed-off-by: Pete Wyckoff p...@padd.com --- 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

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

2013-03-05 Thread Pete Wyckoff
it off and see if it is worth considering. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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 sh...@keba.be writes: 2013/1/5 Pete Wyckoff p...@padd.com: sh...@keba.be wrote on Thu, 03 Jan 2013 15:58 -0500: ... Please do feel welcome to to rearrange or expand the documentation so it makes more sense

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 p...@padd.com 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: git status | webkit

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

2013-02-16 Thread Pete Wyckoff
Stock min 4.56 avg 5.79 +/- 0.79 max 7.08 Duy min 3.96 avg 5.25 +/- 0.95 max 6.95 Similar 30%-ish speedup on webkit. And an absolute gain of 2.7 seconds is quite nice. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

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

2013-02-03 Thread Pete Wyckoff
. Probably some elements of GitPython can be used too. I'm not so interested in the raw database manipulation, but the command wrappers look reasonable. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

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

2013-02-03 Thread Pete Wyckoff
not use os.getcwd(), as you show. I'll whip something up soon, unless you beat me to it. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2013-01-30 Thread Pete Wyckoff
. That work will need much of the changes in this Cygwin series as well. It is more complicated since there's no native python for Msysgit (yet). I think the Cygwin changes should go in now. -- Pete -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH 1/2] git-p4.py: support Python 2.5

2013-01-26 Thread Pete Wyckoff
translate() was a bit too subtle already. Could you try something like this instead? m = re.search([*#@%], path) return m is not None I think that'll work everywhere and not force people to look up how translate and maketrans work. -- Pete -- To unsubscribe from this list

Re: [PATCH 2/2] git-p4.py: support Python 2.4

2013-01-26 Thread Pete Wyckoff
-by: Pete Wyckoff p...@padd.com diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh index 21924df..be299dc 100755 --- a/t/t9802-git-p4-filetype.sh +++ b/t/t9802-git-p4-filetype.sh @@ -105,12 +105,13 @@ build_gendouble() { cat gendouble.py -\EOF import sys

  1   2   3   >