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 2594a4
> >>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
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
---
Note: Applies
s/branchortag
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"
could get something like this to work.
Start in getBranchMapping() and don't forget to write up your
work in Documentation/git-p4.txt. Also, this is sort of a messy
area of the code, unfortunately. t/t9801 tries to make sure some
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
' 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
-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
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
ect-branches -v
Yes, this is a good bug. You could do "git rev-parse -q --verify"
on parent before trying to read the rev-list.
But then what should happen? I suspect git-p4 will just create
that ref when it commits the change it is 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
apply "
> tryPatchCmd = patchcmd + "--check -"
> applyPatchCmd = patchcmd + "--check --apply -"
> --
This looks like a straightforward change, but can you give a
bit more background on why a full index is required? Do you
mean that "git apply&
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
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
put 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
> Sig
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
ple comparisons like
you quote.
I'm not sure how to robustify this. At least doing the multiple
comparisons should make the tests work again. The goal of this
series of tests is to make sure that copy detection is working,
not to verify that the correct copy choice was made. That should
b
revision of each
file for each change already in git. And git already knows the
blob for each of files in those changes. With this mapping, you
could modify git p4 to check for the blob first, before doing "p4
print" on the file#rev. See also git-p4raw from Sam Vilain that
builds up SQL f
port stream,
which is supposed to make it write the branches out. You might
consider grabbing the fast-import process 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,
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
^\"..\"%s\"" % (id, id)
> > +diffcmd = "git diff-tree -p \"%s\"" % (id)
> > patchcmd = diffcmd + " | git apply "
> > tryPatchCmd = patchcmd + "--check -"
> > applyPatchCmd = patchcmd + &q
> 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 "
pre-merge-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
Thomas Rast writes:
> Antoine Pelisse writes:
>
>>>> On Wed, 27 Nov 2013 15:17:27 +
>>>> Pete Forman wrote:
>>>>
>>>>> I am looking for a way of detecting up front whether a git pull or
>>>>> git merge woul
#x27;t actually feed this file directly to "p4 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
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
nts to nowhere. Maybe do:
$ p4 describe -s 59702
and see if you can figure out which of those could be a symlink, then
inspect it:
$ p4 fstat //depot/symlink@59702
(probably shows it is "headRev 1")
$ p4 print -q //depot/symlink#1
$ p4 print -q //depot/symlink#1 | od -
nk#1 | od -c
>
> Thanks for checking this depot info first.
I've tried to hack a test that produces a null symlink,
and having done so, find an error later on trying to
generate a symlink that points to "". So the "easy"
fix of checking for an empty string is unlikely
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
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
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
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
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
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
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
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
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
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
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
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
-
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-
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
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
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
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
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
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
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
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
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
---
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
-
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
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
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-
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
er than git :-(
So sorry. I on the other hand have been fortunate enough to
switch to using only git.
Nevertheless, 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 maintenanc
y" \
> +print "or \"p4 submit -i <%s\" to use the one prepared by" \
>" \"git p4\"." % fileName
> print "You can delete the file \"%s\" when finished." % fileName
>
Looks
ubstantive work 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.
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!
(3 sec ?). My theory
about one gigantic object is debunked: you have only the 118 MB
one. Perhaps there's some container or process memory limit, as
Luke guessed, but it's not obvious here.
The other big hammer is "strace". If you're still interested in
playing wit
The changes don't overlap. If you give it a range that includes
changes already synced, git-p4 makes sure to start only at the
lowest change it has 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
.e., like the output of `git diff`). If `-v` is specified
Should this be `git diff --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`?
-
sitively 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
+
> > 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;
27;m a bit out of my depth on case-insensitive file systems. Do
check if the cloner in question has core.ignorecase config option
set:
git config --get 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
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
d cleanup_git &&
How does the p4 sync help here?
> +test_expect_success 'view wildcard *' '
> + client_view "//depot/... //client/..." \
> + "-//depot/dir1/*.junk //client/dir1/*.junk" \
> + "-//depot/dir2/*.junk //client/dir2/*.junk&quo
ern 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 approach will make the import take twice
as long, I'll guess. Do you have a
[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
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 +--
\0 \0 c o d e s 006 \0 \0 \0 b i 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)
--
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
; to just search cache value.
>
> Could you accept?
This looks good. I've started my own performance testing
on a few-hundred-thousand file repo to confirm your findings.
If it seems to work out, we can clean up the patch. Otherwise
maybe need to think about having both implementatio
perf tests on the 3-patch version. It
looks 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 major
e attractiveness of the simplicity and increased client spec feature
coverage weighs in its 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 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
fill all of memory. You will at least isolate
the change.
There are options to git-fast-import to limit max pack size
and to cause it to skip importing files that are too big, if
that would help.
You can also use a client spec to hide the offending files
from git.
Can you watch with "
This bug was introduced in cb585a9 (git-p4: keyword
flattening fixes, 2011-10-16). The newline character
is indeed special, and $File$ expansions should not try
to match across multiple lines.
Based-on-patch-by: Chris Goard
Signed-off-by: Pete Wyckoff
---
cgo...@gmail.com wrote on Mon, 16 Jul
o standard where that is specified.
>
> If open() is not required to be idempotent, it's use with O_CREAT |
> O_EXCL and SA_RESTART seems fatally flawed.
man 7 signal (linux man-pages 3.42) describes open() as restartable.
Which network filesystem and OS are you using? The third
br...@interlinx.bc.ca wrote on Mon, 05 Nov 2012 10:25 -0500:
> On 12-11-04 05:10 PM, Pete Wyckoff wrote:
> > Which network filesystem and OS are you using?
>
> The filesystem is Lustre. So not only is it networked, it is
> distributed where the namespace and data store are ha
vitor@gmail.com wrote on Mon, 05 Nov 2012 17:37 +:
> Pete Wyckoff padd.com> writes:
>
> >
> > From: Gary Gibbons perforce.com>
> >
> > For -M option (detectRenames) in P4Submit, use 'p4 move' rather
> > than 'p4 integrate
esolve reference" comes from refs.c, which is
when fast-import calls update_branch() on each of the changed
branches as it is finishing.
Vitor, what could git-p4 have done to create a branch name called
"refs/remotes/p4/depot/MAINLINE/02_SubSystem/10_ARINC_429"?
Any other questions for Arthur?
-- 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
low disabling "p4 move" with a configurable. Check
for both these cases by testing a p4 move command on bogus
filenames and looking for strings in the error messages.
Signed-off-by: Pete Wyckoff
---
vitor@gmail.com wrote on Wed, 07 Nov 2012 21:06 +:
> On Mon, Nov 5, 2012
These are assorted minor fixes. They should be safe for 1.8.1,
and are not urgent enough for maint.
Four of them deal with handling errors from p4d better. The first two
of these have been seen on the list already. The third showed up in my
own testing. The fourth adds a test to make sure that
e
checking in hopes of narrowing down odd behavior seen on
at least two occasions.
Based-on-patch-by: Matt Arsenault
Reported-by: Arthur
Signed-off-by: Pete Wyckoff
---
git-p4.py | 35 ++-
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/git-p4.py b
low disabling "p4 move" with a configuration setting.
Check for both these cases by testing a p4 move command on bogus
filenames and looking for strings in the error messages.
Reported-by: Vitor Antunes
Signed-off-by: Pete Wyckoff
---
git-p4.py| 21
ithout the proper contents. Instead the errant files
will contain a p4 error message, such as "Librarian checkout
//depot/path failed".
Signed-off-by: Pete Wyckoff
---
git-p4.py | 38 +++---
t/t9800-git-p4-basic.sh | 13 -
This test passes already. Make sure p4 diagnostic errors are displayed.
Signed-off-by: Pete Wyckoff
---
t/t9800-git-p4-basic.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 05797c3..8c59796 100755
--- a/t/t9800-git-p4
Signed-off-by: Pete Wyckoff
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index cb1ec8d..9712082 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2406,7 +2406,7 @@ class P4Sync(Command, P4UserMap):
try
It confuses pylint, and is never needed.
Signed-off-by: Pete Wyckoff
---
git-p4.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 9712082..551aec9 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3188,7 +3188,6 @@ def main():
printUsage(commands.keys
at
are identical for both built-in and stand-alone command. Could
be that your text would better go near or with that one, as perhaps
api-command.txt.
-- Pete
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord
git commit -a -m three &&
> - GIT_REMOTE_TESTGIT_SLEEPY=2 git push) &&
> - compare_refs localclone2 HEAD server2 HEAD
> -'
> -
Why does this cause problems?
If you're going to rip it out, please finish the job, and take
out the other two hunks that a
gh, maybe we should try to unify the approach to git-p4
and potential future .py scripts in git.
Acked-by: Pete Wyckoff
Thanks for fixing this bug.
-- Pete
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ke
IR
> +
> +write_script "$HOME/svnrdump" <<\EOF
> +exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
> +EOF
You don't really need to export PYTHON_PATH and GIT_BUILD_DIR if
you get them expanded in the svnrdump sc
sion-related failures more explicit, rather than have users
parse an ImportError traceback, e.g. That seems somewhat useful
for people with ancient installs.
But what about the high-end of the version range? I'm pretty
sure most of these scripts will throw syntax errors on >= 3.0,
how should
eko line4 edit" fileko &&
> git p4 submit &&
> scrub_ko_check fileko &&
I checked that the test still works with your changes.
Thanks for the cleanup!
Acked-by: 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
gits...@pobox.com wrote on Wed, 02 Jan 2013 15:06 -0800:
> Pete Wyckoff writes:
>
> > tbo...@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
> >> sed -i is not portable on all systems.
> >> Use sed with different input and output files.
> >> Utilize a tm
n git,
but restricted to a linear history. I haven't tested that
recently, but will add a test and fix it if needed too.
Please do feel welcome to to rearrange or expand the
documentation so it makes more sense, if you are so inspired.
-- 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
the correct
author information.
Can you explain a bit more what you're looking for?
-- 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
sh...@keba.be wrote on Sat, 12 Jan 2013 14:44 -0500:
> 2013/1/12 Pete Wyckoff :
> > sh...@keba.be wrote on Thu, 10 Jan 2013 22:38 -0500:
> >> I'm in a situation where I don't have P4 admin rights to use the
> >> --preserve-user option of git-p4. However, I wou
(Makefile: detect when PYTHON_PATH changes, 2012-12-18).
It doesn't check version, just path, but hopefully that's good
enough. I'm imagining a rule that would do "clean" if
../GIT-PYTHON-VARS changed, then build without --force.
-- Pete
--
To unsubscribe f
y one place that does:
p4 = subprocess.Popen("p4 -G ...")
marshal.load(p4.stdout)
If that's the only issue, this might not be too paniful.
I hesitated to take Sebastian's changes due to the huge number of
print() lines, but maybe a 2to3 approach would make th
j...@keeping.me.uk wrote on Sun, 13 Jan 2013 00:41 +:
> On Sat, Jan 12, 2013 at 06:43:04PM -0500, Pete Wyckoff wrote:
> > Can you give me some hints about the byte/unicode string issues
> > in git-p4.py? There's really only one place that does:
> >
> >
1 - 100 of 246 matches
Mail list logo
